X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fplatforms%2Fpseries%2Frtasd.c;fp=arch%2Fpowerpc%2Fplatforms%2Fpseries%2Frtasd.c;h=a6f628d4c9dc59130e2c226b7abf6348fa9764d0;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=2e4e04042d85705f9700de82ba8aabe001e8239c;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 2e4e04042..a6f628d4c 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -27,7 +27,6 @@
 #include <asm/prom.h>
 #include <asm/nvram.h>
 #include <asm/atomic.h>
-#include <asm/machdep.h>
 
 #if 0
 #define DEBUG(A...)	printk(KERN_ERR A)
@@ -348,7 +347,7 @@ static int enable_surveillance(int timeout)
 		return 0;
 
 	if (error == -EINVAL) {
-		printk(KERN_DEBUG "rtasd: surveillance not supported\n");
+		printk(KERN_INFO "rtasd: surveillance not supported\n");
 		return 0;
 	}
 
@@ -440,7 +439,7 @@ static int rtasd(void *unused)
 		goto error;
 	}
 
-	printk(KERN_DEBUG "RTAS daemon started\n");
+	printk(KERN_INFO "RTAS daemon started\n");
 
 	DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));
 
@@ -482,13 +481,13 @@ static int __init rtas_init(void)
 {
 	struct proc_dir_entry *entry;
 
-	if (!machine_is(pseries))
+	if (!platform_is_pseries())
 		return 0;
 
 	/* No RTAS */
 	if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
-		printk(KERN_DEBUG "rtasd: no event-scan on system\n");
-		return -ENODEV;
+		printk(KERN_INFO "rtasd: no event-scan on system\n");
+		return 1;
 	}
 
 	entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);