---

yaml --- r: 199447 b: refs/heads/master c: 293a7cf h: refs/heads/master i: 199445: 103e5fe 199443: aa9f810 199439: 3ecbae1 v: v3
git-mirror · May 31, 2010 · f6b6ea9 · f6b6ea9
1 parent 94f22b6
commit f6b6ea9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67a3e12b05e055c0415c556a315a3d3eb637e29e
+refs/heads/master: 293a7cfeedc2b2380a7c7274902323c3cf5f7575
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
@@ -2014,6 +2014,7 @@ static noinline struct module *load_module(void __user *umod,
 	long err = 0;
 	void *ptr = NULL; /* Stops spurious gcc warning */
 	unsigned long symoffs, stroffs, *strmap;
+	void __percpu *percpu;
 
 	mm_segment_t old_fs;
 
@@ -2158,6 +2159,8 @@ static noinline struct module *load_module(void __user *umod,
 			goto free_mod;
 		sechdrs[pcpuindex].sh_flags &= ~(unsigned long)SHF_ALLOC;
 	}
+	/* Keep this around for failure path. */
+	percpu = mod_percpu(mod);
 
 	/* Determine total sizes, and put offsets in sh_entsize.  For now
 	   this is done generically; there doesn't appear to be any
@@ -2463,7 +2466,7 @@ static noinline struct module *load_module(void __user *umod,
 	module_free(mod, mod->module_core);
 	/* mod will be freed with core. Don't access it beyond this line! */
  free_percpu:
-	percpu_modfree(mod);
+	free_percpu(percpu);
  free_mod:
 	kfree(args);
 	kfree(strmap);