From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 19 Oct 2008 17:04:47 +0000 (+0200)
Subject: Merge branch 'linus' into tracing-v28-for-linus-v3
X-Git-Tag: v2.6.28-rc3~86^2~26^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e10e879a8c334a5927d800a3663a24d562cfa31;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
	init/main.c
	kernel/module.c
	scripts/bootgraph.pl
---

3e10e879a8c334a5927d800a3663a24d562cfa31
diff --cc kernel/module.c
index 7576c2d,25bc9ac..0d8d21e
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -1836,9 -1860,7 +1865,10 @@@ static noinline struct module *load_mod
  #endif
  	unsigned int markersindex;
  	unsigned int markersstringsindex;
+ 	unsigned int verboseindex;
 +	unsigned int tracepointsindex;
 +	unsigned int tracepointsstringsindex;
 +	unsigned int mcountindex;
  	struct module *mod;
  	long err = 0;
  	void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
@@@ -2126,12 -2155,7 +2164,13 @@@
  	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");
 +
 +	mcountindex = find_sec(hdr, sechdrs, secstrings,
 +			       "__mcount_loc");
  
  	/* Now do relocations. */
  	for (i = 1; i < hdr->e_shnum; i++) {
@@@ -2188,16 -2205,8 +2227,17 @@@
  		marker_update_probe_range(mod->markers,
  			mod->markers + mod->num_markers);
  #endif
+ 	dynamic_printk_setup(sechdrs, verboseindex);
 +#ifdef CONFIG_TRACEPOINTS
 +		tracepoint_update_probe_range(mod->tracepoints,
 +			mod->tracepoints + mod->num_tracepoints);
 +#endif
 +	}
 +
 +	/* sechdrs[0].sh_size is always zero */
 +	mseg = (void *)sechdrs[mcountindex].sh_addr;
 +	ftrace_init_module(mseg, mseg + sechdrs[mcountindex].sh_size);
 +
  	err = module_finalize(hdr, sechdrs, mod);
  	if (err < 0)
  		goto cleanup;