Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 14 deletions

diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index 8b2210b633df..d12d4f629cec 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -220,20 +220,7 @@ scdrv_dispatch_event(char *event, int len)
                                " Sending SIGPWR to init...\n");
 
                 /* give a SIGPWR signal to init proc */
-
-                /* first find init's task */
-                read_lock(&tasklist_lock);
-                for_each_process(p) {
-                        if (p->pid == 1)
-                                break;
-                }
-                if (p) {
-                        force_sig(SIGPWR, p);
-                } else {
-                        printk(KERN_ERR "Failed to signal init!\n");
-                        snsc_shutting_down = 0; /* so can try again (?) */
-                }
-                read_unlock(&tasklist_lock);
+                kill_proc(1, SIGPWR, 0);
         } else {
                 /* print to system log */
                 printk("%s|$(0x%x)%s\n", severity, esp_code, desc);