* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits) Revert "tracing: Include module.h in define_trace.h" irq: don't put module.h into irq.h for tracking irqgen modules. bluetooth: macroize two small inlines to avoid module.h ip_vs.h: fix implicit use of module_get/module_put from module.h nf_conntrack.h: fix up fallout from implicit moduleparam.h presence include: replace linux/module.h with "struct module" wherever possible include: convert various register fcns to macros to avoid include chaining crypto.h: remove unused crypto_tfm_alg_modname() inline uwb.h: fix implicit use of asm/page.h for PAGE_SIZE pm_runtime.h: explicitly requires notifier.h linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h miscdevice.h: fix up implicit use of lists and types stop_machine.h: fix implicit use of smp.h for smp_processor_id of: fix implicit use of errno.h in include/linux/of.h of_platform.h: delete needless include <linux/module.h> acpi: remove module.h include from platform/aclinux.h miscdevice.h: delete unnecessary inclusion of module.h device_cgroup.h: delete needless include <linux/module.h> net: sch_generic remove redundant use of <linux/module.h> net: inet_timewait_sock doesnt need <linux/module.h> ... Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in - drivers/media/dvb/frontends/dibx000_common.c - drivers/media/video/{mt9m111.c,ov6650.c} - drivers/mfd/ab3550-core.c - include/linux/dmaengine.h
Showing the changes to include/trace (2 of 2057 files). Show all
Unified · Split
| @@ -21,16 +21,6 @@ · 20 unmodified lines | |||
| 21 | #undef CREATE_TRACE_POINTS | 21 | #undef CREATE_TRACE_POINTS |
| 22 | 22 | ||
| 23 | #include <linux/stringify.h> | 23 | #include <linux/stringify.h> |
| 24 | /* | ||
| 25 | * module.h includes tracepoints, and because ftrace.h | ||
| 26 | * pulls in module.h: | ||
| 27 | * trace/ftrace.h -> linux/ftrace_event.h -> linux/perf_event.h -> | ||
| 28 | * linux/ftrace.h -> linux/module.h | ||
| 29 | * we must include module.h here before we play with any of | ||
| 30 | * the TRACE_EVENT() macros, otherwise the tracepoints included | ||
| 31 | * by module.h may break the build. | ||
| 32 | */ | ||
| 33 | #include <linux/module.h> | ||
| 34 | 24 | ||
| 35 | #undef TRACE_EVENT | 25 | #undef TRACE_EVENT |
| 36 | #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ | 26 | #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ |
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Because linux/module.h has tracepoints in the header, and ftrace.h | 2 | * Because linux/module.h has tracepoints in the header, and ftrace.h |
| 3 | * eventually includes this file, define_trace.h includes linux/module.h | 3 | * used to include this file, define_trace.h includes linux/module.h |
| 4 | * But we do not want the module.h to override the TRACE_SYSTEM macro | 4 | * But we do not want the module.h to override the TRACE_SYSTEM macro |
| 5 | * variable that define_trace.h is processing, so we only set it | 5 | * variable that define_trace.h is processing, so we only set it |
| 6 | * when module events are being processed, which would happen when | 6 | * when module events are being processed, which would happen when |