diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /kernel/panic.c | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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(); |