From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Oct 2008 20:35:07 +0000 (-0700)
Subject: Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.28-rc1~78
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=92b29b86fe2e183d44eb467e5e74a5f718ef2e43

Merge branch 'tracing-v28-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits)
  tracing/fastboot: improve help text
  tracing/stacktrace: improve help text
  tracing/fastboot: fix initcalls disposition in bootgraph.pl
  tracing/fastboot: fix bootgraph.pl initcall name regexp
  tracing/fastboot: fix issues and improve output of bootgraph.pl
  tracepoints: synchronize unregister static inline
  tracepoints: tracepoint_synchronize_unregister()
  ftrace: make ftrace_test_p6nop disassembler-friendly
  markers: fix synchronize marker unregister static inline
  tracing/fastboot: add better resolution to initcall debug/tracing
  trace: add build-time check to avoid overrunning hex buffer
  ftrace: fix hex output mode of ftrace
  tracing/fastboot: fix initcalls disposition in bootgraph.pl
  tracing/fastboot: fix printk format typo in boot tracer
  ftrace: return an error when setting a nonexistent tracer
  ftrace: make some tracers reentrant
  ring-buffer: make reentrant
  ring-buffer: move page indexes into page headers
  tracing/fastboot: only trace non-module initcalls
  ftrace: move pc counter in irqtrace
  ...

Manually fix conflicts:
 - init/main.c: initcall tracing
 - kernel/module.c: verbose level vs tracepoints
 - scripts/bootgraph.pl: fallout from cherry-picking commits.
---

92b29b86fe2e183d44eb467e5e74a5f718ef2e43
diff --cc kernel/module.c
index 25bc9ac,7576c2d..0d8d21e
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -1860,7 -1836,9 +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 */
@@@ -2155,7 -2126,12 +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++) {
@@@ -2205,8 -2188,16 +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;