From: Dave Jones <davej@redhat.com> Now that the syscalls.h stuff is in mainline, that clears the way for this I guess? --- arch/i386/kernel/process.c | 2 -- drivers/char/h8.c | 3 --- drivers/md/md.c | 3 --- drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 2 -- drivers/net/hamradio/baycom_epp.c | 3 --- drivers/scsi/cpqfcTSworker.c | 4 ---- drivers/scsi/qla2xxx/qla_os.h | 2 -- fs/jffs/inode-v23.c | 7 ------- fs/jffs2/background.c | 4 ---- fs/lockd/clntlock.c | 3 --- fs/lockd/svc.c | 2 -- kernel/signal.c | 3 --- net/bluetooth/bnep/core.c | 2 -- net/bluetooth/rfcomm/core.c | 2 -- net/core/netfilter.c | 3 --- net/sunrpc/sched.c | 2 -- net/sunrpc/svc.c | 2 -- net/sunrpc/xprt.c | 3 --- 18 files changed, 52 deletions(-) diff -puN arch/i386/kernel/process.c~remove-KERNEL_SYSCALLS-stuff arch/i386/kernel/process.c --- 25/arch/i386/kernel/process.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/arch/i386/kernel/process.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN drivers/char/h8.c~remove-KERNEL_SYSCALLS-stuff drivers/char/h8.c --- 25/drivers/char/h8.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/drivers/char/h8.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN drivers/md/md.c~remove-KERNEL_SYSCALLS-stuff drivers/md/md.c --- 25/drivers/md/md.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/drivers/md/md.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN drivers/media/dvb/dvb-core/dvb_ringbuffer.c~remove-KERNEL_SYSCALLS-stuff drivers/media/dvb/dvb-core/dvb_ringbuffer.c --- 25/drivers/media/dvb/dvb-core/dvb_ringbuffer.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/drivers/media/dvb/dvb-core/dvb_ringbuffer.c 2004-02-25 12:23:07.000000000 -0800 @@ -24,8 +24,6 @@ */ - -#define __KERNEL_SYSCALLS__ #include <linux/errno.h> #include <linux/kernel.h> #include <linux/module.h> diff -puN drivers/net/hamradio/baycom_epp.c~remove-KERNEL_SYSCALLS-stuff drivers/net/hamradio/baycom_epp.c --- 25/drivers/net/hamradio/baycom_epp.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/drivers/net/hamradio/baycom_epp.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN drivers/scsi/cpqfcTSworker.c~remove-KERNEL_SYSCALLS-stuff drivers/scsi/cpqfcTSworker.c --- 25/drivers/scsi/cpqfcTSworker.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/drivers/scsi/cpqfcTSworker.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN drivers/scsi/qla2xxx/qla_os.h~remove-KERNEL_SYSCALLS-stuff drivers/scsi/qla2xxx/qla_os.h --- 25/drivers/scsi/qla2xxx/qla_os.h~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/drivers/scsi/qla2xxx/qla_os.h 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN fs/jffs2/background.c~remove-KERNEL_SYSCALLS-stuff fs/jffs2/background.c --- 25/fs/jffs2/background.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/fs/jffs2/background.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN fs/jffs/inode-v23.c~remove-KERNEL_SYSCALLS-stuff fs/jffs/inode-v23.c --- 25/fs/jffs/inode-v23.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/fs/jffs/inode-v23.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN fs/lockd/clntlock.c~remove-KERNEL_SYSCALLS-stuff fs/lockd/clntlock.c --- 25/fs/lockd/clntlock.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/fs/lockd/clntlock.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN fs/lockd/svc.c~remove-KERNEL_SYSCALLS-stuff fs/lockd/svc.c --- 25/fs/lockd/svc.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/fs/lockd/svc.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN kernel/signal.c~remove-KERNEL_SYSCALLS-stuff kernel/signal.c --- 25/kernel/signal.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/kernel/signal.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN net/bluetooth/bnep/core.c~remove-KERNEL_SYSCALLS-stuff net/bluetooth/bnep/core.c --- 25/net/bluetooth/bnep/core.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/net/bluetooth/bnep/core.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN net/bluetooth/rfcomm/core.c~remove-KERNEL_SYSCALLS-stuff net/bluetooth/rfcomm/core.c --- 25/net/bluetooth/rfcomm/core.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/net/bluetooth/rfcomm/core.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN net/core/netfilter.c~remove-KERNEL_SYSCALLS-stuff net/core/netfilter.c --- 25/net/core/netfilter.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/net/core/netfilter.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN net/sunrpc/sched.c~remove-KERNEL_SYSCALLS-stuff net/sunrpc/sched.c --- 25/net/sunrpc/sched.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/net/sunrpc/sched.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN net/sunrpc/svc.c~remove-KERNEL_SYSCALLS-stuff net/sunrpc/svc.c --- 25/net/sunrpc/svc.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/net/sunrpc/svc.c 2004-02-25 12:23:07.000000000 -0800 @@ -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 -puN net/sunrpc/xprt.c~remove-KERNEL_SYSCALLS-stuff net/sunrpc/xprt.c --- 25/net/sunrpc/xprt.c~remove-KERNEL_SYSCALLS-stuff 2004-02-25 12:23:07.000000000 -0800 +++ 25-akpm/net/sunrpc/xprt.c 2004-02-25 12:23:07.000000000 -0800 @@ -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> _