Subject: linux-next: manual merge of the rr tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 15 Sep 2009 13:26:26 +1000

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in kernel/module.c
between commit 7ead8b8313d92b3a69a1a61b0dcbc4cd66c960dc ("tracing/events:
Add module tracepoints") from Linus' tree and commit
25306e21864c2a220d6fa2e0632425028aa9626c ("module:ro-nx-protection") from
the rr tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc kernel/module.c
index 46580ed,6f84bb5..0000000
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -54,12 -54,8 +54,13 @@@
  #include <linux/async.h>
  #include <linux/percpu.h>
  #include <linux/kmemleak.h>
+ #include <linux/pfn.h>
  
 +#define CREATE_TRACE_POINTS
 +#include <trace/events/module.h>
 +
 +EXPORT_TRACEPOINT_SYMBOL(module_get);
 +
  #if 0
  #define DEBUGP printk
  #else
@@@ -2373,8 -2600,18 +2609,20 @@@ static noinline struct module *load_mod
  	/* Get rid of temporary copy */
  	vfree(hdr);
  
+ 	/* Set RO and NX regions for core */
+ 	set_section_ro_nx(mod->module_core,
+ 			  mod->core_text_size,
+ 			  mod->core_ro_size,
+ 			  mod->core_size);
+ 
+ 	/* Set RO and NX regions for init */
+ 	set_section_ro_nx(mod->module_init,
+ 			  mod->init_text_size,
+ 			  mod->init_ro_size,
+ 			  mod->init_size);
+ 
 +	trace_module_load(mod);
 +
  	/* Done! */
  	return mod;