1 files changed, 3 insertions, 17 deletions

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index f66b54086ce5..c0212db40032 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -717,9 +717,7 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
                         break;
                 }
                 if (proglen == oldproglen) {
-                        image = module_alloc(max_t(unsigned int,
-                                                   proglen,
-                                                   sizeof(struct work_struct)));
+                        image = module_alloc(proglen);
                         if (!image)
                                 goto out;
                 }
@@ -738,20 +736,8 @@ out:
         return;
 }
 
-static void jit_free_defer(struct work_struct *arg)
-{
-        module_free(NULL, arg);
-}
-
-/* run from softirq, we must use a work_struct to call
- * module_free() from process context
- */
 void bpf_jit_free(struct sk_filter *fp)
 {
-        if (fp->bpf_func != sk_run_filter) {
-                struct work_struct *work = (struct work_struct *)fp->bpf_func;
-
-                INIT_WORK(work, jit_free_defer);
-                schedule_work(work);
-        }
+        if (fp->bpf_func != sk_run_filter)
+                module_free(NULL, fp->bpf_func);
 }