Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b0e525 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:
 "Two bug fixes:

   - A fix for cputime accounting vs CPU hotplug

   - Add two options to zfcpdump_defconfig to make SCSI dump work again"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: fix zfcpdump-config
  s390/cputime: fix guest/irq/softirq times after CPU hotplug
parents 503f7e29 0015a978

arch/s390/configs/zfcpdump_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ CONFIG_NET=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_BLK_DEV_RAM=y

# CONFIG_BLK_DEV_XPRAM is not set

# CONFIG_DCSSBLK is not set

# CONFIG_DASD is not set
@@ -59,6 +60,7 @@ CONFIG_CONFIGFS_FS=y 
# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_PANIC_ON_OOPS=y

# CONFIG_SCHED_DEBUG is not set

arch/s390/kernel/smp.c

+3 −0
Original line number Diff line number Diff line
@@ -293,7 +293,10 @@ static void pcpu_attach_task(struct pcpu *pcpu, struct task_struct *tsk) 
	lc->lpp = LPP_MAGIC;

	lc->current_pid = tsk->pid;

	lc->user_timer = tsk->thread.user_timer;

	lc->guest_timer = tsk->thread.guest_timer;

	lc->system_timer = tsk->thread.system_timer;

	lc->hardirq_timer = tsk->thread.hardirq_timer;

	lc->softirq_timer = tsk->thread.softirq_timer;

	lc->steal_timer = 0;

}