mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-28 01:21:58 +00:00
[PATCH] s390: cleanup Kconfig
Sanitize some s390 Kconfig options. We have ARCH_S390, ARCH_S390X, ARCH_S390_31, 64BIT, S390_SUPPORT and COMPAT. Replace these 6 options by S390, 64BIT and COMPAT. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
9bbc8346fb
commit
347a8dc3b8
60 changed files with 183 additions and 208 deletions
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue