From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Siarhei Liakh <sliakh.lkml@gmail•com>,
Xuxian Jiang <jiang@cs•ncsu.edu>, Li Zefan <lizf@cn•fujitsu.com>
Subject: linux-next: manual merge of the rr tree with Linus' tree
Date: Tue, 15 Sep 2009 13:26:26 +1000 [thread overview]
Message-ID: <20090915132626.1997607e.sfr@canb.auug.org.au> (raw)
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 sfr@canb•auug.org.au
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;
next reply other threads:[~2009-09-15 3:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-15 3:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-21 2:11 linux-next: manual merge of the rr tree with Linus' tree Stephen Rothwell
2012-05-23 2:15 Stephen Rothwell
2010-01-18 4:06 Stephen Rothwell
2010-01-12 2:13 Stephen Rothwell
2009-12-17 2:07 Stephen Rothwell
2009-08-24 3:07 Stephen Rothwell
2009-07-06 2:05 Stephen Rothwell
2009-06-29 3:43 Stephen Rothwell
2009-06-24 3:08 Stephen Rothwell
2009-06-12 3:54 Stephen Rothwell
2009-05-27 3:55 Stephen Rothwell
2009-04-16 2:19 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090915132626.1997607e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jiang@cs$(echo .)ncsu.edu \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lizf@cn$(echo .)fujitsu.com \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sliakh.lkml@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox