Permalink
Browse files

Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/paulg/linux

Pull cleanup of fs/ and lib/ users of module.h from Paul Gortmaker:
 "Fix up files in fs/ and lib/ dirs to only use module.h if they really
  need it.

  These are trivial in scope vs the work done previously.  We now have
  things where any few remaining cleanups can be farmed out to arch or
  subsystem maintainers, and I have done so when possible.  What is
  remaining here represents the bits that don't clearly lie within a
  single arch/subsystem boundary, like the fs dir and the lib dir.

  Some duplicate includes arising from overlapping fixes from
  independent subsystem maintainer submissions are also quashed."

Fix up trivial conflicts due to clashes with other include file cleanups
(including some due to the previous bug.h cleanup pull).

* tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  lib: reduce the use of module.h wherever possible
  fs: reduce the use of module.h wherever possible
  includecheck: delete any duplicate instances of module.h
  • Loading branch information...
2 parents ed2d265 + 8bc3bcc commit 11bcb32848ddb5ab28f09f142b625e2ba4d55c4c @torvalds committed Mar 24, 2012
Showing with 100 additions and 100 deletions.
  1. +0 −1 drivers/dma/imx-dma.c
  2. +0 −1 drivers/dma/imx-sdma.c
  3. +0 −1 drivers/mmc/host/sdhci-tegra.c
  4. +0 −1 drivers/power/max8998_charger.c
  5. +0 −1 drivers/staging/iio/gyro/adis16060_core.c
  6. +1 −1 fs/aio.c
  7. +1 −1 fs/attr.c
  8. +1 −1 fs/bad_inode.c
  9. +1 −1 fs/binfmt_flat.c
  10. +1 −1 fs/bio.c
  11. +1 −1 fs/buffer.c
  12. +0 −1 fs/compat.c
  13. +0 −1 fs/compat_ioctl.c
  14. +1 −1 fs/dcache.c
  15. +1 −1 fs/dcookies.c
  16. +1 −1 fs/eventfd.c
  17. +1 −1 fs/file.c
  18. +1 −1 fs/fs-writeback.c
  19. +1 −1 fs/fs_struct.c
  20. +1 −1 fs/ioctl.c
  21. +1 −1 fs/libfs.c
  22. +1 −1 fs/mpage.c
  23. +1 −1 fs/namei.c
  24. +1 −1 fs/posix_acl.c
  25. +1 −1 fs/read_write.c
  26. +1 −1 fs/readdir.c
  27. +1 −1 fs/select.c
  28. +1 −1 fs/seq_file.c
  29. +1 −1 fs/splice.c
  30. +1 −1 fs/stack.c
  31. +1 −1 fs/stat.c
  32. +1 −1 fs/statfs.c
  33. +1 −1 fs/super.c
  34. +1 −1 fs/sync.c
  35. +1 −1 fs/xattr.c
  36. +1 −1 fs/xattr_acl.c
  37. +0 −1 kernel/params.c
  38. +1 −1 lib/argv_split.c
  39. +1 −1 lib/atomic64.c
  40. +1 −1 lib/average.c
  41. +1 −1 lib/bcd.c
  42. +2 −1 lib/bitmap.c
  43. +1 −1 lib/bsearch.c
  44. +1 −1 lib/check_signature.c
  45. +1 −1 lib/checksum.c
  46. +1 −1 lib/cmdline.c
  47. +1 −1 lib/cpu_rmap.c
  48. +1 −1 lib/cpumask.c
  49. +2 −1 lib/ctype.c
  50. +1 −1 lib/debug_locks.c
  51. +1 −1 lib/dec_and_lock.c
  52. +1 −1 lib/devres.c
  53. +2 −1 lib/div64.c
  54. +1 −1 lib/dump_stack.c
  55. +1 −1 lib/fault-inject.c
  56. +1 −1 lib/find_last_bit.c
  57. +1 −1 lib/find_next_bit.c
  58. +1 −1 lib/flex_array.c
  59. +1 −1 lib/gcd.c
  60. +1 −1 lib/genalloc.c
  61. +1 −1 lib/halfmd4.c
  62. +1 −1 lib/hexdump.c
  63. +1 −1 lib/hweight.c
  64. +1 −1 lib/idr.c
  65. +1 −1 lib/int_sqrt.c
  66. +1 −1 lib/iomap.c
  67. +1 −1 lib/iomap_copy.c
  68. +1 −1 lib/iommu-helper.c
  69. +1 −1 lib/ioremap.c
  70. +2 −1 lib/irq_regs.c
  71. +1 −1 lib/kasprintf.c
  72. +1 −1 lib/klist.c
  73. +1 −1 lib/kobject.c
  74. +2 −1 lib/kobject_uevent.c
  75. +1 −1 lib/kstrtox.c
  76. +1 −1 lib/lcm.c
  77. +1 −1 lib/list_debug.c
  78. +1 −1 lib/llist.c
  79. +0 −1 lib/locking-selftest.c
  80. +1 −1 lib/md5.c
  81. +1 −1 lib/nlattr.c
  82. +2 −1 lib/parser.c
  83. +1 −1 lib/radix-tree.c
  84. +1 −1 lib/random32.c
  85. +1 −1 lib/ratelimit.c
  86. +2 −1 lib/rational.c
  87. +1 −1 lib/rbtree.c
  88. +1 −1 lib/rwsem-spinlock.c
  89. +1 −1 lib/rwsem.c
  90. +1 −1 lib/scatterlist.c
  91. +1 −1 lib/sha1.c
  92. +1 −1 lib/smp_processor_id.c
  93. +1 −1 lib/spinlock_debug.c
  94. +3 −1 lib/string.c
  95. +1 −1 lib/string_helpers.c
  96. +1 −1 lib/swiotlb.c
  97. +1 −1 lib/syscall.c
  98. +1 −1 lib/timerqueue.c
  99. +1 −1 lib/uuid.c
  100. +1 −1 lib/vsprintf.c
View
@@ -14,7 +14,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
#include <linux/init.h>
-#include <linux/module.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
View
@@ -35,7 +35,6 @@
#include <linux/dmaengine.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/module.h>
#include <asm/irq.h>
#include <mach/sdma.h>
@@ -23,7 +23,6 @@
#include <linux/gpio.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
-#include <linux/module.h>
#include <asm/gpio.h>
@@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/module.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/slab.h>
@@ -14,7 +14,6 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
-#include <linux/module.h>
#include "../iio.h"
#include "../sysfs.h"
View
@@ -13,7 +13,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/aio_abi.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/syscalls.h>
#include <linux/backing-dev.h>
#include <linux/uio.h>
View
@@ -5,7 +5,7 @@
* changes by Thomas Schoebel-Theuer
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/time.h>
#include <linux/mm.h>
#include <linux/string.h>
View
@@ -9,7 +9,7 @@
*/
#include <linux/fs.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/stat.h>
#include <linux/time.h>
#include <linux/namei.h>
View
@@ -15,7 +15,7 @@
* JAN/99 -- coded full program relocation (gerg@snapgear.com)
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/mm.h>
View
@@ -22,7 +22,7 @@
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/mempool.h>
#include <linux/workqueue.h>
#include <scsi/sg.h> /* for struct sg_iovec */
View
@@ -29,7 +29,7 @@
#include <linux/file.h>
#include <linux/quotaops.h>
#include <linux/highmem.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/writeback.h>
#include <linux/hash.h>
#include <linux/suspend.h>
View
@@ -33,7 +33,6 @@
#include <linux/nfs4_mount.h>
#include <linux/syscalls.h>
#include <linux/ctype.h>
-#include <linux/module.h>
#include <linux/dirent.h>
#include <linux/fsnotify.h>
#include <linux/highuid.h>
View
@@ -49,7 +49,6 @@
#include <linux/elevator.h>
#include <linux/rtc.h>
#include <linux/pci.h>
-#include <linux/module.h>
#include <linux/serial.h>
#include <linux/if_tun.h>
#include <linux/ctype.h>
View
@@ -23,7 +23,7 @@
#include <linux/init.h>
#include <linux/hash.h>
#include <linux/cache.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/mount.h>
#include <linux/file.h>
#include <asm/uaccess.h>
View
@@ -13,7 +13,7 @@
*/
#include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/mount.h>
View
@@ -16,7 +16,7 @@
#include <linux/spinlock.h>
#include <linux/anon_inodes.h>
#include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/kref.h>
#include <linux/eventfd.h>
View
@@ -6,7 +6,7 @@
* Manage the dynamic fd arrays in the process files_struct.
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/mmzone.h>
View
@@ -14,7 +14,7 @@
*/
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/sched.h>
View
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/path.h>
View
@@ -10,7 +10,7 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/security.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/uaccess.h>
#include <linux/writeback.h>
#include <linux/buffer_head.h>
View
@@ -3,7 +3,7 @@
* Library for filesystems writers.
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/pagemap.h>
#include <linux/slab.h>
#include <linux/mount.h>
View
@@ -13,7 +13,7 @@
*/
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/mm.h>
#include <linux/kdev_t.h>
#include <linux/gfp.h>
View
@@ -15,7 +15,7 @@
*/
#include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/namei.h>
View
@@ -18,7 +18,7 @@
#include <linux/fs.h>
#include <linux/sched.h>
#include <linux/posix_acl.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/errno.h>
View
@@ -11,7 +11,7 @@
#include <linux/uio.h>
#include <linux/fsnotify.h>
#include <linux/security.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/syscalls.h>
#include <linux/pagemap.h>
#include <linux/splice.h>
View
@@ -6,7 +6,7 @@
#include <linux/stddef.h>
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/time.h>
#include <linux/mm.h>
#include <linux/errno.h>
View
@@ -17,7 +17,7 @@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/slab.h>
#include <linux/poll.h>
#include <linux/personality.h> /* for STICKY_TIMEOUTS */
View
@@ -6,7 +6,7 @@
*/
#include <linux/fs.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
View
@@ -25,7 +25,7 @@
#include <linux/mm_inline.h>
#include <linux/swap.h>
#include <linux/writeback.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/syscalls.h>
#include <linux/uio.h>
#include <linux/security.h>
View
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/fs.h>
#include <linux/fs_stack.h>
View
@@ -4,7 +4,7 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/file.h>
View
@@ -1,5 +1,5 @@
#include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/fs.h>
#include <linux/file.h>
#include <linux/mount.h>
View
@@ -20,7 +20,7 @@
* Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/slab.h>
#include <linux/acct.h>
#include <linux/blkdev.h>
View
@@ -6,7 +6,7 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/namei.h>
#include <linux/sched.h>
#include <linux/writeback.h>
View
@@ -16,7 +16,7 @@
#include <linux/security.h>
#include <linux/evm.h>
#include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/fsnotify.h>
#include <linux/audit.h>
#include <asm/uaccess.h>
View
@@ -5,7 +5,7 @@
* Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/fs.h>
#include <linux/posix_acl_xattr.h>
#include <linux/gfp.h>
View
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/errno.h>
View
@@ -6,7 +6,7 @@
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/export.h>
static const char *skip_arg(const char *cp)
{
View
@@ -13,7 +13,7 @@
#include <linux/cache.h>
#include <linux/spinlock.h>
#include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/atomic.h>
/*
View
@@ -5,7 +5,7 @@
* Version 2. See the file COPYING for more details.
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/average.h>
#include <linux/kernel.h>
#include <linux/bug.h>
View
@@ -1,5 +1,5 @@
#include <linux/bcd.h>
-#include <linux/module.h>
+#include <linux/export.h>
unsigned bcd2bin(unsigned char val)
{
View
@@ -5,7 +5,8 @@
* This source code is licensed under the GNU General Public License,
* Version 2. See the file COPYING for more details.
*/
-#include <linux/module.h>
+#include <linux/export.h>
+#include <linux/thread_info.h>
#include <linux/ctype.h>
#include <linux/errno.h>
#include <linux/bitmap.h>
View
@@ -9,7 +9,7 @@
* published by the Free Software Foundation; version 2.
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/bsearch.h>
/*
View
@@ -1,5 +1,5 @@
#include <linux/io.h>
-#include <linux/module.h>
+#include <linux/export.h>
/**
* check_signature - find BIOS signatures
View
@@ -32,7 +32,7 @@
/* Revised by Kenneth Albanowski for m68knommu. Basic problem: unaligned access
kills, so most of the assembly has to go. */
-#include <linux/module.h>
+#include <linux/export.h>
#include <net/checksum.h>
#include <asm/byteorder.h>
View
@@ -12,7 +12,7 @@
*
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/string.h>
Oops, something went wrong.

0 comments on commit 11bcb32

Please sign in to comment.