Merge commit 'v2.6.36-rc7' into perf/core
Ingo Molnar [Fri, 8 Oct 2010 08:46:27 +0000 (10:46 +0200)]
Conflicts:
arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
Makefile
arch/x86/kernel/module.c
include/linux/module.h
kernel/module.c

diff --cc Makefile
Simple merge
@@@ -239,10 -239,7 +239,10 @@@ int module_finalize(const Elf_Ehdr *hdr
                apply_paravirt(pseg, pseg + para->sh_size);
        }
  
 +      /* make jump label nops */
 +      jump_label_apply_nops(me);
 +
-       return module_bug_finalize(hdr, sechdrs, me);
+       return 0;
  }
  
  void module_arch_cleanup(struct module *mod)
Simple merge
diff --cc kernel/module.c
Simple merge