Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 's390-6.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- Fix absolute zero lowcore corruption on kdump when CPU0 is offline
- Fix lowcore protection setup for offline CPU restart
* tag 's390-6.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/smp: enforce lowcore protection on CPU restart
s390/boot: fix absolute zero lowcore corruption on boot
+3
-2
+1
-1
arch/s390/kernel/nmi.c
+1
-1
arch/s390/kernel/nmi.c
···
64
64
* structure. The structure is required for machine check happening
65
65
* early in the boot process.
66
66
*/
67
-
static struct mcesa boot_mcesa __initdata __aligned(MCESA_MAX_SIZE);
67
+
static struct mcesa boot_mcesa __aligned(MCESA_MAX_SIZE);
68
68
69
69
void __init nmi_alloc_mcesa_early(u64 *mcesad)
70
70
{
+2
-1
arch/s390/kernel/setup.c
+2
-1
arch/s390/kernel/setup.c
···
479
479
put_abs_lowcore(restart_data, lc->restart_data);
480
480
put_abs_lowcore(restart_source, lc->restart_source);
481
481
put_abs_lowcore(restart_psw, lc->restart_psw);
482
+
put_abs_lowcore(mcesad, lc->mcesad);
482
483
483
484
mcck_stack = (unsigned long)memblock_alloc(THREAD_SIZE, THREAD_SIZE);
484
485
if (!mcck_stack)
···
508
507
S390_lowcore.svc_new_psw.mask |= PSW_MASK_DAT;
509
508
S390_lowcore.program_new_psw.mask |= PSW_MASK_DAT;
510
509
S390_lowcore.io_new_psw.mask |= PSW_MASK_DAT;
511
-
__ctl_store(S390_lowcore.cregs_save_area, 0, 15);
512
510
__ctl_set_bit(0, 28);
511
+
__ctl_store(S390_lowcore.cregs_save_area, 0, 15);
513
512
put_abs_lowcore(restart_flags, RESTART_FLAG_CTLREGS);
514
513
put_abs_lowcore(program_new_psw, lc->program_new_psw);
515
514
for (cr = 0; cr < ARRAY_SIZE(lc->cregs_save_area); cr++)