2 files changed, 23 insertions, 50 deletions

diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c
index 943a9473b138..26a2d4c54b68 100644
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/i386/mach-voyager/voyager_cat.c
@@ -1111,7 +1111,7 @@ voyager_cat_do_common_interrupt(void)
                                 printk(KERN_ERR "Voyager front panel switch turned off\n");
                                 voyager_status.switch_off = 1;
                                 voyager_status.request_from_kernel = 1;
-                                up(&kvoyagerd_sem);
+                                wake_up_process(voyager_thread);
                         }
                         /* Tell the hardware we're taking care of the
                          * shutdown, otherwise it will power the box off
@@ -1157,7 +1157,7 @@ voyager_cat_do_common_interrupt(void)
                         outb(VOYAGER_CAT_END, CAT_CMD);
                         voyager_status.power_fail = 1;
                         voyager_status.request_from_kernel = 1;
-                        up(&kvoyagerd_sem);
+                        wake_up_process(voyager_thread);
                 }
                 
                 
diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/i386/mach-voyager/voyager_thread.c
index f39887359e8e..fdc1d926fb2a 100644
--- a/arch/i386/mach-voyager/voyager_thread.c
+++ b/arch/i386/mach-voyager/voyager_thread.c
@@ -24,33 +24,16 @@
 #include <linux/kmod.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
+#include <linux/kthread.h>
 #include <asm/desc.h>
 #include <asm/voyager.h>
 #include <asm/vic.h>
 #include <asm/mtrr.h>
 #include <asm/msr.h>
 
-#define THREAD_NAME "kvoyagerd"
 
-/* external variables */
-int kvoyagerd_running = 0;
-DECLARE_MUTEX_LOCKED(kvoyagerd_sem);
-
-static int thread(void *);
-
-static __u8 set_timeout = 0;
-
-/* Start the machine monitor thread.  Return 1 if OK, 0 if fail */
-static int __init
-voyager_thread_start(void)
-{
-        if(kernel_thread(thread, NULL, CLONE_KERNEL) < 0) {
-                /* This is serious, but not fatal */
-                printk(KERN_ERR "Voyager: Failed to create system monitor thread!!!\n");
-                return 1;
-        }
-        return 0;
-}
+struct task_struct *voyager_thread;
+static __u8 set_timeout;
 
 static int
 execute(const char *string)
@@ -110,31 +93,15 @@ check_continuing_condition(void)
         }
 }
 
-static void
-wakeup(unsigned long unused)
-{
-        up(&kvoyagerd_sem);
-}
-
 static int
 thread(void *unused)
 {
-        struct timer_list wakeup_timer;
-
-        kvoyagerd_running = 1;
-
-        daemonize(THREAD_NAME);
-
-        set_timeout = 0;
-
-        init_timer(&wakeup_timer);
-
-        sigfillset(&current->blocked);
-
         printk(KERN_NOTICE "Voyager starting monitor thread\n");
 
-        for(;;) {
-                down_interruptible(&kvoyagerd_sem);
+        for (;;) {
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(set_timeout ? HZ : MAX_SCHEDULE_TIMEOUT);
+
                 VDEBUG(("Voyager Daemon awoken\n"));
                 if(voyager_status.request_from_kernel == 0) {
                         /* probably awoken from timeout */
@@ -143,20 +110,26 @@ thread(void *unused)
                         check_from_kernel();
                         voyager_status.request_from_kernel = 0;
                 }
-                if(set_timeout) {
-                        del_timer(&wakeup_timer);
-                        wakeup_timer.expires = HZ + jiffies;
-                        wakeup_timer.function = wakeup;
-                        add_timer(&wakeup_timer);
-                }
         }
 }
 
+static int __init
+voyager_thread_start(void)
+{
+        voyager_thread = kthread_run(thread, NULL, "kvoyagerd");
+        if (IS_ERR(voyager_thread)) {
+                printk(KERN_ERR "Voyager: Failed to create system monitor thread.\n");
+                return PTR_ERR(voyager_thread);
+        }
+        return 0;
+}
+
+
 static void __exit
 voyager_thread_stop(void)
 {
-        /* FIXME: do nothing at the moment */
+        kthread_stop(voyager_thread);
 }
 
 module_init(voyager_thread_start);
-//module_exit(voyager_thread_stop);
+module_exit(voyager_thread_stop);