Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / pseries / rtasd.c

diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 30925d29bcead9e896c3109177fce633c8c7d883..7d3e2b0bd4d299d5f467fde2a014dec0fb835fdb 100644 (file)
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -29,11 +29,6 @@
 #include <asm/atomic.h>
 #include <asm/machdep.h>
 
-#if 0
-#define DEBUG(A...)    printk(KERN_ERR A)
-#else
-#define DEBUG(A...)
-#endif
 
 static DEFINE_SPINLOCK(rtasd_log_lock);
 
@@ -54,8 +49,9 @@ static unsigned int rtas_event_scan_rate;
 static int full_rtas_msgs = 0;
 
 /* Stop logging to nvram after first fatal error */
-static int no_more_logging;
-
+static int logging_enabled; /* Until we initialize everything,
+                             * make sure we don't try logging
+                             * anything */
 static int error_log_cnt;
 
 /*
@@ -197,7 +193,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
        unsigned long s;
        int len = 0;
 
-       DEBUG("logging event\n");
+       pr_debug("rtasd: logging event\n");
        if (buf == NULL)
                return;
 
@@ -217,7 +213,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
        }
 
        /* Write error to NVRAM */
-       if (!no_more_logging && !(err_type & ERR_FLAG_BOOT))
+       if (logging_enabled && !(err_type & ERR_FLAG_BOOT))
                nvram_write_error_log(buf, len, err_type, error_log_cnt);
 
        /*
@@ -229,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_more_logging) {
-               no_more_logging = 1;
+       if (fatal || !logging_enabled) {
+               logging_enabled = 0;
                spin_unlock_irqrestore(&rtasd_log_lock, s);
                return;
        }
@@ -302,7 +298,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_more_logging)
+       if (rtas_log_size == 0 && logging_enabled)
                nvram_clear_error_log();
        spin_unlock_irqrestore(&rtasd_log_lock, s);
 
@@ -381,7 +377,7 @@ static void do_event_scan_all_cpus(long delay)
 {
        int cpu;
 
-       lock_cpu_hotplug();
+       get_online_cpus();
        cpu = first_cpu(cpu_online_map);
        for (;;) {
                set_cpus_allowed(current, cpumask_of_cpu(cpu));
@@ -389,15 +385,15 @@ static void do_event_scan_all_cpus(long delay)
                set_cpus_allowed(current, CPU_MASK_ALL);
 
                /* Drop hotplug lock, and sleep for the specified delay */
-               unlock_cpu_hotplug();
+               put_online_cpus();
                msleep_interruptible(delay);
-               lock_cpu_hotplug();
+               get_online_cpus();
 
                cpu = next_cpu(cpu, cpu_online_map);
                if (cpu == NR_CPUS)
                        break;
        }
-       unlock_cpu_hotplug();
+       put_online_cpus();
 }
 
 static int rtasd(void *unused)
@@ -408,12 +404,15 @@ static int rtasd(void *unused)
        daemonize("rtasd");
 
        printk(KERN_DEBUG "RTAS daemon started\n");
-       DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));
+       pr_debug("rtasd: will sleep for %d milliseconds\n",
+                (30000 / rtas_event_scan_rate));
 
        /* See if we have any error stored in NVRAM */
        memset(logdata, 0, rtas_error_log_max);
        rc = nvram_read_error_log(logdata, rtas_error_log_max,
                                  &err_type, &error_log_cnt);
+       /* We can use rtas_log_buf now */
+       logging_enabled = 1;
 
        if (!rc) {
                if (err_type != ERR_FLAG_ALREADY_LOGGED) {
@@ -425,9 +424,9 @@ static int rtasd(void *unused)
        do_event_scan_all_cpus(1000);
 
        if (surveillance_timeout != -1) {
-               DEBUG("enabling surveillance\n");
+               pr_debug("rtasd: enabling surveillance\n");
                enable_surveillance(surveillance_timeout);
-               DEBUG("surveillance enabled\n");
+               pr_debug("rtasd: surveillance enabled\n");
        }
 
        /* Delay should be at least one second since some
@@ -469,10 +468,9 @@ static int __init rtas_init(void)
                return -ENOMEM;
        }
 
-       entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);
-       if (entry)
-               entry->proc_fops = &proc_rtas_log_operations;
-       else
+       entry = proc_create("ppc64/rtas/error_log", S_IRUSR, NULL,
+                           &proc_rtas_log_operations);
+       if (!entry)
                printk(KERN_ERR "Failed to create error_log proc entry\n");
 
        if (kernel_thread(rtasd, NULL, CLONE_FS) < 0)