Merge branches 'softirq-for-linus', 'x86-debug-for-linus', 'x86-numa-for-linus',...

[mv-sheeva.git] / arch / s390 / kernel / mem_detect.c

diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/kernel/mem_detect.c
index 559af0d07878867cb0e382226c33852af5e17e62..0fbe4e32f7ba298c83b22dfe831b66545fba8ace 100644 (file)
--- a/arch/s390/kernel/mem_detect.c
+++ b/arch/s390/kernel/mem_detect.c
@@ -54,11 +54,11 @@ void detect_memory_layout(struct mem_chunk chunk[])
         * right thing and we don't get scheduled away with low address
         * protection disabled.
         */
-       flags = __raw_local_irq_stnsm(0xf8);
+       flags = __arch_local_irq_stnsm(0xf8);
        __ctl_store(cr0, 0, 0);
        __ctl_clear_bit(0, 28);
        find_memory_chunks(chunk);
        __ctl_load(cr0, 0, 0);
-       __raw_local_irq_ssm(flags);
+       arch_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(detect_memory_layout);