git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into core/generic-dma-coherent
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
rtasd.c
diff --git
a/arch/powerpc/platforms/pseries/rtasd.c
b/arch/powerpc/platforms/pseries/rtasd.c
index
e3078ce
..
c9ffd8c
100644
(file)
--- a/
arch/powerpc/platforms/pseries/rtasd.c
+++ b/
arch/powerpc/platforms/pseries/rtasd.c
@@
-29,15
+29,10
@@
#include <asm/atomic.h>
#include <asm/machdep.h>
#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);
static DEFINE_SPINLOCK(rtasd_log_lock);
-DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait);
+
static
DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait);
static char *rtas_log_buf;
static unsigned long rtas_log_start;
static char *rtas_log_buf;
static unsigned long rtas_log_start;
@@
-198,7
+193,7
@@
void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
unsigned long s;
int len = 0;
unsigned long s;
int len = 0;
-
DEBUG("
logging event\n");
+
pr_debug("rtasd:
logging event\n");
if (buf == NULL)
return;
if (buf == NULL)
return;
@@
-334,7
+329,7
@@
static unsigned int rtas_log_poll(struct file *file, poll_table * wait)
return 0;
}
return 0;
}
-const struct file_operations proc_rtas_log_operations = {
+
static
const struct file_operations proc_rtas_log_operations = {
.read = rtas_log_read,
.poll = rtas_log_poll,
.open = rtas_log_open,
.read = rtas_log_read,
.poll = rtas_log_poll,
.open = rtas_log_open,
@@
-409,7
+404,8
@@
static int rtasd(void *unused)
daemonize("rtasd");
printk(KERN_DEBUG "RTAS daemon started\n");
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);
/* See if we have any error stored in NVRAM */
memset(logdata, 0, rtas_error_log_max);
@@
-428,9
+424,9
@@
static int rtasd(void *unused)
do_event_scan_all_cpus(1000);
if (surveillance_timeout != -1) {
do_event_scan_all_cpus(1000);
if (surveillance_timeout != -1) {
-
DEBUG("
enabling surveillance\n");
+
pr_debug("rtasd:
enabling surveillance\n");
enable_surveillance(surveillance_timeout);
enable_surveillance(surveillance_timeout);
-
DEBUG("
surveillance enabled\n");
+
pr_debug("rtasd:
surveillance enabled\n");
}
/* Delay should be at least one second since some
}
/* Delay should be at least one second since some
@@
-472,10
+468,9
@@
static int __init rtas_init(void)
return -ENOMEM;
}
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)
printk(KERN_ERR "Failed to create error_log proc entry\n");
if (kernel_thread(rtasd, NULL, CLONE_FS) < 0)