This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc64 / kernel / rtasd.c

diff --git a/arch/ppc64/kernel/rtasd.c b/arch/ppc64/kernel/rtasd.c
index 536f049..c6370a8 100644 (file)
--- a/arch/ppc64/kernel/rtasd.c
+++ b/arch/ppc64/kernel/rtasd.c
@@ -48,7 +48,7 @@ static unsigned int rtas_error_log_buffer_max;
 
 static int full_rtas_msgs = 0;
 
-extern int no_logging;
+extern volatile int no_more_logging;
 
 volatile int error_log_cnt = 0;
 
@@ -213,7 +213,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
        }
 
        /* Write error to NVRAM */
-       if (!no_logging && !(err_type & ERR_FLAG_BOOT))
+       if (!no_more_logging && !(err_type & ERR_FLAG_BOOT))
                nvram_write_error_log(buf, len, err_type);
 
        /*
@@ -225,8 +225,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
                printk_log_rtas(buf, len);
 
        /* Check to see if we need to or have stopped logging */
-       if (fatal || no_logging) {
-               no_logging = 1;
+       if (fatal || no_more_logging) {
+               no_more_logging = 1;
                spin_unlock_irqrestore(&rtasd_log_lock, s);
                return;
        }
@@ -275,7 +275,7 @@ static int rtas_log_release(struct inode * inode, struct file * file)
  * know that we can safely clear the events in NVRAM.
  * Next we'll sit and wait for something else to log.
  */
-static ssize_t rtas_log_read(struct file * file, char __user * buf,
+static ssize_t rtas_log_read(struct file * file, char * buf,
                         size_t count, loff_t *ppos)
 {
        int error;
@@ -299,7 +299,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
 
        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_logging)
+       if (rtas_log_size == 0 && !no_more_logging)
                nvram_clear_error_log();
        spin_unlock_irqrestore(&rtasd_log_lock, s);
 
@@ -417,6 +417,9 @@ static int rtasd(void *unused)
                goto error;
        }
 
+       /* We can use rtas_log_buf now */
+       no_more_logging = 0;
+
        printk(KERN_ERR "RTAS daemon started\n");
 
        DEBUG("will sleep for %d jiffies\n", (HZ*60/rtas_event_scan_rate) / 2);
@@ -425,10 +428,6 @@ static int rtasd(void *unused)
        memset(logdata, 0, rtas_error_log_max);
 
        rc = nvram_read_error_log(logdata, rtas_error_log_max, &err_type);
-
-       /* We can use rtas_log_buf now */
-       no_logging = 0;
-
        if (!rc) {
                if (err_type != ERR_FLAG_ALREADY_LOGGED) {
                        pSeries_log_error(logdata, err_type | ERR_FLAG_BOOT, 0);