Merge /spare/repo/linux-2.6/

1 files changed, 7 insertions, 1 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 5734ab09d3f9..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;
 }
@@ -1758,6 +1758,7 @@ sys_init_module(void __user *umod,
                 const char __user *uargs)
 {
         struct module *mod;
+        mm_segment_t old_fs = get_fs();
         int ret = 0;
 
         /* Must have permission */
@@ -1775,6 +1776,9 @@ sys_init_module(void __user *umod,
                 return PTR_ERR(mod);
         }
 
+        /* flush the icache in correct context */
+        set_fs(KERNEL_DS);
+
         /* Flush the instruction cache, since we've played with text */
         if (mod->module_init)
                 flush_icache_range((unsigned long)mod->module_init,
@@ -1783,6 +1787,8 @@ sys_init_module(void __user *umod,
         flush_icache_range((unsigned long)mod->module_core,
                            (unsigned long)mod->module_core + mod->core_size);
 
+        set_fs(old_fs);
+
         /* Now sew it into the lists.  They won't access us, since
            strong_try_module_get() will fail. */
         stop_machine_run(__link_module, mod, NR_CPUS);