diff options
Diffstat (limited to 'kernel/panic.c')
-rw-r--r-- | kernel/panic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index aabc5f86fa3f..c5c4ab255834 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
@@ -60,7 +60,7 @@ NORET_TYPE void panic(const char * fmt, ...) | |||
60 | long i; | 60 | long i; |
61 | static char buf[1024]; | 61 | static char buf[1024]; |
62 | va_list args; | 62 | va_list args; |
63 | #if defined(CONFIG_ARCH_S390) | 63 | #if defined(CONFIG_S390) |
64 | unsigned long caller = (unsigned long) __builtin_return_address(0); | 64 | unsigned long caller = (unsigned long) __builtin_return_address(0); |
65 | #endif | 65 | #endif |
66 | 66 | ||
@@ -125,7 +125,7 @@ NORET_TYPE void panic(const char * fmt, ...) | |||
125 | printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n"); | 125 | printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n"); |
126 | } | 126 | } |
127 | #endif | 127 | #endif |
128 | #if defined(CONFIG_ARCH_S390) | 128 | #if defined(CONFIG_S390) |
129 | disabled_wait(caller); | 129 | disabled_wait(caller); |
130 | #endif | 130 | #endif |
131 | local_irq_enable(); | 131 | local_irq_enable(); |