From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 8 Oct 2010 08:46:27 +0000 (+0200)
Subject: Merge commit 'v2.6.36-rc7' into perf/core
X-Git-Tag: v2.6.37-rc1~214^2~28
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=7cd2541cf2395962daf98ec32a141aba3398a9b2;p=net-next-2.6.git

Merge commit 'v2.6.36-rc7' into perf/core

Conflicts:
	arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.

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

7cd2541cf2395962daf98ec32a141aba3398a9b2
diff --cc arch/x86/kernel/module.c
index 5399f58de7e,1c355c55096..8f295609173
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@@ -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)