From: David Gibson <david@gibson.dropbear.id.au>
Both arch/ppc64/kernel/ras.c and arch/ppc64/kernel/rtasd.c have a spinlock
variable declared static called "log_lock". Since the code in these files
interact quit a lot, having two different locks with identical names is
manifestly confusing. This patch renames both locks to something a little
clearer. In the case of ras.c it also renames the buffer protected by the
lock to a more usefullly greppable name.
Signed-off-by: David Gibson <dwg@au.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/ppc64/kernel/ras.c | 34 +++++++++++++++++-----------------
25-akpm/arch/ppc64/kernel/rtasd.c | 20 ++++++++++----------
2 files changed, 27 insertions(+), 27 deletions(-)
diff -puN arch/ppc64/kernel/ras.c~ppc64-fix-ras-irq-handlers arch/ppc64/kernel/ras.c
--- 25/arch/ppc64/kernel/ras.c~ppc64-fix-ras-irq-handlers 2004-07-29 21:34:42.885842000 -0700
+++ 25-akpm/arch/ppc64/kernel/ras.c 2004-07-29 21:34:42.890841240 -0700
@@ -52,8 +52,8 @@
#include <asm/rtas.h>
#include <asm/ppcdebug.h>
-static unsigned char log_buf[RTAS_ERROR_LOG_MAX];
-static spinlock_t log_lock = SPIN_LOCK_UNLOCKED;
+static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];
+static spinlock_t ras_log_buf_lock = SPIN_LOCK_UNLOCKED;
static int ras_get_sensor_state_token;
static int ras_check_exception_token;
@@ -155,23 +155,23 @@ ras_epow_interrupt(int irq, void *dev_id
else
critical = 0;
- spin_lock(&log_lock);
+ spin_lock(&ras_log_buf_lock);
status = rtas_call(ras_check_exception_token, 6, 1, NULL,
RAS_VECTOR_OFFSET,
virt_irq_to_real(irq_offset_down(irq)),
RTAS_EPOW_WARNING | RTAS_POWERMGM_EVENTS,
- critical, __pa(&log_buf), RTAS_ERROR_LOG_MAX);
+ critical, __pa(&ras_log_buf), RTAS_ERROR_LOG_MAX);
udbg_printf("EPOW <0x%lx 0x%x 0x%x>\n",
- *((unsigned long *)&log_buf), status, state);
+ *((unsigned long *)&ras_log_buf), status, state);
printk(KERN_WARNING "EPOW <0x%lx 0x%x 0x%x>\n",
- *((unsigned long *)&log_buf), status, state);
+ *((unsigned long *)&ras_log_buf), status, state);
/* format and print the extended information */
- log_error(log_buf, ERR_TYPE_RTAS_LOG, 0);
+ log_error(ras_log_buf, ERR_TYPE_RTAS_LOG, 0);
- spin_unlock(&log_lock);
+ spin_unlock(&ras_log_buf_lock);
return IRQ_HANDLED;
}
@@ -190,15 +190,15 @@ ras_error_interrupt(int irq, void *dev_i
int status = 0xdeadbeef;
int fatal;
- spin_lock(&log_lock);
+ spin_lock(&ras_log_buf_lock);
status = rtas_call(ras_check_exception_token, 6, 1, NULL,
RAS_VECTOR_OFFSET,
virt_irq_to_real(irq_offset_down(irq)),
RTAS_INTERNAL_ERROR, 1 /*Time Critical */,
- __pa(&log_buf), RTAS_ERROR_LOG_MAX);
+ __pa(&ras_log_buf), RTAS_ERROR_LOG_MAX);
- rtas_elog = (struct rtas_error_log *)log_buf;
+ rtas_elog = (struct rtas_error_log *)ras_log_buf;
if ((status == 0) && (rtas_elog->severity >= SEVERITY_ERROR_SYNC))
fatal = 1;
@@ -206,13 +206,13 @@ ras_error_interrupt(int irq, void *dev_i
fatal = 0;
/* format and print the extended information */
- log_error(log_buf, ERR_TYPE_RTAS_LOG, fatal);
+ log_error(ras_log_buf, ERR_TYPE_RTAS_LOG, fatal);
if (fatal) {
udbg_printf("Fatal HW Error <0x%lx 0x%x>\n",
- *((unsigned long *)&log_buf), status);
+ *((unsigned long *)&ras_log_buf), status);
printk(KERN_EMERG "Error: Fatal hardware error <0x%lx 0x%x>\n",
- *((unsigned long *)&log_buf), status);
+ *((unsigned long *)&ras_log_buf), status);
#ifndef DEBUG
/* Don't actually power off when debugging so we can test
@@ -223,12 +223,12 @@ ras_error_interrupt(int irq, void *dev_i
#endif
} else {
udbg_printf("Recoverable HW Error <0x%lx 0x%x>\n",
- *((unsigned long *)&log_buf), status);
+ *((unsigned long *)&ras_log_buf), status);
printk(KERN_WARNING
"Warning: Recoverable hardware error <0x%lx 0x%x>\n",
- *((unsigned long *)&log_buf), status);
+ *((unsigned long *)&ras_log_buf), status);
}
- spin_unlock(&log_lock);
+ spin_unlock(&ras_log_buf_lock);
return IRQ_HANDLED;
}
diff -puN arch/ppc64/kernel/rtasd.c~ppc64-fix-ras-irq-handlers arch/ppc64/kernel/rtasd.c
--- 25/arch/ppc64/kernel/rtasd.c~ppc64-fix-ras-irq-handlers 2004-07-29 21:34:42.886841848 -0700
+++ 25-akpm/arch/ppc64/kernel/rtasd.c 2004-07-29 21:34:42.891841088 -0700
@@ -33,7 +33,7 @@
#define DEBUG(A...)
#endif
-static spinlock_t log_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t rtasd_log_lock = SPIN_LOCK_UNLOCKED;
DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait);
@@ -152,7 +152,7 @@ void pSeries_log_error(char *buf, unsign
if (buf == NULL)
return;
- spin_lock_irqsave(&log_lock, s);
+ spin_lock_irqsave(&rtasd_log_lock, s);
/* get length and increase count */
switch (err_type & ERR_TYPE_MASK) {
@@ -163,7 +163,7 @@ void pSeries_log_error(char *buf, unsign
break;
case ERR_TYPE_KERNEL_PANIC:
default:
- spin_unlock_irqrestore(&log_lock, s);
+ spin_unlock_irqrestore(&rtasd_log_lock, s);
return;
}
@@ -174,7 +174,7 @@ void pSeries_log_error(char *buf, unsign
/* Check to see if we need to or have stopped logging */
if (fatal || no_more_logging) {
no_more_logging = 1;
- spin_unlock_irqrestore(&log_lock, s);
+ spin_unlock_irqrestore(&rtasd_log_lock, s);
return;
}
@@ -199,12 +199,12 @@ void pSeries_log_error(char *buf, unsign
else
rtas_log_start += 1;
- spin_unlock_irqrestore(&log_lock, s);
+ spin_unlock_irqrestore(&rtasd_log_lock, s);
wake_up_interruptible(&rtas_log_wait);
break;
case ERR_TYPE_KERNEL_PANIC:
default:
- spin_unlock_irqrestore(&log_lock, s);
+ spin_unlock_irqrestore(&rtasd_log_lock, s);
return;
}
@@ -247,24 +247,24 @@ static ssize_t rtas_log_read(struct file
return -ENOMEM;
- spin_lock_irqsave(&log_lock, s);
+ spin_lock_irqsave(&rtasd_log_lock, s);
/* if it's 0, then we know we got the last one (the one in NVRAM) */
if (rtas_log_size == 0 && !no_more_logging)
nvram_clear_error_log();
- spin_unlock_irqrestore(&log_lock, s);
+ spin_unlock_irqrestore(&rtasd_log_lock, s);
error = wait_event_interruptible(rtas_log_wait, rtas_log_size);
if (error)
goto out;
- spin_lock_irqsave(&log_lock, s);
+ spin_lock_irqsave(&rtasd_log_lock, s);
offset = rtas_error_log_buffer_max * (rtas_log_start & LOG_NUMBER_MASK);
memcpy(tmp, &rtas_log_buf[offset], count);
rtas_log_start += 1;
rtas_log_size -= 1;
- spin_unlock_irqrestore(&log_lock, s);
+ spin_unlock_irqrestore(&rtasd_log_lock, s);
error = copy_to_user(buf, tmp, count) ? -EFAULT : count;
out:
_