[PATCH] Kill bogus __KERNEL_SYSCALLS usage

From: Dave Jones <davej@redhat.com>

Now that the syscalls.h stuff is in mainline, that clears the way for this
I guess?

diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 20dd1731eee0573979babb7f692ade2f2b71155c..7aea2c8f5a44e522366506eae46fe070872c27f5 100644 (file)
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -11,7 +11,6 @@
  * This file handles the architecture-dependent parts of process handling..
  */
 
-#define __KERNEL_SYSCALLS__
 #include <stdarg.h>
 
 #include <linux/errno.h>
@@ -23,7 +22,6 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/stddef.h>
-#include <linux/unistd.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/user.h>

diff --git a/drivers/char/h8.c b/drivers/char/h8.c
index ba69f09fdb292ed47aac7832ab831fca359e4214..19843a0d15388c05c9792c28dff2783284604724 100644 (file)
--- a/drivers/char/h8.c
+++ b/drivers/char/h8.c
@@ -30,9 +30,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 
-#define __KERNEL_SYSCALLS__
-#include <asm/unistd.h>
-
 #include "h8.h"
 
 #define DEBUG_H8

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4c70edd6100868e1a06542c670b81d5618c20913..874b29ccd65094795d1cf7635cf7a7e56cc3c1de 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -44,9 +44,6 @@
 #include <linux/kmod.h>
 #endif
 
-#define __KERNEL_SYSCALLS__
-#include <linux/unistd.h>
-
 #include <asm/unaligned.h>
 
 #define MAJOR_NR MD_MAJOR

diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index d6a2a751b05d8f45a2174563ff53c4bffcb030ae..03759e108846d38ea4759eb65ad5ef85a4dc6f9a 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@ -24,8 +24,6 @@
  */
 
 
-
-#define __KERNEL_SYSCALLS__
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index bc85d5d0016e59f481841db3c110836ea1b40ef9..258fb84d8b23b16d5a5a5f8c0f55aa22c4d07be1 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -59,9 +59,6 @@
 #include <net/ax25.h> 
 #endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
 
-#define __KERNEL_SYSCALLS__
-#include <linux/unistd.h>
-
 /* --------------------------------------------------------------------- */
 
 #define BAYCOM_DEBUG

diff --git a/drivers/scsi/cpqfcTSworker.c b/drivers/scsi/cpqfcTSworker.c
index 2b5735863b655d7767c1b0fa7a229642ccd3a1bc..026b613c328b7f2fe0f0fe70b142f70f147dc075 100644 (file)
--- a/drivers/scsi/cpqfcTSworker.c
+++ b/drivers/scsi/cpqfcTSworker.c
@@ -32,12 +32,8 @@
 #include <linux/smp_lock.h>
 #include <linux/pci.h>
 
-#define __KERNEL_SYSCALLS__
-
 #define SHUTDOWN_SIGS  (sigmask(SIGKILL)|sigmask(SIGINT)|sigmask(SIGTERM))
 
-#include <linux/unistd.h>
-
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/dma.h>

diff --git a/drivers/scsi/qla2xxx/qla_os.h b/drivers/scsi/qla2xxx/qla_os.h
index 67345d6269d4932df4b94572928f6b338fcfa94c..3cc6d2f17f59711547b679ae508f674ced7770b4 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.h
+++ b/drivers/scsi/qla2xxx/qla_os.h
@@ -41,8 +41,6 @@
 #include <linux/slab.h>
 #include <linux/mempool.h>
 #include <linux/vmalloc.h>
-#define __KERNEL_SYSCALLS__
-#include <linux/unistd.h>
 #include <linux/smp_lock.h>
 #include <linux/bio.h>
 #include <linux/moduleparam.h>

diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index c2f970fb706115f11b7325170e6e39a3bacae65d..97cd3526636c9b9669a75068fbbc8380d0a03464 100644 (file)
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -26,14 +26,7 @@
  * maybe other stuff do to.
  */
 
-/* Argh. Some architectures have kernel_thread in asm/processor.h
-   Some have it in unistd.h and you need to define __KERNEL_SYSCALLS__
-   Pass me a baseball bat and the person responsible.
-   dwmw2
-*/
-#define __KERNEL_SYSCALLS__
 #include <linux/time.h>
-#include <linux/unistd.h>
 
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 6412a0a9e8e544896a5349dbcda2552c757687bf..621231064418f7f11a2c925d2c4a7d85dbdd9379 100644 (file)
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -11,14 +11,10 @@
  *
  */
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/kernel.h>
 #include <linux/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
-#include <linux/sched.h>
-#include <linux/unistd.h>
 #include <linux/suspend.h>
 #include "nodelist.h"
 

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 3ed42dc5b1625246222729a3288188b1bda55dad..6c95574b2cfc4ab676b11c5bf20346a0aac3fa63 100644 (file)
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -6,13 +6,10 @@
  * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
  */
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/time.h>
 #include <linux/nfs_fs.h>
-#include <linux/unistd.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 479a8b55004680e661881edd92b4c4b34ebe6fce..47c77137b042ecda8267489e586f7e2c704e671d 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -12,7 +12,6 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#define __KERNEL_SYSCALLS__
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -23,7 +22,6 @@
 #include <linux/errno.h>
 #include <linux/in.h>
 #include <linux/uio.h>
-#include <linux/unistd.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>

diff --git a/kernel/signal.c b/kernel/signal.c
index e0675f1d5e9c28322b338eff4185e74af03f3dd4..7cbb9c60dd00322aa450eb38abe3f2b4d72e2c44 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -10,12 +10,9 @@
  *             to allow signals to be sent reliably.
  */
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/unistd.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/sched.h>

diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index aca6800b9bd1020b49fdd3823df4e581fc4db0d7..7bfd15c28e0311194beb73e862fa3070c7f30d05 100644 (file)
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -29,8 +29,6 @@
  * $Id: core.c,v 1.20 2002/08/04 21:23:58 maxk Exp $
  */ 
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/config.h>
 #include <linux/module.h>
 

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 6e381222edecda15730c58ec38cc4fb31b128bbe..d0cb7053e2037e1a04df4f8824f2d46d703429e9 100644 (file)
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -31,8 +31,6 @@
  * $Id: core.c,v 1.42 2002/10/01 23:26:25 maxk Exp $
  */
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>

diff --git a/net/core/netfilter.c b/net/core/netfilter.c
index cf2c4159ff8d12d3026697c7339580aa61d3d3f6..d132da324705316d8f3bb81894a51ae0694a6c94 100644 (file)
--- a/net/core/netfilter.c
+++ b/net/core/netfilter.c
@@ -27,9 +27,6 @@
 #include <net/route.h>
 #include <linux/ip.h>
 
-#define __KERNEL_SYSCALLS__
-#include <linux/unistd.h>
-
 /* In this code, we can be waiting indefinitely for userspace to
  * service a packet if a hook returns NF_QUEUE.  We could keep a count
  * of skbuffs queued for userspace, and not deregister a hook unless

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 47e9600da135d7315a28761ac32c3ce75072a6b3..1799921a2f6502cfd9099530fbb51b1f7e85fc9c 100644 (file)
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -11,12 +11,10 @@
 
 #include <linux/module.h>
 
-#define __KERNEL_SYSCALLS__
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/mempool.h>
-#include <linux/unistd.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a56d0fdbd7617382d71ca38eb78d00f2cfe0a60d..03ae390e23163f50c28b77c1eafc013fde3c66d4 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -6,13 +6,11 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#define __KERNEL_SYSCALLS__
 #include <linux/linkage.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/net.h>
 #include <linux/in.h>
-#include <linux/unistd.h>
 #include <linux/mm.h>
 
 #include <linux/sunrpc/types.h>

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 84ccc9d8e05bc9bbe0264458d92a7fa6af669763..605bcc921d344592d6d6c87a80a3078da2da3cdd 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -43,8 +43,6 @@
  *   (C) 1999 Trond Myklebust <trond.myklebust@fys.uio.no>
  */
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/capability.h>
@@ -56,7 +54,6 @@
 #include <linux/mm.h>
 #include <linux/udp.h>
 #include <linux/tcp.h>
-#include <linux/unistd.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/file.h>
 #include <linux/workqueue.h>