Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[karo-tx-linux.git] / arch / s390 / kernel / early.c

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index a734f3585cebdd8eda8db980fb0343bae16a1b1b..0dff972a169c16dd533c8256de9771e96f459e01 100644 (file)
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -258,13 +258,19 @@ static __init void setup_topology(void)
 static void early_pgm_check_handler(void)
 {
        const struct exception_table_entry *fixup;
+       unsigned long cr0, cr0_new;
        unsigned long addr;
 
        addr = S390_lowcore.program_old_psw.addr;
        fixup = search_exception_tables(addr & PSW_ADDR_INSN);
        if (!fixup)
                disabled_wait(0);
+       /* Disable low address protection before storing into lowcore. */
+       __ctl_store(cr0, 0, 0);
+       cr0_new = cr0 & ~(1UL << 28);
+       __ctl_load(cr0_new, 0, 0);
        S390_lowcore.program_old_psw.addr = extable_fixup(fixup)|PSW_ADDR_AMODE;
+       __ctl_load(cr0, 0, 0);
 }
 
 static noinline __init void setup_lowcore_early(void)