* '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 kernel/sys.c (1 of 2057 files). Show all
Unified · Split
| @@ -4,7 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | −#include <linux/module.h> | |
| 7 | +#include <linux/export.h> | |
| 8 | 8 | #include <linux/mm.h> |
| 9 | 9 | #include <linux/utsname.h> |
| 10 | 10 | #include <linux/mman.h> |
| @@ -12,6 +12,7 @@ · 1 unmodified line | ||
| 12 | 12 | #include <linux/prctl.h> |
| 13 | 13 | #include <linux/highuid.h> |
| 14 | 14 | #include <linux/fs.h> |
| 15 | +#include <linux/kmod.h> | |
| 15 | 16 | #include <linux/perf_event.h> |
| 16 | 17 | #include <linux/resource.h> |
| 17 | 18 | #include <linux/kernel.h> |