diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /arch/powerpc/platforms | |
parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/pseries/rtasd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c index f4e55be2eea9..afad9f5ac0ac 100644 --- a/arch/powerpc/platforms/pseries/rtasd.c +++ b/arch/powerpc/platforms/pseries/rtasd.c | |||
@@ -208,6 +208,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) | |||
208 | break; | 208 | break; |
209 | case ERR_TYPE_KERNEL_PANIC: | 209 | case ERR_TYPE_KERNEL_PANIC: |
210 | default: | 210 | default: |
211 | WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ | ||
211 | spin_unlock_irqrestore(&rtasd_log_lock, s); | 212 | spin_unlock_irqrestore(&rtasd_log_lock, s); |
212 | return; | 213 | return; |
213 | } | 214 | } |
@@ -227,6 +228,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) | |||
227 | /* Check to see if we need to or have stopped logging */ | 228 | /* Check to see if we need to or have stopped logging */ |
228 | if (fatal || !logging_enabled) { | 229 | if (fatal || !logging_enabled) { |
229 | logging_enabled = 0; | 230 | logging_enabled = 0; |
231 | WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ | ||
230 | spin_unlock_irqrestore(&rtasd_log_lock, s); | 232 | spin_unlock_irqrestore(&rtasd_log_lock, s); |
231 | return; | 233 | return; |
232 | } | 234 | } |
@@ -249,11 +251,13 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) | |||
249 | else | 251 | else |
250 | rtas_log_start += 1; | 252 | rtas_log_start += 1; |
251 | 253 | ||
254 | WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ | ||
252 | spin_unlock_irqrestore(&rtasd_log_lock, s); | 255 | spin_unlock_irqrestore(&rtasd_log_lock, s); |
253 | wake_up_interruptible(&rtas_log_wait); | 256 | wake_up_interruptible(&rtas_log_wait); |
254 | break; | 257 | break; |
255 | case ERR_TYPE_KERNEL_PANIC: | 258 | case ERR_TYPE_KERNEL_PANIC: |
256 | default: | 259 | default: |
260 | WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ | ||
257 | spin_unlock_irqrestore(&rtasd_log_lock, s); | 261 | spin_unlock_irqrestore(&rtasd_log_lock, s); |
258 | return; | 262 | return; |
259 | } | 263 | } |