16 files changed, 135 insertions, 110 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 32c96628463e..27dd3ee47099 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -19,7 +19,7 @@
 static DEFINE_MUTEX(cpu_add_remove_lock);
 static DEFINE_MUTEX(cpu_bitmask_lock);
 
-static __cpuinitdata BLOCKING_NOTIFIER_HEAD(cpu_chain);
+static __cpuinitdata RAW_NOTIFIER_HEAD(cpu_chain);
 
 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
  * Should always be manipulated under cpu_add_remove_lock
@@ -68,7 +68,11 @@ EXPORT_SYMBOL_GPL(unlock_cpu_hotplug);
 /* Need to know about CPUs going up/down? */
 int __cpuinit register_cpu_notifier(struct notifier_block *nb)
 {
-        return blocking_notifier_chain_register(&cpu_chain, nb);
+        int ret;
+        mutex_lock(&cpu_add_remove_lock);
+        ret = raw_notifier_chain_register(&cpu_chain, nb);
+        mutex_unlock(&cpu_add_remove_lock);
+        return ret;
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -77,7 +81,9 @@ EXPORT_SYMBOL(register_cpu_notifier);
 
 void unregister_cpu_notifier(struct notifier_block *nb)
 {
-        blocking_notifier_chain_unregister(&cpu_chain, nb);
+        mutex_lock(&cpu_add_remove_lock);
+        raw_notifier_chain_unregister(&cpu_chain, nb);
+        mutex_unlock(&cpu_add_remove_lock);
 }
 EXPORT_SYMBOL(unregister_cpu_notifier);
 
@@ -126,7 +132,7 @@ static int _cpu_down(unsigned int cpu)
         if (!cpu_online(cpu))
                 return -EINVAL;
 
-        err = blocking_notifier_call_chain(&cpu_chain, CPU_DOWN_PREPARE,
+        err = raw_notifier_call_chain(&cpu_chain, CPU_DOWN_PREPARE,
                                                 (void *)(long)cpu);
         if (err == NOTIFY_BAD) {
                 printk("%s: attempt to take down CPU %u failed\n",
@@ -146,7 +152,7 @@ static int _cpu_down(unsigned int cpu)
 
         if (IS_ERR(p)) {
                 /* CPU didn't die: tell everyone.  Can't complain. */
-                if (blocking_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED,
+                if (raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED,
                                 (void *)(long)cpu) == NOTIFY_BAD)
                         BUG();
 
@@ -169,7 +175,7 @@ static int _cpu_down(unsigned int cpu)
         put_cpu();
 
         /* CPU is completely dead: tell everyone.  Too late to complain. */
-        if (blocking_notifier_call_chain(&cpu_chain, CPU_DEAD,
+        if (raw_notifier_call_chain(&cpu_chain, CPU_DEAD,
                         (void *)(long)cpu) == NOTIFY_BAD)
                 BUG();
 
@@ -206,7 +212,7 @@ static int __devinit _cpu_up(unsigned int cpu)
         if (cpu_online(cpu) || !cpu_present(cpu))
                 return -EINVAL;
 
-        ret = blocking_notifier_call_chain(&cpu_chain, CPU_UP_PREPARE, hcpu);
+        ret = raw_notifier_call_chain(&cpu_chain, CPU_UP_PREPARE, hcpu);
         if (ret == NOTIFY_BAD) {
                 printk("%s: attempt to bring up CPU %u failed\n",
                                 __FUNCTION__, cpu);
@@ -223,11 +229,11 @@ static int __devinit _cpu_up(unsigned int cpu)
         BUG_ON(!cpu_online(cpu));
 
         /* Now call notifier in preparation. */
-        blocking_notifier_call_chain(&cpu_chain, CPU_ONLINE, hcpu);
+        raw_notifier_call_chain(&cpu_chain, CPU_ONLINE, hcpu);
 
 out_notify:
         if (ret != 0)
-                blocking_notifier_call_chain(&cpu_chain,
+                raw_notifier_call_chain(&cpu_chain,
                                 CPU_UP_CANCELED, hcpu);
 
         return ret;
diff --git a/kernel/fork.c b/kernel/fork.c
index 7dc6140baac6..29ebb30850ed 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -984,6 +984,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         if (!p)
                 goto fork_out;
 
+        rt_mutex_init_task(p);
+
 #ifdef CONFIG_TRACE_IRQFLAGS
         DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
         DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
@@ -1088,8 +1090,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         p->lockdep_recursion = 0;
 #endif
 
-        rt_mutex_init_task(p);
-
 #ifdef CONFIG_DEBUG_MUTEXES
         p->blocked_on = NULL; /* not blocked yet */
 #endif
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 11c99697acfe..2d0dc3efe813 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -499,7 +499,8 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 #endif /* CONFIG_SMP */
 
 void
-__set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained)
+__set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
+                  const char *name)
 {
         struct irq_desc *desc;
         unsigned long flags;
@@ -540,6 +541,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained)
                 desc->depth = 1;
         }
         desc->handle_irq = handle;
+        desc->name = name;
 
         if (handle != handle_bad_irq && is_chained) {
                 desc->status &= ~IRQ_DISABLED;
@@ -555,30 +557,13 @@ set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,
                          irq_flow_handler_t handle)
 {
         set_irq_chip(irq, chip);
-        __set_irq_handler(irq, handle, 0);
+        __set_irq_handler(irq, handle, 0, NULL);
 }
 
-/*
- * Get a descriptive string for the highlevel handler, for
- * /proc/interrupts output:
- */
-const char *
-handle_irq_name(irq_flow_handler_t handle)
+void
+set_irq_chip_and_handler_name(unsigned int irq, struct irq_chip *chip,
+                              irq_flow_handler_t handle, const char *name)
 {
-        if (handle == handle_level_irq)
-                return "level  ";
-        if (handle == handle_fasteoi_irq)
-                return "fasteoi";
-        if (handle == handle_edge_irq)
-                return "edge   ";
-        if (handle == handle_simple_irq)
-                return "simple ";
-#ifdef CONFIG_SMP
-        if (handle == handle_percpu_irq)
-                return "percpu ";
-#endif
-        if (handle == handle_bad_irq)
-                return "bad    ";
-
-        return NULL;
+        set_irq_chip(irq, chip);
+        __set_irq_handler(irq, handle, 0, name);
 }
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 607c7809ad01..9a352667007c 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -57,7 +57,7 @@ static int irq_affinity_write_proc(struct file *file, const char __user *buffer,
         if (!irq_desc[irq].chip->set_affinity || no_irq_affinity)
                 return -EIO;
 
-        err = cpumask_parse(buffer, count, new_value);
+        err = cpumask_parse_user(buffer, count, new_value);
         if (err)
                 return err;
 
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index ba7156ac70c1..b739be2a6dc9 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -575,6 +575,8 @@ static noinline int print_circular_bug_tail(void)
         return 0;
 }
 
+#define RECURSION_LIMIT 40
+
 static int noinline print_infinite_recursion_bug(void)
 {
         __raw_spin_unlock(&hash_lock);
@@ -595,7 +597,7 @@ check_noncircular(struct lock_class *source, unsigned int depth)
         debug_atomic_inc(&nr_cyclic_check_recursions);
         if (depth > max_recursion_depth)
                 max_recursion_depth = depth;
-        if (depth >= 20)
+        if (depth >= RECURSION_LIMIT)
                 return print_infinite_recursion_bug();
         /*
          * Check this lock's dependency list:
@@ -645,7 +647,7 @@ find_usage_forwards(struct lock_class *source, unsigned int depth)
 
         if (depth > max_recursion_depth)
                 max_recursion_depth = depth;
-        if (depth >= 20)
+        if (depth >= RECURSION_LIMIT)
                 return print_infinite_recursion_bug();
 
         debug_atomic_inc(&nr_find_usage_forwards_checks);
@@ -684,7 +686,7 @@ find_usage_backwards(struct lock_class *source, unsigned int depth)
 
         if (depth > max_recursion_depth)
                 max_recursion_depth = depth;
-        if (depth >= 20)
+        if (depth >= RECURSION_LIMIT)
                 return print_infinite_recursion_bug();
 
         debug_atomic_inc(&nr_find_usage_backwards_checks);
@@ -1114,8 +1116,6 @@ static int count_matching_names(struct lock_class *new_class)
         return count + 1;
 }
 
-extern void __error_too_big_MAX_LOCKDEP_SUBCLASSES(void);
-
 /*
  * Register a lock's class in the hash-table, if the class is not present
  * yet. Otherwise we look it up. We cache the result in the lock object
@@ -1153,8 +1153,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
          * (or spin_lock_init()) call - which acts as the key. For static
          * locks we use the lock object itself as the key.
          */
-        if (sizeof(struct lock_class_key) > sizeof(struct lock_class))
-                __error_too_big_MAX_LOCKDEP_SUBCLASSES();
+        BUILD_BUG_ON(sizeof(struct lock_class_key) > sizeof(struct lock_class));
 
         key = lock->key->subkeys + subclass;
 
diff --git a/kernel/module.c b/kernel/module.c
index 7f60e782de1e..67009bd56c52 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -87,6 +87,12 @@ static inline int strong_try_module_get(struct module *mod)
         return try_module_get(mod);
 }
 
+static inline void add_taint_module(struct module *mod, unsigned flag)
+{
+        add_taint(flag);
+        mod->taints |= flag;
+}
+
 /* A thread that wants to hold a reference to a module only while it
  * is running can call ths to safely exit.
  * nfsd and lockd use this.
@@ -847,12 +853,10 @@ static int check_version(Elf_Shdr *sechdrs,
                 return 0;
         }
         /* Not in module's version table.  OK, but that taints the kernel. */
-        if (!(tainted & TAINT_FORCED_MODULE)) {
+        if (!(tainted & TAINT_FORCED_MODULE))
                 printk("%s: no version for \"%s\" found: kernel tainted.\n",
                        mod->name, symname);
-                add_taint(TAINT_FORCED_MODULE);
-                mod->taints |= TAINT_FORCED_MODULE;
-        }
+        add_taint_module(mod, TAINT_FORCED_MODULE);
         return 1;
 }
 
@@ -910,7 +914,8 @@ static unsigned long resolve_symbol(Elf_Shdr *sechdrs,
         unsigned long ret;
         const unsigned long *crc;
 
-        ret = __find_symbol(name, &owner, &crc, mod->license_gplok);
+        ret = __find_symbol(name, &owner, &crc,
+                        !(mod->taints & TAINT_PROPRIETARY_MODULE));
         if (ret) {
                 /* use_module can fail due to OOM, or module unloading */
                 if (!check_version(sechdrs, versindex, name, mod, crc) ||
@@ -1335,12 +1340,11 @@ static void set_license(struct module *mod, const char *license)
         if (!license)
                 license = "unspecified";
 
-        mod->license_gplok = license_is_gpl_compatible(license);
-        if (!mod->license_gplok && !(tainted & TAINT_PROPRIETARY_MODULE)) {
-                printk(KERN_WARNING "%s: module license '%s' taints kernel.\n",
-                       mod->name, license);
-                add_taint(TAINT_PROPRIETARY_MODULE);
-                mod->taints |= TAINT_PROPRIETARY_MODULE;
+        if (!license_is_gpl_compatible(license)) {
+                if (!(tainted & TAINT_PROPRIETARY_MODULE))
+                        printk(KERN_WARNING "%s: module license '%s' taints"
+                                "kernel.\n", mod->name, license);
+                add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
         }
 }
 
@@ -1619,8 +1623,7 @@ static struct module *load_module(void __user *umod,
         modmagic = get_modinfo(sechdrs, infoindex, "vermagic");
         /* This is allowed: modprobe --force will invalidate it. */
         if (!modmagic) {
-                add_taint(TAINT_FORCED_MODULE);
-                mod->taints |= TAINT_FORCED_MODULE;
+                add_taint_module(mod, TAINT_FORCED_MODULE);
                 printk(KERN_WARNING "%s: no version magic, tainting kernel.\n",
                        mod->name);
         } else if (!same_magic(modmagic, vermagic)) {
@@ -1714,14 +1717,10 @@ static struct module *load_module(void __user *umod,
         /* Set up license info based on the info section */
         set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
 
-        if (strcmp(mod->name, "ndiswrapper") == 0) {
-                add_taint(TAINT_PROPRIETARY_MODULE);
-                mod->taints |= TAINT_PROPRIETARY_MODULE;
-        }
-        if (strcmp(mod->name, "driverloader") == 0) {
-                add_taint(TAINT_PROPRIETARY_MODULE);
-                mod->taints |= TAINT_PROPRIETARY_MODULE;
-        }
+        if (strcmp(mod->name, "ndiswrapper") == 0)
+                add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
+        if (strcmp(mod->name, "driverloader") == 0)
+                add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
 
         /* Set up MODINFO_ATTR fields */
         setup_modinfo(mod, sechdrs, infoindex);
@@ -1766,8 +1765,7 @@ static struct module *load_module(void __user *umod,
             (mod->num_unused_gpl_syms && !unusedgplcrcindex)) {
                 printk(KERN_WARNING "%s: No versions for exported symbols."
                        " Tainting kernel.\n", mod->name);
-                add_taint(TAINT_FORCED_MODULE);
-                mod->taints |= TAINT_FORCED_MODULE;
+                add_taint_module(mod, TAINT_FORCED_MODULE);
         }
 #endif
 
@@ -2132,9 +2130,33 @@ static void m_stop(struct seq_file *m, void *p)
         mutex_unlock(&module_mutex);
 }
 
+static char *taint_flags(unsigned int taints, char *buf)
+{
+        int bx = 0;
+
+        if (taints) {
+                buf[bx++] = '(';
+                if (taints & TAINT_PROPRIETARY_MODULE)
+                        buf[bx++] = 'P';
+                if (taints & TAINT_FORCED_MODULE)
+                        buf[bx++] = 'F';
+                /*
+                 * TAINT_FORCED_RMMOD: could be added.
+                 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
+                 * apply to modules.
+                 */
+                buf[bx++] = ')';
+        }
+        buf[bx] = '\0';
+
+        return buf;
+}
+
 static int m_show(struct seq_file *m, void *p)
 {
         struct module *mod = list_entry(p, struct module, list);
+        char buf[8];
+
         seq_printf(m, "%s %lu",
                    mod->name, mod->init_size + mod->core_size);
         print_unload_info(m, mod);
@@ -2147,6 +2169,10 @@ static int m_show(struct seq_file *m, void *p)
         /* Used by oprofile and other similar tools. */
         seq_printf(m, " 0x%p", mod->module_core);
 
+        /* Taints info */
+        if (mod->taints)
+                seq_printf(m, " %s", taint_flags(mod->taints, buf));
+
         seq_printf(m, "\n");
         return 0;
 }
@@ -2235,28 +2261,6 @@ struct module *module_text_address(unsigned long addr)
         return mod;
 }
 
-static char *taint_flags(unsigned int taints, char *buf)
-{
-        *buf = '\0';
-        if (taints) {
-                int bx;
-
-                buf[0] = '(';
-                bx = 1;
-                if (taints & TAINT_PROPRIETARY_MODULE)
-                        buf[bx++] = 'P';
-                if (taints & TAINT_FORCED_MODULE)
-                        buf[bx++] = 'F';
-                /*
-                 * TAINT_FORCED_RMMOD: could be added.
-                 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
-                 * apply to modules.
-                 */
-                buf[bx] = ')';
-        }
-        return buf;
-}
-
 /* Don't grab lock, we're oopsing. */
 void print_modules(void)
 {
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 479b16b44f79..7c3e1e6dfb5b 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -88,6 +88,19 @@ static inline union cpu_time_count cpu_time_sub(const clockid_t which_clock,
 }
 
 /*
+ * Divide and limit the result to res >= 1
+ *
+ * This is necessary to prevent signal delivery starvation, when the result of
+ * the division would be rounded down to 0.
+ */
+static inline cputime_t cputime_div_non_zero(cputime_t time, unsigned long div)
+{
+        cputime_t res = cputime_div(time, div);
+
+        return max_t(cputime_t, res, 1);
+}
+
+/*
  * Update expiry time from increment, and increase overrun count,
  * given the current clock sample.
  */
@@ -483,8 +496,8 @@ static void process_timer_rebalance(struct task_struct *p,
                 BUG();
                 break;
         case CPUCLOCK_PROF:
-                left = cputime_div(cputime_sub(expires.cpu, val.cpu),
-                                   nthreads);
+                left = cputime_div_non_zero(cputime_sub(expires.cpu, val.cpu),
+                                       nthreads);
                 do {
                         if (likely(!(t->flags & PF_EXITING))) {
                                 ticks = cputime_add(prof_ticks(t), left);
@@ -498,8 +511,8 @@ static void process_timer_rebalance(struct task_struct *p,
                 } while (t != p);
                 break;
         case CPUCLOCK_VIRT:
-                left = cputime_div(cputime_sub(expires.cpu, val.cpu),
-                                   nthreads);
+                left = cputime_div_non_zero(cputime_sub(expires.cpu, val.cpu),
+                                       nthreads);
                 do {
                         if (likely(!(t->flags & PF_EXITING))) {
                                 ticks = cputime_add(virt_ticks(t), left);
@@ -515,6 +528,7 @@ static void process_timer_rebalance(struct task_struct *p,
         case CPUCLOCK_SCHED:
                 nsleft = expires.sched - val.sched;
                 do_div(nsleft, nthreads);
+                nsleft = max_t(unsigned long long, nsleft, 1);
                 do {
                         if (likely(!(t->flags & PF_EXITING))) {
                                 ns = t->sched_time + nsleft;
@@ -1159,12 +1173,13 @@ static void check_process_timers(struct task_struct *tsk,
 
                 prof_left = cputime_sub(prof_expires, utime);
                 prof_left = cputime_sub(prof_left, stime);
-                prof_left = cputime_div(prof_left, nthreads);
+                prof_left = cputime_div_non_zero(prof_left, nthreads);
                 virt_left = cputime_sub(virt_expires, utime);
-                virt_left = cputime_div(virt_left, nthreads);
+                virt_left = cputime_div_non_zero(virt_left, nthreads);
                 if (sched_expires) {
                         sched_left = sched_expires - sched_time;
                         do_div(sched_left, nthreads);
+                        sched_left = max_t(unsigned long long, sched_left, 1);
                 } else {
                         sched_left = 0;
                 }
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index d72234942798..d3a158a60312 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -18,6 +18,7 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/pm.h>
+#include <linux/console.h>
 #include <linux/cpu.h>
 
 #include "power.h"
@@ -119,8 +120,10 @@ int pm_suspend_disk(void)
         if (error)
                 return error;
 
+        suspend_console();
         error = device_suspend(PMSG_FREEZE);
         if (error) {
+                resume_console();
                 printk("Some devices failed to suspend\n");
                 unprepare_processes();
                 return error;
@@ -133,6 +136,7 @@ int pm_suspend_disk(void)
 
         if (in_suspend) {
                 device_resume();
+                resume_console();
                 pr_debug("PM: writing image.\n");
                 error = swsusp_write();
                 if (!error)
@@ -148,6 +152,7 @@ int pm_suspend_disk(void)
         swsusp_free();
  Done:
         device_resume();
+        resume_console();
         unprepare_processes();
         return error;
 }
@@ -212,7 +217,9 @@ static int software_resume(void)
 
         pr_debug("PM: Preparing devices for restore.\n");
 
+        suspend_console();
         if ((error = device_suspend(PMSG_PRETHAW))) {
+                resume_console();
                 printk("Some devices failed to suspend\n");
                 swsusp_free();
                 goto Thaw;
@@ -224,6 +231,7 @@ static int software_resume(void)
         swsusp_resume();
         pr_debug("PM: Restore failed, recovering.n");
         device_resume();
+        resume_console();
  Thaw:
         unprepare_processes();
  Done:
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 9b2ee5344dee..1a3b0dd2c3fc 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -425,7 +425,8 @@ static int submit(int rw, pgoff_t page_off, struct page *page,
                         bio_set_pages_dirty(bio);
                 bio_put(bio);
         } else {
-                get_page(page);
+                if (rw == READ)
+                        get_page(page); /* These pages are freed later */
                 bio->bi_private = *bio_chain;
                 *bio_chain = bio;
                 submit_bio(rw | (1 << BIO_RW_SYNC), bio);
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 93b5dd283dea..d991d3b0e5a4 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -19,6 +19,7 @@
 #include <linux/swapops.h>
 #include <linux/pm.h>
 #include <linux/fs.h>
+#include <linux/console.h>
 #include <linux/cpu.h>
 
 #include <asm/uaccess.h>
@@ -173,12 +174,14 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 /* Free memory before shutting down devices. */
                 error = swsusp_shrink_memory();
                 if (!error) {
+                        suspend_console();
                         error = device_suspend(PMSG_FREEZE);
                         if (!error) {
                                 in_suspend = 1;
                                 error = swsusp_suspend();
                                 device_resume();
                         }
+                        resume_console();
                 }
                 up(&pm_sem);
                 if (!error)
@@ -196,11 +199,13 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 snapshot_free_unused_memory(&data->handle);
                 down(&pm_sem);
                 pm_prepare_console();
+                suspend_console();
                 error = device_suspend(PMSG_PRETHAW);
                 if (!error) {
                         error = swsusp_resume();
                         device_resume();
                 }
+                resume_console();
                 pm_restore_console();
                 up(&pm_sem);
                 break;
@@ -289,6 +294,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 }
 
                 /* Put devices to sleep */
+                suspend_console();
                 error = device_suspend(PMSG_SUSPEND);
                 if (error) {
                         printk(KERN_ERR "Failed to suspend some devices.\n");
@@ -299,7 +305,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                         /* Wake up devices */
                         device_resume();
                 }
-
+                resume_console();
                 if (pm_ops->finish)
                         pm_ops->finish(PM_SUSPEND_MEM);
 
diff --git a/kernel/printk.c b/kernel/printk.c
index 771f5e861bcd..f7d427ef5038 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -820,15 +820,8 @@ void release_console_sem(void)
         console_locked = 0;
         up(&console_sem);
         spin_unlock_irqrestore(&logbuf_lock, flags);
-        if (wake_klogd && !oops_in_progress && waitqueue_active(&log_wait)) {
-                /*
-                 * If we printk from within the lock dependency code,
-                 * from within the scheduler code, then do not lock
-                 * up due to self-recursion:
-                 */
-                if (!lockdep_internal())
-                        wake_up_interruptible(&log_wait);
-        }
+        if (wake_klogd && !oops_in_progress && waitqueue_active(&log_wait))
+                wake_up_interruptible(&log_wait);
 }
 EXPORT_SYMBOL(release_console_sem);
 
diff --git a/kernel/profile.c b/kernel/profile.c
index 857300a2afec..f940b462eec9 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -399,7 +399,7 @@ static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffe
         unsigned long full_count = count, err;
         cpumask_t new_value;
 
-        err = cpumask_parse(buffer, count, new_value);
+        err = cpumask_parse_user(buffer, count, new_value);
         if (err)
                 return err;
 
diff --git a/kernel/sched.c b/kernel/sched.c
index 53608a59d6e3..094b5687eef6 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1822,14 +1822,14 @@ context_switch(struct rq *rq, struct task_struct *prev,
         struct mm_struct *mm = next->mm;
         struct mm_struct *oldmm = prev->active_mm;
 
-        if (unlikely(!mm)) {
+        if (!mm) {
                 next->active_mm = oldmm;
                 atomic_inc(&oldmm->mm_count);
                 enter_lazy_tlb(oldmm, next);
         } else
                 switch_mm(oldmm, mm, next);
 
-        if (unlikely(!prev->mm)) {
+        if (!prev->mm) {
                 prev->active_mm = NULL;
                 WARN_ON(rq->prev_mm);
                 rq->prev_mm = oldmm;
@@ -3491,7 +3491,7 @@ asmlinkage void __sched preempt_schedule(void)
          * If there is a non-zero preempt_count or interrupts are disabled,
          * we do not want to preempt the current task.  Just return..
          */
-        if (unlikely(ti->preempt_count || irqs_disabled()))
+        if (likely(ti->preempt_count || irqs_disabled()))
                 return;
 
 need_resched:
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 7a3b2e75f040..0e53314b14de 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -49,6 +49,7 @@ cond_syscall(compat_sys_get_robust_list);
 cond_syscall(sys_epoll_create);
 cond_syscall(sys_epoll_ctl);
 cond_syscall(sys_epoll_wait);
+cond_syscall(sys_epoll_pwait);
 cond_syscall(sys_semget);
 cond_syscall(sys_semop);
 cond_syscall(sys_semtimedop);
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 126bb30c4afe..a99b2a6e6a07 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -57,7 +57,7 @@ static cycle_t jiffies_read(void)
 
 struct clocksource clocksource_jiffies = {
         .name           = "jiffies",
-        .rating         = 0, /* lowest rating*/
+        .rating         = 1, /* lowest valid rating*/
         .read           = jiffies_read,
         .mask           = 0xffffffff, /*32bits*/
         .mult           = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index cfc737bffe6d..3df9bfc7ff78 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -28,6 +28,7 @@
 #include <linux/notifier.h>
 #include <linux/kthread.h>
 #include <linux/hardirq.h>
+#include <linux/mempolicy.h>
 
 /*
  * The per-CPU workqueue (if single thread, we always use the first
@@ -245,6 +246,12 @@ static int worker_thread(void *__cwq)
         sigprocmask(SIG_BLOCK, &blocked, NULL);
         flush_signals(current);
 
+        /*
+         * We inherited MPOL_INTERLEAVE from the booting kernel.
+         * Set MPOL_DEFAULT to insure node local allocations.
+         */
+        numa_default_policy();
+
         /* SIG_IGN makes children autoreap: see do_notify_parent(). */
         sa.sa.sa_handler = SIG_IGN;
         sa.sa.sa_flags = 0;