From: Mathieu Desnoyers <mathieu.desnoyers@polymtl•ca>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org, Greg KH <greg@kroah•com>,
Jason Baron <jbaron@redhat•com>
Subject: Re: linux-next: manual merge of the ftrace tree
Date: Thu, 21 Aug 2008 00:03:18 -0400 [thread overview]
Message-ID: <20080821040317.GA19629@Krystal> (raw)
In-Reply-To: <20080821130903.1df56278.sfr@canb.auug.org.au>
* Stephen Rothwell (sfr@canb•auug.org.au) wrote:
> Hi all,
>
> [I have reported this previously but something has changed slightly.]
>
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/module.c between commit bf8b9a59e335ca159aa4b3878ced0e94ea74cbc4
> ("driver core: basic infrastructure for per-module dynamic debug
> messages") from the driver-core tree and commit
> e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
> from the ftrace tree.
>
Looks good to me, thanks !
Mathieu
> Just overlapping additions. I fixed it up (see below).
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc kernel/module.c
> index b610466,6962348..0000000
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@@ -44,9 -44,9 +44,10 @@@
> #include <linux/unwind.h>
> #include <asm/uaccess.h>
> #include <asm/cacheflush.h>
> +#include <asm/sections.h>
> #include <linux/license.h>
> #include <asm/sections.h>
> + #include <linux/tracepoint.h>
>
> #if 0
> #define DEBUGP printk
> @@@ -1866,7 -1832,8 +1867,9 @@@ static struct module *load_module(void
> #endif
> unsigned int markersindex;
> unsigned int markersstringsindex;
> + unsigned int verboseindex;
> + unsigned int tracepointsindex;
> + unsigned int tracepointsstringsindex;
> struct module *mod;
> long err = 0;
> void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
> @@@ -2153,7 -2120,9 +2156,10 @@@
> markersindex = find_sec(hdr, sechdrs, secstrings, "__markers");
> markersstringsindex = find_sec(hdr, sechdrs, secstrings,
> "__markers_strings");
> + verboseindex = find_sec(hdr, sechdrs, secstrings, "__verbose");
> + tracepointsindex = find_sec(hdr, sechdrs, secstrings, "__tracepoints");
> + tracepointsstringsindex = find_sec(hdr, sechdrs, secstrings,
> + "__tracepoints_strings");
>
> /* Now do relocations. */
> for (i = 1; i < hdr->e_shnum; i++) {
> @@@ -2203,8 -2179,11 +2216,12 @@@
> marker_update_probe_range(mod->markers,
> mod->markers + mod->num_markers);
> #endif
> + #ifdef CONFIG_TRACEPOINTS
> + tracepoint_update_probe_range(mod->tracepoints,
> + mod->tracepoints + mod->num_tracepoints);
> + #endif
> + }
> + dynamic_printk_setup(mod, sechdrs, verboseindex, secstrings);
> err = module_finalize(hdr, sechdrs, mod);
> if (err < 0)
> goto cleanup;
--
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
next prev parent reply other threads:[~2008-08-21 4:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-21 3:09 linux-next: manual merge of the ftrace tree Stephen Rothwell
2008-08-21 3:33 ` Greg KH
2008-08-21 4:03 ` Mathieu Desnoyers [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-11 0:41 Stephen Rothwell
2008-12-11 1:23 ` Frédéric Weisbecker
2008-12-11 2:07 ` Stephen Rothwell
2008-12-12 9:23 ` Ingo Molnar
2008-12-01 0:37 Stephen Rothwell
2008-12-01 7:40 ` Ingo Molnar
2008-11-24 0:11 Stephen Rothwell
2008-11-24 2:11 ` Ingo Molnar
2008-11-24 2:23 ` Stephen Rothwell
2008-10-14 5:03 Stephen Rothwell
2008-10-14 6:26 ` Ingo Molnar
2008-10-14 7:00 ` Stephen Rothwell
2008-08-15 1:54 Stephen Rothwell
2008-08-25 2:01 ` Stephen Rothwell
2008-08-25 9:16 ` Ingo Molnar
2008-08-25 11:56 ` 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=20080821040317.GA19629@Krystal \
--to=mathieu.desnoyers@polymtl$(echo .)ca \
--cc=greg@kroah$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jbaron@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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