* '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 security (2 of 2057 files). Show all
Unified · Split
| @@ -80,6 +80,7 @@ · 79 unmodified lines | ||
| 80 | 80 | #include <linux/posix-timers.h> |
| 81 | 81 | #include <linux/syslog.h> |
| 82 | 82 | #include <linux/user_namespace.h> |
| 83 | +#include <linux/export.h> | |
| 83 | 84 | |
| 84 | 85 | #include "avc.h" |
| 85 | 86 | #include "objsec.h" |
| @@ -14,6 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/slab.h> |
| 15 | 15 | #include <linux/stddef.h> |
| 16 | 16 | #include <linux/kernel.h> |
| 17 | +#include <linux/export.h> | |
| 17 | 18 | #include <linux/skbuff.h> |
| 18 | 19 | #include <linux/netlink.h> |
| 19 | 20 | #include <linux/selinux_netlink.h> |