Merge master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / drivers / char / snsc_event.c

diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index a4fa507..d12d4f6 100644 (file)
--- 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);
@@ -287,7 +274,7 @@ scdrv_event_init(struct sysctl_data_s *scd)
 {
        int rv;
 
-       event_sd = kmalloc(sizeof (struct subch_data_s), GFP_KERNEL);
+       event_sd = kzalloc(sizeof (struct subch_data_s), GFP_KERNEL);
        if (event_sd == NULL) {
                printk(KERN_WARNING "%s: couldn't allocate subchannel info"
                       " for event monitoring\n", __FUNCTION__);
@@ -295,7 +282,6 @@ scdrv_event_init(struct sysctl_data_s *scd)
        }
 
        /* initialize subch_data_s fields */
-       memset(event_sd, 0, sizeof (struct subch_data_s));
        event_sd->sd_nasid = scd->scd_nasid;
        spin_lock_init(&event_sd->sd_rlock);
 
@@ -311,7 +297,7 @@ scdrv_event_init(struct sysctl_data_s *scd)
 
        /* hook event subchannel up to the system controller interrupt */
        rv = request_irq(SGI_UART_VECTOR, scdrv_event_interrupt,
-                        SA_SHIRQ | SA_INTERRUPT,
+                        IRQF_SHARED | IRQF_DISABLED,
                         "system controller events", event_sd);
        if (rv) {
                printk(KERN_WARNING "%s: irq request failed (%d)\n",
@@ -321,5 +307,3 @@ scdrv_event_init(struct sysctl_data_s *scd)
                return;
        }
 }
-
-