projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] kprobes: changed from using spinlock to mutex
[powerpc.git]
/
kernel
/
panic.c
diff --git
a/kernel/panic.c
b/kernel/panic.c
index
aabc5f8
..
c5c4ab2
100644
(file)
--- 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;
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
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
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();
disabled_wait(caller);
#endif
local_irq_enable();