[PATCH] move capable() to capability.h

- Move capable() from sched.h to capability.h;

- Use <linux/capability.h> where capable() is used
	(in include/, block/, ipc/, kernel/, a few drivers/,
	mm/, security/, & sound/;
	many more drivers/ to go)

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/block/ioctl.c b/block/ioctl.c
index 82030e1dfd631b1495f87ebe632f30ed6f1086fa..e1109491c234c0ec50d15d220b81589d52cb10c6 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -1,4 +1,4 @@
-#include <linux/sched.h>               /* for capable() */
+#include <linux/capability.h>
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/hdreg.h>

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 18de84c8ccd8bca5d1fafe8d0326cda0998cf87d..cc72210687eb4f3a75e17ce39a46bfd2b4e70fa9 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -21,6 +21,7 @@
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/capability.h>
 #include <linux/completion.h>
 #include <linux/cdrom.h>
 #include <linux/slab.h>

diff --git a/drivers/acorn/char/i2c.c b/drivers/acorn/char/i2c.c
index c22bb9dca1ec9668b5de80242d41184535ae04ee..c26c08b368297897f6a07bb86bfb02db3212b3ce 100644 (file)
--- a/drivers/acorn/char/i2c.c
+++ b/drivers/acorn/char/i2c.c
@@ -12,6 +12,7 @@
  *  On Acorn machines, the following i2c devices are on the bus:
  *     - PCF8583 real time clock & static RAM
  */
+#include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/time.h>

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 5b3d5e9ddcb656708956dc417c93990a8322dac9..3d384e3d34decfa481fe2ed722e2e4b9445a41d6 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -7,6 +7,7 @@
  *
  */
 
+#include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 58801d718cc2f7b024ab67973d514399ae240699..d1a05224627ed36aec464213ac302e8c5494982b 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -13,8 +13,8 @@
 #include <linux/sysdev.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/sched.h>       /* capable() */
 #include <linux/topology.h>
+#include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/memory.h>
 #include <linux/kobject.h>

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index bda5bce681b6bbdf0962c39e50cc3e8b4c3e1877..343379f23a53cf432b98118c00e095b497aa6e6c 100644 (file)
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -65,11 +65,11 @@
  *   v0.01 release to linux-ia64@linuxia64.org
  */
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/sched.h>               /* for capable() */
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/string.h>

diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index 166bca79013348284662eddb6ea6b31022ea2964..b80318f0342022fe53827cae6e242a66479d761b 100644 (file)
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -15,6 +15,7 @@
 #include <linux/vmalloc.h>
 #include <linux/oprofile.h>
 #include <linux/sched.h>
+#include <linux/capability.h>
 #include <linux/dcookies.h>
 #include <linux/fs.h>
 #include <asm/uaccess.h>

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index f357d3f6036072069a3734215e1d3931236a421e..3627a2d7f79feb3b701dceba05312e8079cbe002 100644 (file)
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -30,6 +30,7 @@
 #include <linux/types.h>
 #include <linux/ioport.h>
 #include <linux/utsname.h>
+#include <linux/capability.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/inetdevice.h>

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 38bdca2fac6beaacafd8090b27a292c31eec770e..42a3c54e8e6ccb6d4a29983c313ecc6d078af2e8 100644 (file)
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -42,9 +42,9 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/sched.h>               /* for capable() */
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/capability.h>
 #include <linux/ctype.h>
 #include <linux/sysfs.h>
 #include <linux/kobject.h>

diff --git a/fs/xfs/linux-2.6/xfs_cred.h b/fs/xfs/linux-2.6/xfs_cred.h
index 4af491024727264536ef4a0200d527dce35daa36..e7f3da61c6c39afd5f669d3faa80a577977558f9 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_cred.h
+++ b/fs/xfs/linux-2.6/xfs_cred.h
@@ -18,6 +18,8 @@
 #ifndef __XFS_CRED_H__
 #define __XFS_CRED_H__
 
+#include <linux/capability.h>
+
 /*
  * Credentials
  */
@@ -27,7 +29,7 @@ typedef struct cred {
 
 extern struct cred *sys_cred;
 
-/* this is a hack.. (assums sys_cred is the only cred_t in the system) */
+/* this is a hack.. (assumes sys_cred is the only cred_t in the system) */
 static __inline int capable_cred(cred_t *cr, int cid)
 {
        return (cr == sys_cred) ? 1 : capable(cid);

diff --git a/include/linux/capability.h b/include/linux/capability.h
index 6b4618902d3dd3f9fcb6298326a757dac415fb87..5a23ce7526292fa6e406ccae0ea3926b5bb210e3 100644 (file)
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -43,6 +43,7 @@ typedef struct __user_cap_data_struct {
 #ifdef __KERNEL__
 
 #include <linux/spinlock.h>
+#include <asm/current.h>
 
 /* #define STRICT_CAP_T_TYPECHECKS */
 
@@ -356,6 +357,8 @@ static inline kernel_cap_t cap_invert(kernel_cap_t c)
 
 #define cap_is_fs_cap(c)     (CAP_TO_MASK(c) & CAP_FS_MASK)
 
+extern int capable(int cap);
+
 #endif /* __KERNEL__ */
 
 #endif /* !_LINUX_CAPABILITY_H */

diff --git a/include/linux/mm.h b/include/linux/mm.h
index e53d2c6fd5f4b0ef2321d12d7a6d75bf7c9dae4c..c643016499a17860605566a77ea2c622f83f0ffe 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3,6 +3,7 @@
 
 #include <linux/sched.h>
 #include <linux/errno.h>
+#include <linux/capability.h>
 
 #ifdef __KERNEL__
 

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2ae8711bfba16b0060334d2bf08574b9edbbdce2..3b74c4bf2934b4e3a1bb561dbee934ebb79d787a 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1112,10 +1112,6 @@ static inline int sas_ss_flags(unsigned long sp)
                : on_sig_stack(sp) ? SS_ONSTACK : 0);
 }
 
-
-/* code is in security.c or kernel/sys.c if !SECURITY */
-extern int capable(int cap);
-
 /*
  * Routines for handling mm_structs
  */

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a8aa6152eea6b0f0e07c5d5470cf1892970d189b..4e776f9c80e7c1fbe0da01a1dcdc9f63c04ebd89 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -11,6 +11,7 @@
  * This file is released under the GPL.
  */
 
+#include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/file.h>

diff --git a/ipc/msg.c b/ipc/msg.c
index d035bd2aba9671cc56fdd6f10b81182ac628b011..a91b64763b86ed282d993552216b60c734833031 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -15,6 +15,7 @@
  * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
  */
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/msg.h>

diff --git a/ipc/sem.c b/ipc/sem.c
index cb5bb2a5df96f417f5c44b1108e8483ee3a10585..46bb8a678decb50f760193c94cf2dcbce9f0e4e8 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -73,6 +73,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
+#include <linux/capability.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
 #include "util.h"

diff --git a/ipc/shm.c b/ipc/shm.c
index 0b92e874fc068fb1bc34f3e5940cfb45542f29f7..4c28d2d8e305cca5781f02117b55e9b21922bdd0 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -27,6 +27,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
+#include <linux/capability.h>
 #include <linux/ptrace.h>
 #include <linux/seq_file.h>
 

diff --git a/ipc/util.c b/ipc/util.c
index 23f1cec150c106dd7e0aa17e34699679c70e02dc..38b9a0af3bd86373b38106fe7ca00bfe745aca05 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -20,6 +20,7 @@
 #include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
+#include <linux/capability.h>
 #include <linux/highuid.h>
 #include <linux/security.h>
 #include <linux/rcupdate.h>

diff --git a/kernel/acct.c b/kernel/acct.c
index 38d57fa6b78fe8d02c6a053f9f06b6902a0b41c2..065d8b4e51ef921fedc018c103ed4124d664ad71 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -47,6 +47,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/acct.h>
+#include <linux/capability.h>
 #include <linux/file.h>
 #include <linux/tty.h>
 #include <linux/security.h>

diff --git a/kernel/capability.c b/kernel/capability.c
index 8986a37a67ea32290a725826a0b7b8c07a7d01b1..bfa3c92e16f2b1c5a9971335f6500cb17a6c8a49 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -7,6 +7,7 @@
  * 30 May 2002:        Cleanup, Robert M. Love <rml@tech9.net>
  */ 
 
+#include <linux/capability.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/security.h>

diff --git a/kernel/exit.c b/kernel/exit.c
index 802722814925d6391bb021d99106314c7c6b085e..f8e609ff1893f2d85f76f4b56cba97135b97d152 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
+#include <linux/capability.h>
 #include <linux/completion.h>
 #include <linux/personality.h>
 #include <linux/tty.h>

diff --git a/kernel/fork.c b/kernel/fork.c
index 3bdcab49998d2dd43bf951ae87a855e955eaf090..16a776ec2c0b45eb35cb65985c84326ea22c4106 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -28,6 +28,7 @@
 #include <linux/binfmts.h>
 #include <linux/mman.h>
 #include <linux/fs.h>
+#include <linux/capability.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/security.h>

diff --git a/kernel/kexec.c b/kernel/kexec.c
index de1441656efdacf2d86a5db5226fb6e7f1469655..bf39d28e4c0e7b44313124d84681f012ca193713 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -6,6 +6,7 @@
  * Version 2.  See the file COPYING for more details.
  */
 
+#include <linux/capability.h>
 #include <linux/mm.h>
 #include <linux/file.h>
 #include <linux/slab.h>

diff --git a/kernel/module.c b/kernel/module.c
index e4276046a1b62489b9b4e60362119ad95656e438..618ed6e23ecccf12b16d9bac17a62510758989be 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -28,6 +28,7 @@
 #include <linux/syscalls.h>
 #include <linux/fcntl.h>
 #include <linux/rcupdate.h>
+#include <linux/capability.h>
 #include <linux/cpu.h>
 #include <linux/moduleparam.h>
 #include <linux/errno.h>

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index cceaf09ac413a4da1b9ea3d27d7655cb405e785c..5f33cdb6fff5f7e629842a8bee7865bb2607515c 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -7,6 +7,7 @@
  * to continually duplicate across every architecture.
  */
 
+#include <linux/capability.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/errno.h>

diff --git a/kernel/sched.c b/kernel/sched.c
index 34a945bcc022a6767ae2ed4adbcd5d56716db98b..d129e560cc0db55108b31a8e43c000d045ecf8be 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -27,6 +27,7 @@
 #include <linux/smp_lock.h>
 #include <asm/mmu_context.h>
 #include <linux/interrupt.h>
+#include <linux/capability.h>
 #include <linux/completion.h>
 #include <linux/kernel_stat.h>
 #include <linux/security.h>

diff --git a/kernel/signal.c b/kernel/signal.c
index 08aa5b263f36b01c0308c11f94428b404f5c7582..1da2e74beb97240947ebe3da5a30a4c5ae81a8fe 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -25,6 +25,7 @@
 #include <linux/posix-timers.h>
 #include <linux/signal.h>
 #include <linux/audit.h>
+#include <linux/capability.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>

diff --git a/kernel/sys.c b/kernel/sys.c
index 9ccf713491f989a3f8b6442f73c765f1069e2d79..d09cac23fdfd6460daa501f6f549e69f762f2391 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/kexec.h>
 #include <linux/workqueue.h>
+#include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/key.h>
 #include <linux/times.h>

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 03b0598f2369d2e6cd0d67493f161c675b87b954..62d4d9566876eb9e32199c3969d61d306543d708 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
+#include <linux/capability.h>
 #include <linux/ctype.h>
 #include <linux/utsname.h>
 #include <linux/capability.h>

diff --git a/kernel/time.c b/kernel/time.c
index 169e8329e0b63ba59ce29f438dd90f182280ce03..7477b1d2079e32a614ea82e6ae21fde3abe48373 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -29,6 +29,7 @@
 
 #include <linux/module.h>
 #include <linux/timex.h>
+#include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>

diff --git a/kernel/uid16.c b/kernel/uid16.c
index f669941e8b26d8d483d22889c9e328d3a5b6264f..aa25605027c8eb19c682cd6efec17b0d79073451 100644 (file)
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
@@ -10,6 +10,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/prctl.h>
+#include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/highuid.h>
 #include <linux/security.h>

diff --git a/mm/filemap.c b/mm/filemap.c
index 96de772be487b7c8e6df4e591bd2f3cf9b8647ab..a965b6b35f266bce90ad5703ec4c81b7270e9d8e 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <linux/fs.h>
 #include <linux/aio.h>
+#include <linux/capability.h>
 #include <linux/kernel_stat.h>
 #include <linux/mm.h>
 #include <linux/swap.h>

diff --git a/mm/mlock.c b/mm/mlock.c
index 4ae3a46ff7688a4d12d0022854120be978844242..b90c59573abf5da8bd00dcc7b224796ce66befc5 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -5,6 +5,7 @@
  *  (C) Copyright 2002 Christoph Hellwig
  */
 
+#include <linux/capability.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/mempolicy.h>

diff --git a/mm/mmap.c b/mm/mmap.c
index 64ba4dbcb7def44e02c278a01926b061d0417f40..47556d2b3e90ddbde4b0b8e69430ef5b3726e3af 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -13,6 +13,7 @@
 #include <linux/pagemap.h>
 #include <linux/swap.h>
 #include <linux/syscalls.h>
+#include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/file.h>
 #include <linux/fs.h>

diff --git a/mm/mremap.c b/mm/mremap.c
index ddaeee9a0b69e5a5e5b232377ae97801fd6a438e..1903bdf65e428d88e5bf124243d99ee7ab7c51e3 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -13,6 +13,7 @@
 #include <linux/shm.h>
 #include <linux/mman.h>
 #include <linux/swap.h>
+#include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/highmem.h>
 #include <linux/security.h>

diff --git a/mm/swapfile.c b/mm/swapfile.c
index d8a5afc8b2a3a417ade826173ce96a55f2ac0000..957fef43fa6081ec62cf3459e3b5db2d865eae57 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -25,6 +25,7 @@
 #include <linux/rmap.h>
 #include <linux/security.h>
 #include <linux/backing-dev.h>
+#include <linux/capability.h>
 #include <linux/syscalls.h>
 
 #include <asm/pgtable.h>

diff --git a/security/commoncap.c b/security/commoncap.c
index 04c12f58d656200b29c1e0c60c31e7ac62349741..8a6e097f99ea677acf091800f4bd3797975f9f75 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -7,6 +7,7 @@
  *
  */
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/security/dummy.c b/security/dummy.c
index a15c54709fdefe69defdd67c49340e2485d65006..f1a5bd98bf10c3ed56d82ddea1ce33cf5a0bc905 100644 (file)
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -14,6 +14,7 @@
 
 #undef DEBUG
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 3d2ebae029c1775b49722314b2def71bc4aabe9d..90db5c76cf6e5bdad2778f6a18e6a772dd281c51 100644 (file)
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -16,6 +16,7 @@
 #include <linux/syscalls.h>
 #include <linux/keyctl.h>
 #include <linux/fs.h>
+#include <linux/capability.h>
 #include <linux/err.h>
 #include <asm/uaccess.h>
 #include "internal.h"

diff --git a/security/security.c b/security/security.c
index ed5fb80769c3731003cec9ea07a41001a3c72bf2..f693e1f66b98521c3c6e0995a5c6182935b1b18a 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -11,6 +11,7 @@
  *     (at your option) any later version.
  */
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 1a903390ad6dc99d79a16bade1c498246b88789a..5098372527351628d14fb2c861c71d276de9f4ac 100644 (file)
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -27,6 +27,7 @@
 
 #include <sound/driver.h>
 #include <linux/pci.h>
+#include <linux/capability.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>