Skip to content

Commit 32aaeff

Browse files
torvaldstorvalds
committed
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* '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
2 parents 208bca0 + 67b8499 commit 32aaeff

File tree

2,057 files changed

+2248
-606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,057 files changed

+2248
-606
lines changed

‎arch/alpha/kernel/core_irongate.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ irongate_init_arch(void)
303303
#include <linux/vmalloc.h>
304304
#include <linux/agp_backend.h>
305305
#include <linux/agpgart.h>
306+
#include <linux/export.h>
306307
#include <asm/pgalloc.h>
307308

308309
#define GET_PAGE_DIR_OFF(addr) (addr >> 22)

‎arch/alpha/kernel/pci-sysfs.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
#include <linux/sched.h>
13+
#include <linux/stat.h>
1314
#include <linux/slab.h>
1415
#include <linux/pci.h>
1516

‎arch/alpha/kernel/pci_iommu.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/pci.h>
88
#include <linux/gfp.h>
99
#include <linux/bootmem.h>
10+
#include <linux/export.h>
1011
#include <linux/scatterlist.h>
1112
#include <linux/log2.h>
1213
#include <linux/dma-mapping.h>

‎arch/alpha/kernel/setup.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include <asm/setup.h>
4444
#include <asm/io.h>
4545
#include <linux/log2.h>
46+
#include <linux/export.h>
4647

4748
extern struct atomic_notifier_head panic_notifier_list;
4849
static int alpha_panic_event(struct notifier_block *, unsigned long, void *);

‎arch/arm/common/it8152.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <linux/ioport.h>
2626
#include <linux/irq.h>
2727
#include <linux/io.h>
28+
#include <linux/export.h>
2829

2930
#include <asm/mach/pci.h>
3031
#include <asm/hardware/it8152.h>

‎arch/arm/common/scoop.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/string.h>
1717
#include <linux/slab.h>
1818
#include <linux/platform_device.h>
19+
#include <linux/export.h>
1920
#include <linux/io.h>
2021
#include <asm/hardware/scoop.h>
2122

‎arch/arm/kernel/armksyms.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* it under the terms of the GNU General Public License version 2 as
88
* published by the Free Software Foundation.
99
*/
10-
#include <linux/module.h>
10+
#include <linux/export.h>
1111
#include <linux/sched.h>
1212
#include <linux/string.h>
1313
#include <linux/cryptohash.h>

‎arch/arm/kernel/bios32.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Bits taken from various places.
77
*/
8-
#include <linux/module.h>
8+
#include <linux/export.h>
99
#include <linux/kernel.h>
1010
#include <linux/pci.h>
1111
#include <linux/slab.h>

‎arch/arm/kernel/devtree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
#include <linux/init.h>
12-
#include <linux/module.h>
12+
#include <linux/export.h>
1313
#include <linux/errno.h>
1414
#include <linux/types.h>
1515
#include <linux/bootmem.h>

‎arch/arm/kernel/elf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <linux/module.h>
1+
#include <linux/export.h>
22
#include <linux/sched.h>
33
#include <linux/personality.h>
44
#include <linux/binfmts.h>

0 commit comments

Comments
 (0)