| From 6aa4659865454a3885195aa49348c46a69e6bee2 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Mon, 22 Feb 2010 21:31:42 +0100 |
| Subject: [PATCH] powerpc: rtasd: do not check for irq_disabled on RT |
| |
| commit 6aa4659865454a3885195aa49348c46a69e6bee2 in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c |
| index 2e4832a..0059a8f 100644 |
| --- a/arch/powerpc/kernel/rtasd.c |
| +++ b/arch/powerpc/kernel/rtasd.c |
| @@ -209,7 +209,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) |
| break; |
| case ERR_TYPE_KERNEL_PANIC: |
| default: |
| - WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| + WARN_ON_ONCE_NONRT(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| spin_unlock_irqrestore(&rtasd_log_lock, s); |
| return; |
| } |
| @@ -231,7 +231,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) |
| /* Check to see if we need to or have stopped logging */ |
| if (fatal || !logging_enabled) { |
| logging_enabled = 0; |
| - WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| + WARN_ON_ONCE_NONRT(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| spin_unlock_irqrestore(&rtasd_log_lock, s); |
| return; |
| } |
| @@ -254,13 +254,13 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) |
| else |
| rtas_log_start += 1; |
| |
| - WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| + WARN_ON_ONCE_NONRT(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| spin_unlock_irqrestore(&rtasd_log_lock, s); |
| wake_up_interruptible(&rtas_log_wait); |
| break; |
| case ERR_TYPE_KERNEL_PANIC: |
| default: |
| - WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| + WARN_ON_ONCE_NONRT(!irqs_disabled()); /* @@@ DEBUG @@@ */ |
| spin_unlock_irqrestore(&rtasd_log_lock, s); |
| return; |
| } |
| -- |
| 1.7.1.1 |
| |
