Merge branch 'linus' into tracing-v28-for-linus-v3
Ingo Molnar [Sun, 19 Oct 2008 17:04:47 +0000 (19:04 +0200)]
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl

1  2 
arch/x86/Kconfig
include/asm-generic/vmlinux.lds.h
include/linux/init.h
include/linux/kernel.h
include/linux/module.h
init/Kconfig
kernel/exit.c
kernel/module.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc 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 */
        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++) {
                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;