X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fpanic.c;h=c5c4ab255834e5760715e3f7ce4871a2a943245e;hb=199e7056895c8427dec63e1d9841ceafcfaaf314;hp=aabc5f86fa3f4422a2b2cea9b3d67723cd99e317;hpb=c0d6f9663b30a09ed725229b2d50391268c8538e;p=linux-2.6

diff --git a/kernel/panic.c b/kernel/panic.c
index aabc5f86fa..c5c4ab2558 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -60,7 +60,7 @@ NORET_TYPE void panic(const char * fmt, ...)
 	long i;
 	static char buf[1024];
 	va_list args;
-#if defined(CONFIG_ARCH_S390)
+#if defined(CONFIG_S390)
         unsigned long caller = (unsigned long) __builtin_return_address(0);
 #endif
 
@@ -125,7 +125,7 @@ NORET_TYPE void panic(const char * fmt, ...)
 		printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n");
 	}
 #endif
-#if defined(CONFIG_ARCH_S390)
+#if defined(CONFIG_S390)
         disabled_wait(caller);
 #endif
 	local_irq_enable();