7 files changed, 21 insertions, 9 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index f42a17f88699..a28d11e10877 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -194,6 +194,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm)
         mm->mmap = NULL;
         mm->mmap_cache = NULL;
         mm->free_area_cache = oldmm->mmap_base;
+        mm->cached_hole_size = ~0UL;
         mm->map_count = 0;
         set_mm_counter(mm, rss, 0);
         set_mm_counter(mm, anon_rss, 0);
@@ -249,8 +250,9 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm)
 
                 /*
                  * Link in the new vma and copy the page table entries:
-                 * link in first so that swapoff can see swap entries,
-                 * and try_to_unmap_one's find_vma find the new vma.
+                 * link in first so that swapoff can see swap entries.
+                 * Note that, exceptionally, here the vma is inserted
+                 * without holding mm->mmap_sem.
                  */
                 spin_lock(&mm->page_table_lock);
                 *pprev = tmp;
@@ -322,6 +324,7 @@ static struct mm_struct * mm_init(struct mm_struct * mm)
         mm->ioctx_list = NULL;
         mm->default_kioctx = (struct kioctx)INIT_KIOCTX(mm->default_kioctx, *mm);
         mm->free_area_cache = TASK_UNMAPPED_BASE;
+        mm->cached_hole_size = ~0UL;
 
         if (likely(!mm_alloc_pgd(mm))) {
                 mm->def_flags = 0;
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 5202e4c4a5b6..ac6700985705 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -6,6 +6,7 @@
  * This file contains driver APIs to the irq subsystem.
  */
 
+#include <linux/config.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/random.h>
@@ -255,6 +256,13 @@ void free_irq(unsigned int irq, void *dev_id)
 
                         /* Found it - now remove it from the list of entries */
                         *pp = action->next;
+
+                        /* Currently used only by UML, might disappear one day.*/
+#ifdef CONFIG_IRQ_RELEASE_METHOD
+                        if (desc->handler->release)
+                                desc->handler->release(irq, dev_id);
+#endif
+
                         if (!desc->action) {
                                 desc->status |= IRQ_DISABLED;
                                 if (desc->handler->shutdown)
diff --git a/kernel/module.c b/kernel/module.c
index 83b3d376708c..a566745dde62 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -379,7 +379,7 @@ static void module_unload_init(struct module *mod)
         for (i = 0; i < NR_CPUS; i++)
                 local_set(&mod->ref[i].count, 0);
         /* Hold reference count during initialization. */
-        local_set(&mod->ref[_smp_processor_id()].count, 1);
+        local_set(&mod->ref[raw_smp_processor_id()].count, 1);
         /* Backwards compatibility macros put refcount during init. */
         mod->waiter = current;
 }
diff --git a/kernel/power/smp.c b/kernel/power/smp.c
index cba3584b80fe..457c2302ed42 100644
--- a/kernel/power/smp.c
+++ b/kernel/power/smp.c
@@ -48,11 +48,11 @@ void disable_nonboot_cpus(void)
 {
         oldmask = current->cpus_allowed;
         set_cpus_allowed(current, cpumask_of_cpu(0));
-        printk("Freezing CPUs (at %d)", _smp_processor_id());
+        printk("Freezing CPUs (at %d)", raw_smp_processor_id());
         current->state = TASK_INTERRUPTIBLE;
         schedule_timeout(HZ);
         printk("...");
-        BUG_ON(_smp_processor_id() != 0);
+        BUG_ON(raw_smp_processor_id() != 0);
 
         /* FIXME: for this to work, all the CPUs must be running
          * "idle" thread (or we deadlock). Is that guaranteed? */
diff --git a/kernel/sched.c b/kernel/sched.c
index f12a0c8a7d98..deca041fc364 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3814,7 +3814,7 @@ EXPORT_SYMBOL(yield);
  */
 void __sched io_schedule(void)
 {
-        struct runqueue *rq = &per_cpu(runqueues, _smp_processor_id());
+        struct runqueue *rq = &per_cpu(runqueues, raw_smp_processor_id());
 
         atomic_inc(&rq->nr_iowait);
         schedule();
@@ -3825,7 +3825,7 @@ EXPORT_SYMBOL(io_schedule);
 
 long __sched io_schedule_timeout(long timeout)
 {
-        struct runqueue *rq = &per_cpu(runqueues, _smp_processor_id());
+        struct runqueue *rq = &per_cpu(runqueues, raw_smp_processor_id());
         long ret;
 
         atomic_inc(&rq->nr_iowait);
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 6116b25aa7cf..84a9d18aa8da 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -100,7 +100,7 @@ static int stop_machine(void)
         stopmachine_state = STOPMACHINE_WAIT;
 
         for_each_online_cpu(i) {
-                if (i == _smp_processor_id())
+                if (i == raw_smp_processor_id())
                         continue;
                 ret = kernel_thread(stopmachine, (void *)(long)i,CLONE_KERNEL);
                 if (ret < 0)
@@ -182,7 +182,7 @@ struct task_struct *__stop_machine_run(int (*fn)(void *), void *data,
 
         /* If they don't care which CPU fn runs on, bind to any online one. */
         if (cpu == NR_CPUS)
-                cpu = _smp_processor_id();
+                cpu = raw_smp_processor_id();
 
         p = kthread_create(do_stop, &smdata, "kstopmachine");
         if (!IS_ERR(p)) {
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 0dda70ed1f98..6f15bea7d1a8 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -77,6 +77,7 @@ cond_syscall(sys_request_key);
 cond_syscall(sys_keyctl);
 cond_syscall(compat_sys_keyctl);
 cond_syscall(compat_sys_socketcall);
+cond_syscall(sys_set_zone_reclaim);
 
 /* arch-specific weak syscall entries */
 cond_syscall(sys_pciconfig_read);