From f6b6ea99dca3cdf788cba1d91be75ff3747b76e4 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 31 May 2010 19:53:50 +0930 Subject: [PATCH] --- yaml --- r: 199447 b: refs/heads/master c: 293a7cfeedc2b2380a7c7274902323c3cf5f7575 h: refs/heads/master i: 199445: 103e5fed9f05cefd3d6467893215ba872fed742b 199443: aa9f8107fc2f8a1e606a85d89de7e8d947d2fe8a 199439: 3ecbae1be839f340541adc8f20e6b5af44d5e859 v: v3 --- [refs] | 2 +- trunk/kernel/module.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a30d9d6757a..0012070000e3 100644 --- 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 index 333fbcc96978..d806e00e4450 100644 --- 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);