5 files changed, 14 insertions, 8 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 9336f2e89e..ac1f850d49 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -252,7 +252,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         mask_ack_irq(desc, irq);
 
         if (unlikely(desc->status & IRQ_INPROGRESS))
-                goto out;
+                goto out_unlock;
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
         kstat_cpu(cpu).irqs[irq]++;
 
@@ -263,7 +263,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         action = desc->action;
         if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
                 desc->status |= IRQ_PENDING;
-                goto out;
+                goto out_unlock;
         }
 
         desc->status |= IRQ_INPROGRESS;
@@ -276,9 +276,9 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
 
         spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
-out:
         if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
                 desc->chip->unmask(irq);
+out_unlock:
         spin_unlock(&desc->lock);
 }
 
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 872f91ba2c..35f10f7ff9 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -63,8 +63,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
         desc->chip->enable(irq);
 
         if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
-                desc->status &= ~IRQ_PENDING;
-                desc->status = status | IRQ_REPLAY;
+                desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
                 if (!desc->chip || !desc->chip->retrigger ||
                                         !desc->chip->retrigger(irq)) {
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 1d32defa38..5c470c57fb 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -197,11 +197,12 @@ static void __call_usermodehelper(void *data)
 {
         struct subprocess_info *sub_info = data;
         pid_t pid;
+        int wait = sub_info->wait;
 
         /* CLONE_VFORK: wait until the usermode helper has execve'd
          * successfully We need the data structures to stay around
          * until that is done.  */
-        if (sub_info->wait)
+        if (wait)
                 pid = kernel_thread(wait_for_helper, sub_info,
                                     CLONE_FS | CLONE_FILES | SIGCHLD);
         else
@@ -211,7 +212,7 @@ static void __call_usermodehelper(void *data)
         if (pid < 0) {
                 sub_info->retval = pid;
                 complete(sub_info->complete);
-        } else if (!sub_info->wait)
+        } else if (!wait)
                 complete(sub_info->complete);
 }
 
diff --git a/kernel/module.c b/kernel/module.c
index 2a19cd47c0..b7fe6e8409 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1054,6 +1054,12 @@ static int mod_sysfs_setup(struct module *mod,
 {
         int err;
 
+        if (!module_subsys.kset.subsys) {
+                printk(KERN_ERR "%s: module_subsys not initialized\n",
+                       mod->name);
+                err = -EINVAL;
+                goto out;
+        }
         memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
         err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);
         if (err)
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index e781876573..2ed4040d0d 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -75,7 +75,7 @@ static int prepare_reply(struct genl_info *info, u8 cmd, struct sk_buff **skbp,
         /*
          * If new attributes are added, please revisit this allocation
          */
-        skb = nlmsg_new(size);
+        skb = nlmsg_new(size, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;