GIT 80b9192ee032f919da1b6e8b305c7cc9881b0907 git://git.infradead.org/hdrcleanup-2.6.git commit 80b9192ee032f919da1b6e8b305c7cc9881b0907 Author: David Woodhouse Date: Mon May 8 15:51:57 2006 +0100 Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Also remove Bob Burroughs' email address, since it's no longer valid. Acked-by: Eric D Rossman Signed-off-by: David Woodhouse commit c0f1fe00c3923135b2c2f443448585482da8a53e Author: David Woodhouse Date: Sat May 6 19:47:57 2006 +0100 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Reverts commit eba7f3bdb6344adee8a3d044f405ed38f5c66c6b Signed-off-by: David Woodhouse commit 05f75fd3bb92d9f5eaa8620195ff77a89431f2d2 Author: David Woodhouse Date: Thu May 4 17:50:04 2006 +0100 Include and use __uXX types in Signed-off-by: David Woodhouse commit cb8c1fdc0cf703e3297499dcd1a4b20b27570a7a Author: David Woodhouse Date: Thu May 4 17:32:44 2006 +0100 Use __uXX types in , include too Signed-off-by: David Woodhouse commit de654c97861c314fd0fc0b6a6dd1bc4202e00e42 Author: David Woodhouse Date: Thu May 4 17:28:26 2006 +0100 Remove private struct dx_hash_info from public view in Signed-off-by: David Woodhouse commit 7ee7d0e3186e2ad2a872436b5a272a814ea5cb0f Author: David Woodhouse Date: Thu May 4 15:49:24 2006 +0100 Include and use __uXX types in Signed-off-by: David Woodhouse commit 5da0458900bb5f56eb5e7a7c5ed275b5eaf51762 Author: David Woodhouse Date: Thu May 4 15:07:59 2006 +0100 Use __uXX types in for struct divert_blk et al. Signed-off-by: David Woodhouse commit 5ee882f153a49098a12f6b26f153ba12a33d767a Author: David Woodhouse Date: Thu May 4 12:39:12 2006 +0100 Use __u32 for elf_addr_t in , not u32. It's user-visible. Signed-off-by: David Woodhouse commit 2c88f4a8bc4276013f7eee7824056d9cecccadb1 Author: David Woodhouse Date: Thu May 4 12:07:37 2006 +0100 Remove PPP_FCS from user view in , remove __P mess entirely Signed-off-by: David Woodhouse commit 90abbae2d35b3dc55fd39f8ab04acaf3da5cdc0a Author: David Woodhouse Date: Thu May 4 02:55:50 2006 +0100 Use __uXX types in user-visible structures in Signed-off-by: David Woodhouse commit 8e1515df578e4665b77d1e0eec3c8b041d159b23 Author: David Woodhouse Date: Thu May 4 01:42:36 2006 +0100 Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Signed-off-by: David Woodhouse commit 56b192c337ddad05dee83c9bea079f41df775990 Author: David Woodhouse Date: Thu May 4 01:18:33 2006 +0100 Use __uXX types for S390 DASD volume label definitions which are user-visible Signed-off-by: David Woodhouse commit 9a798c076fcc26f29bf9e9d350a17cdeff0a314f Author: David Woodhouse Date: Thu May 4 01:17:41 2006 +0100 S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Signed-off-by: David Woodhouse commit ac12c0fc8c08a14bfa263c3a478ee82ad3e346d2 Author: David Woodhouse Date: Thu May 4 00:59:14 2006 +0100 Remove unneeded inclusion of from Signed-off-by: David Woodhouse commit eba7f3bdb6344adee8a3d044f405ed38f5c66c6b Author: David Woodhouse Date: Thu May 4 00:44:14 2006 +0100 Fix private integer types used in V4L2 ioctls. Signed-off-by: David Woodhouse commit 888855dc00c302c88663ec256bb422f4b27046f2 Author: David Woodhouse Date: Thu May 4 00:42:42 2006 +0100 Fix integer types in SNDRV_HDSP_IOCTL_GET_PEAK_RMS ioctl We should be using __u32 et al, not the kernel-private types. Signed-off-by: David Woodhouse commit 423bc7b22bdeb73efeabfcf91d8a459ac33088f1 Author: David Woodhouse Date: Thu May 4 00:41:02 2006 +0100 Restore __attribute_const__ to user-visibility in linux/compiler.h...for now Signed-off-by: David Woodhouse commit 4f79c3ffc6e04623711e86cf9a0e09e4aad8cb36 Author: David Woodhouse Date: Tue May 2 10:41:25 2006 +0100 Guard some of linux/compiler.h with #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit c3ce7e203af5d8eab7c3390fc991a1fcb152f741 Author: David Woodhouse Date: Sat Apr 29 01:53:47 2006 +0100 Sanitise ethtool.h and mii.h for userspace. They shouldn't be using 'u32' et al in structures which are used for communication with userspace. Switch to the proper types (__u32 etc). Signed-off-by: David Woodhouse commit 56142536868a2be34f261ed8fdca1610f8a73fbd Author: David Woodhouse Date: Sat Apr 29 01:51:47 2006 +0100 Remove unneeded _syscallX macros from user view in asm-*/unistd.h These aren't needed by glibc or klibc, and they're broken in some cases anyway. The uClibc folks are apparently switching over to stop using them too (now that we agreed that they should be dropped, at least). Signed-off-by: David Woodhouse commit 34c278d3913a15b64943e8c40a16b4f732cc7c59 Author: David Woodhouse Date: Sat Apr 29 01:49:06 2006 +0100 Remove 'extern int errno;' from public view in linux/unistd.h Signed-off-by: David Woodhouse commit c7afb48eb5147be9eb9789b4161462d246451ac2 Author: David Woodhouse Date: Sat Apr 29 01:48:16 2006 +0100 Remove struct input_device_id from public view in linux/input.h It uses kernel_ulong_t but can't be wrapped in __KERNEL__ because it's used from scripts/mod/file2alias.c -- but we _can_ hide it inside header manually too (and it doesn't generally exist for userspace). Signed-off-by: David Woodhouse commit 778382e08cce51b6268ca49449e5bd70c8413799 Author: David Woodhouse Date: Sat Apr 29 01:46:02 2006 +0100 Don't include in public part of linux/pci.h Signed-off-by: David Woodhouse commit acc429a517bd11fdcac9bea97d082d26231beb92 Author: David Woodhouse Date: Thu Apr 27 16:46:56 2006 +0100 linux/blkpg.h needs for __user Signed-off-by: David Woodhouse commit cd469e0cc67b74ba41daec335ea72baedb750b80 Author: David Woodhouse Date: Thu Apr 27 15:48:08 2006 +0100 Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h Signed-off-by: David Woodhouse commit ad1588798620901c12ba86c71865150a4eb727bf Author: David Woodhouse Date: Thu Apr 27 06:57:23 2006 +0100 Add standard include guard to asm-generic/signal and use compiler.h Signed-off-by: David Woodhouse commit 274f5946dcb7c970455067be9e13a22174787592 Author: David Woodhouse Date: Thu Apr 27 04:47:10 2006 +0100 Don't include implementation details from asm-s390/ptrace.h and page.h Signed-off-by: David Woodhouse commit b7b3c76a0a21c5a98124e90c47c488f7e4166f87 Author: David Woodhouse Date: Thu Apr 27 00:12:56 2006 +0100 Sanitise linux/sched.h for userspace consumption There was a whole load of crap exposed which should have been inside the existing #ifdef __KERNEL__ part. Also hide struct sched_param for now, since glibc has its own and doesn't like being given ours (yet). Signed-off-by: David Woodhouse commit f001e47f83db18a9f202f25c0255b4d11ebe468b Author: David Woodhouse Date: Thu Apr 27 00:11:01 2006 +0100 Sanitise linux/audit.h for userspace consumption, split elf-em.h from elf.h Don't include outside __KERNEL__, and split the EM_xxx definitions out of elf.h into elf-em.h so that audit.h can include just that and not pollute the namespace any further than it needs to. Signed-off-by: David Woodhouse commit 62c4f0a2d5a188f73a94f2cb8ea0dba3e7cf0a7f Author: David Woodhouse Date: Wed Apr 26 12:56:16 2006 +0100 Don't include linux/config.h from anywhere else in include/ Signed-off-by: David Woodhouse commit 089f26d5e31b7bf42a9a8fefec08b30cd27f4b0e Author: David Woodhouse Date: Tue Apr 25 15:29:01 2006 +0100 Don't include and from linux/socket.h Signed-off-by: David Woodhouse commit d85004eb15a635b3937e91d1dbadb1d37541983c Author: David Woodhouse Date: Tue Apr 25 15:18:46 2006 +0100 Don't include private headers from user-visible part of linux/ext3_fs.h Signed-off-by: David Woodhouse commit 52a78c1cae382ff5684f3970848676de12449745 Author: David Woodhouse Date: Tue Apr 25 15:18:31 2006 +0100 Don't include private headers from user-visible part of linux/ext2_fs.h Signed-off-by: David Woodhouse commit 19b3bd667b6a4fc4c164c743492cec08d91d74a5 Author: David Woodhouse Date: Tue Apr 25 15:18:05 2006 +0100 Don't include private headers from user-visible part of linux/smb_fs.h Signed-off-by: David Woodhouse commit 1af042271f9bf7601f7ecf4d328ccde3a44d2c72 Author: David Woodhouse Date: Tue Apr 25 15:16:44 2006 +0100 Sanitise linux/sunrpc/debug.h for userspace consumption Move some inclusion of private header files and the definition of RPC_DEBUG inside the existing #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit eae19a762de975e109394b1edcba6587323c7d1a Author: David Woodhouse Date: Tue Apr 25 15:14:50 2006 +0100 Don't export CONFIG_COMPAT stuff in linux/usbdevice_fs.h to userspace Signed-off-by: David Woodhouse commit 468db83658f776ec87a953778f18611301668148 Author: David Woodhouse Date: Tue Apr 25 15:00:56 2006 +0100 Don't include from user-visible part of linux/wanrouter.h Signed-off-by: David Woodhouse commit c6e82e72361db12759fdcdbfd3b598acb6b34b07 Author: David Woodhouse Date: Tue Apr 25 15:00:06 2006 +0100 Move comment in mtd-abi.h to stop confusing unifdef Currently, unifdef removes the comment which starts on the same line as the #ifdef __KERNEL__, but leaves the second line of the comment in place. Move the comment onto a separate line. Signed-off-by: David Woodhouse commit 7ab2febd4d3c6f50545cee11a116536a09748d59 Author: David Woodhouse Date: Tue Apr 25 14:55:46 2006 +0100 Don't include private headers from user-visible part of linux/signal.h Signed-off-by: David Woodhouse commit 8ffbc759a5b655feb69435c4dfa857c391f9dcc8 Author: David Woodhouse Date: Tue Apr 25 14:55:13 2006 +0100 Don't include from user-visible part of linux/sem.h Signed-off-by: David Woodhouse commit a3b6714e1744a5e841753d74aca1de5972f24e6d Author: David Woodhouse Date: Tue Apr 25 14:54:40 2006 +0100 Partially sanitise linux/sched.h for userspace consumption For now, just make sure all inclusion of private header files is done within #ifdef __KERNEL__. There'll be more to clean up later. Signed-off-by: David Woodhouse commit 98ca79d52bc34b8dfff729bc8559dbb918c9d02a Author: David Woodhouse Date: Tue Apr 25 14:52:51 2006 +0100 Don't include from user-visible part of reiserfs_xattr.h Signed-off-by: David Woodhouse commit 0409d3a332fc4347efba535a5003943f2a4aa1ca Author: David Woodhouse Date: Tue Apr 25 14:52:13 2006 +0100 Don't include private headers from user-visible parts of linux/quota.h Signed-off-by: David Woodhouse commit 997b7af2fe0810ca82a2f801a295218b51426e5a Author: David Woodhouse Date: Tue Apr 25 14:51:45 2006 +0100 Don't include private headers from user-visible parts of include/linux/nfs*.h Signed-off-by: David Woodhouse commit eacf17bdbc8e6f24fe46cd7e10fb9a657f060d08 Author: David Woodhouse Date: Tue Apr 25 14:46:09 2006 +0100 Don't include from user-visible part of linux/net.h Signed-off-by: David Woodhouse commit 77597ad663f9e2d40a89c6e27824701bb5fabb83 Author: David Woodhouse Date: Tue Apr 25 14:26:46 2006 +0100 Don't include from user-visible part of linux/msg.h Signed-off-by: David Woodhouse commit 58908d093e77224973b3f7bf54470d51949ff110 Author: David Woodhouse Date: Tue Apr 25 14:26:26 2006 +0100 Don't include private files from user-visible part of linux/ncp_fs.h Signed-off-by: David Woodhouse commit 9cdcb56636717ccb935dc66c5d56681eaa5941c1 Author: David Woodhouse Date: Tue Apr 25 14:18:07 2006 +0100 Sanitise linux/mman.h for userspace consumption It only really needs to define a few constants and include when it's used by userspace. Move the rest within #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit 8e442735ae6e2e1c857fb0c746027da8d8e40a81 Author: David Woodhouse Date: Tue Apr 25 14:16:14 2006 +0100 Remove gratuitous inclusion of from linux/isdn/tpam.h Signed-off-by: David Woodhouse commit 2e0e1f9f1c478ee14fb60524024f7b730df76912 Author: David Woodhouse Date: Tue Apr 25 14:15:44 2006 +0100 Don't include from user-visible part of linux/ipmi.h Signed-off-by: David Woodhouse commit a1b9298e55d2395be4ac25de3340b6eee01c6f67 Author: David Woodhouse Date: Tue Apr 25 14:14:52 2006 +0100 Sanitise linux/i2c.h for userspace consumption It was unconditionally including a whole bunch of headers which aren't user-visible, and also exposing a lot of private internal stuff of its own. Also fix some legacy character set to UTF-8 while we're at it. Signed-off-by: David Woodhouse commit 5a570cc0a41bd316afc91ba2c7151fed70d10b31 Author: David Woodhouse Date: Tue Apr 25 14:10:40 2006 +0100 Sanitise linux/i2c-algo-ite.h for userspace consumption It doesn't need to include i2c.h, because a forward declaration of struct i2c_adapter is perfectly sufficient. And it can be inside #ifdef __KERNEL__ along with the kernel-internal structure definition. Signed-off-by: David Woodhouse commit 34186efc17025520a53a48468338003d238a77d7 Author: David Woodhouse Date: Tue Apr 25 14:07:57 2006 +0100 Include various private files only from within __KERNEL__ in genhd.h Signed-off-by: David Woodhouse commit f2999e4ea41d6ec6252d3b6d275b40d468a3c07e Author: David Woodhouse Date: Tue Apr 25 14:07:02 2006 +0100 Export only the appropriate GS_xxx flags to userspace from generic_serial.h Signed-off-by: David Woodhouse commit 25478bb26f2be1504112b764047105811a52c3cb Author: David Woodhouse Date: Tue Apr 25 13:59:30 2006 +0100 Use __KERNEL__ to hide kernel-private bits of linux/gameport.h Signed-off-by: David Woodhouse commit 72b9760b65cbe0d24e668c34c8fefb2ba417f14b Author: David Woodhouse Date: Tue Apr 25 13:58:23 2006 +0100 Don't include agp_backend.h in user-visible part of agpgart.h Signed-off-by: David Woodhouse commit a1ff0eafce81a58861534926722a70f211b04faa Author: David Woodhouse Date: Tue Apr 25 13:57:44 2006 +0100 Include from linux/acct.h only in kernel-private part. Signed-off-by: David Woodhouse commit dd02ec3ac25828d0918f5b389defe2238d015fe6 Author: David Woodhouse Date: Tue Apr 25 13:51:52 2006 +0100 Remove user-visible references to PAGE_SIZE in include/asm-powerpc/elf.h Signed-off-by: David Woodhouse --- Signed-off-by: Andrew Morton --- drivers/s390/crypto/z90crypt.h | 185 -------- include/acpi/platform/aclinux.h | 1 include/asm-alpha/bitops.h | 1 include/asm-alpha/cache.h | 1 include/asm-alpha/cacheflush.h | 1 include/asm-alpha/core_cia.h | 1 include/asm-alpha/core_t2.h | 1 include/asm-alpha/dma-mapping.h | 1 include/asm-alpha/dma.h | 1 include/asm-alpha/floppy.h | 1 include/asm-alpha/hardirq.h | 1 include/asm-alpha/hw_irq.h | 1 include/asm-alpha/ide.h | 1 include/asm-alpha/io.h | 1 include/asm-alpha/irq.h | 1 include/asm-alpha/kmap_types.h | 1 include/asm-alpha/machvec.h | 1 include/asm-alpha/mmu_context.h | 1 include/asm-alpha/mmzone.h | 1 include/asm-alpha/page.h | 1 include/asm-alpha/param.h | 1 include/asm-alpha/pgalloc.h | 1 include/asm-alpha/pgtable.h | 1 include/asm-alpha/serial.h | 1 include/asm-alpha/smp.h | 1 include/asm-alpha/spinlock.h | 1 include/asm-alpha/system.h | 1 include/asm-alpha/tlbflush.h | 1 include/asm-alpha/unistd.h | 7 include/asm-arm/apm.h | 1 include/asm-arm/arch-aaec2000/memory.h | 1 include/asm-arm/arch-cl7500/acornfb.h | 1 include/asm-arm/arch-clps711x/hardware.h | 1 include/asm-arm/arch-clps711x/memory.h | 1 include/asm-arm/arch-clps711x/uncompress.h | 1 include/asm-arm/arch-ebsa285/hardware.h | 1 include/asm-arm/arch-ebsa285/memory.h | 1 include/asm-arm/arch-ebsa285/vmalloc.h | 1 include/asm-arm/arch-integrator/smp.h | 1 include/asm-arm/arch-iop3xx/memory.h | 1 include/asm-arm/arch-iop3xx/timex.h | 1 include/asm-arm/arch-iop3xx/uncompress.h | 1 include/asm-arm/arch-ixp4xx/dma.h | 1 include/asm-arm/arch-lh7a40x/constants.h | 1 include/asm-arm/arch-lh7a40x/irqs.h | 1 include/asm-arm/arch-lh7a40x/registers.h | 1 include/asm-arm/arch-omap/board.h | 1 include/asm-arm/arch-omap/hardware.h | 1 include/asm-arm/arch-omap/system.h | 1 include/asm-arm/arch-omap/uncompress.h | 1 include/asm-arm/arch-pxa/idp.h | 1 include/asm-arm/arch-pxa/irqs.h | 1 include/asm-arm/arch-pxa/pxa-regs.h | 1 include/asm-arm/arch-pxa/timex.h | 1 include/asm-arm/arch-realview/smp.h | 1 include/asm-arm/arch-s3c2410/dma.h | 1 include/asm-arm/arch-s3c2410/uncompress.h | 1 include/asm-arm/arch-sa1100/assabet.h | 1 include/asm-arm/arch-sa1100/cerf.h | 1 include/asm-arm/arch-sa1100/collie.h | 1 include/asm-arm/arch-sa1100/dma.h | 1 include/asm-arm/arch-sa1100/hardware.h | 1 include/asm-arm/arch-sa1100/ide.h | 1 include/asm-arm/arch-sa1100/irqs.h | 1 include/asm-arm/arch-sa1100/memory.h | 1 include/asm-arm/arch-sa1100/system.h | 1 include/asm-arm/atomic.h | 1 include/asm-arm/bug.h | 1 include/asm-arm/cacheflush.h | 1 include/asm-arm/cpu.h | 1 include/asm-arm/dma-mapping.h | 1 include/asm-arm/dma.h | 1 include/asm-arm/elf.h | 1 include/asm-arm/fpstate.h | 1 include/asm-arm/glue.h | 1 include/asm-arm/hardirq.h | 1 include/asm-arm/hardware/dec21285.h | 1 include/asm-arm/hardware/iomd.h | 1 include/asm-arm/leds.h | 1 include/asm-arm/mach/serial_at91rm9200.h | 1 include/asm-arm/mach/serial_sa1100.h | 1 include/asm-arm/memory.h | 1 include/asm-arm/page.h | 1 include/asm-arm/pci.h | 1 include/asm-arm/proc-fns.h | 1 include/asm-arm/ptrace.h | 1 include/asm-arm/smp.h | 1 include/asm-arm/system.h | 1 include/asm-arm/tlbflush.h | 1 include/asm-arm/unistd.h | 10 include/asm-arm26/atomic.h | 1 include/asm-arm26/bug.h | 1 include/asm-arm26/dma.h | 1 include/asm-arm26/hardirq.h | 1 include/asm-arm26/hardware.h | 1 include/asm-arm26/io.h | 1 include/asm-arm26/leds.h | 1 include/asm-arm26/mach-types.h | 1 include/asm-arm26/page.h | 1 include/asm-arm26/pgtable.h | 1 include/asm-arm26/serial.h | 1 include/asm-arm26/smp.h | 1 include/asm-arm26/sysirq.h | 1 include/asm-arm26/system.h | 1 include/asm-arm26/unistd.h | 10 include/asm-cris/arch-v10/io.h | 1 include/asm-cris/arch-v10/page.h | 1 include/asm-cris/arch-v10/system.h | 1 include/asm-cris/arch-v32/io.h | 1 include/asm-cris/arch-v32/irq.h | 1 include/asm-cris/arch-v32/page.h | 1 include/asm-cris/arch-v32/processor.h | 1 include/asm-cris/arch-v32/system.h | 1 include/asm-cris/eshlibld.h | 1 include/asm-cris/etraxgpio.h | 1 include/asm-cris/fasttimer.h | 1 include/asm-cris/page.h | 1 include/asm-cris/pci.h | 1 include/asm-cris/pgtable.h | 1 include/asm-cris/processor.h | 1 include/asm-cris/rtc.h | 1 include/asm-cris/tlbflush.h | 1 include/asm-cris/unistd.h | 9 include/asm-frv/atomic.h | 1 include/asm-frv/bitops.h | 1 include/asm-frv/bug.h | 1 include/asm-frv/cache.h | 1 include/asm-frv/dma.h | 1 include/asm-frv/elf.h | 1 include/asm-frv/fpu.h | 1 include/asm-frv/hardirq.h | 1 include/asm-frv/highmem.h | 1 include/asm-frv/ide.h | 1 include/asm-frv/io.h | 1 include/asm-frv/irq.h | 1 include/asm-frv/mmu_context.h | 1 include/asm-frv/page.h | 1 include/asm-frv/pci.h | 1 include/asm-frv/pgalloc.h | 1 include/asm-frv/pgtable.h | 1 include/asm-frv/processor.h | 1 include/asm-frv/segment.h | 1 include/asm-frv/serial.h | 1 include/asm-frv/smp.h | 1 include/asm-frv/system.h | 1 include/asm-frv/tlbflush.h | 1 include/asm-frv/types.h | 1 include/asm-frv/unaligned.h | 1 include/asm-frv/unistd.h | 7 include/asm-frv/virtconvert.h | 1 include/asm-generic/bug.h | 1 include/asm-generic/dma-mapping.h | 1 include/asm-generic/fcntl.h | 1 include/asm-generic/local.h | 1 include/asm-generic/signal.h | 7 include/asm-generic/tlb.h | 1 include/asm-h8300/bitops.h | 1 include/asm-h8300/dma.h | 1 include/asm-h8300/elf.h | 1 include/asm-h8300/hardirq.h | 1 include/asm-h8300/io.h | 1 include/asm-h8300/keyboard.h | 1 include/asm-h8300/mmu_context.h | 1 include/asm-h8300/page.h | 1 include/asm-h8300/page_offset.h | 1 include/asm-h8300/param.h | 1 include/asm-h8300/pgtable.h | 1 include/asm-h8300/processor.h | 1 include/asm-h8300/semaphore-helper.h | 1 include/asm-h8300/shm.h | 1 include/asm-h8300/system.h | 1 include/asm-h8300/unaligned.h | 1 include/asm-h8300/unistd.h | 7 include/asm-h8300/virtconvert.h | 1 include/asm-i386/apic.h | 1 include/asm-i386/atomic.h | 1 include/asm-i386/bitops.h | 1 include/asm-i386/bug.h | 1 include/asm-i386/bugs.h | 1 include/asm-i386/byteorder.h | 1 include/asm-i386/cache.h | 1 include/asm-i386/dma.h | 1 include/asm-i386/fixmap.h | 1 include/asm-i386/hardirq.h | 1 include/asm-i386/highmem.h | 1 include/asm-i386/hpet.h | 1 include/asm-i386/hw_irq.h | 1 include/asm-i386/ide.h | 1 include/asm-i386/io.h | 1 include/asm-i386/io_apic.h | 1 include/asm-i386/irq.h | 1 include/asm-i386/kmap_types.h | 1 include/asm-i386/mach-summit/mach_apic.h | 1 include/asm-i386/mmu_context.h | 1 include/asm-i386/mtrr.h | 1 include/asm-i386/page.h | 5 include/asm-i386/param.h | 1 include/asm-i386/pci.h | 1 include/asm-i386/pgalloc.h | 1 include/asm-i386/pgtable.h | 1 include/asm-i386/processor.h | 1 include/asm-i386/serial.h | 1 include/asm-i386/smp.h | 1 include/asm-i386/spinlock.h | 1 include/asm-i386/string.h | 1 include/asm-i386/system.h | 1 include/asm-i386/thread_info.h | 1 include/asm-i386/timex.h | 1 include/asm-i386/tlbflush.h | 1 include/asm-i386/types.h | 1 include/asm-i386/uaccess.h | 1 include/asm-i386/unistd.h | 7 include/asm-ia64/asmmacro.h | 1 include/asm-ia64/cache.h | 1 include/asm-ia64/delay.h | 1 include/asm-ia64/dma-mapping.h | 1 include/asm-ia64/dma.h | 1 include/asm-ia64/elf.h | 1 include/asm-ia64/hardirq.h | 1 include/asm-ia64/ia32.h | 1 include/asm-ia64/ide.h | 1 include/asm-ia64/intrinsics.h | 1 include/asm-ia64/kmap_types.h | 1 include/asm-ia64/machvec.h | 1 include/asm-ia64/meminit.h | 1 include/asm-ia64/nodedata.h | 1 include/asm-ia64/numa.h | 1 include/asm-ia64/page.h | 1 include/asm-ia64/param.h | 1 include/asm-ia64/percpu.h | 1 include/asm-ia64/pgalloc.h | 1 include/asm-ia64/pgtable.h | 1 include/asm-ia64/processor.h | 1 include/asm-ia64/ptrace.h | 1 include/asm-ia64/smp.h | 1 include/asm-ia64/sn/simulator.h | 1 include/asm-ia64/sn/sn_cpuid.h | 1 include/asm-ia64/sn/sn_sal.h | 1 include/asm-ia64/sn/xpc.h | 1 include/asm-ia64/string.h | 1 include/asm-ia64/system.h | 1 include/asm-ia64/tlb.h | 1 include/asm-ia64/tlbflush.h | 1 include/asm-ia64/unistd.h | 1 include/asm-m32r/assembler.h | 1 include/asm-m32r/atomic.h | 1 include/asm-m32r/bitops.h | 1 include/asm-m32r/cacheflush.h | 1 include/asm-m32r/hardirq.h | 1 include/asm-m32r/ide.h | 1 include/asm-m32r/irq.h | 1 include/asm-m32r/kmap_types.h | 1 include/asm-m32r/m32104ut/m32104ut_pld.h | 1 include/asm-m32r/m32700ut/m32700ut_lan.h | 1 include/asm-m32r/m32700ut/m32700ut_lcd.h | 1 include/asm-m32r/m32700ut/m32700ut_pld.h | 1 include/asm-m32r/m32r.h | 1 include/asm-m32r/mmu.h | 1 include/asm-m32r/mmu_context.h | 2 include/asm-m32r/opsput/opsput_lan.h | 1 include/asm-m32r/opsput/opsput_lcd.h | 1 include/asm-m32r/opsput/opsput_pld.h | 1 include/asm-m32r/page.h | 1 include/asm-m32r/pgalloc.h | 1 include/asm-m32r/pgtable-2level.h | 1 include/asm-m32r/pgtable.h | 1 include/asm-m32r/processor.h | 1 include/asm-m32r/ptrace.h | 1 include/asm-m32r/rtc.h | 1 include/asm-m32r/semaphore.h | 1 include/asm-m32r/serial.h | 1 include/asm-m32r/sigcontext.h | 1 include/asm-m32r/smp.h | 1 include/asm-m32r/spinlock.h | 1 include/asm-m32r/system.h | 1 include/asm-m32r/timex.h | 1 include/asm-m32r/tlbflush.h | 1 include/asm-m32r/uaccess.h | 1 include/asm-m32r/unistd.h | 5 include/asm-m68k/atomic.h | 1 include/asm-m68k/bug.h | 1 include/asm-m68k/dma-mapping.h | 1 include/asm-m68k/dma.h | 1 include/asm-m68k/dvma.h | 1 include/asm-m68k/elf.h | 1 include/asm-m68k/entry.h | 1 include/asm-m68k/fpu.h | 1 include/asm-m68k/hardirq.h | 1 include/asm-m68k/ide.h | 1 include/asm-m68k/io.h | 1 include/asm-m68k/irq.h | 1 include/asm-m68k/mc146818rtc.h | 1 include/asm-m68k/mmu_context.h | 1 include/asm-m68k/motorola_pgtable.h | 1 include/asm-m68k/openprom.h | 1 include/asm-m68k/page.h | 1 include/asm-m68k/page_offset.h | 1 include/asm-m68k/pgalloc.h | 1 include/asm-m68k/pgtable.h | 1 include/asm-m68k/processor.h | 1 include/asm-m68k/semaphore-helper.h | 1 include/asm-m68k/serial.h | 1 include/asm-m68k/setup.h | 1 include/asm-m68k/shm.h | 1 include/asm-m68k/system.h | 1 include/asm-m68k/tlbflush.h | 1 include/asm-m68k/unistd.h | 7 include/asm-m68k/virtconvert.h | 1 include/asm-m68knommu/bitops.h | 1 include/asm-m68knommu/coldfire.h | 1 include/asm-m68knommu/commproc.h | 1 include/asm-m68knommu/dma-mapping.h | 1 include/asm-m68knommu/dma.h | 1 include/asm-m68knommu/elf.h | 1 include/asm-m68knommu/elia.h | 1 include/asm-m68knommu/entry.h | 1 include/asm-m68knommu/fpu.h | 1 include/asm-m68knommu/hardirq.h | 1 include/asm-m68knommu/io.h | 1 include/asm-m68knommu/irq.h | 1 include/asm-m68knommu/m5206sim.h | 1 include/asm-m68knommu/m520xsim.h | 1 include/asm-m68knommu/m523xsim.h | 1 include/asm-m68knommu/m5272sim.h | 1 include/asm-m68knommu/m527xsim.h | 1 include/asm-m68knommu/m528xsim.h | 1 include/asm-m68knommu/mcfcache.h | 1 include/asm-m68knommu/mcfdma.h | 1 include/asm-m68knommu/mcfmbus.h | 1 include/asm-m68knommu/mcfne.h | 1 include/asm-m68knommu/mcfpci.h | 1 include/asm-m68knommu/mcfpit.h | 1 include/asm-m68knommu/mcfsim.h | 1 include/asm-m68knommu/mcfsmc.h | 1 include/asm-m68knommu/mcftimer.h | 1 include/asm-m68knommu/mcfuart.h | 1 include/asm-m68knommu/mcfwdebug.h | 1 include/asm-m68knommu/mmu_context.h | 1 include/asm-m68knommu/nettel.h | 1 include/asm-m68knommu/page.h | 1 include/asm-m68knommu/page_offset.h | 1 include/asm-m68knommu/param.h | 1 include/asm-m68knommu/pgtable.h | 1 include/asm-m68knommu/processor.h | 1 include/asm-m68knommu/semaphore-helper.h | 1 include/asm-m68knommu/system.h | 1 include/asm-m68knommu/unaligned.h | 1 include/asm-m68knommu/unistd.h | 7 include/asm-mips/a.out.h | 1 include/asm-mips/addrspace.h | 1 include/asm-mips/arc/types.h | 1 include/asm-mips/asm.h | 1 include/asm-mips/asmmacro.h | 1 include/asm-mips/atomic.h | 1 include/asm-mips/bcache.h | 1 include/asm-mips/bitops.h | 1 include/asm-mips/bug.h | 1 include/asm-mips/bugs.h | 1 include/asm-mips/byteorder.h | 1 include/asm-mips/cache.h | 1 include/asm-mips/checksum.h | 1 include/asm-mips/cpu-features.h | 1 include/asm-mips/cpu-info.h | 1 include/asm-mips/ddb5xxx/ddb5477.h | 1 include/asm-mips/ddb5xxx/ddb5xxx.h | 1 include/asm-mips/debug.h | 1 include/asm-mips/dec/prom.h | 1 include/asm-mips/delay.h | 1 include/asm-mips/dma.h | 1 include/asm-mips/elf.h | 1 include/asm-mips/fcntl.h | 1 include/asm-mips/fixmap.h | 1 include/asm-mips/fpu.h | 1 include/asm-mips/futex.h | 1 include/asm-mips/hazards.h | 1 include/asm-mips/highmem.h | 1 include/asm-mips/interrupt.h | 1 include/asm-mips/io.h | 1 include/asm-mips/ip32/machine.h | 1 include/asm-mips/irq.h | 1 include/asm-mips/isadep.h | 1 include/asm-mips/jmr3927/irq.h | 1 include/asm-mips/kmap_types.h | 1 include/asm-mips/local.h | 1 include/asm-mips/mach-au1x00/au1000.h | 1 include/asm-mips/mach-au1x00/au1xxx.h | 1 include/asm-mips/mach-au1x00/au1xxx_dbdma.h | 1 include/asm-mips/mach-au1x00/au1xxx_ide.h | 1 include/asm-mips/mach-au1x00/au1xxx_psc.h | 1 include/asm-mips/mach-au1x00/ioremap.h | 1 include/asm-mips/mach-cobalt/cpu-feature-overrides.h | 1 include/asm-mips/mach-db1x00/db1x00.h | 1 include/asm-mips/mach-generic/ide.h | 1 include/asm-mips/mach-generic/kmalloc.h | 1 include/asm-mips/mach-generic/spaces.h | 1 include/asm-mips/mach-ip22/spaces.h | 1 include/asm-mips/mach-ip32/cpu-feature-overrides.h | 1 include/asm-mips/mach-ip32/kmalloc.h | 1 include/asm-mips/mach-mips/cpu-feature-overrides.h | 1 include/asm-mips/mach-mips/irq.h | 1 include/asm-mips/mach-pb1x00/pb1550.h | 1 include/asm-mips/mach-sim/cpu-feature-overrides.h | 1 include/asm-mips/mips-boards/generic.h | 1 include/asm-mips/mipsregs.h | 1 include/asm-mips/mmu_context.h | 1 include/asm-mips/mmzone.h | 1 include/asm-mips/module.h | 1 include/asm-mips/msgbuf.h | 1 include/asm-mips/paccess.h | 1 include/asm-mips/page.h | 1 include/asm-mips/pci.h | 1 include/asm-mips/pgalloc.h | 1 include/asm-mips/pgtable-32.h | 1 include/asm-mips/pgtable-64.h | 1 include/asm-mips/pgtable-bits.h | 1 include/asm-mips/pgtable.h | 1 include/asm-mips/prefetch.h | 1 include/asm-mips/processor.h | 1 include/asm-mips/ptrace.h | 1 include/asm-mips/reg.h | 1 include/asm-mips/resource.h | 1 include/asm-mips/serial.h | 1 include/asm-mips/sgiarcs.h | 1 include/asm-mips/sibyte/board.h | 1 include/asm-mips/sibyte/carmel.h | 1 include/asm-mips/sibyte/sentosa.h | 1 include/asm-mips/sibyte/swarm.h | 1 include/asm-mips/siginfo.h | 1 include/asm-mips/signal.h | 1 include/asm-mips/sim.h | 1 include/asm-mips/smp.h | 1 include/asm-mips/sn/addrs.h | 1 include/asm-mips/sn/agent.h | 1 include/asm-mips/sn/arch.h | 1 include/asm-mips/sn/io.h | 1 include/asm-mips/sn/klconfig.h | 1 include/asm-mips/sn/kldir.h | 1 include/asm-mips/sn/launch.h | 1 include/asm-mips/sn/mapped_kernel.h | 1 include/asm-mips/sn/sn0/addrs.h | 1 include/asm-mips/sn/sn0/arch.h | 1 include/asm-mips/sn/sn0/hubmd.h | 1 include/asm-mips/stackframe.h | 1 include/asm-mips/string.h | 1 include/asm-mips/system.h | 1 include/asm-mips/thread_info.h | 1 include/asm-mips/tlbflush.h | 1 include/asm-mips/tx4927/toshiba_rbtx4927.h | 1 include/asm-mips/types.h | 1 include/asm-mips/uaccess.h | 1 include/asm-mips/unistd.h | 7 include/asm-mips/vr41xx/vrc4173.h | 1 include/asm-mips/war.h | 1 include/asm-mips/wbflush.h | 1 include/asm-parisc/atomic.h | 1 include/asm-parisc/cache.h | 1 include/asm-parisc/cacheflush.h | 1 include/asm-parisc/dma-mapping.h | 1 include/asm-parisc/dma.h | 1 include/asm-parisc/io.h | 1 include/asm-parisc/irq.h | 1 include/asm-parisc/kmap_types.h | 1 include/asm-parisc/page.h | 1 include/asm-parisc/param.h | 1 include/asm-parisc/pci.h | 1 include/asm-parisc/pdc.h | 1 include/asm-parisc/pgtable.h | 1 include/asm-parisc/processor.h | 1 include/asm-parisc/psw.h | 1 include/asm-parisc/smp.h | 1 include/asm-parisc/system.h | 1 include/asm-parisc/tlbflush.h | 1 include/asm-parisc/unistd.h | 4 include/asm-powerpc/abs_addr.h | 1 include/asm-powerpc/cache.h | 1 include/asm-powerpc/dma-mapping.h | 1 include/asm-powerpc/dma.h | 1 include/asm-powerpc/eeh.h | 1 include/asm-powerpc/elf.h | 9 include/asm-powerpc/floppy.h | 1 include/asm-powerpc/hw_irq.h | 1 include/asm-powerpc/ide.h | 1 include/asm-powerpc/iommu.h | 1 include/asm-powerpc/irq.h | 1 include/asm-powerpc/iseries/iseries_io.h | 1 include/asm-powerpc/machdep.h | 1 include/asm-powerpc/mmzone.h | 1 include/asm-powerpc/paca.h | 1 include/asm-powerpc/page.h | 1 include/asm-powerpc/pgtable.h | 1 include/asm-powerpc/ppc_asm.h | 1 include/asm-powerpc/prom.h | 1 include/asm-powerpc/smp.h | 1 include/asm-powerpc/smu.h | 1 include/asm-powerpc/spu.h | 1 include/asm-powerpc/thread_info.h | 1 include/asm-powerpc/time.h | 1 include/asm-powerpc/timex.h | 1 include/asm-powerpc/tlb.h | 1 include/asm-powerpc/tlbflush.h | 1 include/asm-powerpc/topology.h | 1 include/asm-powerpc/types.h | 1 include/asm-powerpc/unistd.h | 8 include/asm-powerpc/vga.h | 1 include/asm-powerpc/vio.h | 1 include/asm-ppc/amigahw.h | 1 include/asm-ppc/bootinfo.h | 1 include/asm-ppc/commproc.h | 1 include/asm-ppc/ibm403.h | 1 include/asm-ppc/ibm44x.h | 1 include/asm-ppc/ibm4xx.h | 1 include/asm-ppc/io.h | 1 include/asm-ppc/machdep.h | 1 include/asm-ppc/mmu.h | 1 include/asm-ppc/mmu_context.h | 1 include/asm-ppc/mpc8260.h | 1 include/asm-ppc/mpc83xx.h | 1 include/asm-ppc/mpc85xx.h | 1 include/asm-ppc/mpc8xx.h | 1 include/asm-ppc/mv64x60.h | 1 include/asm-ppc/ocp.h | 1 include/asm-ppc/open_pic.h | 1 include/asm-ppc/page.h | 2 include/asm-ppc/pc_serial.h | 1 include/asm-ppc/pgalloc.h | 1 include/asm-ppc/pgtable.h | 1 include/asm-ppc/ppc4xx_dma.h | 1 include/asm-ppc/ppc4xx_pic.h | 1 include/asm-ppc/serial.h | 1 include/asm-ppc/smp.h | 1 include/asm-ppc/time.h | 1 include/asm-s390/bitops.h | 1 include/asm-s390/cmb.h | 2 include/asm-s390/debug.h | 1 include/asm-s390/hardirq.h | 1 include/asm-s390/idals.h | 1 include/asm-s390/local.h | 1 include/asm-s390/lowcore.h | 1 include/asm-s390/page.h | 6 include/asm-s390/pgalloc.h | 1 include/asm-s390/ptrace.h | 6 include/asm-s390/sfp-machine.h | 1 include/asm-s390/smp.h | 1 include/asm-s390/system.h | 1 include/asm-s390/tlbflush.h | 1 include/asm-s390/types.h | 1 include/asm-s390/unistd.h | 8 include/asm-s390/vtoc.h | 38 - include/asm-s390/z90crypt.h | 212 ++++++++++ include/asm-sh/bug.h | 1 include/asm-sh/checksum.h | 1 include/asm-sh/dma-mapping.h | 1 include/asm-sh/dma.h | 1 include/asm-sh/fixmap.h | 1 include/asm-sh/hardirq.h | 1 include/asm-sh/hd64461/hd64461.h | 1 include/asm-sh/hd64465/hd64465.h | 1 include/asm-sh/ide.h | 1 include/asm-sh/io.h | 1 include/asm-sh/irq.h | 1 include/asm-sh/keyboard.h | 1 include/asm-sh/kmap_types.h | 1 include/asm-sh/machvec.h | 1 include/asm-sh/machvec_init.h | 1 include/asm-sh/mpc1211/dma.h | 1 include/asm-sh/overdrive/overdrive.h | 1 include/asm-sh/page.h | 1 include/asm-sh/pgtable.h | 1 include/asm-sh/serial.h | 1 include/asm-sh/smp.h | 1 include/asm-sh/system.h | 1 include/asm-sh/types.h | 1 include/asm-sh/unistd.h | 7 include/asm-sh/watchdog.h | 1 include/asm-sh64/bug.h | 1 include/asm-sh64/dma-mapping.h | 1 include/asm-sh64/hardirq.h | 1 include/asm-sh64/ide.h | 1 include/asm-sh64/irq.h | 1 include/asm-sh64/mmu_context.h | 1 include/asm-sh64/page.h | 1 include/asm-sh64/param.h | 1 include/asm-sh64/pgtable.h | 1 include/asm-sh64/system.h | 1 include/asm-sh64/unistd.h | 7 include/asm-sparc/asmmacro.h | 1 include/asm-sparc/atomic.h | 1 include/asm-sparc/bugs.h | 1 include/asm-sparc/cacheflush.h | 1 include/asm-sparc/delay.h | 1 include/asm-sparc/dma-mapping.h | 1 include/asm-sparc/dma.h | 1 include/asm-sparc/elf.h | 1 include/asm-sparc/fixmap.h | 1 include/asm-sparc/hardirq.h | 1 include/asm-sparc/ide.h | 1 include/asm-sparc/irq.h | 1 include/asm-sparc/mostek.h | 1 include/asm-sparc/page.h | 1 include/asm-sparc/pgalloc.h | 1 include/asm-sparc/pgtable.h | 1 include/asm-sparc/sfp-machine.h | 1 include/asm-sparc/smp.h | 1 include/asm-sparc/system.h | 2 include/asm-sparc/timer.h | 1 include/asm-sparc/tlbflush.h | 1 include/asm-sparc/unistd.h | 4 include/asm-sparc/vac-ops.h | 1 include/asm-sparc/winmacro.h | 1 include/asm-sparc64/atomic.h | 1 include/asm-sparc64/bitops.h | 1 include/asm-sparc64/bugs.h | 1 include/asm-sparc64/cacheflush.h | 1 include/asm-sparc64/delay.h | 1 include/asm-sparc64/dma-mapping.h | 1 include/asm-sparc64/dma.h | 1 include/asm-sparc64/floppy.h | 1 include/asm-sparc64/ide.h | 1 include/asm-sparc64/irq.h | 1 include/asm-sparc64/kprobes.h | 1 include/asm-sparc64/mc146818rtc.h | 1 include/asm-sparc64/mmu.h | 1 include/asm-sparc64/oplib.h | 1 include/asm-sparc64/page.h | 1 include/asm-sparc64/param.h | 1 include/asm-sparc64/pgalloc.h | 1 include/asm-sparc64/pgtable.h | 1 include/asm-sparc64/processor.h | 1 include/asm-sparc64/siginfo.h | 1 include/asm-sparc64/signal.h | 1 include/asm-sparc64/smp.h | 1 include/asm-sparc64/spinlock.h | 1 include/asm-sparc64/system.h | 1 include/asm-sparc64/timer.h | 1 include/asm-sparc64/tlb.h | 1 include/asm-sparc64/tlbflush.h | 1 include/asm-sparc64/ttable.h | 1 include/asm-sparc64/unistd.h | 4 include/asm-um/a.out.h | 1 include/asm-um/cache.h | 1 include/asm-um/elf-ppc.h | 1 include/asm-um/fixmap.h | 1 include/asm-um/hardirq.h | 1 include/asm-um/linkage.h | 1 include/asm-um/mmu_context.h | 1 include/asm-um/page.h | 1 include/asm-um/pgalloc.h | 1 include/asm-um/processor-generic.h | 1 include/asm-um/ptrace-generic.h | 1 include/asm-um/smp.h | 1 include/asm-um/thread_info.h | 1 include/asm-v850/atomic.h | 1 include/asm-v850/bitops.h | 1 include/asm-v850/dma-mapping.h | 1 include/asm-v850/hardirq.h | 1 include/asm-v850/machdep.h | 1 include/asm-v850/pgtable.h | 1 include/asm-v850/processor.h | 1 include/asm-v850/serial.h | 1 include/asm-v850/unistd.h | 12 include/asm-v850/v850e_uart.h | 1 include/asm-x86_64/apic.h | 1 include/asm-x86_64/atomic.h | 1 include/asm-x86_64/bitops.h | 1 include/asm-x86_64/bugs.h | 1 include/asm-x86_64/cache.h | 1 include/asm-x86_64/calling.h | 1 include/asm-x86_64/dma-mapping.h | 1 include/asm-x86_64/dma.h | 1 include/asm-x86_64/dwarf2.h | 1 include/asm-x86_64/fixmap.h | 1 include/asm-x86_64/hardirq.h | 1 include/asm-x86_64/hw_irq.h | 1 include/asm-x86_64/ia32.h | 1 include/asm-x86_64/io.h | 1 include/asm-x86_64/io_apic.h | 1 include/asm-x86_64/mmu_context.h | 1 include/asm-x86_64/mmzone.h | 1 include/asm-x86_64/mtrr.h | 1 include/asm-x86_64/page.h | 5 include/asm-x86_64/param.h | 1 include/asm-x86_64/pci.h | 1 include/asm-x86_64/processor.h | 1 include/asm-x86_64/serial.h | 1 include/asm-x86_64/smp.h | 1 include/asm-x86_64/spinlock.h | 1 include/asm-x86_64/swiotlb.h | 1 include/asm-x86_64/system.h | 1 include/asm-x86_64/tlbflush.h | 1 include/asm-x86_64/topology.h | 1 include/asm-x86_64/uaccess.h | 1 include/asm-x86_64/unistd.h | 7 include/asm-xtensa/atomic.h | 1 include/asm-xtensa/checksum.h | 1 include/asm-xtensa/delay.h | 1 include/asm-xtensa/dma.h | 1 include/asm-xtensa/hardirq.h | 1 include/asm-xtensa/ide.h | 1 include/asm-xtensa/io.h | 1 include/asm-xtensa/irq.h | 1 include/asm-xtensa/mmu_context.h | 1 include/asm-xtensa/page.h | 1 include/asm-xtensa/pgalloc.h | 1 include/asm-xtensa/platform.h | 1 include/asm-xtensa/system.h | 1 include/asm-xtensa/unistd.h | 21 include/linux/acct.h | 3 include/linux/acpi.h | 1 include/linux/affs_hardblocks.h | 72 +-- include/linux/agpgart.h | 3 include/linux/amba/clcd.h | 1 include/linux/atmdev.h | 1 include/linux/audit.h | 4 include/linux/blkdev.h | 1 include/linux/blkpg.h | 1 include/linux/blktrace_api.h | 1 include/linux/blockgroup_lock.h | 1 include/linux/cache.h | 1 include/linux/coda.h | 1 include/linux/compat.h | 1 include/linux/compiler.h | 19 include/linux/cpufreq.h | 1 include/linux/cramfs_fs.h | 34 - include/linux/crypto.h | 1 include/linux/cyclomx.h | 1 include/linux/dcookies.h | 1 include/linux/devfs_fs_kernel.h | 1 include/linux/device.h | 1 include/linux/divert.h | 20 include/linux/dmi.h | 1 include/linux/dnotify.h | 1 include/linux/elf-em.h | 44 ++ include/linux/elf.h | 59 -- include/linux/errqueue.h | 1 include/linux/ethtool.h | 169 ++++--- include/linux/ext2_fs.h | 2 include/linux/ext3_fs.h | 10 include/linux/fs.h | 1 include/linux/ftape.h | 1 include/linux/gameport.h | 6 include/linux/generic_serial.h | 6 include/linux/genhd.h | 12 include/linux/gfp.h | 1 include/linux/hardirq.h | 1 include/linux/highmem.h | 1 include/linux/highuid.h | 1 include/linux/i2c-algo-ite.h | 7 include/linux/i2c.h | 9 include/linux/i2o-dev.h | 167 +++---- include/linux/ide.h | 1 include/linux/if_frad.h | 1 include/linux/if_tr.h | 1 include/linux/init.h | 1 include/linux/inotify.h | 1 include/linux/interrupt.h | 1 include/linux/ipmi.h | 2 include/linux/ipv6.h | 1 include/linux/irq.h | 1 include/linux/irq_cpustat.h | 1 include/linux/isapnp.h | 1 include/linux/isdn.h | 1 include/linux/isdn/tpam.h | 1 include/linux/isdn_ppp.h | 1 include/linux/isdnif.h | 1 include/linux/kallsyms.h | 1 include/linux/kernel_stat.h | 1 include/linux/kmod.h | 1 include/linux/kprobes.h | 1 include/linux/linkage.h | 1 include/linux/lockd/lockd.h | 1 include/linux/lockd/nlm.h | 1 include/linux/mempolicy.h | 1 include/linux/migrate.h | 1 include/linux/mii.h | 30 - include/linux/mm.h | 1 include/linux/mman.h | 12 include/linux/mmzone.h | 1 include/linux/module.h | 1 include/linux/msg.h | 2 include/linux/mtd/cfi.h | 1 include/linux/mtd/map.h | 1 include/linux/mtd/mtd.h | 1 include/linux/mtd/nand.h | 1 include/linux/mtd/physmap.h | 1 include/linux/mtd/xip.h | 1 include/linux/nbd.h | 12 include/linux/ncp_fs.h | 5 include/linux/net.h | 3 include/linux/netdevice.h | 1 include/linux/netfilter.h | 1 include/linux/netfilter/xt_conntrack.h | 2 include/linux/netfilter_arp.h | 1 include/linux/netfilter_bridge.h | 1 include/linux/netfilter_ipv4.h | 1 include/linux/netfilter_ipv4/ip_conntrack.h | 1 include/linux/netfilter_ipv4/listhelp.h | 1 include/linux/nfs.h | 8 include/linux/nfs4.h | 6 include/linux/nfs_fs.h | 39 - include/linux/nfsd/nfsd.h | 1 include/linux/nfsd/nfsfh.h | 1 include/linux/nfsd/syscall.h | 1 include/linux/numa.h | 1 include/linux/parport.h | 1 include/linux/pci.h | 5 include/linux/percpu_counter.h | 1 include/linux/pm.h | 1 include/linux/pm_legacy.h | 1 include/linux/pmu.h | 1 include/linux/ppp_defs.h | 14 include/linux/preempt.h | 1 include/linux/proc_fs.h | 1 include/linux/profile.h | 1 include/linux/quota.h | 4 include/linux/quotaops.h | 1 include/linux/reiserfs_xattr.h | 3 include/linux/relay.h | 1 include/linux/rio.h | 1 include/linux/rio_drv.h | 1 include/linux/rmap.h | 1 include/linux/rtnetlink.h | 1 include/linux/rwsem.h | 1 include/linux/scc.h | 1 include/linux/sched.h | 90 ++-- include/linux/seccomp.h | 1 include/linux/sem.h | 2 include/linux/seqlock.h | 1 include/linux/serialP.h | 1 include/linux/serial_core.h | 1 include/linux/signal.h | 4 include/linux/skbuff.h | 1 include/linux/slab.h | 1 include/linux/smb_fs.h | 4 include/linux/smp.h | 1 include/linux/smp_lock.h | 1 include/linux/socket.h | 2 include/linux/spinlock.h | 1 include/linux/stop_machine.h | 1 include/linux/sunrpc/auth.h | 1 include/linux/sunrpc/debug.h | 24 - include/linux/sunrpc/stats.h | 1 include/linux/suspend.h | 1 include/linux/swap.h | 1 include/linux/syscalls.h | 1 include/linux/sysrq.h | 1 include/linux/tcp.h | 1 include/linux/threads.h | 1 include/linux/timer.h | 1 include/linux/timex.h | 1 include/linux/tty.h | 1 include/linux/types.h | 1 include/linux/udp.h | 1 include/linux/ufs_fs.h | 1 include/linux/unistd.h | 2 include/linux/usb.h | 1 include/linux/usb_usual.h | 1 include/linux/usbdevice_fs.h | 2 include/linux/vt_buffer.h | 1 include/linux/vt_kern.h | 1 include/linux/wait.h | 1 include/linux/wanrouter.h | 4 include/mtd/mtd-abi.h | 5 include/net/addrconf.h | 1 include/net/af_unix.h | 1 include/net/ax25.h | 1 include/net/compat.h | 1 include/net/dst.h | 1 include/net/icmp.h | 1 include/net/inet6_hashtables.h | 1 include/net/inet_hashtables.h | 1 include/net/inet_sock.h | 1 include/net/inet_timewait_sock.h | 1 include/net/ip.h | 1 include/net/ip_fib.h | 1 include/net/ip_mp_alg.h | 1 include/net/ip_vs.h | 1 include/net/ipv6.h | 1 include/net/irda/irda.h | 1 include/net/irda/irda_device.h | 1 include/net/irda/irlap.h | 1 include/net/irda/irlmp.h | 1 include/net/irda/irlmp_frame.h | 1 include/net/irda/qos.h | 1 include/net/ndisc.h | 1 include/net/netfilter/nf_conntrack.h | 1 include/net/pkt_act.h | 1 include/net/protocol.h | 1 include/net/raw.h | 1 include/net/red.h | 1 include/net/route.h | 1 include/net/sch_generic.h | 1 include/net/sctp/sctp.h | 1 include/net/sock.h | 1 include/net/tcp.h | 1 include/pcmcia/ss.h | 1 include/scsi/scsi_transport_fc.h | 1 include/scsi/scsi_transport_spi.h | 1 include/sound/driver.h | 1 include/sound/hdsp.h | 12 include/video/edid.h | 1 include/video/vga.h | 1 acpi/processor.h | 0 902 files changed, 796 insertions(+), 1617 deletions(-) diff -puN drivers/s390/crypto/z90crypt.h~git-hdrcleanup drivers/s390/crypto/z90crypt.h --- devel/drivers/s390/crypto/z90crypt.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/drivers/s390/crypto/z90crypt.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,7 @@ /* * linux/drivers/s390/crypto/z90crypt.h * - * z90crypt 1.3.3 + * z90crypt 1.3.3 (kernel-private header) * * Copyright (C) 2001, 2005 IBM Corporation * Author(s): Robert Burroughs (burrough@us.ibm.com) @@ -27,188 +27,7 @@ #ifndef _Z90CRYPT_H_ #define _Z90CRYPT_H_ -#include - -#define z90crypt_VERSION 1 -#define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards -#define z90crypt_VARIANT 3 // 3 = CEX2A support - -/** - * struct ica_rsa_modexpo - * - * Requirements: - * - outputdatalength is at least as large as inputdatalength. - * - All key parts are right justified in their fields, padded on - * the left with zeroes. - * - length(b_key) = inputdatalength - * - length(n_modulus) = inputdatalength - */ -struct ica_rsa_modexpo { - char __user * inputdata; - unsigned int inputdatalength; - char __user * outputdata; - unsigned int outputdatalength; - char __user * b_key; - char __user * n_modulus; -}; - -/** - * struct ica_rsa_modexpo_crt - * - * Requirements: - * - inputdatalength is even. - * - outputdatalength is at least as large as inputdatalength. - * - All key parts are right justified in their fields, padded on - * the left with zeroes. - * - length(bp_key) = inputdatalength/2 + 8 - * - length(bq_key) = inputdatalength/2 - * - length(np_key) = inputdatalength/2 + 8 - * - length(nq_key) = inputdatalength/2 - * - length(u_mult_inv) = inputdatalength/2 + 8 - */ -struct ica_rsa_modexpo_crt { - char __user * inputdata; - unsigned int inputdatalength; - char __user * outputdata; - unsigned int outputdatalength; - char __user * bp_key; - char __user * bq_key; - char __user * np_prime; - char __user * nq_prime; - char __user * u_mult_inv; -}; - -#define Z90_IOCTL_MAGIC 'z' // NOTE: Need to allocate from linux folks - -/** - * Interface notes: - * - * The ioctl()s which are implemented (along with relevant details) - * are: - * - * ICARSAMODEXPO - * Perform an RSA operation using a Modulus-Exponent pair - * This takes an ica_rsa_modexpo struct as its arg. - * - * NOTE: please refer to the comments preceding this structure - * for the implementation details for the contents of the - * block - * - * ICARSACRT - * Perform an RSA operation using a Chinese-Remainder Theorem key - * This takes an ica_rsa_modexpo_crt struct as its arg. - * - * NOTE: please refer to the comments preceding this structure - * for the implementation details for the contents of the - * block - * - * Z90STAT_TOTALCOUNT - * Return an integer count of all device types together. - * - * Z90STAT_PCICACOUNT - * Return an integer count of all PCICAs. - * - * Z90STAT_PCICCCOUNT - * Return an integer count of all PCICCs. - * - * Z90STAT_PCIXCCMCL2COUNT - * Return an integer count of all MCL2 PCIXCCs. - * - * Z90STAT_PCIXCCMCL3COUNT - * Return an integer count of all MCL3 PCIXCCs. - * - * Z90STAT_CEX2CCOUNT - * Return an integer count of all CEX2Cs. - * - * Z90STAT_CEX2ACOUNT - * Return an integer count of all CEX2As. - * - * Z90STAT_REQUESTQ_COUNT - * Return an integer count of the number of entries waiting to be - * sent to a device. - * - * Z90STAT_PENDINGQ_COUNT - * Return an integer count of the number of entries sent to a - * device awaiting the reply. - * - * Z90STAT_TOTALOPEN_COUNT - * Return an integer count of the number of open file handles. - * - * Z90STAT_DOMAIN_INDEX - * Return the integer value of the Cryptographic Domain. - * - * Z90STAT_STATUS_MASK - * Return an 64 element array of unsigned chars for the status of - * all devices. - * 0x01: PCICA - * 0x02: PCICC - * 0x03: PCIXCC_MCL2 - * 0x04: PCIXCC_MCL3 - * 0x05: CEX2C - * 0x06: CEX2A - * 0x0d: device is disabled via the proc filesystem - * - * Z90STAT_QDEPTH_MASK - * Return an 64 element array of unsigned chars for the queue - * depth of all devices. - * - * Z90STAT_PERDEV_REQCNT - * Return an 64 element array of unsigned integers for the number - * of successfully completed requests per device since the device - * was detected and made available. - * - * ICAZ90STATUS (deprecated) - * Return some device driver status in a ica_z90_status struct - * This takes an ica_z90_status struct as its arg. - * - * NOTE: this ioctl() is deprecated, and has been replaced with - * single ioctl()s for each type of status being requested - * - * Z90STAT_PCIXCCCOUNT (deprecated) - * Return an integer count of all PCIXCCs (MCL2 + MCL3). - * This is DEPRECATED now that MCL3 PCIXCCs are treated differently from - * MCL2 PCIXCCs. - * - * Z90QUIESCE (not recommended) - * Quiesce the driver. This is intended to stop all new - * requests from being processed. Its use is NOT recommended, - * except in circumstances where there is no other way to stop - * callers from accessing the driver. Its original use was to - * allow the driver to be "drained" of work in preparation for - * a system shutdown. - * - * NOTE: once issued, this ban on new work cannot be undone - * except by unloading and reloading the driver. - */ - -/** - * Supported ioctl calls - */ -#define ICARSAMODEXPO _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0) -#define ICARSACRT _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0) - -/* DEPRECATED status calls (bound for removal at some point) */ -#define ICAZ90STATUS _IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status) -#define Z90STAT_PCIXCCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x43, int) - -/* unrelated to ICA callers */ -#define Z90QUIESCE _IO(Z90_IOCTL_MAGIC, 0x11) - -/* New status calls */ -#define Z90STAT_TOTALCOUNT _IOR(Z90_IOCTL_MAGIC, 0x40, int) -#define Z90STAT_PCICACOUNT _IOR(Z90_IOCTL_MAGIC, 0x41, int) -#define Z90STAT_PCICCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x42, int) -#define Z90STAT_PCIXCCMCL2COUNT _IOR(Z90_IOCTL_MAGIC, 0x4b, int) -#define Z90STAT_PCIXCCMCL3COUNT _IOR(Z90_IOCTL_MAGIC, 0x4c, int) -#define Z90STAT_CEX2CCOUNT _IOR(Z90_IOCTL_MAGIC, 0x4d, int) -#define Z90STAT_CEX2ACOUNT _IOR(Z90_IOCTL_MAGIC, 0x4e, int) -#define Z90STAT_REQUESTQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x44, int) -#define Z90STAT_PENDINGQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x45, int) -#define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int) -#define Z90STAT_DOMAIN_INDEX _IOR(Z90_IOCTL_MAGIC, 0x47, int) -#define Z90STAT_STATUS_MASK _IOR(Z90_IOCTL_MAGIC, 0x48, char[64]) -#define Z90STAT_QDEPTH_MASK _IOR(Z90_IOCTL_MAGIC, 0x49, char[64]) -#define Z90STAT_PERDEV_REQCNT _IOR(Z90_IOCTL_MAGIC, 0x4a, int[64]) +#include /** * local errno definitions diff -puN include/acpi/platform/aclinux.h~git-hdrcleanup include/acpi/platform/aclinux.h --- devel/include/acpi/platform/aclinux.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/acpi/platform/aclinux.h 2006-05-14 02:02:37.000000000 -0700 @@ -49,7 +49,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/acpi/processor.h~git-hdrcleanup include/acpi/processor.h diff -puN include/asm-alpha/bitops.h~git-hdrcleanup include/asm-alpha/bitops.h --- devel/include/asm-alpha/bitops.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/bitops.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_BITOPS_H #define _ALPHA_BITOPS_H -#include #include /* diff -puN include/asm-alpha/cacheflush.h~git-hdrcleanup include/asm-alpha/cacheflush.h --- devel/include/asm-alpha/cacheflush.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/cacheflush.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_CACHEFLUSH_H #define _ALPHA_CACHEFLUSH_H -#include #include /* Caches aren't brain-dead on the Alpha. */ diff -puN include/asm-alpha/cache.h~git-hdrcleanup include/asm-alpha/cache.h --- devel/include/asm-alpha/cache.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/cache.h 2006-05-14 02:02:37.000000000 -0700 @@ -4,7 +4,6 @@ #ifndef __ARCH_ALPHA_CACHE_H #define __ARCH_ALPHA_CACHE_H -#include /* Bytes per L1 (data) cache line. */ #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6) diff -puN include/asm-alpha/core_cia.h~git-hdrcleanup include/asm-alpha/core_cia.h --- devel/include/asm-alpha/core_cia.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/core_cia.h 2006-05-14 02:02:37.000000000 -0700 @@ -4,7 +4,6 @@ /* Define to experiment with fitting everything into one 512MB HAE window. */ #define CIA_ONE_HAE_WINDOW 1 -#include #include #include diff -puN include/asm-alpha/core_t2.h~git-hdrcleanup include/asm-alpha/core_t2.h --- devel/include/asm-alpha/core_t2.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/core_t2.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ALPHA_T2__H__ #define __ALPHA_T2__H__ -#include #include #include #include diff -puN include/asm-alpha/dma.h~git-hdrcleanup include/asm-alpha/dma.h --- devel/include/asm-alpha/dma.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/dma.h 2006-05-14 02:02:37.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include #include #include diff -puN include/asm-alpha/dma-mapping.h~git-hdrcleanup include/asm-alpha/dma-mapping.h --- devel/include/asm-alpha/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/dma-mapping.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_DMA_MAPPING_H #define _ALPHA_DMA_MAPPING_H -#include #ifdef CONFIG_PCI diff -puN include/asm-alpha/floppy.h~git-hdrcleanup include/asm-alpha/floppy.h --- devel/include/asm-alpha/floppy.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/floppy.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_ALPHA_FLOPPY_H #define __ASM_ALPHA_FLOPPY_H -#include #define fd_inb(port) inb_p(port) #define fd_outb(value,port) outb_p(value,port) diff -puN include/asm-alpha/hardirq.h~git-hdrcleanup include/asm-alpha/hardirq.h --- devel/include/asm-alpha/hardirq.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/hardirq.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_HARDIRQ_H #define _ALPHA_HARDIRQ_H -#include #include #include diff -puN include/asm-alpha/hw_irq.h~git-hdrcleanup include/asm-alpha/hw_irq.h --- devel/include/asm-alpha/hw_irq.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/hw_irq.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_HW_IRQ_H #define _ALPHA_HW_IRQ_H -#include static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {} diff -puN include/asm-alpha/ide.h~git-hdrcleanup include/asm-alpha/ide.h --- devel/include/asm-alpha/ide.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/ide.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifdef __KERNEL__ -#include #define IDE_ARCH_OBSOLETE_DEFAULTS diff -puN include/asm-alpha/io.h~git-hdrcleanup include/asm-alpha/io.h --- devel/include/asm-alpha/io.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/io.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-alpha/irq.h~git-hdrcleanup include/asm-alpha/irq.h --- devel/include/asm-alpha/irq.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/irq.h 2006-05-14 02:02:37.000000000 -0700 @@ -8,7 +8,6 @@ */ #include -#include #if defined(CONFIG_ALPHA_GENERIC) diff -puN include/asm-alpha/kmap_types.h~git-hdrcleanup include/asm-alpha/kmap_types.h --- devel/include/asm-alpha/kmap_types.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/kmap_types.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ /* Dummy header just to define km_type. */ -#include #ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , diff -puN include/asm-alpha/machvec.h~git-hdrcleanup include/asm-alpha/machvec.h --- devel/include/asm-alpha/machvec.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/machvec.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ALPHA_MACHVEC_H #define __ALPHA_MACHVEC_H 1 -#include #include /* diff -puN include/asm-alpha/mmu_context.h~git-hdrcleanup include/asm-alpha/mmu_context.h --- devel/include/asm-alpha/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/mmu_context.h 2006-05-14 02:02:37.000000000 -0700 @@ -7,7 +7,6 @@ * Copyright (C) 1996, Linus Torvalds */ -#include #include #include #include diff -puN include/asm-alpha/mmzone.h~git-hdrcleanup include/asm-alpha/mmzone.h --- devel/include/asm-alpha/mmzone.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/mmzone.h 2006-05-14 02:02:37.000000000 -0700 @@ -5,7 +5,6 @@ #ifndef _ASM_MMZONE_H_ #define _ASM_MMZONE_H_ -#include #include struct bootmem_data_t; /* stupid forward decl. */ diff -puN include/asm-alpha/page.h~git-hdrcleanup include/asm-alpha/page.h --- devel/include/asm-alpha/page.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/page.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_PAGE_H #define _ALPHA_PAGE_H -#include #include /* PAGE_SHIFT determines the page size */ diff -puN include/asm-alpha/param.h~git-hdrcleanup include/asm-alpha/param.h --- devel/include/asm-alpha/param.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/param.h 2006-05-14 02:02:37.000000000 -0700 @@ -5,7 +5,6 @@ hardware ignores reprogramming. We also need userland buy-in to the change in HZ, since this is visible in the wait4 resources etc. */ -#include #ifndef HZ # ifndef CONFIG_ALPHA_RAWHIDE diff -puN include/asm-alpha/pgalloc.h~git-hdrcleanup include/asm-alpha/pgalloc.h --- devel/include/asm-alpha/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/pgalloc.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_PGALLOC_H #define _ALPHA_PGALLOC_H -#include #include #include diff -puN include/asm-alpha/pgtable.h~git-hdrcleanup include/asm-alpha/pgtable.h --- devel/include/asm-alpha/pgtable.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/pgtable.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ * This hopefully works with any standard Alpha page-size, as defined * in (currently 8192). */ -#include #include #include diff -puN include/asm-alpha/serial.h~git-hdrcleanup include/asm-alpha/serial.h --- devel/include/asm-alpha/serial.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/serial.h 2006-05-14 02:02:37.000000000 -0700 @@ -2,7 +2,6 @@ * include/asm-alpha/serial.h */ -#include /* * This assumes you have a 1.8432 MHz clock for your UART. diff -puN include/asm-alpha/smp.h~git-hdrcleanup include/asm-alpha/smp.h --- devel/include/asm-alpha/smp.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/smp.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include #include #include #include diff -puN include/asm-alpha/spinlock.h~git-hdrcleanup include/asm-alpha/spinlock.h --- devel/include/asm-alpha/spinlock.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/spinlock.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_SPINLOCK_H #define _ALPHA_SPINLOCK_H -#include #include #include #include diff -puN include/asm-alpha/system.h~git-hdrcleanup include/asm-alpha/system.h --- devel/include/asm-alpha/system.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/system.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ALPHA_SYSTEM_H #define __ALPHA_SYSTEM_H -#include #include #include #include diff -puN include/asm-alpha/tlbflush.h~git-hdrcleanup include/asm-alpha/tlbflush.h --- devel/include/asm-alpha/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/tlbflush.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ALPHA_TLBFLUSH_H #define _ALPHA_TLBFLUSH_H -#include #include #include diff -puN include/asm-alpha/unistd.h~git-hdrcleanup include/asm-alpha/unistd.h --- devel/include/asm-alpha/unistd.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-alpha/unistd.h 2006-05-14 02:02:37.000000000 -0700 @@ -383,6 +383,8 @@ #define __NR_inotify_add_watch 445 #define __NR_inotify_rm_watch 446 +#ifdef __KERNEL__ + #define NR_SYSCALLS 447 #if defined(__GNUC__) @@ -565,9 +567,8 @@ type name (type1 arg1,type2 arg2,type3 a _syscall_return(type); \ } -#endif /* __LIBRARY__ && __GNUC__ */ +#endif /* __GNUC__ */ -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 @@ -578,7 +579,6 @@ type name (type1 arg1,type2 arg2,type3 a #define __ARCH_WANT_SYS_OLD_GETRLIMIT #define __ARCH_WANT_SYS_OLDUMOUNT #define __ARCH_WANT_SYS_SIGPENDING -#endif #ifdef __KERNEL_SYSCALLS__ @@ -661,4 +661,5 @@ asmlinkage long sys_rt_sigaction(int sig #define cond_syscall(x) asm(".weak\t" #x "\n" #x " = sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _ALPHA_UNISTD_H */ diff -puN include/asm-arm26/atomic.h~git-hdrcleanup include/asm-arm26/atomic.h --- devel/include/asm-arm26/atomic.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/atomic.h 2006-05-14 02:02:37.000000000 -0700 @@ -20,7 +20,6 @@ #ifndef __ASM_ARM_ATOMIC_H #define __ASM_ARM_ATOMIC_H -#include #ifdef CONFIG_SMP #error SMP is NOT supported diff -puN include/asm-arm26/bug.h~git-hdrcleanup include/asm-arm26/bug.h --- devel/include/asm-arm26/bug.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/bug.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASMARM_BUG_H #define _ASMARM_BUG_H -#include #ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE diff -puN include/asm-arm26/dma.h~git-hdrcleanup include/asm-arm26/dma.h --- devel/include/asm-arm26/dma.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/dma.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ typedef unsigned int dmach_t; -#include #include #include #include diff -puN include/asm-arm26/hardirq.h~git-hdrcleanup include/asm-arm26/hardirq.h --- devel/include/asm-arm26/hardirq.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/hardirq.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include #include #include #include diff -puN include/asm-arm26/hardware.h~git-hdrcleanup include/asm-arm26/hardware.h --- devel/include/asm-arm26/hardware.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/hardware.h 2006-05-14 02:02:37.000000000 -0700 @@ -16,7 +16,6 @@ #ifndef __ASM_HARDWARE_H #define __ASM_HARDWARE_H -#include /* diff -puN include/asm-arm26/io.h~git-hdrcleanup include/asm-arm26/io.h --- devel/include/asm-arm26/io.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/io.h 2006-05-14 02:02:37.000000000 -0700 @@ -22,7 +22,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-arm26/leds.h~git-hdrcleanup include/asm-arm26/leds.h --- devel/include/asm-arm26/leds.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/leds.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef ASM_ARM_LEDS_H #define ASM_ARM_LEDS_H -#include typedef enum { led_idle_start, diff -puN include/asm-arm26/mach-types.h~git-hdrcleanup include/asm-arm26/mach-types.h --- devel/include/asm-arm26/mach-types.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/mach-types.h 2006-05-14 02:02:37.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef __ASM_ARM_MACH_TYPE_H #define __ASM_ARM_MACH_TYPE_H -#include #ifndef __ASSEMBLY__ extern unsigned int __machine_arch_type; diff -puN include/asm-arm26/page.h~git-hdrcleanup include/asm-arm26/page.h --- devel/include/asm-arm26/page.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/page.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASMARM_PAGE_H #define _ASMARM_PAGE_H -#include #ifdef __KERNEL__ #ifndef __ASSEMBLY__ diff -puN include/asm-arm26/pgtable.h~git-hdrcleanup include/asm-arm26/pgtable.h --- devel/include/asm-arm26/pgtable.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/pgtable.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #include -#include #include /* diff -puN include/asm-arm26/serial.h~git-hdrcleanup include/asm-arm26/serial.h --- devel/include/asm-arm26/serial.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/serial.h 2006-05-14 02:02:37.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef __ASM_SERIAL_H #define __ASM_SERIAL_H -#include /* * This assumes you have a 1.8432 MHz clock for your UART. diff -puN include/asm-arm26/smp.h~git-hdrcleanup include/asm-arm26/smp.h --- devel/include/asm-arm26/smp.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/smp.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include #ifdef CONFIG_SMP #error SMP not supported diff -puN include/asm-arm26/sysirq.h~git-hdrcleanup include/asm-arm26/sysirq.h --- devel/include/asm-arm26/sysirq.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/sysirq.h 2006-05-14 02:02:37.000000000 -0700 @@ -11,7 +11,6 @@ * 04-04-1998 PJB Merged arc and a5k versions */ -#include #if defined(CONFIG_ARCH_A5K) #define IRQ_PRINTER 0 diff -puN include/asm-arm26/system.h~git-hdrcleanup include/asm-arm26/system.h --- devel/include/asm-arm26/system.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/system.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include /* * This is used to ensure the compiler did actually allocate the register we diff -puN include/asm-arm26/unistd.h~git-hdrcleanup include/asm-arm26/unistd.h --- devel/include/asm-arm26/unistd.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm26/unistd.h 2006-05-14 02:02:37.000000000 -0700 @@ -14,8 +14,6 @@ #ifndef __ASM_ARM_UNISTD_H #define __ASM_ARM_UNISTD_H -#include - #define __NR_SYSCALL_BASE 0x900000 /* @@ -312,6 +310,9 @@ #define __ARM_NR_cacheflush (__ARM_NR_BASE+2) #define __ARM_NR_usr26 (__ARM_NR_BASE+3) +#ifdef __KERNEL__ +#include + #define __sys2(x) #x #define __sys1(x) __sys2(x) @@ -443,7 +444,6 @@ type name(type1 arg1, type2 arg2, type3 __syscall_return(type,__res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 @@ -462,7 +462,6 @@ type name(type1 arg1, type2 arg2, type3 #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -486,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -496,4 +495,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* __ASM_ARM_UNISTD_H */ diff -puN include/asm-arm/apm.h~git-hdrcleanup include/asm-arm/apm.h --- devel/include/asm-arm/apm.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/apm.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef ARM_ASM_SA1100_APM_H #define ARM_ASM_SA1100_APM_H -#include #include /* diff -puN include/asm-arm/arch-aaec2000/memory.h~git-hdrcleanup include/asm-arm/arch-aaec2000/memory.h --- devel/include/asm-arm/arch-aaec2000/memory.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-aaec2000/memory.h 2006-05-14 02:02:37.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include #define PHYS_OFFSET UL(0xf0000000) diff -puN include/asm-arm/arch-cl7500/acornfb.h~git-hdrcleanup include/asm-arm/arch-cl7500/acornfb.h --- devel/include/asm-arm/arch-cl7500/acornfb.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-cl7500/acornfb.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,4 +1,3 @@ -#include #define acornfb_valid_pixrate(var) (var->pixclock >= 39325 && var->pixclock <= 40119) static inline void diff -puN include/asm-arm/arch-clps711x/hardware.h~git-hdrcleanup include/asm-arm/arch-clps711x/hardware.h --- devel/include/asm-arm/arch-clps711x/hardware.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-clps711x/hardware.h 2006-05-14 02:02:37.000000000 -0700 @@ -22,7 +22,6 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include #define CLPS7111_VIRT_BASE 0xff000000 #define CLPS7111_BASE CLPS7111_VIRT_BASE diff -puN include/asm-arm/arch-clps711x/memory.h~git-hdrcleanup include/asm-arm/arch-clps711x/memory.h --- devel/include/asm-arm/arch-clps711x/memory.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-clps711x/memory.h 2006-05-14 02:02:37.000000000 -0700 @@ -20,7 +20,6 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include /* * Physical DRAM offset. diff -puN include/asm-arm/arch-clps711x/uncompress.h~git-hdrcleanup include/asm-arm/arch-clps711x/uncompress.h --- devel/include/asm-arm/arch-clps711x/uncompress.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-clps711x/uncompress.h 2006-05-14 02:02:37.000000000 -0700 @@ -17,7 +17,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 #include #include #include diff -puN include/asm-arm/arch-ebsa285/hardware.h~git-hdrcleanup include/asm-arm/arch-ebsa285/hardware.h --- devel/include/asm-arm/arch-ebsa285/hardware.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-ebsa285/hardware.h 2006-05-14 02:02:37.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include #include #ifdef CONFIG_ARCH_FOOTBRIDGE diff -puN include/asm-arm/arch-ebsa285/memory.h~git-hdrcleanup include/asm-arm/arch-ebsa285/memory.h --- devel/include/asm-arm/arch-ebsa285/memory.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-ebsa285/memory.h 2006-05-14 02:02:37.000000000 -0700 @@ -19,7 +19,6 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include #if defined(CONFIG_FOOTBRIDGE_ADDIN) /* diff -puN include/asm-arm/arch-ebsa285/vmalloc.h~git-hdrcleanup include/asm-arm/arch-ebsa285/vmalloc.h --- devel/include/asm-arm/arch-ebsa285/vmalloc.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-ebsa285/vmalloc.h 2006-05-14 02:02:37.000000000 -0700 @@ -6,7 +6,6 @@ * published by the Free Software Foundation. */ -#include #ifdef CONFIG_ARCH_FOOTBRIDGE #define VMALLOC_END (PAGE_OFFSET + 0x30000000) diff -puN include/asm-arm/arch-integrator/smp.h~git-hdrcleanup include/asm-arm/arch-integrator/smp.h --- devel/include/asm-arm/arch-integrator/smp.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-integrator/smp.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef ASMARM_ARCH_SMP_H #define ASMARM_ARCH_SMP_H -#include #include #include diff -puN include/asm-arm/arch-iop3xx/memory.h~git-hdrcleanup include/asm-arm/arch-iop3xx/memory.h --- devel/include/asm-arm/arch-iop3xx/memory.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-iop3xx/memory.h 2006-05-14 02:02:37.000000000 -0700 @@ -5,7 +5,6 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include #include /* diff -puN include/asm-arm/arch-iop3xx/timex.h~git-hdrcleanup include/asm-arm/arch-iop3xx/timex.h --- devel/include/asm-arm/arch-iop3xx/timex.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-iop3xx/timex.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ * * IOP3xx architecture timex specifications */ -#include #include #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) diff -puN include/asm-arm/arch-iop3xx/uncompress.h~git-hdrcleanup include/asm-arm/arch-iop3xx/uncompress.h --- devel/include/asm-arm/arch-iop3xx/uncompress.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-iop3xx/uncompress.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ /* * linux/include/asm-arm/arch-iop3xx/uncompress.h */ -#include #include #include #include diff -puN include/asm-arm/arch-ixp4xx/dma.h~git-hdrcleanup include/asm-arm/arch-ixp4xx/dma.h --- devel/include/asm-arm/arch-ixp4xx/dma.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-ixp4xx/dma.h 2006-05-14 02:02:37.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H -#include #include #include #include diff -puN include/asm-arm/arch-lh7a40x/constants.h~git-hdrcleanup include/asm-arm/arch-lh7a40x/constants.h --- devel/include/asm-arm/arch-lh7a40x/constants.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-lh7a40x/constants.h 2006-05-14 02:02:37.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_ARCH_CONSTANTS_H #define __ASM_ARCH_CONSTANTS_H -#include /* Addressing constants */ diff -puN include/asm-arm/arch-lh7a40x/irqs.h~git-hdrcleanup include/asm-arm/arch-lh7a40x/irqs.h --- devel/include/asm-arm/arch-lh7a40x/irqs.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-lh7a40x/irqs.h 2006-05-14 02:02:37.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H -#include #define FIQ_START 80 diff -puN include/asm-arm/arch-lh7a40x/registers.h~git-hdrcleanup include/asm-arm/arch-lh7a40x/registers.h --- devel/include/asm-arm/arch-lh7a40x/registers.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-lh7a40x/registers.h 2006-05-14 02:02:37.000000000 -0700 @@ -9,7 +9,6 @@ * */ -#include #include #ifndef __ASM_ARCH_REGISTERS_H diff -puN include/asm-arm/arch-omap/board.h~git-hdrcleanup include/asm-arm/arch-omap/board.h --- devel/include/asm-arm/arch-omap/board.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-omap/board.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _OMAP_BOARD_H #define _OMAP_BOARD_H -#include #include /* Different peripheral ids */ diff -puN include/asm-arm/arch-omap/hardware.h~git-hdrcleanup include/asm-arm/arch-omap/hardware.h --- devel/include/asm-arm/arch-omap/hardware.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-omap/hardware.h 2006-05-14 02:02:37.000000000 -0700 @@ -37,7 +37,6 @@ #define __ASM_ARCH_OMAP_HARDWARE_H #include -#include #ifndef __ASSEMBLER__ #include #include diff -puN include/asm-arm/arch-omap/system.h~git-hdrcleanup include/asm-arm/arch-omap/system.h --- devel/include/asm-arm/arch-omap/system.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-omap/system.h 2006-05-14 02:02:37.000000000 -0700 @@ -4,7 +4,6 @@ */ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include #include #include diff -puN include/asm-arm/arch-omap/uncompress.h~git-hdrcleanup include/asm-arm/arch-omap/uncompress.h --- devel/include/asm-arm/arch-omap/uncompress.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-omap/uncompress.h 2006-05-14 02:02:37.000000000 -0700 @@ -17,7 +17,6 @@ * kind, whether express or implied. */ -#include #include #include #include diff -puN include/asm-arm/arch-pxa/idp.h~git-hdrcleanup include/asm-arm/arch-pxa/idp.h --- devel/include/asm-arm/arch-pxa/idp.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-pxa/idp.h 2006-05-14 02:02:37.000000000 -0700 @@ -15,7 +15,6 @@ * Changes for 2.6 kernel. */ -#include /* * Note: this file must be safe to include in assembly files diff -puN include/asm-arm/arch-pxa/irqs.h~git-hdrcleanup include/asm-arm/arch-pxa/irqs.h --- devel/include/asm-arm/arch-pxa/irqs.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-pxa/irqs.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ * published by the Free Software Foundation. */ -#include #ifdef CONFIG_PXA27x #define PXA_IRQ_SKIP 0 diff -puN include/asm-arm/arch-pxa/pxa-regs.h~git-hdrcleanup include/asm-arm/arch-pxa/pxa-regs.h --- devel/include/asm-arm/arch-pxa/pxa-regs.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-pxa/pxa-regs.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef __PXA_REGS_H #define __PXA_REGS_H -#include /* * PXA Chip selects diff -puN include/asm-arm/arch-pxa/timex.h~git-hdrcleanup include/asm-arm/arch-pxa/timex.h --- devel/include/asm-arm/arch-pxa/timex.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-pxa/timex.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ * published by the Free Software Foundation. */ -#include #if defined(CONFIG_PXA25x) /* PXA250/210 timer base */ diff -puN include/asm-arm/arch-realview/smp.h~git-hdrcleanup include/asm-arm/arch-realview/smp.h --- devel/include/asm-arm/arch-realview/smp.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-realview/smp.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef ASMARM_ARCH_SMP_H #define ASMARM_ARCH_SMP_H -#include #include diff -puN include/asm-arm/arch-s3c2410/dma.h~git-hdrcleanup include/asm-arm/arch-s3c2410/dma.h --- devel/include/asm-arm/arch-s3c2410/dma.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-s3c2410/dma.h 2006-05-14 02:02:37.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H __FILE__ -#include #include #include "hardware.h" diff -puN include/asm-arm/arch-s3c2410/uncompress.h~git-hdrcleanup include/asm-arm/arch-s3c2410/uncompress.h --- devel/include/asm-arm/arch-s3c2410/uncompress.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-s3c2410/uncompress.h 2006-05-14 02:02:37.000000000 -0700 @@ -22,7 +22,6 @@ #ifndef __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H -#include /* defines for UART registers */ #include "asm/arch/regs-serial.h" diff -puN include/asm-arm/arch-sa1100/assabet.h~git-hdrcleanup include/asm-arm/arch-sa1100/assabet.h --- devel/include/asm-arm/arch-sa1100/assabet.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/assabet.h 2006-05-14 02:02:37.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_ARCH_ASSABET_H #define __ASM_ARCH_ASSABET_H -#include /* System Configuration Register flags */ diff -puN include/asm-arm/arch-sa1100/cerf.h~git-hdrcleanup include/asm-arm/arch-sa1100/cerf.h --- devel/include/asm-arm/arch-sa1100/cerf.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/cerf.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _INCLUDE_CERF_H_ #define _INCLUDE_CERF_H_ -#include #define CERF_ETH_IO 0xf0000000 #define CERF_ETH_IRQ IRQ_GPIO26 diff -puN include/asm-arm/arch-sa1100/collie.h~git-hdrcleanup include/asm-arm/arch-sa1100/collie.h --- devel/include/asm-arm/arch-sa1100/collie.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/collie.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef __ASM_ARCH_COLLIE_H #define __ASM_ARCH_COLLIE_H -#include #define COLLIE_SCP_CHARGE_ON SCOOP_GPCR_PA11 #define COLLIE_SCP_DIAG_BOOT1 SCOOP_GPCR_PA12 diff -puN include/asm-arm/arch-sa1100/dma.h~git-hdrcleanup include/asm-arm/arch-sa1100/dma.h --- devel/include/asm-arm/arch-sa1100/dma.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/dma.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H -#include #include "hardware.h" diff -puN include/asm-arm/arch-sa1100/hardware.h~git-hdrcleanup include/asm-arm/arch-sa1100/hardware.h --- devel/include/asm-arm/arch-sa1100/hardware.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/hardware.h 2006-05-14 02:02:37.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include #define UNCACHEABLE_ADDR 0xfa050000 diff -puN include/asm-arm/arch-sa1100/ide.h~git-hdrcleanup include/asm-arm/arch-sa1100/ide.h --- devel/include/asm-arm/arch-sa1100/ide.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/ide.h 2006-05-14 02:02:37.000000000 -0700 @@ -9,7 +9,6 @@ * architectures. */ -#include #include #include #include diff -puN include/asm-arm/arch-sa1100/irqs.h~git-hdrcleanup include/asm-arm/arch-sa1100/irqs.h --- devel/include/asm-arm/arch-sa1100/irqs.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/irqs.h 2006-05-14 02:02:37.000000000 -0700 @@ -7,7 +7,6 @@ * * 2001/11/14 RMK Cleaned up and standardised a lot of the IRQs. */ -#include #define IRQ_GPIO0 0 #define IRQ_GPIO1 1 diff -puN include/asm-arm/arch-sa1100/memory.h~git-hdrcleanup include/asm-arm/arch-sa1100/memory.h --- devel/include/asm-arm/arch-sa1100/memory.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/memory.h 2006-05-14 02:02:37.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#include #include /* diff -puN include/asm-arm/arch-sa1100/system.h~git-hdrcleanup include/asm-arm/arch-sa1100/system.h --- devel/include/asm-arm/arch-sa1100/system.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/arch-sa1100/system.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ * * Copyright (c) 1999 Nicolas Pitre */ -#include #include static inline void arch_idle(void) diff -puN include/asm-arm/atomic.h~git-hdrcleanup include/asm-arm/atomic.h --- devel/include/asm-arm/atomic.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/atomic.h 2006-05-14 02:02:37.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef __ASM_ARM_ATOMIC_H #define __ASM_ARM_ATOMIC_H -#include #include typedef struct { volatile int counter; } atomic_t; diff -puN include/asm-arm/bug.h~git-hdrcleanup include/asm-arm/bug.h --- devel/include/asm-arm/bug.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/bug.h 2006-05-14 02:02:37.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASMARM_BUG_H #include -#include #ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE diff -puN include/asm-arm/cacheflush.h~git-hdrcleanup include/asm-arm/cacheflush.h --- devel/include/asm-arm/cacheflush.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/cacheflush.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASMARM_CACHEFLUSH_H #define _ASMARM_CACHEFLUSH_H -#include #include #include diff -puN include/asm-arm/cpu.h~git-hdrcleanup include/asm-arm/cpu.h --- devel/include/asm-arm/cpu.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/cpu.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_ARM_CPU_H #define __ASM_ARM_CPU_H -#include #include struct cpuinfo_arm { diff -puN include/asm-arm/dma.h~git-hdrcleanup include/asm-arm/dma.h --- devel/include/asm-arm/dma.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/dma.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ typedef unsigned int dmach_t; -#include #include #include #include diff -puN include/asm-arm/dma-mapping.h~git-hdrcleanup include/asm-arm/dma-mapping.h --- devel/include/asm-arm/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/dma-mapping.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #include /* need struct page */ #include diff -puN include/asm-arm/elf.h~git-hdrcleanup include/asm-arm/elf.h --- devel/include/asm-arm/elf.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/elf.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASMARM_ELF_H #define __ASMARM_ELF_H -#include /* * ELF register definitions.. diff -puN include/asm-arm/fpstate.h~git-hdrcleanup include/asm-arm/fpstate.h --- devel/include/asm-arm/fpstate.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/fpstate.h 2006-05-14 02:02:37.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef __ASM_ARM_FPSTATE_H #define __ASM_ARM_FPSTATE_H -#include #ifndef __ASSEMBLY__ diff -puN include/asm-arm/glue.h~git-hdrcleanup include/asm-arm/glue.h --- devel/include/asm-arm/glue.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/glue.h 2006-05-14 02:02:37.000000000 -0700 @@ -15,7 +15,6 @@ */ #ifdef __KERNEL__ -#include #ifdef __STDC__ #define ____glue(name,fn) name##fn diff -puN include/asm-arm/hardirq.h~git-hdrcleanup include/asm-arm/hardirq.h --- devel/include/asm-arm/hardirq.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/hardirq.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include #include #include #include diff -puN include/asm-arm/hardware/dec21285.h~git-hdrcleanup include/asm-arm/hardware/dec21285.h --- devel/include/asm-arm/hardware/dec21285.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/hardware/dec21285.h 2006-05-14 02:02:37.000000000 -0700 @@ -18,7 +18,6 @@ #define DC21285_PCI_IO 0x7c000000 #define DC21285_PCI_MEM 0x80000000 -#include #ifndef __ASSEMBLY__ #include #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) diff -puN include/asm-arm/hardware/iomd.h~git-hdrcleanup include/asm-arm/hardware/iomd.h --- devel/include/asm-arm/hardware/iomd.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/hardware/iomd.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef __ASMARM_HARDWARE_IOMD_H #define __ASMARM_HARDWARE_IOMD_H -#include #ifndef __ASSEMBLY__ diff -puN include/asm-arm/leds.h~git-hdrcleanup include/asm-arm/leds.h --- devel/include/asm-arm/leds.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/leds.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef ASM_ARM_LEDS_H #define ASM_ARM_LEDS_H -#include typedef enum { led_idle_start, diff -puN include/asm-arm/mach/serial_at91rm9200.h~git-hdrcleanup include/asm-arm/mach/serial_at91rm9200.h --- devel/include/asm-arm/mach/serial_at91rm9200.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/mach/serial_at91rm9200.h 2006-05-14 02:02:37.000000000 -0700 @@ -7,7 +7,6 @@ * * Low level machine dependent UART functions. */ -#include struct uart_port; diff -puN include/asm-arm/mach/serial_sa1100.h~git-hdrcleanup include/asm-arm/mach/serial_sa1100.h --- devel/include/asm-arm/mach/serial_sa1100.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/mach/serial_sa1100.h 2006-05-14 02:02:37.000000000 -0700 @@ -7,7 +7,6 @@ * * Low level machine dependent UART functions. */ -#include struct uart_port; struct uart_info; diff -puN include/asm-arm/memory.h~git-hdrcleanup include/asm-arm/memory.h --- devel/include/asm-arm/memory.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/memory.h 2006-05-14 02:02:37.000000000 -0700 @@ -22,7 +22,6 @@ #define UL(x) (x) #endif -#include #include #include #include diff -puN include/asm-arm/page.h~git-hdrcleanup include/asm-arm/page.h --- devel/include/asm-arm/page.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/page.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASMARM_PAGE_H #define _ASMARM_PAGE_H -#include /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 diff -puN include/asm-arm/pci.h~git-hdrcleanup include/asm-arm/pci.h --- devel/include/asm-arm/pci.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/pci.h 2006-05-14 02:02:37.000000000 -0700 @@ -2,7 +2,6 @@ #define ASMARM_PCI_H #ifdef __KERNEL__ -#include #include #include /* for PCIBIOS_MIN_* */ diff -puN include/asm-arm/proc-fns.h~git-hdrcleanup include/asm-arm/proc-fns.h --- devel/include/asm-arm/proc-fns.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/proc-fns.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,7 +13,6 @@ #ifdef __KERNEL__ -#include /* * Work out if we need multiple CPU support diff -puN include/asm-arm/ptrace.h~git-hdrcleanup include/asm-arm/ptrace.h --- devel/include/asm-arm/ptrace.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/ptrace.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_ARM_PTRACE_H #define __ASM_ARM_PTRACE_H -#include #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 diff -puN include/asm-arm/smp.h~git-hdrcleanup include/asm-arm/smp.h --- devel/include/asm-arm/smp.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/smp.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_ARM_SMP_H #define __ASM_ARM_SMP_H -#include #include #include #include diff -puN include/asm-arm/system.h~git-hdrcleanup include/asm-arm/system.h --- devel/include/asm-arm/system.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/system.h 2006-05-14 02:02:37.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #define CPU_ARCH_UNKNOWN 0 #define CPU_ARCH_ARMv3 1 diff -puN include/asm-arm/tlbflush.h~git-hdrcleanup include/asm-arm/tlbflush.h --- devel/include/asm-arm/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/tlbflush.h 2006-05-14 02:02:37.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASMARM_TLBFLUSH_H #define _ASMARM_TLBFLUSH_H -#include #ifndef CONFIG_MMU diff -puN include/asm-arm/unistd.h~git-hdrcleanup include/asm-arm/unistd.h --- devel/include/asm-arm/unistd.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-arm/unistd.h 2006-05-14 02:02:37.000000000 -0700 @@ -13,8 +13,6 @@ #ifndef __ASM_ARM_UNISTD_H #define __ASM_ARM_UNISTD_H -#include - #define __NR_OABI_SYSCALL_BASE 0x900000 #if defined(__thumb__) || defined(__ARM_EABI__) @@ -378,6 +376,9 @@ #undef __NR_ipc #endif +#ifdef __KERNEL__ +#include + #define __sys2(x) #x #define __sys1(x) __sys2(x) @@ -526,7 +527,6 @@ type name(type1 arg1, type2 arg2, type3 __syscall_return(type,__res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME @@ -547,7 +547,6 @@ type name(type1 arg1, type2 arg2, type3 #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_SYS_SOCKETCALL #endif -#endif #ifdef __KERNEL_SYSCALLS__ @@ -571,7 +570,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -581,4 +580,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* __ASM_ARM_UNISTD_H */ diff -puN include/asm-cris/arch-v10/io.h~git-hdrcleanup include/asm-cris/arch-v10/io.h --- devel/include/asm-cris/arch-v10/io.h~git-hdrcleanup 2006-05-14 02:02:36.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v10/io.h 2006-05-14 02:02:37.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASM_ARCH_CRIS_IO_H #include -#include /* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */ diff -puN include/asm-cris/arch-v10/page.h~git-hdrcleanup include/asm-cris/arch-v10/page.h --- devel/include/asm-cris/arch-v10/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v10/page.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _CRIS_ARCH_PAGE_H #define _CRIS_ARCH_PAGE_H -#include #ifdef __KERNEL__ diff -puN include/asm-cris/arch-v10/system.h~git-hdrcleanup include/asm-cris/arch-v10/system.h --- devel/include/asm-cris/arch-v10/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v10/system.h 2006-05-14 02:02:37.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_CRIS_ARCH_SYSTEM_H #define __ASM_CRIS_ARCH_SYSTEM_H -#include /* read the CPU version register */ diff -puN include/asm-cris/arch-v32/io.h~git-hdrcleanup include/asm-cris/arch-v32/io.h --- devel/include/asm-cris/arch-v32/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v32/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #include #include #include -#include enum crisv32_io_dir { diff -puN include/asm-cris/arch-v32/irq.h~git-hdrcleanup include/asm-cris/arch-v32/irq.h --- devel/include/asm-cris/arch-v32/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v32/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_ARCH_IRQ_H #define _ASM_ARCH_IRQ_H -#include #include "hwregs/intr_vect.h" /* Number of non-cpu interrupts. */ diff -puN include/asm-cris/arch-v32/page.h~git-hdrcleanup include/asm-cris/arch-v32/page.h --- devel/include/asm-cris/arch-v32/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v32/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_CRIS_ARCH_PAGE_H #define _ASM_CRIS_ARCH_PAGE_H -#include #ifdef __KERNEL__ diff -puN include/asm-cris/arch-v32/processor.h~git-hdrcleanup include/asm-cris/arch-v32/processor.h --- devel/include/asm-cris/arch-v32/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v32/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_CRIS_ARCH_PROCESSOR_H #define _ASM_CRIS_ARCH_PROCESSOR_H -#include /* Return current instruction pointer. */ #define current_text_addr() \ diff -puN include/asm-cris/arch-v32/system.h~git-hdrcleanup include/asm-cris/arch-v32/system.h --- devel/include/asm-cris/arch-v32/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/arch-v32/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_CRIS_ARCH_SYSTEM_H #define _ASM_CRIS_ARCH_SYSTEM_H -#include /* Read the CPU version register. */ static inline unsigned long rdvr(void) diff -puN include/asm-cris/eshlibld.h~git-hdrcleanup include/asm-cris/eshlibld.h --- devel/include/asm-cris/eshlibld.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/eshlibld.h 2006-05-14 02:02:38.000000000 -0700 @@ -32,7 +32,6 @@ /* We have dependencies all over the place for the host system for xsim being a linux system, so let's not pretend anything else with #ifdef:s here until fixed. */ -#include #include /* Maybe do sanity checking if file input. */ diff -puN include/asm-cris/etraxgpio.h~git-hdrcleanup include/asm-cris/etraxgpio.h --- devel/include/asm-cris/etraxgpio.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/etraxgpio.h 2006-05-14 02:02:38.000000000 -0700 @@ -25,7 +25,6 @@ #ifndef _ASM_ETRAXGPIO_H #define _ASM_ETRAXGPIO_H -#include /* etraxgpio _IOC_TYPE, bits 8 to 15 in ioctl cmd */ #ifdef CONFIG_ETRAX_ARCH_V10 #define ETRAXGPIO_IOCTYPE 43 diff -puN include/asm-cris/fasttimer.h~git-hdrcleanup include/asm-cris/fasttimer.h --- devel/include/asm-cris/fasttimer.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/fasttimer.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * This may be useful in other OS than Linux so use 2 space indentation... * Copyright (C) 2000, 2002 Axis Communications AB */ -#include #include /* struct timeval */ #include diff -puN include/asm-cris/page.h~git-hdrcleanup include/asm-cris/page.h --- devel/include/asm-cris/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _CRIS_PAGE_H #define _CRIS_PAGE_H -#include #include /* PAGE_SHIFT determines the page size */ diff -puN include/asm-cris/pci.h~git-hdrcleanup include/asm-cris/pci.h --- devel/include/asm-cris/pci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/pci.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_CRIS_PCI_H #define __ASM_CRIS_PCI_H -#include #ifdef __KERNEL__ #include /* for struct page */ diff -puN include/asm-cris/pgtable.h~git-hdrcleanup include/asm-cris/pgtable.h --- devel/include/asm-cris/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #include #ifndef __ASSEMBLY__ -#include #include #include #endif diff -puN include/asm-cris/processor.h~git-hdrcleanup include/asm-cris/processor.h --- devel/include/asm-cris/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_CRIS_PROCESSOR_H #define __ASM_CRIS_PROCESSOR_H -#include #include #include #include diff -puN include/asm-cris/rtc.h~git-hdrcleanup include/asm-cris/rtc.h --- devel/include/asm-cris/rtc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/rtc.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #define __RTC_H__ -#include #ifdef CONFIG_ETRAX_DS1302 /* Dallas DS1302 clock/calendar register numbers. */ diff -puN include/asm-cris/tlbflush.h~git-hdrcleanup include/asm-cris/tlbflush.h --- devel/include/asm-cris/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _CRIS_TLBFLUSH_H #define _CRIS_TLBFLUSH_H -#include #include #include #include diff -puN include/asm-cris/unistd.h~git-hdrcleanup include/asm-cris/unistd.h --- devel/include/asm-cris/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-cris/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -295,11 +295,11 @@ #define __NR_request_key 287 #define __NR_keyctl 288 -#define NR_syscalls 289 +#ifdef __KERNEL__ +#define NR_syscalls 289 -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -379,12 +379,10 @@ asmlinkage long sys_rt_sigaction(int sig * complaints. We don't want to use -fno-builtin, so just use a * different name when in the kernel. */ -#ifdef __KERNEL__ #define _exit kernel_syscall_exit -#endif static inline _syscall1(int,_exit,int,exitcode) static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* @@ -395,4 +393,5 @@ static inline _syscall3(pid_t,waitpid,pi */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _ASM_CRIS_UNISTD_H_ */ diff -puN include/asm-frv/atomic.h~git-hdrcleanup include/asm-frv/atomic.h --- devel/include/asm-frv/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef _ASM_ATOMIC_H #define _ASM_ATOMIC_H -#include #include #include diff -puN include/asm-frv/bitops.h~git-hdrcleanup include/asm-frv/bitops.h --- devel/include/asm-frv/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef _ASM_BITOPS_H #define _ASM_BITOPS_H -#include #include #include #include diff -puN include/asm-frv/bug.h~git-hdrcleanup include/asm-frv/bug.h --- devel/include/asm-frv/bug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/bug.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_BUG_H #define _ASM_BUG_H -#include #include #ifdef CONFIG_BUG diff -puN include/asm-frv/cache.h~git-hdrcleanup include/asm-frv/cache.h --- devel/include/asm-frv/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_CACHE_H #define __ASM_CACHE_H -#include /* bytes per L1 cache line */ #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT) diff -puN include/asm-frv/dma.h~git-hdrcleanup include/asm-frv/dma.h --- devel/include/asm-frv/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ //#define DMA_DEBUG 1 -#include #include #undef MAX_DMA_CHANNELS /* don't use kernel/dma.c */ diff -puN include/asm-frv/elf.h~git-hdrcleanup include/asm-frv/elf.h --- devel/include/asm-frv/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_ELF_H #define __ASM_ELF_H -#include #include #include diff -puN include/asm-frv/fpu.h~git-hdrcleanup include/asm-frv/fpu.h --- devel/include/asm-frv/fpu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/fpu.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_FPU_H #define __ASM_FPU_H -#include /* * MAX floating point unit state size (FSAVE/FRESTORE) diff -puN include/asm-frv/hardirq.h~git-hdrcleanup include/asm-frv/hardirq.h --- devel/include/asm-frv/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include #include #include diff -puN include/asm-frv/highmem.h~git-hdrcleanup include/asm-frv/highmem.h --- devel/include/asm-frv/highmem.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/highmem.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-frv/ide.h~git-hdrcleanup include/asm-frv/ide.h --- devel/include/asm-frv/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-frv/io.h~git-hdrcleanup include/asm-frv/io.h --- devel/include/asm-frv/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-frv/irq.h~git-hdrcleanup include/asm-frv/irq.h --- devel/include/asm-frv/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_IRQ_H_ #define _ASM_IRQ_H_ -#include /* * the system has an on-CPU PIC and another PIC on the FPGA and other PICs on other peripherals, diff -puN include/asm-frv/mmu_context.h~git-hdrcleanup include/asm-frv/mmu_context.h --- devel/include/asm-frv/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_MMU_CONTEXT_H #define _ASM_MMU_CONTEXT_H -#include #include #include #include diff -puN include/asm-frv/page.h~git-hdrcleanup include/asm-frv/page.h --- devel/include/asm-frv/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-frv/pci.h~git-hdrcleanup include/asm-frv/pci.h --- devel/include/asm-frv/pci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/pci.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef ASM_PCI_H #define ASM_PCI_H -#include #include #include #include diff -puN include/asm-frv/pgalloc.h~git-hdrcleanup include/asm-frv/pgalloc.h --- devel/include/asm-frv/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _ASM_PGALLOC_H #define _ASM_PGALLOC_H -#include #include #include diff -puN include/asm-frv/pgtable.h~git-hdrcleanup include/asm-frv/pgtable.h --- devel/include/asm-frv/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #ifndef _ASM_PGTABLE_H #define _ASM_PGTABLE_H -#include #include #include #include diff -puN include/asm-frv/processor.h~git-hdrcleanup include/asm-frv/processor.h --- devel/include/asm-frv/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_PROCESSOR_H #define _ASM_PROCESSOR_H -#include #include #ifndef __ASSEMBLY__ diff -puN include/asm-frv/segment.h~git-hdrcleanup include/asm-frv/segment.h --- devel/include/asm-frv/segment.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/segment.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_SEGMENT_H #define _ASM_SEGMENT_H -#include #ifndef __ASSEMBLY__ diff -puN include/asm-frv/serial.h~git-hdrcleanup include/asm-frv/serial.h --- devel/include/asm-frv/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * * Based on linux/include/asm-i386/serial.h */ -#include #include /* diff -puN include/asm-frv/smp.h~git-hdrcleanup include/asm-frv/smp.h --- devel/include/asm-frv/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include #ifdef CONFIG_SMP #error SMP not supported diff -puN include/asm-frv/system.h~git-hdrcleanup include/asm-frv/system.h --- devel/include/asm-frv/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_SYSTEM_H #define _ASM_SYSTEM_H -#include /* get configuration macros */ #include #include diff -puN include/asm-frv/tlbflush.h~git-hdrcleanup include/asm-frv/tlbflush.h --- devel/include/asm-frv/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_TLBFLUSH_H #define _ASM_TLBFLUSH_H -#include #include #include diff -puN include/asm-frv/types.h~git-hdrcleanup include/asm-frv/types.h --- devel/include/asm-frv/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -46,7 +46,6 @@ typedef unsigned long long __u64; #ifndef __ASSEMBLY__ -#include typedef signed char s8; typedef unsigned char u8; diff -puN include/asm-frv/unaligned.h~git-hdrcleanup include/asm-frv/unaligned.h --- devel/include/asm-frv/unaligned.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/unaligned.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_UNALIGNED_H #define _ASM_UNALIGNED_H -#include /* * Unaligned accesses on uClinux can't be performed in a fault handler - the diff -puN include/asm-frv/unistd.h~git-hdrcleanup include/asm-frv/unistd.h --- devel/include/asm-frv/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -317,6 +317,8 @@ #define __NR_pselect6 308 #define __NR_ppoll 309 +#ifdef __KERNEL__ + #define NR_syscalls 310 /* @@ -477,9 +479,8 @@ static inline pid_t wait(int * wait_stat return waitpid(-1,wait_stat,0); } -#endif +#endif /* __KERNEL_SYSCALLS__ */ -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION /* #define __ARCH_WANT_OLD_READDIR */ #define __ARCH_WANT_OLD_STAT @@ -503,7 +504,6 @@ static inline pid_t wait(int * wait_stat #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_RT_SIGSUSPEND -#endif /* * "Conditional" syscalls @@ -515,4 +515,5 @@ static inline pid_t wait(int * wait_stat #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") #endif +#endif /* __KERNEL__ */ #endif /* _ASM_UNISTD_H_ */ diff -puN include/asm-frv/virtconvert.h~git-hdrcleanup include/asm-frv/virtconvert.h --- devel/include/asm-frv/virtconvert.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-frv/virtconvert.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifdef __KERNEL__ -#include #include #ifdef CONFIG_MMU diff -puN include/asm-generic/bug.h~git-hdrcleanup include/asm-generic/bug.h --- devel/include/asm-generic/bug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-generic/bug.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASM_GENERIC_BUG_H #include -#include #ifdef CONFIG_BUG #ifndef HAVE_ARCH_BUG diff -puN include/asm-generic/dma-mapping.h~git-hdrcleanup include/asm-generic/dma-mapping.h --- devel/include/asm-generic/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-generic/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _ASM_GENERIC_DMA_MAPPING_H #define _ASM_GENERIC_DMA_MAPPING_H -#include #ifdef CONFIG_PCI diff -puN include/asm-generic/fcntl.h~git-hdrcleanup include/asm-generic/fcntl.h --- devel/include/asm-generic/fcntl.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-generic/fcntl.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_GENERIC_FCNTL_H #define _ASM_GENERIC_FCNTL_H -#include #include /* open/fcntl - O_SYNC is only implemented on blocks devices and on files diff -puN include/asm-generic/local.h~git-hdrcleanup include/asm-generic/local.h --- devel/include/asm-generic/local.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-generic/local.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_GENERIC_LOCAL_H #define _ASM_GENERIC_LOCAL_H -#include #include #include #include diff -puN include/asm-generic/signal.h~git-hdrcleanup include/asm-generic/signal.h --- devel/include/asm-generic/signal.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-generic/signal.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,3 +1,8 @@ +#ifndef __ASM_GENERIC_SIGNAL_H +#define __ASM_GENERIC_SIGNAL_H + +#include + #ifndef SIG_BLOCK #define SIG_BLOCK 0 /* for blocking signals */ #endif @@ -19,3 +24,5 @@ typedef __restorefn_t __user *__sigresto #define SIG_IGN ((__force __sighandler_t)1) /* ignore signal */ #define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ #endif + +#endif /* __ASM_GENERIC_SIGNAL_H */ diff -puN include/asm-generic/tlb.h~git-hdrcleanup include/asm-generic/tlb.h --- devel/include/asm-generic/tlb.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-generic/tlb.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _ASM_GENERIC__TLB_H #define _ASM_GENERIC__TLB_H -#include #include #include #include diff -puN include/asm-h8300/bitops.h~git-hdrcleanup include/asm-h8300/bitops.h --- devel/include/asm-h8300/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Copyright 2002, Yoshinori Sato */ -#include #include #include diff -puN include/asm-h8300/dma.h~git-hdrcleanup include/asm-h8300/dma.h --- devel/include/asm-h8300/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _H8300_DMA_H #define _H8300_DMA_H -#include /* * Set number of channels of DMA on ColdFire for different implementations. diff -puN include/asm-h8300/elf.h~git-hdrcleanup include/asm-h8300/elf.h --- devel/include/asm-h8300/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * ELF register definitions.. */ -#include #include #include diff -puN include/asm-h8300/hardirq.h~git-hdrcleanup include/asm-h8300/hardirq.h --- devel/include/asm-h8300/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define __H8300_HARDIRQ_H #include -#include #include #include #include diff -puN include/asm-h8300/io.h~git-hdrcleanup include/asm-h8300/io.h --- devel/include/asm-h8300/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #include #if defined(CONFIG_H83007) || defined(CONFIG_H83068) diff -puN include/asm-h8300/keyboard.h~git-hdrcleanup include/asm-h8300/keyboard.h --- devel/include/asm-h8300/keyboard.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/keyboard.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _H8300_KEYBOARD_H #define _H8300_KEYBOARD_H -#include /* dummy i.e. no real keyboard */ #define kbd_setkeycode(x...) (-ENOSYS) diff -puN include/asm-h8300/mmu_context.h~git-hdrcleanup include/asm-h8300/mmu_context.h --- devel/include/asm-h8300/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __H8300_MMU_CONTEXT_H #define __H8300_MMU_CONTEXT_H -#include #include #include #include diff -puN include/asm-h8300/page.h~git-hdrcleanup include/asm-h8300/page.h --- devel/include/asm-h8300/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _H8300_PAGE_H #define _H8300_PAGE_H -#include /* PAGE_SHIFT determines the page size */ diff -puN include/asm-h8300/page_offset.h~git-hdrcleanup include/asm-h8300/page_offset.h --- devel/include/asm-h8300/page_offset.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/page_offset.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,4 +1,3 @@ -#include #define PAGE_OFFSET_RAW 0x00000000 diff -puN include/asm-h8300/param.h~git-hdrcleanup include/asm-h8300/param.h --- devel/include/asm-h8300/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _H8300_PARAM_H #define _H8300_PARAM_H -#include #ifndef HZ #define HZ 100 diff -puN include/asm-h8300/pgtable.h~git-hdrcleanup include/asm-h8300/pgtable.h --- devel/include/asm-h8300/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #include -#include #include #include #include diff -puN include/asm-h8300/processor.h~git-hdrcleanup include/asm-h8300/processor.h --- devel/include/asm-h8300/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ */ #define current_text_addr() ({ __label__ _l; _l: &&_l;}) -#include #include #include #include diff -puN include/asm-h8300/semaphore-helper.h~git-hdrcleanup include/asm-h8300/semaphore-helper.h --- devel/include/asm-h8300/semaphore-helper.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/semaphore-helper.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ * m68k version by Andreas Schwab */ -#include #include /* diff -puN include/asm-h8300/shm.h~git-hdrcleanup include/asm-h8300/shm.h --- devel/include/asm-h8300/shm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/shm.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _H8300_SHM_H #define _H8300_SHM_H -#include /* format of page table entries that correspond to shared memory pages currently out in swap space (see also mm/swap.c): diff -puN include/asm-h8300/system.h~git-hdrcleanup include/asm-h8300/system.h --- devel/include/asm-h8300/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _H8300_SYSTEM_H #define _H8300_SYSTEM_H -#include /* get configuration macros */ #include /* diff -puN include/asm-h8300/unaligned.h~git-hdrcleanup include/asm-h8300/unaligned.h --- devel/include/asm-h8300/unaligned.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/unaligned.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __H8300_UNALIGNED_H #define __H8300_UNALIGNED_H -#include /* Use memmove here, so gcc does not insert a __builtin_memcpy. */ diff -puN include/asm-h8300/unistd.h~git-hdrcleanup include/asm-h8300/unistd.h --- devel/include/asm-h8300/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -292,6 +292,8 @@ #define __NR_request_key 287 #define __NR_keyctl 288 +#ifdef __KERNEL__ + #define NR_syscalls 289 @@ -460,7 +462,6 @@ type name(atype a, btype b, ctype c, dty __syscall_return(type, __res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -483,7 +484,6 @@ type name(atype a, btype b, ctype c, dty #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -534,7 +534,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -543,4 +543,5 @@ asmlinkage long sys_rt_sigaction(int sig asm (".weak\t_" #name "\n" \ ".set\t_" #name ",_sys_ni_syscall"); +#endif /* __KERNEL__ */ #endif /* _ASM_H8300_UNISTD_H_ */ diff -puN include/asm-h8300/virtconvert.h~git-hdrcleanup include/asm-h8300/virtconvert.h --- devel/include/asm-h8300/virtconvert.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-h8300/virtconvert.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifdef __KERNEL__ -#include #include #include diff -puN include/asm-i386/apic.h~git-hdrcleanup include/asm-i386/apic.h --- devel/include/asm-i386/apic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/apic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_APIC_H #define __ASM_APIC_H -#include #include #include #include diff -puN include/asm-i386/atomic.h~git-hdrcleanup include/asm-i386/atomic.h --- devel/include/asm-i386/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ARCH_I386_ATOMIC__ #define __ARCH_I386_ATOMIC__ -#include #include #include diff -puN include/asm-i386/bitops.h~git-hdrcleanup include/asm-i386/bitops.h --- devel/include/asm-i386/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * Copyright 1992, Linus Torvalds. */ -#include #include #include diff -puN include/asm-i386/bug.h~git-hdrcleanup include/asm-i386/bug.h --- devel/include/asm-i386/bug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/bug.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _I386_BUG_H #define _I386_BUG_H -#include /* * Tell the user there is some problem. diff -puN include/asm-i386/bugs.h~git-hdrcleanup include/asm-i386/bugs.h --- devel/include/asm-i386/bugs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/bugs.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ * void check_bugs(void); */ -#include #include #include #include diff -puN include/asm-i386/byteorder.h~git-hdrcleanup include/asm-i386/byteorder.h --- devel/include/asm-i386/byteorder.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/byteorder.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ /* For avoiding bswap on i386 */ #ifdef __KERNEL__ -#include #endif static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) diff -puN include/asm-i386/cache.h~git-hdrcleanup include/asm-i386/cache.h --- devel/include/asm-i386/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #ifndef __ARCH_I386_CACHE_H #define __ARCH_I386_CACHE_H -#include /* L1 cache line size */ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) diff -puN include/asm-i386/dma.h~git-hdrcleanup include/asm-i386/dma.h --- devel/include/asm-i386/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include #include /* And spinlocks */ #include /* need byte IO */ #include diff -puN include/asm-i386/fixmap.h~git-hdrcleanup include/asm-i386/fixmap.h --- devel/include/asm-i386/fixmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/fixmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include /* used by vmalloc.c, vsyscall.lds.S. * diff -puN include/asm-i386/hardirq.h~git-hdrcleanup include/asm-i386/hardirq.h --- devel/include/asm-i386/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include #include #include diff -puN include/asm-i386/highmem.h~git-hdrcleanup include/asm-i386/highmem.h --- devel/include/asm-i386/highmem.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/highmem.h 2006-05-14 02:02:38.000000000 -0700 @@ -20,7 +20,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-i386/hpet.h~git-hdrcleanup include/asm-i386/hpet.h --- devel/include/asm-i386/hpet.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/hpet.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,7 +27,6 @@ #include #include -#include #include diff -puN include/asm-i386/hw_irq.h~git-hdrcleanup include/asm-i386/hw_irq.h --- devel/include/asm-i386/hw_irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/hw_irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * */ -#include #include #include #include diff -puN include/asm-i386/ide.h~git-hdrcleanup include/asm-i386/ide.h --- devel/include/asm-i386/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifdef __KERNEL__ -#include #ifndef MAX_HWIFS # ifdef CONFIG_BLK_DEV_IDEPCI diff -puN include/asm-i386/io_apic.h~git-hdrcleanup include/asm-i386/io_apic.h --- devel/include/asm-i386/io_apic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/io_apic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_IO_APIC_H #define __ASM_IO_APIC_H -#include #include #include diff -puN include/asm-i386/io.h~git-hdrcleanup include/asm-i386/io.h --- devel/include/asm-i386/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#include #include #include diff -puN include/asm-i386/irq.h~git-hdrcleanup include/asm-i386/irq.h --- devel/include/asm-i386/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ * */ -#include #include /* include comes from machine specific directory */ #include "irq_vectors.h" diff -puN include/asm-i386/kmap_types.h~git-hdrcleanup include/asm-i386/kmap_types.h --- devel/include/asm-i386/kmap_types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/kmap_types.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_KMAP_TYPES_H #define _ASM_KMAP_TYPES_H -#include #ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , diff -puN include/asm-i386/mach-summit/mach_apic.h~git-hdrcleanup include/asm-i386/mach-summit/mach_apic.h --- devel/include/asm-i386/mach-summit/mach_apic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/mach-summit/mach_apic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_MACH_APIC_H #define __ASM_MACH_APIC_H -#include #include #define esr_disable (1) diff -puN include/asm-i386/mmu_context.h~git-hdrcleanup include/asm-i386/mmu_context.h --- devel/include/asm-i386/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __I386_SCHED_H #define __I386_SCHED_H -#include #include #include #include diff -puN include/asm-i386/mtrr.h~git-hdrcleanup include/asm-i386/mtrr.h --- devel/include/asm-i386/mtrr.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/mtrr.h 2006-05-14 02:02:38.000000000 -0700 @@ -23,7 +23,6 @@ #ifndef _LINUX_MTRR_H #define _LINUX_MTRR_H -#include #include #include diff -puN include/asm-i386/page.h~git-hdrcleanup include/asm-i386/page.h --- devel/include/asm-i386/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifdef __KERNEL__ #ifndef __ASSEMBLY__ -#include #ifdef CONFIG_X86_USE_3DNOW @@ -137,9 +136,9 @@ extern int page_is_ram(unsigned long pag ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ - #include #include +#endif /* __KERNEL__ */ + #endif /* _I386_PAGE_H */ diff -puN include/asm-i386/param.h~git-hdrcleanup include/asm-i386/param.h --- devel/include/asm-i386/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASMi386_PARAM_H #ifdef __KERNEL__ -# include # define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ diff -puN include/asm-i386/pci.h~git-hdrcleanup include/asm-i386/pci.h --- devel/include/asm-i386/pci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/pci.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __i386_PCI_H #define __i386_PCI_H -#include #ifdef __KERNEL__ #include /* for struct page */ diff -puN include/asm-i386/pgalloc.h~git-hdrcleanup include/asm-i386/pgalloc.h --- devel/include/asm-i386/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _I386_PGALLOC_H #define _I386_PGALLOC_H -#include #include #include #include /* for struct page */ diff -puN include/asm-i386/pgtable.h~git-hdrcleanup include/asm-i386/pgtable.h --- devel/include/asm-i386/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _I386_PGTABLE_H #define _I386_PGTABLE_H -#include /* * The Linux memory management assumes a three-level page table setup. On diff -puN include/asm-i386/processor.h~git-hdrcleanup include/asm-i386/processor.h --- devel/include/asm-i386/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff -puN include/asm-i386/serial.h~git-hdrcleanup include/asm-i386/serial.h --- devel/include/asm-i386/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ * include/asm-i386/serial.h */ -#include /* * This assumes you have a 1.8432 MHz clock for your UART. diff -puN include/asm-i386/smp.h~git-hdrcleanup include/asm-i386/smp.h --- devel/include/asm-i386/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * We need the APIC definitions automatically as part of 'smp.h' */ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-i386/spinlock.h~git-hdrcleanup include/asm-i386/spinlock.h --- devel/include/asm-i386/spinlock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/spinlock.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #include #include #include -#include #include /* diff -puN include/asm-i386/string.h~git-hdrcleanup include/asm-i386/string.h --- devel/include/asm-i386/string.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/string.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _I386_STRING_H_ #ifdef __KERNEL__ -#include /* * On a 486 or Pentium, we are better off not using the * byte string operations. But on a 386 or a PPro the diff -puN include/asm-i386/system.h~git-hdrcleanup include/asm-i386/system.h --- devel/include/asm-i386/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SYSTEM_H #define __ASM_SYSTEM_H -#include #include #include #include diff -puN include/asm-i386/thread_info.h~git-hdrcleanup include/asm-i386/thread_info.h --- devel/include/asm-i386/thread_info.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/thread_info.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifdef __KERNEL__ -#include #include #include diff -puN include/asm-i386/timex.h~git-hdrcleanup include/asm-i386/timex.h --- devel/include/asm-i386/timex.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/timex.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef _ASMi386_TIMEX_H #define _ASMi386_TIMEX_H -#include #include #ifdef CONFIG_X86_ELAN diff -puN include/asm-i386/tlbflush.h~git-hdrcleanup include/asm-i386/tlbflush.h --- devel/include/asm-i386/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _I386_TLBFLUSH_H #define _I386_TLBFLUSH_H -#include #include #include diff -puN include/asm-i386/types.h~git-hdrcleanup include/asm-i386/types.h --- devel/include/asm-i386/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -35,7 +35,6 @@ typedef unsigned long long __u64; #ifndef __ASSEMBLY__ -#include typedef signed char s8; typedef unsigned char u8; diff -puN include/asm-i386/uaccess.h~git-hdrcleanup include/asm-i386/uaccess.h --- devel/include/asm-i386/uaccess.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/uaccess.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ /* * User space memory access functions */ -#include #include #include #include diff -puN include/asm-i386/unistd.h~git-hdrcleanup include/asm-i386/unistd.h --- devel/include/asm-i386/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-i386/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -323,6 +323,8 @@ #define __NR_tee 315 #define __NR_vmsplice 316 +#ifdef __KERNEL__ + #define NR_syscalls 317 /* @@ -422,7 +424,6 @@ __asm__ volatile ("push %%ebp ; push %%e __syscall_return(type,__res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -446,7 +447,6 @@ __syscall_return(type,__res); \ #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_RT_SIGSUSPEND -#endif #ifdef __KERNEL_SYSCALLS__ @@ -485,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -497,4 +497,5 @@ asmlinkage long sys_rt_sigaction(int sig #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") #endif +#endif /* __KERNEL__ */ #endif /* _ASM_I386_UNISTD_H_ */ diff -puN include/asm-ia64/asmmacro.h~git-hdrcleanup include/asm-ia64/asmmacro.h --- devel/include/asm-ia64/asmmacro.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/asmmacro.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * David Mosberger-Tang */ -#include #define ENTRY(name) \ .align 32; \ diff -puN include/asm-ia64/cache.h~git-hdrcleanup include/asm-ia64/cache.h --- devel/include/asm-ia64/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_IA64_CACHE_H #define _ASM_IA64_CACHE_H -#include /* * Copyright (C) 1998-2000 Hewlett-Packard Co diff -puN include/asm-ia64/delay.h~git-hdrcleanup include/asm-ia64/delay.h --- devel/include/asm-ia64/delay.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/delay.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * Copyright (C) 1999 Don Dugger */ -#include #include #include #include diff -puN include/asm-ia64/dma.h~git-hdrcleanup include/asm-ia64/dma.h --- devel/include/asm-ia64/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * David Mosberger-Tang */ -#include #include /* need byte IO */ diff -puN include/asm-ia64/dma-mapping.h~git-hdrcleanup include/asm-ia64/dma-mapping.h --- devel/include/asm-ia64/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * Copyright (C) 2003-2004 Hewlett-Packard Co * David Mosberger-Tang */ -#include #include #define dma_alloc_coherent platform_dma_alloc_coherent diff -puN include/asm-ia64/elf.h~git-hdrcleanup include/asm-ia64/elf.h --- devel/include/asm-ia64/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ * David Mosberger-Tang */ -#include #include #include diff -puN include/asm-ia64/hardirq.h~git-hdrcleanup include/asm-ia64/hardirq.h --- devel/include/asm-ia64/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * David Mosberger-Tang */ -#include #include #include diff -puN include/asm-ia64/ia32.h~git-hdrcleanup include/asm-ia64/ia32.h --- devel/include/asm-ia64/ia32.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/ia32.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_IA64_IA32_H #define _ASM_IA64_IA32_H -#include #include #include diff -puN include/asm-ia64/ide.h~git-hdrcleanup include/asm-ia64/ide.h --- devel/include/asm-ia64/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifdef __KERNEL__ -#include #include diff -puN include/asm-ia64/intrinsics.h~git-hdrcleanup include/asm-ia64/intrinsics.h --- devel/include/asm-ia64/intrinsics.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/intrinsics.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ */ #ifndef __ASSEMBLY__ -#include /* include compiler specific intrinsics */ #include diff -puN include/asm-ia64/kmap_types.h~git-hdrcleanup include/asm-ia64/kmap_types.h --- devel/include/asm-ia64/kmap_types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/kmap_types.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_IA64_KMAP_TYPES_H #define _ASM_IA64_KMAP_TYPES_H -#include #ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , diff -puN include/asm-ia64/machvec.h~git-hdrcleanup include/asm-ia64/machvec.h --- devel/include/asm-ia64/machvec.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/machvec.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_IA64_MACHVEC_H #define _ASM_IA64_MACHVEC_H -#include #include /* forward declarations: */ diff -puN include/asm-ia64/meminit.h~git-hdrcleanup include/asm-ia64/meminit.h --- devel/include/asm-ia64/meminit.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/meminit.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ * for more details. */ -#include /* * Entries defined so far: diff -puN include/asm-ia64/nodedata.h~git-hdrcleanup include/asm-ia64/nodedata.h --- devel/include/asm-ia64/nodedata.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/nodedata.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_IA64_NODEDATA_H #define _ASM_IA64_NODEDATA_H -#include #include #include diff -puN include/asm-ia64/numa.h~git-hdrcleanup include/asm-ia64/numa.h --- devel/include/asm-ia64/numa.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/numa.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_IA64_NUMA_H #define _ASM_IA64_NUMA_H -#include #ifdef CONFIG_NUMA diff -puN include/asm-ia64/page.h~git-hdrcleanup include/asm-ia64/page.h --- devel/include/asm-ia64/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ * David Mosberger-Tang */ -#include #include #include diff -puN include/asm-ia64/param.h~git-hdrcleanup include/asm-ia64/param.h --- devel/include/asm-ia64/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -19,7 +19,6 @@ #define MAXHOSTNAMELEN 64 /* max length of hostname */ #ifdef __KERNEL__ -# include /* mustn't include outside of #ifdef __KERNEL__ */ # ifdef CONFIG_IA64_HP_SIM /* * Yeah, simulating stuff is slow, so let us catch some breath between diff -puN include/asm-ia64/percpu.h~git-hdrcleanup include/asm-ia64/percpu.h --- devel/include/asm-ia64/percpu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/percpu.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ # define THIS_CPU(var) (per_cpu__##var) /* use this to mark accesses to per-CPU variables... */ #else /* !__ASSEMBLY__ */ -#include #include diff -puN include/asm-ia64/pgalloc.h~git-hdrcleanup include/asm-ia64/pgalloc.h --- devel/include/asm-ia64/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ * Copyright (C) 2000, Goutham Rao */ -#include #include #include diff -puN include/asm-ia64/pgtable.h~git-hdrcleanup include/asm-ia64/pgtable.h --- devel/include/asm-ia64/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * David Mosberger-Tang */ -#include #include #include diff -puN include/asm-ia64/processor.h~git-hdrcleanup include/asm-ia64/processor.h --- devel/include/asm-ia64/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ * 06/16/00 A. Mallick added csd/ssd/tssd for ia32 support */ -#include #include #include diff -puN include/asm-ia64/ptrace.h~git-hdrcleanup include/asm-ia64/ptrace.h --- devel/include/asm-ia64/ptrace.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/ptrace.h 2006-05-14 02:02:38.000000000 -0700 @@ -54,7 +54,6 @@ * This is because ar.ec is saved as part of ar.pfs. */ -#include #include #ifndef ASM_OFFSETS_C diff -puN include/asm-ia64/smp.h~git-hdrcleanup include/asm-ia64/smp.h --- devel/include/asm-ia64/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_IA64_SMP_H #define _ASM_IA64_SMP_H -#include #include #include #include diff -puN include/asm-ia64/sn/simulator.h~git-hdrcleanup include/asm-ia64/sn/simulator.h --- devel/include/asm-ia64/sn/simulator.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/sn/simulator.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_IA64_SN_SIMULATOR_H #define _ASM_IA64_SN_SIMULATOR_H -#include #define SNMAGIC 0xaeeeeeee8badbeefL #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) diff -puN include/asm-ia64/sn/sn_cpuid.h~git-hdrcleanup include/asm-ia64/sn/sn_cpuid.h --- devel/include/asm-ia64/sn/sn_cpuid.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/sn/sn_cpuid.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_IA64_SN_SN_CPUID_H #define _ASM_IA64_SN_SN_CPUID_H -#include #include #include #include diff -puN include/asm-ia64/sn/sn_sal.h~git-hdrcleanup include/asm-ia64/sn/sn_sal.h --- devel/include/asm-ia64/sn/sn_sal.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/sn/sn_sal.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ */ -#include #include #include #include diff -puN include/asm-ia64/sn/xpc.h~git-hdrcleanup include/asm-ia64/sn/xpc.h --- devel/include/asm-ia64/sn/xpc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/sn/xpc.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #define _ASM_IA64_SN_XPC_H -#include #include #include #include diff -puN include/asm-ia64/string.h~git-hdrcleanup include/asm-ia64/string.h --- devel/include/asm-ia64/string.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/string.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * David Mosberger-Tang */ -#include /* remove this once we remove the A-step workaround... */ #define __HAVE_ARCH_STRLEN 1 /* see arch/ia64/lib/strlen.S */ #define __HAVE_ARCH_MEMSET 1 /* see arch/ia64/lib/memset.S */ diff -puN include/asm-ia64/system.h~git-hdrcleanup include/asm-ia64/system.h --- devel/include/asm-ia64/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * Copyright (C) 1999 Asit Mallick * Copyright (C) 1999 Don Dugger */ -#include #include #include diff -puN include/asm-ia64/tlbflush.h~git-hdrcleanup include/asm-ia64/tlbflush.h --- devel/include/asm-ia64/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * David Mosberger-Tang */ -#include #include diff -puN include/asm-ia64/tlb.h~git-hdrcleanup include/asm-ia64/tlb.h --- devel/include/asm-ia64/tlb.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/tlb.h 2006-05-14 02:02:38.000000000 -0700 @@ -37,7 +37,6 @@ * } * tlb_finish_mmu(tlb, start, end); // finish unmap for address space MM */ -#include #include #include #include diff -puN include/asm-ia64/unistd.h~git-hdrcleanup include/asm-ia64/unistd.h --- devel/include/asm-ia64/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ia64/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -294,7 +294,6 @@ #ifdef __KERNEL__ -#include #define NR_syscalls 279 /* length of syscall table */ diff -puN include/asm-m32r/assembler.h~git-hdrcleanup include/asm-m32r/assembler.h --- devel/include/asm-m32r/assembler.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/assembler.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * This file contains M32R architecture specific macro definitions. */ -#include #ifndef __STR #ifdef __ASSEMBLY__ diff -puN include/asm-m32r/atomic.h~git-hdrcleanup include/asm-m32r/atomic.h --- devel/include/asm-m32r/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * Copyright (C) 2004 Hirokazu Takata */ -#include #include #include diff -puN include/asm-m32r/bitops.h~git-hdrcleanup include/asm-m32r/bitops.h --- devel/include/asm-m32r/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ * Copyright (C) 2004 Hirokazu Takata */ -#include #include #include #include diff -puN include/asm-m32r/cacheflush.h~git-hdrcleanup include/asm-m32r/cacheflush.h --- devel/include/asm-m32r/cacheflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/cacheflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_M32R_CACHEFLUSH_H #define _ASM_M32R_CACHEFLUSH_H -#include #include extern void _flush_cache_all(void); diff -puN include/asm-m32r/hardirq.h~git-hdrcleanup include/asm-m32r/hardirq.h --- devel/include/asm-m32r/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include #include #include diff -puN include/asm-m32r/ide.h~git-hdrcleanup include/asm-m32r/ide.h --- devel/include/asm-m32r/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifdef __KERNEL__ -#include #ifndef MAX_HWIFS # ifdef CONFIG_BLK_DEV_IDEPCI diff -puN include/asm-m32r/irq.h~git-hdrcleanup include/asm-m32r/irq.h --- devel/include/asm-m32r/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _ASM_M32R_IRQ_H #define _ASM_M32R_IRQ_H -#include #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_USRV) /* diff -puN include/asm-m32r/kmap_types.h~git-hdrcleanup include/asm-m32r/kmap_types.h --- devel/include/asm-m32r/kmap_types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/kmap_types.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ /* Dummy header just to define km_type. */ -#include #ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , diff -puN include/asm-m32r/m32104ut/m32104ut_pld.h~git-hdrcleanup include/asm-m32r/m32104ut/m32104ut_pld.h --- devel/include/asm-m32r/m32104ut/m32104ut_pld.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/m32104ut/m32104ut_pld.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _M32104UT_M32104UT_PLD_H #define _M32104UT_M32104UT_PLD_H -#include #if defined(CONFIG_PLAT_M32104UT) #define PLD_PLAT_BASE 0x02c00000 diff -puN include/asm-m32r/m32700ut/m32700ut_lan.h~git-hdrcleanup include/asm-m32r/m32700ut/m32700ut_lan.h --- devel/include/asm-m32r/m32700ut/m32700ut_lan.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/m32700ut/m32700ut_lan.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _M32700UT_M32700UT_LAN_H #define _M32700UT_M32700UT_LAN_H -#include #ifndef __ASSEMBLY__ /* diff -puN include/asm-m32r/m32700ut/m32700ut_lcd.h~git-hdrcleanup include/asm-m32r/m32700ut/m32700ut_lcd.h --- devel/include/asm-m32r/m32700ut/m32700ut_lcd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/m32700ut/m32700ut_lcd.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _M32700UT_M32700UT_LCD_H #define _M32700UT_M32700UT_LCD_H -#include #ifndef __ASSEMBLY__ /* diff -puN include/asm-m32r/m32700ut/m32700ut_pld.h~git-hdrcleanup include/asm-m32r/m32700ut/m32700ut_pld.h --- devel/include/asm-m32r/m32700ut/m32700ut_pld.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/m32700ut/m32700ut_pld.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _M32700UT_M32700UT_PLD_H #define _M32700UT_M32700UT_PLD_H -#include #if defined(CONFIG_PLAT_M32700UT_Alpha) #define PLD_PLAT_BASE 0x08c00000 diff -puN include/asm-m32r/m32r.h~git-hdrcleanup include/asm-m32r/m32r.h --- devel/include/asm-m32r/m32r.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/m32r.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ * Copyright (C) 2003, 2004 Renesas Technology Corp. */ -#include /* Chip type */ #if defined(CONFIG_CHIP_XNUX_MP) || defined(CONFIG_CHIP_XNUX2_MP) diff -puN include/asm-m32r/mmu_context.h~git-hdrcleanup include/asm-m32r/mmu_context.h --- devel/include/asm-m32r/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #include @@ -15,7 +14,6 @@ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-m32r/mmu.h~git-hdrcleanup include/asm-m32r/mmu.h --- devel/include/asm-m32r/mmu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/mmu.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_M32R_MMU_H #define _ASM_M32R_MMU_H -#include #if !defined(CONFIG_MMU) typedef struct { diff -puN include/asm-m32r/opsput/opsput_lan.h~git-hdrcleanup include/asm-m32r/opsput/opsput_lan.h --- devel/include/asm-m32r/opsput/opsput_lan.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/opsput/opsput_lan.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _OPSPUT_OPSPUT_LAN_H #define _OPSPUT_OPSPUT_LAN_H -#include #ifndef __ASSEMBLY__ /* diff -puN include/asm-m32r/opsput/opsput_lcd.h~git-hdrcleanup include/asm-m32r/opsput/opsput_lcd.h --- devel/include/asm-m32r/opsput/opsput_lcd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/opsput/opsput_lcd.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _OPSPUT_OPSPUT_LCD_H #define _OPSPUT_OPSPUT_LCD_H -#include #ifndef __ASSEMBLY__ /* diff -puN include/asm-m32r/opsput/opsput_pld.h~git-hdrcleanup include/asm-m32r/opsput/opsput_pld.h --- devel/include/asm-m32r/opsput/opsput_pld.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/opsput/opsput_pld.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _OPSPUT_OPSPUT_PLD_H #define _OPSPUT_OPSPUT_PLD_H -#include #define PLD_PLAT_BASE 0x1cc00000 diff -puN include/asm-m32r/page.h~git-hdrcleanup include/asm-m32r/page.h --- devel/include/asm-m32r/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_M32R_PAGE_H #define _ASM_M32R_PAGE_H -#include /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 diff -puN include/asm-m32r/pgalloc.h~git-hdrcleanup include/asm-m32r/pgalloc.h --- devel/include/asm-m32r/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ /* $Id$ */ -#include #include #include diff -puN include/asm-m32r/pgtable-2level.h~git-hdrcleanup include/asm-m32r/pgtable-2level.h --- devel/include/asm-m32r/pgtable-2level.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/pgtable-2level.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include /* * traditional M32R two-level paging structure: diff -puN include/asm-m32r/pgtable.h~git-hdrcleanup include/asm-m32r/pgtable.h --- devel/include/asm-m32r/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -20,7 +20,6 @@ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-m32r/processor.h~git-hdrcleanup include/asm-m32r/processor.h --- devel/include/asm-m32r/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ */ #include -#include #include #include /* pt_regs */ diff -puN include/asm-m32r/ptrace.h~git-hdrcleanup include/asm-m32r/ptrace.h --- devel/include/asm-m32r/ptrace.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/ptrace.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * Copyright (C) 2001-2002, 2004 Hirokazu Takata */ -#include #include /* M32R_PSW_BSM, M32R_PSW_BPM */ /* 0 - 13 are integer registers (general purpose registers). */ diff -puN include/asm-m32r/rtc.h~git-hdrcleanup include/asm-m32r/rtc.h --- devel/include/asm-m32r/rtc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/rtc.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #define __RTC_H__ -#include /* Dallas DS1302 clock/calendar register numbers. */ # define RTC_SECONDS 0 diff -puN include/asm-m32r/semaphore.h~git-hdrcleanup include/asm-m32r/semaphore.h --- devel/include/asm-m32r/semaphore.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/semaphore.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * Copyright (C) 2004, 2006 Hirokazu Takata */ -#include #include #include #include diff -puN include/asm-m32r/serial.h~git-hdrcleanup include/asm-m32r/serial.h --- devel/include/asm-m32r/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ /* include/asm-m32r/serial.h */ -#include #define BASE_BAUD 115200 diff -puN include/asm-m32r/sigcontext.h~git-hdrcleanup include/asm-m32r/sigcontext.h --- devel/include/asm-m32r/sigcontext.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/sigcontext.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ /* $Id$ */ -#include struct sigcontext { /* CPU registers */ diff -puN include/asm-m32r/smp.h~git-hdrcleanup include/asm-m32r/smp.h --- devel/include/asm-m32r/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ /* $Id$ */ -#include #ifdef CONFIG_SMP #ifndef __ASSEMBLY__ diff -puN include/asm-m32r/spinlock.h~git-hdrcleanup include/asm-m32r/spinlock.h --- devel/include/asm-m32r/spinlock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/spinlock.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * Copyright (C) 2004 Hirokazu Takata */ -#include /* CONFIG_DEBUG_SPINLOCK, CONFIG_SMP */ #include #include #include diff -puN include/asm-m32r/system.h~git-hdrcleanup include/asm-m32r/system.h --- devel/include/asm-m32r/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ * Copyright (C) 2004, 2006 Hirokazu Takata */ -#include #include #ifdef __KERNEL__ diff -puN include/asm-m32r/timex.h~git-hdrcleanup include/asm-m32r/timex.h --- devel/include/asm-m32r/timex.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/timex.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * m32r architecture timex specifications */ -#include #define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE) #define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ diff -puN include/asm-m32r/tlbflush.h~git-hdrcleanup include/asm-m32r/tlbflush.h --- devel/include/asm-m32r/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_M32R_TLBFLUSH_H #define _ASM_M32R_TLBFLUSH_H -#include #include /* diff -puN include/asm-m32r/uaccess.h~git-hdrcleanup include/asm-m32r/uaccess.h --- devel/include/asm-m32r/uaccess.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/uaccess.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ /* * User space memory access functions */ -#include #include #include #include diff -puN include/asm-m32r/unistd.h~git-hdrcleanup include/asm-m32r/unistd.h --- devel/include/asm-m32r/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m32r/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -295,6 +295,8 @@ #define __NR_kexec_load 283 #define __NR_waitid 284 +#ifdef __KERNEL__ + #define NR_syscalls 285 /* user-visible error numbers are in the range -1 - -124: see @@ -405,7 +407,6 @@ __asm__ __volatile__ (\ __syscall_return(type,__res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_ALARM @@ -421,7 +422,6 @@ __syscall_return(type,__res); \ #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/ #define __ARCH_WANT_SYS_OLDUMOUNT #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -470,4 +470,5 @@ asmlinkage long sys_rt_sigaction(int sig #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") #endif +#endif /* __KERNEL__ */ #endif /* _ASM_M32R_UNISTD_H */ diff -puN include/asm-m68k/atomic.h~git-hdrcleanup include/asm-m68k/atomic.h --- devel/include/asm-m68k/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ARCH_M68K_ATOMIC__ #define __ARCH_M68K_ATOMIC__ -#include #include /* local_irq_XXX() */ diff -puN include/asm-m68k/bug.h~git-hdrcleanup include/asm-m68k/bug.h --- devel/include/asm-m68k/bug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/bug.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_BUG_H #define _M68K_BUG_H -#include #ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE diff -puN include/asm-m68k/dma.h~git-hdrcleanup include/asm-m68k/dma.h --- devel/include/asm-m68k/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_DMA_H #define _M68K_DMA_H 1 -#include /* it's useless on the m68k, but unfortunately needed by the new bootmem allocator (but this should do it for this) */ diff -puN include/asm-m68k/dma-mapping.h~git-hdrcleanup include/asm-m68k/dma-mapping.h --- devel/include/asm-m68k/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_DMA_MAPPING_H #define _M68K_DMA_MAPPING_H -#include #ifdef CONFIG_PCI #include diff -puN include/asm-m68k/dvma.h~git-hdrcleanup include/asm-m68k/dvma.h --- devel/include/asm-m68k/dvma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/dvma.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __M68K_DVMA_H #define __M68K_DVMA_H -#include #define DVMA_PAGE_SHIFT 13 #define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT) diff -puN include/asm-m68k/elf.h~git-hdrcleanup include/asm-m68k/elf.h --- devel/include/asm-m68k/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * ELF register definitions.. */ -#include #include #include diff -puN include/asm-m68k/entry.h~git-hdrcleanup include/asm-m68k/entry.h --- devel/include/asm-m68k/entry.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/entry.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68K_ENTRY_H #define __M68K_ENTRY_H -#include #include #include diff -puN include/asm-m68k/fpu.h~git-hdrcleanup include/asm-m68k/fpu.h --- devel/include/asm-m68k/fpu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/fpu.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68K_FPU_H #define __M68K_FPU_H -#include /* * MAX floating point unit state size (FSAVE/FRESTORE) diff -puN include/asm-m68k/hardirq.h~git-hdrcleanup include/asm-m68k/hardirq.h --- devel/include/asm-m68k/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68K_HARDIRQ_H #define __M68K_HARDIRQ_H -#include #include #include diff -puN include/asm-m68k/ide.h~git-hdrcleanup include/asm-m68k/ide.h --- devel/include/asm-m68k/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -31,7 +31,6 @@ #ifdef __KERNEL__ -#include #include #include diff -puN include/asm-m68k/io.h~git-hdrcleanup include/asm-m68k/io.h --- devel/include/asm-m68k/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -23,7 +23,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-m68k/irq.h~git-hdrcleanup include/asm-m68k/irq.h --- devel/include/asm-m68k/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_IRQ_H_ #define _M68K_IRQ_H_ -#include #include /* diff -puN include/asm-m68k/mc146818rtc.h~git-hdrcleanup include/asm-m68k/mc146818rtc.h --- devel/include/asm-m68k/mc146818rtc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/mc146818rtc.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #ifndef _ASM_MC146818RTC_H #define _ASM_MC146818RTC_H -#include #ifdef CONFIG_ATARI /* RTC in Atari machines */ diff -puN include/asm-m68k/mmu_context.h~git-hdrcleanup include/asm-m68k/mmu_context.h --- devel/include/asm-m68k/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68K_MMU_CONTEXT_H #define __M68K_MMU_CONTEXT_H -#include static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) { diff -puN include/asm-m68k/motorola_pgtable.h~git-hdrcleanup include/asm-m68k/motorola_pgtable.h --- devel/include/asm-m68k/motorola_pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/motorola_pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _MOTOROLA_PGTABLE_H #define _MOTOROLA_PGTABLE_H -#include /* * Definitions for MMU descriptors diff -puN include/asm-m68knommu/bitops.h~git-hdrcleanup include/asm-m68knommu/bitops.h --- devel/include/asm-m68knommu/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * Copyright 1992, Linus Torvalds. */ -#include #include #include /* swab32 */ #include /* save_flags */ diff -puN include/asm-m68knommu/coldfire.h~git-hdrcleanup include/asm-m68knommu/coldfire.h --- devel/include/asm-m68knommu/coldfire.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/coldfire.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define coldfire_h /****************************************************************************/ -#include /* * Define the processor support peripherals base address. diff -puN include/asm-m68knommu/commproc.h~git-hdrcleanup include/asm-m68knommu/commproc.h --- devel/include/asm-m68knommu/commproc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/commproc.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __CPM_360__ #define __CPM_360__ -#include /* CPM Command register masks: */ #define CPM_CR_RST ((ushort)0x8000) diff -puN include/asm-m68knommu/dma.h~git-hdrcleanup include/asm-m68knommu/dma.h --- devel/include/asm-m68knommu/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ //#define DMA_DEBUG 1 -#include #ifdef CONFIG_COLDFIRE /* diff -puN include/asm-m68knommu/dma-mapping.h~git-hdrcleanup include/asm-m68knommu/dma-mapping.h --- devel/include/asm-m68knommu/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68KNOMMU_DMA_MAPPING_H #define _M68KNOMMU_DMA_MAPPING_H -#include #ifdef CONFIG_PCI #include diff -puN include/asm-m68knommu/elf.h~git-hdrcleanup include/asm-m68knommu/elf.h --- devel/include/asm-m68knommu/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * ELF register definitions.. */ -#include #include #include diff -puN include/asm-m68knommu/elia.h~git-hdrcleanup include/asm-m68knommu/elia.h --- devel/include/asm-m68knommu/elia.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/elia.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define elia_h /****************************************************************************/ -#include #include #ifdef CONFIG_eLIA diff -puN include/asm-m68knommu/entry.h~git-hdrcleanup include/asm-m68knommu/entry.h --- devel/include/asm-m68knommu/entry.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/entry.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68KNOMMU_ENTRY_H #define __M68KNOMMU_ENTRY_H -#include #include #include diff -puN include/asm-m68knommu/fpu.h~git-hdrcleanup include/asm-m68knommu/fpu.h --- devel/include/asm-m68knommu/fpu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/fpu.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68KNOMMU_FPU_H #define __M68KNOMMU_FPU_H -#include /* * MAX floating point unit state size (FSAVE/FRESTORE) diff -puN include/asm-m68knommu/hardirq.h~git-hdrcleanup include/asm-m68knommu/hardirq.h --- devel/include/asm-m68knommu/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68K_HARDIRQ_H #define __M68K_HARDIRQ_H -#include #include #include #include diff -puN include/asm-m68knommu/io.h~git-hdrcleanup include/asm-m68knommu/io.h --- devel/include/asm-m68knommu/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include /* * These are for ISA/PCI shared memory _only_ and should never be used diff -puN include/asm-m68knommu/irq.h~git-hdrcleanup include/asm-m68knommu/irq.h --- devel/include/asm-m68knommu/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_IRQ_H_ #define _M68K_IRQ_H_ -#include #include #ifdef CONFIG_COLDFIRE diff -puN include/asm-m68knommu/m5206sim.h~git-hdrcleanup include/asm-m68knommu/m5206sim.h --- devel/include/asm-m68knommu/m5206sim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/m5206sim.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define m5206sim_h /****************************************************************************/ -#include /* * Define the 5206 SIM register set addresses. diff -puN include/asm-m68knommu/m520xsim.h~git-hdrcleanup include/asm-m68knommu/m520xsim.h --- devel/include/asm-m68knommu/m520xsim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/m520xsim.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define m520xsim_h /****************************************************************************/ -#include /* * Define the 5282 SIM register set addresses. diff -puN include/asm-m68knommu/m523xsim.h~git-hdrcleanup include/asm-m68knommu/m523xsim.h --- devel/include/asm-m68knommu/m523xsim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/m523xsim.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define m523xsim_h /****************************************************************************/ -#include /* * Define the 523x SIM register set addresses. diff -puN include/asm-m68knommu/m5272sim.h~git-hdrcleanup include/asm-m68knommu/m5272sim.h --- devel/include/asm-m68knommu/m5272sim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/m5272sim.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define m5272sim_h /****************************************************************************/ -#include /* * Define the 5272 SIM register set addresses. diff -puN include/asm-m68knommu/m527xsim.h~git-hdrcleanup include/asm-m68knommu/m527xsim.h --- devel/include/asm-m68knommu/m527xsim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/m527xsim.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define m527xsim_h /****************************************************************************/ -#include /* * Define the 5270/5271 SIM register set addresses. diff -puN include/asm-m68knommu/m528xsim.h~git-hdrcleanup include/asm-m68knommu/m528xsim.h --- devel/include/asm-m68knommu/m528xsim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/m528xsim.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define m528xsim_h /****************************************************************************/ -#include /* * Define the 5280/5282 SIM register set addresses. diff -puN include/asm-m68knommu/mcfcache.h~git-hdrcleanup include/asm-m68knommu/mcfcache.h --- devel/include/asm-m68knommu/mcfcache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfcache.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define __M68KNOMMU_MCFCACHE_H /****************************************************************************/ -#include /* * The different ColdFire families have different cache arrangments. diff -puN include/asm-m68knommu/mcfdma.h~git-hdrcleanup include/asm-m68knommu/mcfdma.h --- devel/include/asm-m68knommu/mcfdma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfdma.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define mcfdma_h /****************************************************************************/ -#include /* * Get address specific defines for this Coldfire member. diff -puN include/asm-m68knommu/mcfmbus.h~git-hdrcleanup include/asm-m68knommu/mcfmbus.h --- devel/include/asm-m68knommu/mcfmbus.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfmbus.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef mcfmbus_h #define mcfmbus_h -#include #define MCFMBUS_BASE 0x280 diff -puN include/asm-m68knommu/mcfne.h~git-hdrcleanup include/asm-m68knommu/mcfne.h --- devel/include/asm-m68knommu/mcfne.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfne.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ #define mcfne_h /****************************************************************************/ -#include /* * Support for NE2000 clones devices in ColdFire based boards. diff -puN include/asm-m68knommu/mcfpci.h~git-hdrcleanup include/asm-m68knommu/mcfpci.h --- devel/include/asm-m68knommu/mcfpci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfpci.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define mcfpci_h /****************************************************************************/ -#include #ifdef CONFIG_PCI diff -puN include/asm-m68knommu/mcfpit.h~git-hdrcleanup include/asm-m68knommu/mcfpit.h --- devel/include/asm-m68knommu/mcfpit.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfpit.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define mcfpit_h /****************************************************************************/ -#include /* * Get address specific defines for the 5270/5271, 5280/5282, and 5208. diff -puN include/asm-m68knommu/mcfsim.h~git-hdrcleanup include/asm-m68knommu/mcfsim.h --- devel/include/asm-m68knommu/mcfsim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfsim.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define mcfsim_h /****************************************************************************/ -#include /* * Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282, diff -puN include/asm-m68knommu/mcfsmc.h~git-hdrcleanup include/asm-m68knommu/mcfsmc.h --- devel/include/asm-m68knommu/mcfsmc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfsmc.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ * allow 8 bit accesses. So this code is 16bit access only. */ -#include #undef outb #undef inb diff -puN include/asm-m68knommu/mcftimer.h~git-hdrcleanup include/asm-m68knommu/mcftimer.h --- devel/include/asm-m68knommu/mcftimer.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcftimer.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define mcftimer_h /****************************************************************************/ -#include /* * Get address specific defines for this ColdFire member. diff -puN include/asm-m68knommu/mcfuart.h~git-hdrcleanup include/asm-m68knommu/mcfuart.h --- devel/include/asm-m68knommu/mcfuart.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfuart.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define mcfuart_h /****************************************************************************/ -#include /* * Define the base address of the UARTS within the MBAR address diff -puN include/asm-m68knommu/mcfwdebug.h~git-hdrcleanup include/asm-m68knommu/mcfwdebug.h --- devel/include/asm-m68knommu/mcfwdebug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mcfwdebug.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef mcfdebug_h #define mcfdebug_h /****************************************************************************/ -#include /* Define the debug module registers */ #define MCFDEBUG_CSR 0x0 /* Configuration status */ diff -puN include/asm-m68knommu/mmu_context.h~git-hdrcleanup include/asm-m68knommu/mmu_context.h --- devel/include/asm-m68knommu/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68KNOMMU_MMU_CONTEXT_H #define __M68KNOMMU_MMU_CONTEXT_H -#include #include #include #include diff -puN include/asm-m68knommu/nettel.h~git-hdrcleanup include/asm-m68knommu/nettel.h --- devel/include/asm-m68knommu/nettel.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/nettel.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #define nettel_h /****************************************************************************/ -#include /****************************************************************************/ #ifdef CONFIG_NETtel diff -puN include/asm-m68knommu/page.h~git-hdrcleanup include/asm-m68knommu/page.h --- devel/include/asm-m68knommu/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68KNOMMU_PAGE_H #define _M68KNOMMU_PAGE_H -#include /* PAGE_SHIFT determines the page size */ diff -puN include/asm-m68knommu/page_offset.h~git-hdrcleanup include/asm-m68knommu/page_offset.h --- devel/include/asm-m68knommu/page_offset.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/page_offset.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,5 +1,4 @@ -#include /* This handles the memory map.. */ diff -puN include/asm-m68knommu/param.h~git-hdrcleanup include/asm-m68knommu/param.h --- devel/include/asm-m68knommu/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68KNOMMU_PARAM_H #define _M68KNOMMU_PARAM_H -#include #if defined(CONFIG_CLEOPATRA) #define HZ 1000 diff -puN include/asm-m68knommu/pgtable.h~git-hdrcleanup include/asm-m68knommu/pgtable.h --- devel/include/asm-m68knommu/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ * (C) Copyright 2000-2002, Greg Ungerer */ -#include #include #include #include diff -puN include/asm-m68knommu/processor.h~git-hdrcleanup include/asm-m68knommu/processor.h --- devel/include/asm-m68knommu/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ */ #define current_text_addr() ({ __label__ _l; _l: &&_l;}) -#include #include #include #include diff -puN include/asm-m68knommu/semaphore-helper.h~git-hdrcleanup include/asm-m68knommu/semaphore-helper.h --- devel/include/asm-m68knommu/semaphore-helper.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/semaphore-helper.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * m68k version by Andreas Schwab */ -#include /* * These two _must_ execute atomically wrt each other. diff -puN include/asm-m68knommu/system.h~git-hdrcleanup include/asm-m68knommu/system.h --- devel/include/asm-m68knommu/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68KNOMMU_SYSTEM_H #define _M68KNOMMU_SYSTEM_H -#include /* get configuration macros */ #include #include #include diff -puN include/asm-m68knommu/unaligned.h~git-hdrcleanup include/asm-m68knommu/unaligned.h --- devel/include/asm-m68knommu/unaligned.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/unaligned.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __M68K_UNALIGNED_H #define __M68K_UNALIGNED_H -#include #ifdef CONFIG_COLDFIRE diff -puN include/asm-m68knommu/unistd.h~git-hdrcleanup include/asm-m68knommu/unistd.h --- devel/include/asm-m68knommu/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68knommu/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -286,6 +286,8 @@ #define __NR_request_key 280 #define __NR_keyctl 281 +#ifdef __KERNEL__ + #define NR_syscalls 282 /* user-visible error numbers are in the range -1 - -122: see @@ -437,7 +439,6 @@ type name(atype a, btype b, ctype c, dty return (type)__res; \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -460,7 +461,6 @@ type name(atype a, btype b, ctype c, dty #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -515,7 +515,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -525,4 +525,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _ASM_M68K_UNISTD_H_ */ diff -puN include/asm-m68k/openprom.h~git-hdrcleanup include/asm-m68k/openprom.h --- devel/include/asm-m68k/openprom.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/openprom.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) */ -#include /* Empirical constants... */ #ifdef CONFIG_SUN3 diff -puN include/asm-m68k/page.h~git-hdrcleanup include/asm-m68k/page.h --- devel/include/asm-m68k/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_PAGE_H #define _M68K_PAGE_H -#include /* PAGE_SHIFT determines the page size */ #ifndef CONFIG_SUN3 diff -puN include/asm-m68k/page_offset.h~git-hdrcleanup include/asm-m68k/page_offset.h --- devel/include/asm-m68k/page_offset.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/page_offset.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,4 +1,3 @@ -#include /* This handles the memory map.. */ #ifndef CONFIG_SUN3 diff -puN include/asm-m68k/pgalloc.h~git-hdrcleanup include/asm-m68k/pgalloc.h --- devel/include/asm-m68k/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef M68K_PGALLOC_H #define M68K_PGALLOC_H -#include #include #include #include diff -puN include/asm-m68k/pgtable.h~git-hdrcleanup include/asm-m68k/pgtable.h --- devel/include/asm-m68k/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #include -#include #include #ifndef __ASSEMBLY__ diff -puN include/asm-m68k/processor.h~git-hdrcleanup include/asm-m68k/processor.h --- devel/include/asm-m68k/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ */ #define current_text_addr() ({ __label__ _l; _l: &&_l;}) -#include #include #include #include diff -puN include/asm-m68k/semaphore-helper.h~git-hdrcleanup include/asm-m68k/semaphore-helper.h --- devel/include/asm-m68k/semaphore-helper.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/semaphore-helper.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * m68k version by Andreas Schwab */ -#include #include /* diff -puN include/asm-m68k/serial.h~git-hdrcleanup include/asm-m68k/serial.h --- devel/include/asm-m68k/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * */ -#include /* * This assumes you have a 1.8432 MHz clock for your UART. diff -puN include/asm-m68k/setup.h~git-hdrcleanup include/asm-m68k/setup.h --- devel/include/asm-m68k/setup.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/setup.h 2006-05-14 02:02:38.000000000 -0700 @@ -23,7 +23,6 @@ #ifndef _M68K_SETUP_H #define _M68K_SETUP_H -#include /* diff -puN include/asm-m68k/shm.h~git-hdrcleanup include/asm-m68k/shm.h --- devel/include/asm-m68k/shm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/shm.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_SHM_H #define _M68K_SHM_H -#include /* format of page table entries that correspond to shared memory pages currently out in swap space (see also mm/swap.c): diff -puN include/asm-m68k/system.h~git-hdrcleanup include/asm-m68k/system.h --- devel/include/asm-m68k/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_SYSTEM_H #define _M68K_SYSTEM_H -#include /* get configuration macros */ #include #include #include diff -puN include/asm-m68k/tlbflush.h~git-hdrcleanup include/asm-m68k/tlbflush.h --- devel/include/asm-m68k/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _M68K_TLBFLUSH_H #define _M68K_TLBFLUSH_H -#include #ifndef CONFIG_SUN3 diff -puN include/asm-m68k/unistd.h~git-hdrcleanup include/asm-m68k/unistd.h --- devel/include/asm-m68k/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -285,6 +285,8 @@ #define __NR_request_key 280 #define __NR_keyctl 281 +#ifdef __KERNEL__ + #define NR_syscalls 282 /* user-visible error numbers are in the range -1 - -124: see @@ -383,7 +385,6 @@ __asm__ __volatile__ ("trap #0" \ __syscall_return(type,__res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -406,7 +407,6 @@ __syscall_return(type,__res); \ #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -451,7 +451,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -461,4 +461,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _ASM_M68K_UNISTD_H_ */ diff -puN include/asm-m68k/virtconvert.h~git-hdrcleanup include/asm-m68k/virtconvert.h --- devel/include/asm-m68k/virtconvert.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-m68k/virtconvert.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-mips/addrspace.h~git-hdrcleanup include/asm-mips/addrspace.h --- devel/include/asm-mips/addrspace.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/addrspace.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_ADDRSPACE_H #define _ASM_ADDRSPACE_H -#include #include /* diff -puN include/asm-mips/a.out.h~git-hdrcleanup include/asm-mips/a.out.h --- devel/include/asm-mips/a.out.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/a.out.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifdef __KERNEL__ -#include #endif diff -puN include/asm-mips/arc/types.h~git-hdrcleanup include/asm-mips/arc/types.h --- devel/include/asm-mips/arc/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/arc/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_ARC_TYPES_H #define _ASM_ARC_TYPES_H -#include #ifdef CONFIG_ARC32 diff -puN include/asm-mips/asm.h~git-hdrcleanup include/asm-mips/asm.h --- devel/include/asm-mips/asm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/asm.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __ASM_ASM_H #define __ASM_ASM_H -#include #include #ifndef CAT diff -puN include/asm-mips/asmmacro.h~git-hdrcleanup include/asm-mips/asmmacro.h --- devel/include/asm-mips/asmmacro.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/asmmacro.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_ASMMACRO_H #define _ASM_ASMMACRO_H -#include #include #ifdef CONFIG_32BIT diff -puN include/asm-mips/atomic.h~git-hdrcleanup include/asm-mips/atomic.h --- devel/include/asm-mips/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ * we have to include outside the * main big wrapper ... */ -#include #include #ifndef _ASM_ATOMIC_H diff -puN include/asm-mips/bcache.h~git-hdrcleanup include/asm-mips/bcache.h --- devel/include/asm-mips/bcache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/bcache.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_BCACHE_H #define _ASM_BCACHE_H -#include /* Some R4000 / R4400 / R4600 / R5000 machines may have a non-dma-coherent, chipset implemented caches. On machines with other CPUs the CPU does the diff -puN include/asm-mips/bitops.h~git-hdrcleanup include/asm-mips/bitops.h --- devel/include/asm-mips/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_BITOPS_H #define _ASM_BITOPS_H -#include #include #include #include diff -puN include/asm-mips/bug.h~git-hdrcleanup include/asm-mips/bug.h --- devel/include/asm-mips/bug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/bug.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_BUG_H #define __ASM_BUG_H -#include #ifdef CONFIG_BUG diff -puN include/asm-mips/bugs.h~git-hdrcleanup include/asm-mips/bugs.h --- devel/include/asm-mips/bugs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/bugs.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _ASM_BUGS_H #define _ASM_BUGS_H -#include #include #include #include diff -puN include/asm-mips/byteorder.h~git-hdrcleanup include/asm-mips/byteorder.h --- devel/include/asm-mips/byteorder.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/byteorder.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_BYTEORDER_H #define _ASM_BYTEORDER_H -#include #include #include diff -puN include/asm-mips/cache.h~git-hdrcleanup include/asm-mips/cache.h --- devel/include/asm-mips/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_CACHE_H #define _ASM_CACHE_H -#include #include #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT diff -puN include/asm-mips/checksum.h~git-hdrcleanup include/asm-mips/checksum.h --- devel/include/asm-mips/checksum.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/checksum.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_CHECKSUM_H #define _ASM_CHECKSUM_H -#include #include #include diff -puN include/asm-mips/cpu-features.h~git-hdrcleanup include/asm-mips/cpu-features.h --- devel/include/asm-mips/cpu-features.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/cpu-features.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __ASM_CPU_FEATURES_H #define __ASM_CPU_FEATURES_H -#include #include #include diff -puN include/asm-mips/cpu-info.h~git-hdrcleanup include/asm-mips/cpu-info.h --- devel/include/asm-mips/cpu-info.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/cpu-info.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_CPU_INFO_H #define __ASM_CPU_INFO_H -#include #include #ifdef CONFIG_SGI_IP27 diff -puN include/asm-mips/ddb5xxx/ddb5477.h~git-hdrcleanup include/asm-mips/ddb5xxx/ddb5477.h --- devel/include/asm-mips/ddb5xxx/ddb5477.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/ddb5xxx/ddb5477.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __ASM_DDB5XXX_DDB5477_H #define __ASM_DDB5XXX_DDB5477_H -#include /* * This contains macros that are specific to DDB5477 or renamed from diff -puN include/asm-mips/ddb5xxx/ddb5xxx.h~git-hdrcleanup include/asm-mips/ddb5xxx/ddb5xxx.h --- devel/include/asm-mips/ddb5xxx/ddb5xxx.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/ddb5xxx/ddb5xxx.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef __ASM_DDB5XXX_DDB5XXX_H #define __ASM_DDB5XXX_DDB5XXX_H -#include #include /* diff -puN include/asm-mips/debug.h~git-hdrcleanup include/asm-mips/debug.h --- devel/include/asm-mips/debug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/debug.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _ASM_DEBUG_H #define _ASM_DEBUG_H -#include /* * run-time macros for catching spurious errors. Eable CONFIG_RUNTIME_DEBUG in diff -puN include/asm-mips/dec/prom.h~git-hdrcleanup include/asm-mips/dec/prom.h --- devel/include/asm-mips/dec/prom.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/dec/prom.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _ASM_DEC_PROM_H #define _ASM_DEC_PROM_H -#include #include #include diff -puN include/asm-mips/delay.h~git-hdrcleanup include/asm-mips/delay.h --- devel/include/asm-mips/delay.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/delay.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_DELAY_H #define _ASM_DELAY_H -#include #include #include #include diff -puN include/asm-mips/dma.h~git-hdrcleanup include/asm-mips/dma.h --- devel/include/asm-mips/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include #include /* need byte IO */ #include /* And spinlocks */ #include diff -puN include/asm-mips/elf.h~git-hdrcleanup include/asm-mips/elf.h --- devel/include/asm-mips/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_ELF_H #define _ASM_ELF_H -#include /* ELF header e_flags defines. */ /* MIPS architecture level. */ diff -puN include/asm-mips/fcntl.h~git-hdrcleanup include/asm-mips/fcntl.h --- devel/include/asm-mips/fcntl.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/fcntl.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_FCNTL_H #define _ASM_FCNTL_H -#include #define O_APPEND 0x0008 #define O_SYNC 0x0010 diff -puN include/asm-mips/fixmap.h~git-hdrcleanup include/asm-mips/fixmap.h --- devel/include/asm-mips/fixmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/fixmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include #include #ifdef CONFIG_HIGHMEM #include diff -puN include/asm-mips/fpu.h~git-hdrcleanup include/asm-mips/fpu.h --- devel/include/asm-mips/fpu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/fpu.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_FPU_H #define _ASM_FPU_H -#include #include #include diff -puN include/asm-mips/futex.h~git-hdrcleanup include/asm-mips/futex.h --- devel/include/asm-mips/futex.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/futex.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-mips/hazards.h~git-hdrcleanup include/asm-mips/hazards.h --- devel/include/asm-mips/hazards.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/hazards.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_HAZARDS_H #define _ASM_HAZARDS_H -#include #ifdef __ASSEMBLY__ diff -puN include/asm-mips/highmem.h~git-hdrcleanup include/asm-mips/highmem.h --- devel/include/asm-mips/highmem.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/highmem.h 2006-05-14 02:02:38.000000000 -0700 @@ -19,7 +19,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-mips/interrupt.h~git-hdrcleanup include/asm-mips/interrupt.h --- devel/include/asm-mips/interrupt.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/interrupt.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_INTERRUPT_H #define _ASM_INTERRUPT_H -#include #include __asm__ ( diff -puN include/asm-mips/io.h~git-hdrcleanup include/asm-mips/io.h --- devel/include/asm-mips/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#include #include #include #include diff -puN include/asm-mips/ip32/machine.h~git-hdrcleanup include/asm-mips/ip32/machine.h --- devel/include/asm-mips/ip32/machine.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/ip32/machine.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_IP32_MACHINE_H #define _ASM_IP32_MACHINE_H -#include #ifdef CONFIG_SGI_IP32 diff -puN include/asm-mips/irq.h~git-hdrcleanup include/asm-mips/irq.h --- devel/include/asm-mips/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_IRQ_H #define _ASM_IRQ_H -#include #include #include diff -puN include/asm-mips/isadep.h~git-hdrcleanup include/asm-mips/isadep.h --- devel/include/asm-mips/isadep.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/isadep.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * * Copyright (c) 1998 Harald Koerfgen */ -#include #ifndef __ASM_ISADEP_H #define __ASM_ISADEP_H diff -puN include/asm-mips/jmr3927/irq.h~git-hdrcleanup include/asm-mips/jmr3927/irq.h --- devel/include/asm-mips/jmr3927/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/jmr3927/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASSEMBLY__ -#include #include struct tb_irq_space { diff -puN include/asm-mips/kmap_types.h~git-hdrcleanup include/asm-mips/kmap_types.h --- devel/include/asm-mips/kmap_types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/kmap_types.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_KMAP_TYPES_H #define _ASM_KMAP_TYPES_H -#include #ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , diff -puN include/asm-mips/local.h~git-hdrcleanup include/asm-mips/local.h --- devel/include/asm-mips/local.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/local.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_LOCAL_H #define _ASM_LOCAL_H -#include #include #include diff -puN include/asm-mips/mach-au1x00/au1000.h~git-hdrcleanup include/asm-mips/mach-au1x00/au1000.h --- devel/include/asm-mips/mach-au1x00/au1000.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-au1x00/au1000.h 2006-05-14 02:02:38.000000000 -0700 @@ -35,7 +35,6 @@ #ifndef _AU1000_H_ #define _AU1000_H_ -#include #ifndef _LANGUAGE_ASSEMBLY diff -puN include/asm-mips/mach-au1x00/au1xxx_dbdma.h~git-hdrcleanup include/asm-mips/mach-au1x00/au1xxx_dbdma.h --- devel/include/asm-mips/mach-au1x00/au1xxx_dbdma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-au1x00/au1xxx_dbdma.h 2006-05-14 02:02:38.000000000 -0700 @@ -34,7 +34,6 @@ #ifndef _AU1000_DBDMA_H_ #define _AU1000_DBDMA_H_ -#include #ifndef _LANGUAGE_ASSEMBLY diff -puN include/asm-mips/mach-au1x00/au1xxx.h~git-hdrcleanup include/asm-mips/mach-au1x00/au1xxx.h --- devel/include/asm-mips/mach-au1x00/au1xxx.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-au1x00/au1xxx.h 2006-05-14 02:02:38.000000000 -0700 @@ -23,7 +23,6 @@ #ifndef _AU1XXX_H_ #define _AU1XXX_H_ -#include #include diff -puN include/asm-mips/mach-au1x00/au1xxx_ide.h~git-hdrcleanup include/asm-mips/mach-au1x00/au1xxx_ide.h --- devel/include/asm-mips/mach-au1x00/au1xxx_ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -29,7 +29,6 @@ * Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE * Interface and Linux Device Driver" Application Note. */ -#include #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA #define DMA_WAIT_TIMEOUT 100 diff -puN include/asm-mips/mach-au1x00/au1xxx_psc.h~git-hdrcleanup include/asm-mips/mach-au1x00/au1xxx_psc.h --- devel/include/asm-mips/mach-au1x00/au1xxx_psc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-au1x00/au1xxx_psc.h 2006-05-14 02:02:38.000000000 -0700 @@ -33,7 +33,6 @@ #ifndef _AU1000_PSC_H_ #define _AU1000_PSC_H_ -#include /* The PSC base addresses. */ #ifdef CONFIG_SOC_AU1550 diff -puN include/asm-mips/mach-au1x00/ioremap.h~git-hdrcleanup include/asm-mips/mach-au1x00/ioremap.h --- devel/include/asm-mips/mach-au1x00/ioremap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-au1x00/ioremap.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __ASM_MACH_AU1X00_IOREMAP_H #define __ASM_MACH_AU1X00_IOREMAP_H -#include #include #ifdef CONFIG_64BIT_PHYS_ADDR diff -puN include/asm-mips/mach-cobalt/cpu-feature-overrides.h~git-hdrcleanup include/asm-mips/mach-cobalt/cpu-feature-overrides.h --- devel/include/asm-mips/mach-cobalt/cpu-feature-overrides.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-cobalt/cpu-feature-overrides.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __ASM_COBALT_CPU_FEATURE_OVERRIDES_H #define __ASM_COBALT_CPU_FEATURE_OVERRIDES_H -#include #define cpu_has_tlb 1 #define cpu_has_4kex 1 diff -puN include/asm-mips/mach-db1x00/db1x00.h~git-hdrcleanup include/asm-mips/mach-db1x00/db1x00.h --- devel/include/asm-mips/mach-db1x00/db1x00.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-db1x00/db1x00.h 2006-05-14 02:02:38.000000000 -0700 @@ -28,7 +28,6 @@ #ifndef __ASM_DB1X00_H #define __ASM_DB1X00_H -#include #ifdef CONFIG_MIPS_DB1550 #define BCSR_KSEG1_ADDR 0xAF000000 diff -puN include/asm-mips/mach-generic/ide.h~git-hdrcleanup include/asm-mips/mach-generic/ide.h --- devel/include/asm-mips/mach-generic/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-generic/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-mips/mach-generic/kmalloc.h~git-hdrcleanup include/asm-mips/mach-generic/kmalloc.h --- devel/include/asm-mips/mach-generic/kmalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-generic/kmalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_MACH_GENERIC_KMALLOC_H #define __ASM_MACH_GENERIC_KMALLOC_H -#include #ifndef CONFIG_DMA_COHERENT /* diff -puN include/asm-mips/mach-generic/spaces.h~git-hdrcleanup include/asm-mips/mach-generic/spaces.h --- devel/include/asm-mips/mach-generic/spaces.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-generic/spaces.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_MACH_GENERIC_SPACES_H #define _ASM_MACH_GENERIC_SPACES_H -#include #ifdef CONFIG_32BIT diff -puN include/asm-mips/mach-ip22/spaces.h~git-hdrcleanup include/asm-mips/mach-ip22/spaces.h --- devel/include/asm-mips/mach-ip22/spaces.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-ip22/spaces.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_MACH_IP22_SPACES_H #define _ASM_MACH_IP22_SPACES_H -#include #ifdef CONFIG_32BIT diff -puN include/asm-mips/mach-ip32/cpu-feature-overrides.h~git-hdrcleanup include/asm-mips/mach-ip32/cpu-feature-overrides.h --- devel/include/asm-mips/mach-ip32/cpu-feature-overrides.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-ip32/cpu-feature-overrides.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H -#include /* * R5000 has an interesting "restriction": ll(d)/sc(d) diff -puN include/asm-mips/mach-ip32/kmalloc.h~git-hdrcleanup include/asm-mips/mach-ip32/kmalloc.h --- devel/include/asm-mips/mach-ip32/kmalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-ip32/kmalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_MACH_IP32_KMALLOC_H #define __ASM_MACH_IP32_KMALLOC_H -#include #if defined(CONFIG_CPU_R5000) || defined (CONFIG_CPU_RM7000) #define ARCH_KMALLOC_MINALIGN 32 diff -puN include/asm-mips/mach-mips/cpu-feature-overrides.h~git-hdrcleanup include/asm-mips/mach-mips/cpu-feature-overrides.h --- devel/include/asm-mips/mach-mips/cpu-feature-overrides.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-mips/cpu-feature-overrides.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H -#include /* * CPU feature overrides for MIPS boards diff -puN include/asm-mips/mach-mips/irq.h~git-hdrcleanup include/asm-mips/mach-mips/irq.h --- devel/include/asm-mips/mach-mips/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-mips/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_MACH_MIPS_IRQ_H #define __ASM_MACH_MIPS_IRQ_H -#include #define NR_IRQS 256 diff -puN include/asm-mips/mach-pb1x00/pb1550.h~git-hdrcleanup include/asm-mips/mach-pb1x00/pb1550.h --- devel/include/asm-mips/mach-pb1x00/pb1550.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-pb1x00/pb1550.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,7 +27,6 @@ #ifndef __ASM_PB1550_H #define __ASM_PB1550_H -#include #include #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX diff -puN include/asm-mips/mach-sim/cpu-feature-overrides.h~git-hdrcleanup include/asm-mips/mach-sim/cpu-feature-overrides.h --- devel/include/asm-mips/mach-sim/cpu-feature-overrides.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mach-sim/cpu-feature-overrides.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __ASM_MACH_SIM_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_SIM_CPU_FEATURE_OVERRIDES_H -#include /* * CPU feature overrides for MIPS boards diff -puN include/asm-mips/mips-boards/generic.h~git-hdrcleanup include/asm-mips/mips-boards/generic.h --- devel/include/asm-mips/mips-boards/generic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mips-boards/generic.h 2006-05-14 02:02:38.000000000 -0700 @@ -20,7 +20,6 @@ #ifndef __ASM_MIPS_BOARDS_GENERIC_H #define __ASM_MIPS_BOARDS_GENERIC_H -#include #include #include #include diff -puN include/asm-mips/mipsregs.h~git-hdrcleanup include/asm-mips/mipsregs.h --- devel/include/asm-mips/mipsregs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mipsregs.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _ASM_MIPSREGS_H #define _ASM_MIPSREGS_H -#include #include #include diff -puN include/asm-mips/mmu_context.h~git-hdrcleanup include/asm-mips/mmu_context.h --- devel/include/asm-mips/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_MMU_CONTEXT_H #define _ASM_MMU_CONTEXT_H -#include #include #include #include diff -puN include/asm-mips/mmzone.h~git-hdrcleanup include/asm-mips/mmzone.h --- devel/include/asm-mips/mmzone.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/mmzone.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ #ifndef _ASM_MMZONE_H_ #define _ASM_MMZONE_H_ -#include #include #include diff -puN include/asm-mips/module.h~git-hdrcleanup include/asm-mips/module.h --- devel/include/asm-mips/module.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/module.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_MODULE_H #define _ASM_MODULE_H -#include #include #include diff -puN include/asm-mips/msgbuf.h~git-hdrcleanup include/asm-mips/msgbuf.h --- devel/include/asm-mips/msgbuf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/msgbuf.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_MSGBUF_H #define _ASM_MSGBUF_H -#include /* * The msqid64_ds structure for the MIPS architecture. diff -puN include/asm-mips/paccess.h~git-hdrcleanup include/asm-mips/paccess.h --- devel/include/asm-mips/paccess.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/paccess.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _ASM_PACCESS_H #define _ASM_PACCESS_H -#include #include #ifdef CONFIG_32BIT diff -puN include/asm-mips/page.h~git-hdrcleanup include/asm-mips/page.h --- devel/include/asm-mips/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_PAGE_H #define _ASM_PAGE_H -#include #ifdef __KERNEL__ diff -puN include/asm-mips/pci.h~git-hdrcleanup include/asm-mips/pci.h --- devel/include/asm-mips/pci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/pci.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef _ASM_PCI_H #define _ASM_PCI_H -#include #include #ifdef __KERNEL__ diff -puN include/asm-mips/pgalloc.h~git-hdrcleanup include/asm-mips/pgalloc.h --- devel/include/asm-mips/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_PGALLOC_H #define _ASM_PGALLOC_H -#include #include #include diff -puN include/asm-mips/pgtable-32.h~git-hdrcleanup include/asm-mips/pgtable-32.h --- devel/include/asm-mips/pgtable-32.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/pgtable-32.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_PGTABLE_32_H #define _ASM_PGTABLE_32_H -#include #include #include diff -puN include/asm-mips/pgtable-64.h~git-hdrcleanup include/asm-mips/pgtable-64.h --- devel/include/asm-mips/pgtable-64.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/pgtable-64.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_PGTABLE_64_H #define _ASM_PGTABLE_64_H -#include #include #include diff -puN include/asm-mips/pgtable-bits.h~git-hdrcleanup include/asm-mips/pgtable-bits.h --- devel/include/asm-mips/pgtable-bits.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/pgtable-bits.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_PGTABLE_BITS_H #define _ASM_PGTABLE_BITS_H -#include /* * Note that we shift the lower 32bits of each EntryLo[01] entry diff -puN include/asm-mips/pgtable.h~git-hdrcleanup include/asm-mips/pgtable.h --- devel/include/asm-mips/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_PGTABLE_H #define _ASM_PGTABLE_H -#include #ifdef CONFIG_32BIT #include #endif diff -puN include/asm-mips/prefetch.h~git-hdrcleanup include/asm-mips/prefetch.h --- devel/include/asm-mips/prefetch.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/prefetch.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __ASM_PREFETCH_H #define __ASM_PREFETCH_H -#include /* * R5000 and RM5200 implements pref and prefx instructions but they're nops, so diff -puN include/asm-mips/processor.h~git-hdrcleanup include/asm-mips/processor.h --- devel/include/asm-mips/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_PROCESSOR_H #define _ASM_PROCESSOR_H -#include #include #include diff -puN include/asm-mips/ptrace.h~git-hdrcleanup include/asm-mips/ptrace.h --- devel/include/asm-mips/ptrace.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/ptrace.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_PTRACE_H #define _ASM_PTRACE_H -#include #include diff -puN include/asm-mips/reg.h~git-hdrcleanup include/asm-mips/reg.h --- devel/include/asm-mips/reg.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/reg.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_MIPS_REG_H #define __ASM_MIPS_REG_H -#include #if defined(CONFIG_32BIT) || defined(WANT_COMPAT_REG_H) diff -puN include/asm-mips/resource.h~git-hdrcleanup include/asm-mips/resource.h --- devel/include/asm-mips/resource.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/resource.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_RESOURCE_H #define _ASM_RESOURCE_H -#include /* * These five resource limit IDs have a MIPS/Linux-specific ordering, diff -puN include/asm-mips/serial.h~git-hdrcleanup include/asm-mips/serial.h --- devel/include/asm-mips/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_SERIAL_H #define _ASM_SERIAL_H -#include /* * This assumes you have a 1.8432 MHz clock for your UART. diff -puN include/asm-mips/sgiarcs.h~git-hdrcleanup include/asm-mips/sgiarcs.h --- devel/include/asm-mips/sgiarcs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sgiarcs.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_SGIARCS_H #define _ASM_SGIARCS_H -#include #include #include diff -puN include/asm-mips/sibyte/board.h~git-hdrcleanup include/asm-mips/sibyte/board.h --- devel/include/asm-mips/sibyte/board.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sibyte/board.h 2006-05-14 02:02:38.000000000 -0700 @@ -19,7 +19,6 @@ #ifndef _SIBYTE_BOARD_H #define _SIBYTE_BOARD_H -#include #if defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_PTSWARM) || \ defined(CONFIG_SIBYTE_CRHONE) || defined(CONFIG_SIBYTE_CRHINE) || \ diff -puN include/asm-mips/sibyte/carmel.h~git-hdrcleanup include/asm-mips/sibyte/carmel.h --- devel/include/asm-mips/sibyte/carmel.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sibyte/carmel.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef __ASM_SIBYTE_CARMEL_H #define __ASM_SIBYTE_CARMEL_H -#include #include #include diff -puN include/asm-mips/sibyte/sentosa.h~git-hdrcleanup include/asm-mips/sibyte/sentosa.h --- devel/include/asm-mips/sibyte/sentosa.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sibyte/sentosa.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef __ASM_SIBYTE_SENTOSA_H #define __ASM_SIBYTE_SENTOSA_H -#include #include #include diff -puN include/asm-mips/sibyte/swarm.h~git-hdrcleanup include/asm-mips/sibyte/swarm.h --- devel/include/asm-mips/sibyte/swarm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sibyte/swarm.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef __ASM_SIBYTE_SWARM_H #define __ASM_SIBYTE_SWARM_H -#include #include #include diff -puN include/asm-mips/siginfo.h~git-hdrcleanup include/asm-mips/siginfo.h --- devel/include/asm-mips/siginfo.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/siginfo.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_SIGINFO_H #define _ASM_SIGINFO_H -#include #define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int)) #undef __ARCH_SI_TRAPNO /* exception code needs to fill this ... */ diff -puN include/asm-mips/signal.h~git-hdrcleanup include/asm-mips/signal.h --- devel/include/asm-mips/signal.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/signal.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_SIGNAL_H #define _ASM_SIGNAL_H -#include #include #define _NSIG 128 diff -puN include/asm-mips/sim.h~git-hdrcleanup include/asm-mips/sim.h --- devel/include/asm-mips/sim.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sim.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_SIM_H #define _ASM_SIM_H -#include #include diff -puN include/asm-mips/smp.h~git-hdrcleanup include/asm-mips/smp.h --- devel/include/asm-mips/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include #ifdef CONFIG_SMP diff -puN include/asm-mips/sn/addrs.h~git-hdrcleanup include/asm-mips/sn/addrs.h --- devel/include/asm-mips/sn/addrs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/addrs.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_SN_ADDRS_H #define _ASM_SN_ADDRS_H -#include #ifndef __ASSEMBLY__ #include diff -puN include/asm-mips/sn/agent.h~git-hdrcleanup include/asm-mips/sn/agent.h --- devel/include/asm-mips/sn/agent.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/agent.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_SGI_SN_AGENT_H #define _ASM_SGI_SN_AGENT_H -#include #include #include #include diff -puN include/asm-mips/sn/arch.h~git-hdrcleanup include/asm-mips/sn/arch.h --- devel/include/asm-mips/sn/arch.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/arch.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_SN_ARCH_H #define _ASM_SN_ARCH_H -#include #include #include #ifdef CONFIG_SGI_IP27 diff -puN include/asm-mips/sn/io.h~git-hdrcleanup include/asm-mips/sn/io.h --- devel/include/asm-mips/sn/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_SN_IO_H #define _ASM_SN_IO_H -#include #if defined (CONFIG_SGI_IP27) #include #endif diff -puN include/asm-mips/sn/klconfig.h~git-hdrcleanup include/asm-mips/sn/klconfig.h --- devel/include/asm-mips/sn/klconfig.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/klconfig.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,7 +27,6 @@ * that offsets of existing fields do not change. */ -#include #include #include diff -puN include/asm-mips/sn/kldir.h~git-hdrcleanup include/asm-mips/sn/kldir.h --- devel/include/asm-mips/sn/kldir.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/kldir.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_SN_KLDIR_H #define _ASM_SN_KLDIR_H -#include #if defined(CONFIG_SGI_IO) #include diff -puN include/asm-mips/sn/launch.h~git-hdrcleanup include/asm-mips/sn/launch.h --- devel/include/asm-mips/sn/launch.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/launch.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_SN_LAUNCH_H #define _ASM_SN_LAUNCH_H -#include #include #include diff -puN include/asm-mips/sn/mapped_kernel.h~git-hdrcleanup include/asm-mips/sn/mapped_kernel.h --- devel/include/asm-mips/sn/mapped_kernel.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/mapped_kernel.h 2006-05-14 02:02:38.000000000 -0700 @@ -20,7 +20,6 @@ * code. So no jumps can be done before we have switched to using * cksseg addresses. */ -#include #include #define REP_BASE CAC_BASE diff -puN include/asm-mips/sn/sn0/addrs.h~git-hdrcleanup include/asm-mips/sn/sn0/addrs.h --- devel/include/asm-mips/sn/sn0/addrs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/sn0/addrs.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_SN_SN0_ADDRS_H #define _ASM_SN_SN0_ADDRS_H -#include /* * SN0 (on a T5) Address map diff -puN include/asm-mips/sn/sn0/arch.h~git-hdrcleanup include/asm-mips/sn/sn0/arch.h --- devel/include/asm-mips/sn/sn0/arch.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/sn0/arch.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_SN_SN0_ARCH_H #define _ASM_SN_SN0_ARCH_H -#include #ifndef SABLE diff -puN include/asm-mips/sn/sn0/hubmd.h~git-hdrcleanup include/asm-mips/sn/sn0/hubmd.h --- devel/include/asm-mips/sn/sn0/hubmd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/sn/sn0/hubmd.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_SN_SN0_HUBMD_H #define _ASM_SN_SN0_HUBMD_H -#include /* * Hub Memory/Directory interface registers diff -puN include/asm-mips/stackframe.h~git-hdrcleanup include/asm-mips/stackframe.h --- devel/include/asm-mips/stackframe.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/stackframe.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_STACKFRAME_H #define _ASM_STACKFRAME_H -#include #include #include diff -puN include/asm-mips/string.h~git-hdrcleanup include/asm-mips/string.h --- devel/include/asm-mips/string.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/string.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_STRING_H #define _ASM_STRING_H -#include /* * Most of the inline functions are rather naive implementations so I just diff -puN include/asm-mips/system.h~git-hdrcleanup include/asm-mips/system.h --- devel/include/asm-mips/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _ASM_SYSTEM_H #define _ASM_SYSTEM_H -#include #include #include diff -puN include/asm-mips/thread_info.h~git-hdrcleanup include/asm-mips/thread_info.h --- devel/include/asm-mips/thread_info.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/thread_info.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifdef __KERNEL__ -#include #ifndef __ASSEMBLY__ diff -puN include/asm-mips/tlbflush.h~git-hdrcleanup include/asm-mips/tlbflush.h --- devel/include/asm-mips/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_TLBFLUSH_H #define __ASM_TLBFLUSH_H -#include #include /* diff -puN include/asm-mips/tx4927/toshiba_rbtx4927.h~git-hdrcleanup include/asm-mips/tx4927/toshiba_rbtx4927.h --- devel/include/asm-mips/tx4927/toshiba_rbtx4927.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/tx4927/toshiba_rbtx4927.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,7 +27,6 @@ #ifndef __ASM_TX4927_TOSHIBA_RBTX4927_H #define __ASM_TX4927_TOSHIBA_RBTX4927_H -#include #include #include #ifdef CONFIG_PCI diff -puN include/asm-mips/types.h~git-hdrcleanup include/asm-mips/types.h --- devel/include/asm-mips/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -52,7 +52,6 @@ typedef unsigned long long __u64; #ifndef __ASSEMBLY__ -#include typedef __signed char s8; typedef unsigned char u8; diff -puN include/asm-mips/uaccess.h~git-hdrcleanup include/asm-mips/uaccess.h --- devel/include/asm-mips/uaccess.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/uaccess.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_UACCESS_H #define _ASM_UACCESS_H -#include #include #include #include diff -puN include/asm-mips/unistd.h~git-hdrcleanup include/asm-mips/unistd.h --- devel/include/asm-mips/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -905,6 +905,8 @@ #define __NR_N32_Linux 6000 #define __NR_N32_Linux_syscalls 268 +#ifdef __KERNEL__ + #ifndef __ASSEMBLY__ /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */ @@ -1168,9 +1170,6 @@ type name (atype a,btype b,ctype c,dtype #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ -#ifdef __KERNEL__ - -#include #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR @@ -1197,7 +1196,6 @@ type name (atype a,btype b,ctype c,dtype # ifdef CONFIG_MIPS32_O32 # define __ARCH_WANT_COMPAT_SYS_TIME # endif -#endif #ifdef __KERNEL_SYSCALLS__ @@ -1248,4 +1246,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _ASM_UNISTD_H */ diff -puN include/asm-mips/vr41xx/vrc4173.h~git-hdrcleanup include/asm-mips/vr41xx/vrc4173.h --- devel/include/asm-mips/vr41xx/vrc4173.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/vr41xx/vrc4173.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,7 +24,6 @@ #ifndef __NEC_VRC4173_H #define __NEC_VRC4173_H -#include #include /* diff -puN include/asm-mips/war.h~git-hdrcleanup include/asm-mips/war.h --- devel/include/asm-mips/war.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/war.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_WAR_H #define _ASM_WAR_H -#include /* * Another R4600 erratum. Due to the lack of errata information the exact diff -puN include/asm-mips/wbflush.h~git-hdrcleanup include/asm-mips/wbflush.h --- devel/include/asm-mips/wbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-mips/wbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_WBFLUSH_H #define _ASM_WBFLUSH_H -#include #ifdef CONFIG_CPU_HAS_WB diff -puN include/asm-parisc/atomic.h~git-hdrcleanup include/asm-parisc/atomic.h --- devel/include/asm-parisc/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ #ifndef _ASM_PARISC_ATOMIC_H_ #define _ASM_PARISC_ATOMIC_H_ -#include #include #include diff -puN include/asm-parisc/cacheflush.h~git-hdrcleanup include/asm-parisc/cacheflush.h --- devel/include/asm-parisc/cacheflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/cacheflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _PARISC_CACHEFLUSH_H #define _PARISC_CACHEFLUSH_H -#include #include #include /* for flush_user_dcache_range_asm() proto */ diff -puN include/asm-parisc/cache.h~git-hdrcleanup include/asm-parisc/cache.h --- devel/include/asm-parisc/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ #ifndef __ARCH_PARISC_CACHE_H #define __ARCH_PARISC_CACHE_H -#include /* * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have diff -puN include/asm-parisc/dma.h~git-hdrcleanup include/asm-parisc/dma.h --- devel/include/asm-parisc/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include #include /* need byte IO */ #include diff -puN include/asm-parisc/dma-mapping.h~git-hdrcleanup include/asm-parisc/dma-mapping.h --- devel/include/asm-parisc/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _PARISC_DMA_MAPPING_H #define _PARISC_DMA_MAPPING_H -#include #include #include #include diff -puN include/asm-parisc/io.h~git-hdrcleanup include/asm-parisc/io.h --- devel/include/asm-parisc/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#include #include #include diff -puN include/asm-parisc/irq.h~git-hdrcleanup include/asm-parisc/irq.h --- devel/include/asm-parisc/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _ASM_PARISC_IRQ_H #define _ASM_PARISC_IRQ_H -#include #include #include diff -puN include/asm-parisc/kmap_types.h~git-hdrcleanup include/asm-parisc/kmap_types.h --- devel/include/asm-parisc/kmap_types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/kmap_types.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_KMAP_TYPES_H #define _ASM_KMAP_TYPES_H -#include #ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , diff -puN include/asm-parisc/page.h~git-hdrcleanup include/asm-parisc/page.h --- devel/include/asm-parisc/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifdef __KERNEL__ -#include #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) # define PAGE_SHIFT 12 /* 4k */ diff -puN include/asm-parisc/param.h~git-hdrcleanup include/asm-parisc/param.h --- devel/include/asm-parisc/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASMPARISC_PARAM_H #ifdef __KERNEL__ -#include # ifdef CONFIG_PA20 # define HZ 1000 /* Faster machines */ # else diff -puN include/asm-parisc/pci.h~git-hdrcleanup include/asm-parisc/pci.h --- devel/include/asm-parisc/pci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/pci.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_PARISC_PCI_H #define __ASM_PARISC_PCI_H -#include #include diff -puN include/asm-parisc/pdc.h~git-hdrcleanup include/asm-parisc/pdc.h --- devel/include/asm-parisc/pdc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/pdc.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _PARISC_PDC_H #define _PARISC_PDC_H -#include /* * PDC return values ... diff -puN include/asm-parisc/pgtable.h~git-hdrcleanup include/asm-parisc/pgtable.h --- devel/include/asm-parisc/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #include -#include #include #ifndef __ASSEMBLY__ diff -puN include/asm-parisc/processor.h~git-hdrcleanup include/asm-parisc/processor.h --- devel/include/asm-parisc/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #define __ASM_PARISC_PROCESSOR_H #ifndef __ASSEMBLY__ -#include #include #include diff -puN include/asm-parisc/psw.h~git-hdrcleanup include/asm-parisc/psw.h --- devel/include/asm-parisc/psw.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/psw.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,6 +1,5 @@ #ifndef _PARISC_PSW_H -#include #define PSW_I 0x00000001 #define PSW_D 0x00000002 diff -puN include/asm-parisc/smp.h~git-hdrcleanup include/asm-parisc/smp.h --- devel/include/asm-parisc/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include #if defined(CONFIG_SMP) diff -puN include/asm-parisc/system.h~git-hdrcleanup include/asm-parisc/system.h --- devel/include/asm-parisc/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __PARISC_SYSTEM_H #define __PARISC_SYSTEM_H -#include #include /* The program status word as bitfields. */ diff -puN include/asm-parisc/tlbflush.h~git-hdrcleanup include/asm-parisc/tlbflush.h --- devel/include/asm-parisc/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ /* TLB flushing routines.... */ -#include #include #include diff -puN include/asm-parisc/unistd.h~git-hdrcleanup include/asm-parisc/unistd.h --- devel/include/asm-parisc/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-parisc/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -792,6 +792,7 @@ #define HPUX_GATEWAY_ADDR 0xC0000004 #define LINUX_GATEWAY_ADDR 0x100 +#ifdef __KERNEL__ #ifndef __ASSEMBLY__ #define SYS_ify(syscall_name) __NR_##syscall_name @@ -934,7 +935,6 @@ type name(type1 arg1, type2 arg2, type3 return K_INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_ALARM @@ -956,7 +956,6 @@ type name(type1 arg1, type2 arg2, type3 #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif /* mmap & mmap2 take 6 arguments */ #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \ @@ -1056,4 +1055,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _ASM_PARISC_UNISTD_H_ */ diff -puN include/asm-powerpc/abs_addr.h~git-hdrcleanup include/asm-powerpc/abs_addr.h --- devel/include/asm-powerpc/abs_addr.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/abs_addr.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASM_POWERPC_ABS_ADDR_H #ifdef __KERNEL__ -#include /* * c 2001 PPC 64 Team, IBM Corp diff -puN include/asm-powerpc/cache.h~git-hdrcleanup include/asm-powerpc/cache.h --- devel/include/asm-powerpc/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include /* bytes per L1 cache line */ #if defined(CONFIG_8xx) || defined(CONFIG_403GCX) diff -puN include/asm-powerpc/dma.h~git-hdrcleanup include/asm-powerpc/dma.h --- devel/include/asm-powerpc/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -22,7 +22,6 @@ * with a grain of salt. */ -#include #include #include #include diff -puN include/asm-powerpc/dma-mapping.h~git-hdrcleanup include/asm-powerpc/dma-mapping.h --- devel/include/asm-powerpc/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #define _ASM_DMA_MAPPING_H #ifdef __KERNEL__ -#include #include #include /* need struct page definitions */ diff -puN include/asm-powerpc/eeh.h~git-hdrcleanup include/asm-powerpc/eeh.h --- devel/include/asm-powerpc/eeh.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/eeh.h 2006-05-14 02:02:38.000000000 -0700 @@ -21,7 +21,6 @@ #define _PPC64_EEH_H #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-powerpc/elf.h~git-hdrcleanup include/asm-powerpc/elf.h --- devel/include/asm-powerpc/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,14 +3,14 @@ #ifdef __KERNEL__ #include /* for task_struct */ +#include +#include #endif #include #include #include #include -#include -#include /* PowerPC relocations defined by the ABIs */ #define R_PPC_NONE 0 @@ -129,7 +129,7 @@ typedef elf_greg_t32 elf_gregset_t32[ELF /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */ typedef elf_greg_t32 elf_greg_t; typedef elf_gregset_t32 elf_gregset_t; -# define elf_addr_t u32 +# define elf_addr_t __u32 #endif /* ELF_ARCH */ /* Floating point registers */ @@ -161,6 +161,7 @@ typedef elf_vrreg_t elf_vrregset_t[ELF_N typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; #endif +#ifdef __KERNEL__ /* * This is used to ensure we don't load something for the wrong architecture. */ @@ -176,8 +177,6 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF #define ELF_ET_DYN_BASE (0x08000000) -#ifdef __KERNEL__ - /* Common routine for both 32-bit and 64-bit processes */ static inline void ppc_elf_core_copy_regs(elf_gregset_t elf_regs, struct pt_regs *regs) diff -puN include/asm-powerpc/floppy.h~git-hdrcleanup include/asm-powerpc/floppy.h --- devel/include/asm-powerpc/floppy.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/floppy.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define __ASM_POWERPC_FLOPPY_H #ifdef __KERNEL__ -#include #include #define fd_inb(port) inb_p(port) diff -puN include/asm-powerpc/hw_irq.h~git-hdrcleanup include/asm-powerpc/hw_irq.h --- devel/include/asm-powerpc/hw_irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/hw_irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-powerpc/ide.h~git-hdrcleanup include/asm-powerpc/ide.h --- devel/include/asm-powerpc/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -22,7 +22,6 @@ #endif #ifndef __powerpc64__ -#include #include #include #include diff -puN include/asm-powerpc/iommu.h~git-hdrcleanup include/asm-powerpc/iommu.h --- devel/include/asm-powerpc/iommu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/iommu.h 2006-05-14 02:02:38.000000000 -0700 @@ -22,7 +22,6 @@ #define _ASM_IOMMU_H #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-powerpc/irq.h~git-hdrcleanup include/asm-powerpc/irq.h --- devel/include/asm-powerpc/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * 2 of the License, or (at your option) any later version. */ -#include #include #include diff -puN include/asm-powerpc/iseries/iseries_io.h~git-hdrcleanup include/asm-powerpc/iseries/iseries_io.h --- devel/include/asm-powerpc/iseries/iseries_io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/iseries/iseries_io.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_POWERPC_ISERIES_ISERIES_IO_H #define _ASM_POWERPC_ISERIES_ISERIES_IO_H -#include #ifdef CONFIG_PPC_ISERIES #include diff -puN include/asm-powerpc/machdep.h~git-hdrcleanup include/asm-powerpc/machdep.h --- devel/include/asm-powerpc/machdep.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/machdep.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * 2 of the License, or (at your option) any later version. */ -#include #include #include #include diff -puN include/asm-powerpc/mmzone.h~git-hdrcleanup include/asm-powerpc/mmzone.h --- devel/include/asm-powerpc/mmzone.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/mmzone.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #define _ASM_MMZONE_H_ #ifdef __KERNEL__ -#include /* * generic non-linear memory support: diff -puN include/asm-powerpc/paca.h~git-hdrcleanup include/asm-powerpc/paca.h --- devel/include/asm-powerpc/paca.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/paca.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #define _ASM_POWERPC_PACA_H #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-powerpc/page.h~git-hdrcleanup include/asm-powerpc/page.h --- devel/include/asm-powerpc/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ */ #ifdef __KERNEL__ -#include #include /* diff -puN include/asm-powerpc/pgtable.h~git-hdrcleanup include/asm-powerpc/pgtable.h --- devel/include/asm-powerpc/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ */ #ifndef __ASSEMBLY__ -#include #include #include /* For TASK_SIZE */ #include diff -puN include/asm-powerpc/ppc_asm.h~git-hdrcleanup include/asm-powerpc/ppc_asm.h --- devel/include/asm-powerpc/ppc_asm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/ppc_asm.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ #define _ASM_POWERPC_PPC_ASM_H #include -#include #include #ifndef __ASSEMBLY__ diff -puN include/asm-powerpc/prom.h~git-hdrcleanup include/asm-powerpc/prom.h --- devel/include/asm-powerpc/prom.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/prom.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#include #include #include #include diff -puN include/asm-powerpc/smp.h~git-hdrcleanup include/asm-powerpc/smp.h --- devel/include/asm-powerpc/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #define _ASM_POWERPC_SMP_H #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-powerpc/smu.h~git-hdrcleanup include/asm-powerpc/smu.h --- devel/include/asm-powerpc/smu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/smu.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * Definitions for talking to the SMU chip in newer G5 PowerMacs */ #ifdef __KERNEL__ -#include #include #endif #include diff -puN include/asm-powerpc/spu.h~git-hdrcleanup include/asm-powerpc/spu.h --- devel/include/asm-powerpc/spu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/spu.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,7 +24,6 @@ #define _SPU_H #ifdef __KERNEL__ -#include #include #include diff -puN include/asm-powerpc/thread_info.h~git-hdrcleanup include/asm-powerpc/thread_info.h --- devel/include/asm-powerpc/thread_info.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/thread_info.h 2006-05-14 02:02:38.000000000 -0700 @@ -21,7 +21,6 @@ #define THREAD_SIZE (1 << THREAD_SHIFT) #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-powerpc/time.h~git-hdrcleanup include/asm-powerpc/time.h --- devel/include/asm-powerpc/time.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/time.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #define __POWERPC_TIME_H #ifdef __KERNEL__ -#include #include #include diff -puN include/asm-powerpc/timex.h~git-hdrcleanup include/asm-powerpc/timex.h --- devel/include/asm-powerpc/timex.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/timex.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ * PowerPC architecture timex specifications */ -#include #include #define CLOCK_TICK_RATE 1024000 /* Underlying HZ */ diff -puN include/asm-powerpc/tlbflush.h~git-hdrcleanup include/asm-powerpc/tlbflush.h --- devel/include/asm-powerpc/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ */ #ifdef __KERNEL__ -#include struct mm_struct; diff -puN include/asm-powerpc/tlb.h~git-hdrcleanup include/asm-powerpc/tlb.h --- devel/include/asm-powerpc/tlb.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/tlb.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #define _ASM_POWERPC_TLB_H #ifdef __KERNEL__ -#include #ifndef __powerpc64__ #include #endif diff -puN include/asm-powerpc/topology.h~git-hdrcleanup include/asm-powerpc/topology.h --- devel/include/asm-powerpc/topology.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/topology.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASM_POWERPC_TOPOLOGY_H #ifdef __KERNEL__ -#include struct sys_device; struct device_node; diff -puN include/asm-powerpc/types.h~git-hdrcleanup include/asm-powerpc/types.h --- devel/include/asm-powerpc/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -64,7 +64,6 @@ typedef struct { #ifndef __ASSEMBLY__ -#include typedef signed char s8; typedef unsigned char u8; diff -puN include/asm-powerpc/unistd.h~git-hdrcleanup include/asm-powerpc/unistd.h --- devel/include/asm-powerpc/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -322,12 +322,12 @@ #define __NR_fchmodat 297 #define __NR_faccessat 298 +#ifdef __KERNEL__ + #define __NR_syscalls 299 -#ifdef __KERNEL__ #define __NR__exit __NR_exit #define NR_syscalls __NR_syscalls -#endif #ifndef __ASSEMBLY__ @@ -439,9 +439,7 @@ type name(type1 arg1, type2 arg2, type3 __syscall_nr(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6); \ } -#ifdef __KERNEL__ -#include #include #include #include @@ -497,8 +495,8 @@ extern int execve(const char *file, char #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall") #endif -#endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ +#endif /* __KERNEL__ */ #endif /* _ASM_PPC_UNISTD_H_ */ diff -puN include/asm-powerpc/vga.h~git-hdrcleanup include/asm-powerpc/vga.h --- devel/include/asm-powerpc/vga.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/vga.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #include -#include #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) diff -puN include/asm-powerpc/vio.h~git-hdrcleanup include/asm-powerpc/vio.h --- devel/include/asm-powerpc/vio.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-powerpc/vio.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #define _ASM_POWERPC_VIO_H #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-ppc/amigahw.h~git-hdrcleanup include/asm-ppc/amigahw.h --- devel/include/asm-ppc/amigahw.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/amigahw.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef __ASMPPC_AMIGAHW_H #define __ASMPPC_AMIGAHW_H -#include #include #undef CHIP_PHYSADDR diff -puN include/asm-ppc/bootinfo.h~git-hdrcleanup include/asm-ppc/bootinfo.h --- devel/include/asm-ppc/bootinfo.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/bootinfo.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _PPC_BOOTINFO_H #define _PPC_BOOTINFO_H -#include #include #if defined(CONFIG_APUS) && !defined(__BOOTER__) diff -puN include/asm-ppc/commproc.h~git-hdrcleanup include/asm-ppc/commproc.h --- devel/include/asm-ppc/commproc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/commproc.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __CPM_8XX__ #define __CPM_8XX__ -#include #include #include diff -puN include/asm-ppc/ibm403.h~git-hdrcleanup include/asm-ppc/ibm403.h --- devel/include/asm-ppc/ibm403.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/ibm403.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_IBM403_H__ #define __ASM_IBM403_H__ -#include #if defined(CONFIG_403GCX) diff -puN include/asm-ppc/ibm44x.h~git-hdrcleanup include/asm-ppc/ibm44x.h --- devel/include/asm-ppc/ibm44x.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/ibm44x.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __ASM_IBM44x_H__ #define __ASM_IBM44x_H__ -#include #ifndef NR_BOARD_IRQS #define NR_BOARD_IRQS 0 diff -puN include/asm-ppc/ibm4xx.h~git-hdrcleanup include/asm-ppc/ibm4xx.h --- devel/include/asm-ppc/ibm4xx.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/ibm4xx.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef __ASM_IBM4XX_H__ #define __ASM_IBM4XX_H__ -#include #include #ifdef CONFIG_40x diff -puN include/asm-ppc/io.h~git-hdrcleanup include/asm-ppc/io.h --- devel/include/asm-ppc/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _PPC_IO_H #define _PPC_IO_H -#include #include #include diff -puN include/asm-ppc/machdep.h~git-hdrcleanup include/asm-ppc/machdep.h --- devel/include/asm-ppc/machdep.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/machdep.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _PPC_MACHDEP_H #define _PPC_MACHDEP_H -#include #include #include diff -puN include/asm-ppc/mmu_context.h~git-hdrcleanup include/asm-ppc/mmu_context.h --- devel/include/asm-ppc/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef __PPC_MMU_CONTEXT_H #define __PPC_MMU_CONTEXT_H -#include #include #include #include diff -puN include/asm-ppc/mmu.h~git-hdrcleanup include/asm-ppc/mmu.h --- devel/include/asm-ppc/mmu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/mmu.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef _PPC_MMU_H_ #define _PPC_MMU_H_ -#include #ifndef __ASSEMBLY__ diff -puN include/asm-ppc/mpc8260.h~git-hdrcleanup include/asm-ppc/mpc8260.h --- devel/include/asm-ppc/mpc8260.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/mpc8260.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __ASM_PPC_MPC8260_H__ #define __ASM_PPC_MPC8260_H__ -#include #ifdef CONFIG_8260 diff -puN include/asm-ppc/mpc83xx.h~git-hdrcleanup include/asm-ppc/mpc83xx.h --- devel/include/asm-ppc/mpc83xx.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/mpc83xx.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __ASM_MPC83xx_H__ #define __ASM_MPC83xx_H__ -#include #include #ifdef CONFIG_83xx diff -puN include/asm-ppc/mpc85xx.h~git-hdrcleanup include/asm-ppc/mpc85xx.h --- devel/include/asm-ppc/mpc85xx.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/mpc85xx.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __ASM_MPC85xx_H__ #define __ASM_MPC85xx_H__ -#include #include #ifdef CONFIG_85xx diff -puN include/asm-ppc/mpc8xx.h~git-hdrcleanup include/asm-ppc/mpc8xx.h --- devel/include/asm-ppc/mpc8xx.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/mpc8xx.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __CONFIG_8xx_DEFS #define __CONFIG_8xx_DEFS -#include #ifdef CONFIG_8xx diff -puN include/asm-ppc/mv64x60.h~git-hdrcleanup include/asm-ppc/mv64x60.h --- devel/include/asm-ppc/mv64x60.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/mv64x60.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff -puN include/asm-ppc/ocp.h~git-hdrcleanup include/asm-ppc/ocp.h --- devel/include/asm-ppc/ocp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/ocp.h 2006-05-14 02:02:38.000000000 -0700 @@ -26,7 +26,6 @@ #include #include -#include #include #include diff -puN include/asm-ppc/open_pic.h~git-hdrcleanup include/asm-ppc/open_pic.h --- devel/include/asm-ppc/open_pic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/open_pic.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _PPC_KERNEL_OPEN_PIC_H #define _PPC_KERNEL_OPEN_PIC_H -#include #include #define OPENPIC_SIZE 0x40000 diff -puN include/asm-ppc/page.h~git-hdrcleanup include/asm-ppc/page.h --- devel/include/asm-ppc/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _PPC_PAGE_H #define _PPC_PAGE_H -#include #include /* PAGE_SHIFT determines the page size */ @@ -15,7 +14,6 @@ #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) #ifdef __KERNEL__ -#include /* This must match what is in arch/ppc/Makefile */ #define PAGE_OFFSET CONFIG_KERNEL_START diff -puN include/asm-ppc/pc_serial.h~git-hdrcleanup include/asm-ppc/pc_serial.h --- devel/include/asm-ppc/pc_serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/pc_serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * anyone using any of those on a PPC platform. -- paulus */ -#include /* * This assumes you have a 1.8432 MHz clock for your UART. diff -puN include/asm-ppc/pgalloc.h~git-hdrcleanup include/asm-ppc/pgalloc.h --- devel/include/asm-ppc/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _PPC_PGALLOC_H #define _PPC_PGALLOC_H -#include #include extern void __bad_pte(pmd_t *pmd); diff -puN include/asm-ppc/pgtable.h~git-hdrcleanup include/asm-ppc/pgtable.h --- devel/include/asm-ppc/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #include -#include #ifndef __ASSEMBLY__ #include diff -puN include/asm-ppc/ppc4xx_dma.h~git-hdrcleanup include/asm-ppc/ppc4xx_dma.h --- devel/include/asm-ppc/ppc4xx_dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/ppc4xx_dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,7 +24,6 @@ #ifndef __ASMPPC_PPC4xx_DMA_H #define __ASMPPC_PPC4xx_DMA_H -#include #include #include #include diff -puN include/asm-ppc/ppc4xx_pic.h~git-hdrcleanup include/asm-ppc/ppc4xx_pic.h --- devel/include/asm-ppc/ppc4xx_pic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/ppc4xx_pic.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __PPC4XX_PIC_H__ #define __PPC4XX_PIC_H__ -#include #include #include diff -puN include/asm-ppc/serial.h~git-hdrcleanup include/asm-ppc/serial.h --- devel/include/asm-ppc/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef __ASM_SERIAL_H__ #define __ASM_SERIAL_H__ -#include #if defined(CONFIG_EV64260) #include diff -puN include/asm-ppc/smp.h~git-hdrcleanup include/asm-ppc/smp.h --- devel/include/asm-ppc/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _PPC_SMP_H #define _PPC_SMP_H -#include #include #include #include diff -puN include/asm-ppc/time.h~git-hdrcleanup include/asm-ppc/time.h --- devel/include/asm-ppc/time.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-ppc/time.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __ASM_TIME_H__ #define __ASM_TIME_H__ -#include #include #include #include diff -puN include/asm-s390/bitops.h~git-hdrcleanup include/asm-s390/bitops.h --- devel/include/asm-s390/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * Copyright (C) 1992, Linus Torvalds * */ -#include #include /* diff -puN include/asm-s390/cmb.h~git-hdrcleanup include/asm-s390/cmb.h --- devel/include/asm-s390/cmb.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/cmb.h 2006-05-14 02:02:38.000000000 -0700 @@ -47,7 +47,7 @@ struct cmbdata { /* reset channel measurement block */ #define BIODASDRESETCMB _IO(DASD_IOCTL_LETTER,34) /* read channel measurement data */ -#define BIODASDREADCMB _IOWR(DASD_IOCTL_LETTER,32,u64) +#define BIODASDREADCMB _IOWR(DASD_IOCTL_LETTER,32,__u64) /* read channel measurement data */ #define BIODASDREADALLCMB _IOWR(DASD_IOCTL_LETTER,33,struct cmbdata) diff -puN include/asm-s390/debug.h~git-hdrcleanup include/asm-s390/debug.h --- devel/include/asm-s390/debug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/debug.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef DEBUG_H #define DEBUG_H -#include #include #include diff -puN include/asm-s390/hardirq.h~git-hdrcleanup include/asm-s390/hardirq.h --- devel/include/asm-s390/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include #include #include #include diff -puN include/asm-s390/idals.h~git-hdrcleanup include/asm-s390/idals.h --- devel/include/asm-s390/idals.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/idals.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _S390_IDALS_H #define _S390_IDALS_H -#include #include #include #include diff -puN include/asm-s390/local.h~git-hdrcleanup include/asm-s390/local.h --- devel/include/asm-s390/local.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/local.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_LOCAL_H #define _ASM_LOCAL_H -#include #include #include diff -puN include/asm-s390/lowcore.h~git-hdrcleanup include/asm-s390/lowcore.h --- devel/include/asm-s390/lowcore.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/lowcore.h 2006-05-14 02:02:38.000000000 -0700 @@ -124,7 +124,6 @@ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-s390/page.h~git-hdrcleanup include/asm-s390/page.h --- devel/include/asm-s390/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _S390_PAGE_H #define _S390_PAGE_H -#include #include /* PAGE_SHIFT determines the page size */ @@ -20,6 +19,7 @@ #define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4) #ifdef __KERNEL__ +#include #ifndef __ASSEMBLY__ #ifndef __s390x__ @@ -189,9 +189,9 @@ page_get_storage_key(unsigned long addr) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ - #include #include +#endif /* __KERNEL__ */ + #endif /* _S390_PAGE_H */ diff -puN include/asm-s390/pgalloc.h~git-hdrcleanup include/asm-s390/pgalloc.h --- devel/include/asm-s390/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _S390_PGALLOC_H #define _S390_PGALLOC_H -#include #include #include #include diff -puN include/asm-s390/ptrace.h~git-hdrcleanup include/asm-s390/ptrace.h --- devel/include/asm-s390/ptrace.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/ptrace.h 2006-05-14 02:02:38.000000000 -0700 @@ -181,11 +181,8 @@ #define PTRACE_OLDSETOPTIONS 21 #ifndef __ASSEMBLY__ -#include #include #include -#include -#include typedef union { @@ -301,6 +298,9 @@ typedef struct } s390_regs; #ifdef __KERNEL__ +#include +#include + /* * The pt_regs struct defines the way the registers are stored on * the stack during a system call. diff -puN include/asm-s390/sfp-machine.h~git-hdrcleanup include/asm-s390/sfp-machine.h --- devel/include/asm-s390/sfp-machine.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/sfp-machine.h 2006-05-14 02:02:38.000000000 -0700 @@ -25,7 +25,6 @@ #ifndef _SFP_MACHINE_H #define _SFP_MACHINE_H -#include #define _FP_W_TYPE_SIZE 32 #define _FP_W_TYPE unsigned long diff -puN include/asm-s390/smp.h~git-hdrcleanup include/asm-s390/smp.h --- devel/include/asm-s390/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include #include #include #include diff -puN include/asm-s390/system.h~git-hdrcleanup include/asm-s390/system.h --- devel/include/asm-s390/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef __ASM_SYSTEM_H #define __ASM_SYSTEM_H -#include #include #include #include diff -puN include/asm-s390/tlbflush.h~git-hdrcleanup include/asm-s390/tlbflush.h --- devel/include/asm-s390/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _S390_TLBFLUSH_H #define _S390_TLBFLUSH_H -#include #include #include diff -puN include/asm-s390/types.h~git-hdrcleanup include/asm-s390/types.h --- devel/include/asm-s390/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -58,7 +58,6 @@ typedef __signed__ long saddr_t; #ifndef __ASSEMBLY__ -#include typedef signed char s8; typedef unsigned char u8; diff -puN include/asm-s390/unistd.h~git-hdrcleanup include/asm-s390/unistd.h --- devel/include/asm-s390/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -392,6 +392,8 @@ #endif +#ifdef __KERNEL__ + /* user-visible error numbers are in the range -1 - -122: see */ #define __syscall_return(type, res) \ @@ -546,7 +548,6 @@ type name(type1 arg1, type2 arg2, type3 __syscall_return(type,__res); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_SYS_ALARM @@ -573,11 +574,9 @@ type name(type1 arg1, type2 arg2, type3 # define __ARCH_WANT_COMPAT_SYS_TIME # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND # endif -#endif #ifdef __KERNEL_SYSCALLS__ -#include #include #include #include @@ -625,7 +624,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -635,4 +634,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _ASM_S390_UNISTD_H_ */ diff -puN include/asm-s390/vtoc.h~git-hdrcleanup include/asm-s390/vtoc.h --- devel/include/asm-s390/vtoc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-s390/vtoc.h 2006-05-14 02:02:38.000000000 -0700 @@ -177,27 +177,27 @@ struct vtoc_format7_label } __attribute__ ((packed)); struct vtoc_cms_label { - u8 label_id[4]; /* Label identifier */ - u8 vol_id[6]; /* Volid */ - u16 version_id; /* Version identifier */ - u32 block_size; /* Disk block size */ - u32 origin_ptr; /* Disk origin pointer */ - u32 usable_count; /* Number of usable cylinders/blocks */ - u32 formatted_count; /* Maximum number of formatted cylinders/ + __u8 label_id[4]; /* Label identifier */ + __u8 vol_id[6]; /* Volid */ + __u16 version_id; /* Version identifier */ + __u32 block_size; /* Disk block size */ + __u32 origin_ptr; /* Disk origin pointer */ + __u32 usable_count; /* Number of usable cylinders/blocks */ + __u32 formatted_count; /* Maximum number of formatted cylinders/ * blocks */ - u32 block_count; /* Disk size in CMS blocks */ - u32 used_count; /* Number of CMS blocks in use */ - u32 fst_size; /* File Status Table (FST) size */ - u32 fst_count; /* Number of FSTs per CMS block */ - u8 format_date[6]; /* Disk FORMAT date */ - u8 reserved1[2]; - u32 disk_offset; /* Disk offset when reserved*/ - u32 map_block; /* Allocation Map Block with next hole */ - u32 hblk_disp; /* Displacement into HBLK data of next hole */ - u32 user_disp; /* Displacement into user part of Allocation + __u32 block_count; /* Disk size in CMS blocks */ + __u32 used_count; /* Number of CMS blocks in use */ + __u32 fst_size; /* File Status Table (FST) size */ + __u32 fst_count; /* Number of FSTs per CMS block */ + __u8 format_date[6]; /* Disk FORMAT date */ + __u8 reserved1[2]; + __u32 disk_offset; /* Disk offset when reserved*/ + __u32 map_block; /* Allocation Map Block with next hole */ + __u32 hblk_disp; /* Displacement into HBLK data of next hole */ + __u32 user_disp; /* Displacement into user part of Allocation * map */ - u8 reserved2[4]; - u8 segment_name[8]; /* Name of shared segment */ + __u8 reserved2[4]; + __u8 segment_name[8]; /* Name of shared segment */ } __attribute__ ((packed)); #endif /* _ASM_S390_VTOC_H */ diff -puN /dev/null include/asm-s390/z90crypt.h --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ devel-akpm/include/asm-s390/z90crypt.h 2006-05-14 02:02:38.000000000 -0700 @@ -0,0 +1,212 @@ +/* + * include/asm-s390/z90crypt.h + * + * z90crypt 1.3.3 (user-visible header) + * + * Copyright (C) 2001, 2005 IBM Corporation + * Author(s): Robert Burroughs + * Eric Rossman (edrossma@us.ibm.com) + * + * Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __ASM_S390_Z90CRYPT_H +#define __ASM_S390_Z90CRYPT_H +#include + +#define z90crypt_VERSION 1 +#define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards +#define z90crypt_VARIANT 3 // 3 = CEX2A support + +/** + * struct ica_rsa_modexpo + * + * Requirements: + * - outputdatalength is at least as large as inputdatalength. + * - All key parts are right justified in their fields, padded on + * the left with zeroes. + * - length(b_key) = inputdatalength + * - length(n_modulus) = inputdatalength + */ +struct ica_rsa_modexpo { + char __user * inputdata; + unsigned int inputdatalength; + char __user * outputdata; + unsigned int outputdatalength; + char __user * b_key; + char __user * n_modulus; +}; + +/** + * struct ica_rsa_modexpo_crt + * + * Requirements: + * - inputdatalength is even. + * - outputdatalength is at least as large as inputdatalength. + * - All key parts are right justified in their fields, padded on + * the left with zeroes. + * - length(bp_key) = inputdatalength/2 + 8 + * - length(bq_key) = inputdatalength/2 + * - length(np_key) = inputdatalength/2 + 8 + * - length(nq_key) = inputdatalength/2 + * - length(u_mult_inv) = inputdatalength/2 + 8 + */ +struct ica_rsa_modexpo_crt { + char __user * inputdata; + unsigned int inputdatalength; + char __user * outputdata; + unsigned int outputdatalength; + char __user * bp_key; + char __user * bq_key; + char __user * np_prime; + char __user * nq_prime; + char __user * u_mult_inv; +}; + +#define Z90_IOCTL_MAGIC 'z' // NOTE: Need to allocate from linux folks + +/** + * Interface notes: + * + * The ioctl()s which are implemented (along with relevant details) + * are: + * + * ICARSAMODEXPO + * Perform an RSA operation using a Modulus-Exponent pair + * This takes an ica_rsa_modexpo struct as its arg. + * + * NOTE: please refer to the comments preceding this structure + * for the implementation details for the contents of the + * block + * + * ICARSACRT + * Perform an RSA operation using a Chinese-Remainder Theorem key + * This takes an ica_rsa_modexpo_crt struct as its arg. + * + * NOTE: please refer to the comments preceding this structure + * for the implementation details for the contents of the + * block + * + * Z90STAT_TOTALCOUNT + * Return an integer count of all device types together. + * + * Z90STAT_PCICACOUNT + * Return an integer count of all PCICAs. + * + * Z90STAT_PCICCCOUNT + * Return an integer count of all PCICCs. + * + * Z90STAT_PCIXCCMCL2COUNT + * Return an integer count of all MCL2 PCIXCCs. + * + * Z90STAT_PCIXCCMCL3COUNT + * Return an integer count of all MCL3 PCIXCCs. + * + * Z90STAT_CEX2CCOUNT + * Return an integer count of all CEX2Cs. + * + * Z90STAT_CEX2ACOUNT + * Return an integer count of all CEX2As. + * + * Z90STAT_REQUESTQ_COUNT + * Return an integer count of the number of entries waiting to be + * sent to a device. + * + * Z90STAT_PENDINGQ_COUNT + * Return an integer count of the number of entries sent to a + * device awaiting the reply. + * + * Z90STAT_TOTALOPEN_COUNT + * Return an integer count of the number of open file handles. + * + * Z90STAT_DOMAIN_INDEX + * Return the integer value of the Cryptographic Domain. + * + * Z90STAT_STATUS_MASK + * Return an 64 element array of unsigned chars for the status of + * all devices. + * 0x01: PCICA + * 0x02: PCICC + * 0x03: PCIXCC_MCL2 + * 0x04: PCIXCC_MCL3 + * 0x05: CEX2C + * 0x06: CEX2A + * 0x0d: device is disabled via the proc filesystem + * + * Z90STAT_QDEPTH_MASK + * Return an 64 element array of unsigned chars for the queue + * depth of all devices. + * + * Z90STAT_PERDEV_REQCNT + * Return an 64 element array of unsigned integers for the number + * of successfully completed requests per device since the device + * was detected and made available. + * + * ICAZ90STATUS (deprecated) + * Return some device driver status in a ica_z90_status struct + * This takes an ica_z90_status struct as its arg. + * + * NOTE: this ioctl() is deprecated, and has been replaced with + * single ioctl()s for each type of status being requested + * + * Z90STAT_PCIXCCCOUNT (deprecated) + * Return an integer count of all PCIXCCs (MCL2 + MCL3). + * This is DEPRECATED now that MCL3 PCIXCCs are treated differently from + * MCL2 PCIXCCs. + * + * Z90QUIESCE (not recommended) + * Quiesce the driver. This is intended to stop all new + * requests from being processed. Its use is NOT recommended, + * except in circumstances where there is no other way to stop + * callers from accessing the driver. Its original use was to + * allow the driver to be "drained" of work in preparation for + * a system shutdown. + * + * NOTE: once issued, this ban on new work cannot be undone + * except by unloading and reloading the driver. + */ + +/** + * Supported ioctl calls + */ +#define ICARSAMODEXPO _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0) +#define ICARSACRT _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0) + +/* DEPRECATED status calls (bound for removal at some point) */ +#define ICAZ90STATUS _IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status) +#define Z90STAT_PCIXCCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x43, int) + +/* unrelated to ICA callers */ +#define Z90QUIESCE _IO(Z90_IOCTL_MAGIC, 0x11) + +/* New status calls */ +#define Z90STAT_TOTALCOUNT _IOR(Z90_IOCTL_MAGIC, 0x40, int) +#define Z90STAT_PCICACOUNT _IOR(Z90_IOCTL_MAGIC, 0x41, int) +#define Z90STAT_PCICCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x42, int) +#define Z90STAT_PCIXCCMCL2COUNT _IOR(Z90_IOCTL_MAGIC, 0x4b, int) +#define Z90STAT_PCIXCCMCL3COUNT _IOR(Z90_IOCTL_MAGIC, 0x4c, int) +#define Z90STAT_CEX2CCOUNT _IOR(Z90_IOCTL_MAGIC, 0x4d, int) +#define Z90STAT_CEX2ACOUNT _IOR(Z90_IOCTL_MAGIC, 0x4e, int) +#define Z90STAT_REQUESTQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x44, int) +#define Z90STAT_PENDINGQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x45, int) +#define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int) +#define Z90STAT_DOMAIN_INDEX _IOR(Z90_IOCTL_MAGIC, 0x47, int) +#define Z90STAT_STATUS_MASK _IOR(Z90_IOCTL_MAGIC, 0x48, char[64]) +#define Z90STAT_QDEPTH_MASK _IOR(Z90_IOCTL_MAGIC, 0x49, char[64]) +#define Z90STAT_PERDEV_REQCNT _IOR(Z90_IOCTL_MAGIC, 0x4a, int[64]) + +#endif /* __ASM_S390_Z90CRYPT_H */ diff -puN include/asm-sh64/bug.h~git-hdrcleanup include/asm-sh64/bug.h --- devel/include/asm-sh64/bug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/bug.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SH64_BUG_H #define __ASM_SH64_BUG_H -#include /* * Tell the user there is some problem, then force a segfault (in process diff -puN include/asm-sh64/dma-mapping.h~git-hdrcleanup include/asm-sh64/dma-mapping.h --- devel/include/asm-sh64/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SH_DMA_MAPPING_H #define __ASM_SH_DMA_MAPPING_H -#include #include #include #include diff -puN include/asm-sh64/hardirq.h~git-hdrcleanup include/asm-sh64/hardirq.h --- devel/include/asm-sh64/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SH64_HARDIRQ_H #define __ASM_SH64_HARDIRQ_H -#include #include #include diff -puN include/asm-sh64/ide.h~git-hdrcleanup include/asm-sh64/ide.h --- devel/include/asm-sh64/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifdef __KERNEL__ -#include /* Without this, the initialisation of PCI IDE cards end up calling * ide_init_hwif_ports, which won't work. */ diff -puN include/asm-sh64/irq.h~git-hdrcleanup include/asm-sh64/irq.h --- devel/include/asm-sh64/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ * */ -#include /* * Encoded IRQs are not considered worth to be supported. diff -puN include/asm-sh64/mmu_context.h~git-hdrcleanup include/asm-sh64/mmu_context.h --- devel/include/asm-sh64/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -26,7 +26,6 @@ */ extern unsigned long mmu_context_cache; -#include #include diff -puN include/asm-sh64/page.h~git-hdrcleanup include/asm-sh64/page.h --- devel/include/asm-sh64/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ * */ -#include /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 diff -puN include/asm-sh64/param.h~git-hdrcleanup include/asm-sh64/param.h --- devel/include/asm-sh64/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __ASM_SH64_PARAM_H #define __ASM_SH64_PARAM_H -#include #ifdef __KERNEL__ # ifdef CONFIG_SH_WDT diff -puN include/asm-sh64/pgtable.h~git-hdrcleanup include/asm-sh64/pgtable.h --- devel/include/asm-sh64/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -22,7 +22,6 @@ #include #include #include -#include struct vm_area_struct; diff -puN include/asm-sh64/system.h~git-hdrcleanup include/asm-sh64/system.h --- devel/include/asm-sh64/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ * */ -#include #include #include diff -puN include/asm-sh64/unistd.h~git-hdrcleanup include/asm-sh64/unistd.h --- devel/include/asm-sh64/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh64/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -344,6 +344,8 @@ #define __NR_inotify_add_watch 319 #define __NR_inotify_rm_watch 320 +#ifdef __KERNEL__ + #define NR_syscalls 321 /* user-visible error numbers are in the range -1 - -125: see */ @@ -486,7 +488,6 @@ __asm__ __volatile__ ("!dummy %0 %1 %2 % __syscall_return(type,__sc0); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -509,7 +510,6 @@ __syscall_return(type,__sc0); #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -550,7 +550,7 @@ static inline pid_t wait(int * wait_stat { return waitpid(-1,wait_stat,0); } -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -562,4 +562,5 @@ static inline pid_t wait(int * wait_stat #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") #endif +#endif /* __KERNEL__ */ #endif /* __ASM_SH64_UNISTD_H */ diff -puN include/asm-sh/bug.h~git-hdrcleanup include/asm-sh/bug.h --- devel/include/asm-sh/bug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/bug.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SH_BUG_H #define __ASM_SH_BUG_H -#include #ifdef CONFIG_BUG /* diff -puN include/asm-sh/checksum.h~git-hdrcleanup include/asm-sh/checksum.h --- devel/include/asm-sh/checksum.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/checksum.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * Copyright (C) 1999 by Kaz Kojima & Niibe Yutaka */ -#include #include /* diff -puN include/asm-sh/dma.h~git-hdrcleanup include/asm-sh/dma.h --- devel/include/asm-sh/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #define __ASM_SH_DMA_H #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-sh/dma-mapping.h~git-hdrcleanup include/asm-sh/dma-mapping.h --- devel/include/asm-sh/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SH_DMA_MAPPING_H #define __ASM_SH_DMA_MAPPING_H -#include #include #include #include diff -puN include/asm-sh/fixmap.h~git-hdrcleanup include/asm-sh/fixmap.h --- devel/include/asm-sh/fixmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/fixmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include #include #include #ifdef CONFIG_HIGHMEM diff -puN include/asm-sh/hardirq.h~git-hdrcleanup include/asm-sh/hardirq.h --- devel/include/asm-sh/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SH_HARDIRQ_H #define __ASM_SH_HARDIRQ_H -#include #include #include diff -puN include/asm-sh/hd64461/hd64461.h~git-hdrcleanup include/asm-sh/hd64461/hd64461.h --- devel/include/asm-sh/hd64461/hd64461.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/hd64461/hd64461.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * Copyright (C) 2000 YAEGASHI Takeshi * Hitachi HD64461 companion chip support */ -#include /* Constants for PCMCIA mappings */ #define HD64461_PCC_WINDOW 0x01000000 diff -puN include/asm-sh/hd64465/hd64465.h~git-hdrcleanup include/asm-sh/hd64465/hd64465.h --- devel/include/asm-sh/hd64465/hd64465.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/hd64465/hd64465.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ * Derived from which bore the message: * Copyright (C) 2000 YAEGASHI Takeshi */ -#include #include #include diff -puN include/asm-sh/ide.h~git-hdrcleanup include/asm-sh/ide.h --- devel/include/asm-sh/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifdef __KERNEL__ -#include #define ide_default_io_ctl(base) (0) diff -puN include/asm-sh/io.h~git-hdrcleanup include/asm-sh/io.h --- devel/include/asm-sh/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -23,7 +23,6 @@ * inb by default expands to _inb, but the machine specific code may * define it to __inb if it chooses. */ -#include #include #include #include diff -puN include/asm-sh/irq.h~git-hdrcleanup include/asm-sh/irq.h --- devel/include/asm-sh/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ * */ -#include #include #include /* for pt_regs */ diff -puN include/asm-sh/keyboard.h~git-hdrcleanup include/asm-sh/keyboard.h --- devel/include/asm-sh/keyboard.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/keyboard.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ */ #include -#include #include #ifdef CONFIG_SH_MPC1211 diff -puN include/asm-sh/kmap_types.h~git-hdrcleanup include/asm-sh/kmap_types.h --- devel/include/asm-sh/kmap_types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/kmap_types.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ /* Dummy header just to define km_type. */ -#include #ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , diff -puN include/asm-sh/machvec.h~git-hdrcleanup include/asm-sh/machvec.h --- devel/include/asm-sh/machvec.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/machvec.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _ASM_SH_MACHVEC_H #define _ASM_SH_MACHVEC_H 1 -#include #include #include diff -puN include/asm-sh/machvec_init.h~git-hdrcleanup include/asm-sh/machvec_init.h --- devel/include/asm-sh/machvec_init.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/machvec_init.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef __SH_MACHVEC_INIT_H #define __SH_MACHVEC_INIT_H -#include /* * In a GENERIC kernel, we have lots of these vectors floating about, diff -puN include/asm-sh/mpc1211/dma.h~git-hdrcleanup include/asm-sh/mpc1211/dma.h --- devel/include/asm-sh/mpc1211/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/mpc1211/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_MPC1211_DMA_H #define _ASM_MPC1211_DMA_H -#include #include /* And spinlocks */ #include /* need byte IO */ #include diff -puN include/asm-sh/overdrive/overdrive.h~git-hdrcleanup include/asm-sh/overdrive/overdrive.h --- devel/include/asm-sh/overdrive/overdrive.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/overdrive/overdrive.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * */ -#include #ifndef __OVERDRIVE_H__ #define __OVERDRIVE_H__ diff -puN include/asm-sh/page.h~git-hdrcleanup include/asm-sh/page.h --- devel/include/asm-sh/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ [ P4 control ] 0xE0000000 */ -#include /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 diff -puN include/asm-sh/pgtable.h~git-hdrcleanup include/asm-sh/pgtable.h --- devel/include/asm-sh/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ * Copyright (C) 2002, 2003, 2004 Paul Mundt */ -#include #include /* diff -puN include/asm-sh/serial.h~git-hdrcleanup include/asm-sh/serial.h --- devel/include/asm-sh/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _ASM_SERIAL_H #define _ASM_SERIAL_H -#include #include #ifdef CONFIG_SH_EC3104 diff -puN include/asm-sh/smp.h~git-hdrcleanup include/asm-sh/smp.h --- devel/include/asm-sh/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_SH_SMP_H #define __ASM_SH_SMP_H -#include #include #include diff -puN include/asm-sh/system.h~git-hdrcleanup include/asm-sh/system.h --- devel/include/asm-sh/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Copyright (C) 2002 Paul Mundt */ -#include /* * switch_to() should switch tasks to task nr n, first diff -puN include/asm-sh/types.h~git-hdrcleanup include/asm-sh/types.h --- devel/include/asm-sh/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -35,7 +35,6 @@ typedef unsigned long long __u64; #ifndef __ASSEMBLY__ -#include typedef __signed__ char s8; typedef unsigned char u8; diff -puN include/asm-sh/unistd.h~git-hdrcleanup include/asm-sh/unistd.h --- devel/include/asm-sh/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -304,6 +304,8 @@ #define NR_syscalls 293 +#ifdef __KERNEL__ + /* user-visible error numbers are in the range -1 - -124: see */ #define __syscall_return(type, res) \ @@ -420,7 +422,6 @@ __asm__ __volatile__ ("trapa #0x16" \ __syscall_return(type,__sc0); \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT @@ -443,7 +444,6 @@ __syscall_return(type,__sc0); \ #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -513,7 +513,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -525,4 +525,5 @@ asmlinkage long sys_rt_sigaction(int sig #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") #endif +#endif /* __KERNEL__ */ #endif /* __ASM_SH_UNISTD_H */ diff -puN include/asm-sh/watchdog.h~git-hdrcleanup include/asm-sh/watchdog.h --- devel/include/asm-sh/watchdog.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sh/watchdog.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifdef __KERNEL__ #include -#include #include #include diff -puN include/asm-sparc64/atomic.h~git-hdrcleanup include/asm-sparc64/atomic.h --- devel/include/asm-sparc64/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __ARCH_SPARC64_ATOMIC__ #define __ARCH_SPARC64_ATOMIC__ -#include #include typedef struct { volatile int counter; } atomic_t; diff -puN include/asm-sparc64/bitops.h~git-hdrcleanup include/asm-sparc64/bitops.h --- devel/include/asm-sparc64/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _SPARC64_BITOPS_H #define _SPARC64_BITOPS_H -#include #include #include diff -puN include/asm-sparc64/bugs.h~git-hdrcleanup include/asm-sparc64/bugs.h --- devel/include/asm-sparc64/bugs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/bugs.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) */ -#include extern unsigned long loops_per_jiffy; diff -puN include/asm-sparc64/cacheflush.h~git-hdrcleanup include/asm-sparc64/cacheflush.h --- devel/include/asm-sparc64/cacheflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/cacheflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _SPARC64_CACHEFLUSH_H #define _SPARC64_CACHEFLUSH_H -#include #include #ifndef __ASSEMBLY__ diff -puN include/asm-sparc64/delay.h~git-hdrcleanup include/asm-sparc64/delay.h --- devel/include/asm-sparc64/delay.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/delay.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef __SPARC64_DELAY_H #define __SPARC64_DELAY_H -#include #include #include diff -puN include/asm-sparc64/dma.h~git-hdrcleanup include/asm-sparc64/dma.h --- devel/include/asm-sparc64/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _ASM_SPARC64_DMA_H #define _ASM_SPARC64_DMA_H -#include #include #include #include diff -puN include/asm-sparc64/dma-mapping.h~git-hdrcleanup include/asm-sparc64/dma-mapping.h --- devel/include/asm-sparc64/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_SPARC64_DMA_MAPPING_H #define _ASM_SPARC64_DMA_MAPPING_H -#include #ifdef CONFIG_PCI #include diff -puN include/asm-sparc64/floppy.h~git-hdrcleanup include/asm-sparc64/floppy.h --- devel/include/asm-sparc64/floppy.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/floppy.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ASM_SPARC64_FLOPPY_H #define __ASM_SPARC64_FLOPPY_H -#include #include #include diff -puN include/asm-sparc64/ide.h~git-hdrcleanup include/asm-sparc64/ide.h --- devel/include/asm-sparc64/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-sparc64/irq.h~git-hdrcleanup include/asm-sparc64/irq.h --- devel/include/asm-sparc64/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _SPARC64_IRQ_H #define _SPARC64_IRQ_H -#include #include #include #include diff -puN include/asm-sparc64/kprobes.h~git-hdrcleanup include/asm-sparc64/kprobes.h --- devel/include/asm-sparc64/kprobes.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/kprobes.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _SPARC64_KPROBES_H #define _SPARC64_KPROBES_H -#include #include #include diff -puN include/asm-sparc64/mc146818rtc.h~git-hdrcleanup include/asm-sparc64/mc146818rtc.h --- devel/include/asm-sparc64/mc146818rtc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/mc146818rtc.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #ifndef __ASM_SPARC64_MC146818RTC_H #define __ASM_SPARC64_MC146818RTC_H -#include #include #ifndef RTC_PORT diff -puN include/asm-sparc64/mmu.h~git-hdrcleanup include/asm-sparc64/mmu.h --- devel/include/asm-sparc64/mmu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/mmu.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __MMU_H #define __MMU_H -#include #include #include #include diff -puN include/asm-sparc64/oplib.h~git-hdrcleanup include/asm-sparc64/oplib.h --- devel/include/asm-sparc64/oplib.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/oplib.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __SPARC64_OPLIB_H #define __SPARC64_OPLIB_H -#include #include /* OBP version string. */ diff -puN include/asm-sparc64/page.h~git-hdrcleanup include/asm-sparc64/page.h --- devel/include/asm-sparc64/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifndef _SPARC64_PAGE_H #define _SPARC64_PAGE_H -#include #include #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB) diff -puN include/asm-sparc64/param.h~git-hdrcleanup include/asm-sparc64/param.h --- devel/include/asm-sparc64/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASMSPARC64_PARAM_H #define _ASMSPARC64_PARAM_H -#include #ifdef __KERNEL__ # define HZ CONFIG_HZ /* Internal kernel timer frequency */ diff -puN include/asm-sparc64/pgalloc.h~git-hdrcleanup include/asm-sparc64/pgalloc.h --- devel/include/asm-sparc64/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _SPARC64_PGALLOC_H #define _SPARC64_PGALLOC_H -#include #include #include #include diff -puN include/asm-sparc64/pgtable.h~git-hdrcleanup include/asm-sparc64/pgtable.h --- devel/include/asm-sparc64/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #include -#include #include #include #include diff -puN include/asm-sparc64/processor.h~git-hdrcleanup include/asm-sparc64/processor.h --- devel/include/asm-sparc64/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ */ #define current_text_addr() ({ void *pc; __asm__("rd %%pc, %0" : "=r" (pc)); pc; }) -#include #include #include #include diff -puN include/asm-sparc64/siginfo.h~git-hdrcleanup include/asm-sparc64/siginfo.h --- devel/include/asm-sparc64/siginfo.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/siginfo.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifdef __KERNEL__ -#include #include #ifdef CONFIG_COMPAT diff -puN include/asm-sparc64/signal.h~git-hdrcleanup include/asm-sparc64/signal.h --- devel/include/asm-sparc64/signal.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/signal.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifdef __KERNEL__ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-sparc64/smp.h~git-hdrcleanup include/asm-sparc64/smp.h --- devel/include/asm-sparc64/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef _SPARC64_SMP_H #define _SPARC64_SMP_H -#include #include #include #include diff -puN include/asm-sparc64/spinlock.h~git-hdrcleanup include/asm-sparc64/spinlock.h --- devel/include/asm-sparc64/spinlock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/spinlock.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef __SPARC64_SPINLOCK_H #define __SPARC64_SPINLOCK_H -#include #include /* For NR_CPUS */ #ifndef __ASSEMBLY__ diff -puN include/asm-sparc64/system.h~git-hdrcleanup include/asm-sparc64/system.h --- devel/include/asm-sparc64/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef __SPARC64_SYSTEM_H #define __SPARC64_SYSTEM_H -#include #include #include #include diff -puN include/asm-sparc64/timer.h~git-hdrcleanup include/asm-sparc64/timer.h --- devel/include/asm-sparc64/timer.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/timer.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #include -#include struct sparc64_tick_ops { void (*init_tick)(unsigned long); diff -puN include/asm-sparc64/tlbflush.h~git-hdrcleanup include/asm-sparc64/tlbflush.h --- devel/include/asm-sparc64/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _SPARC64_TLBFLUSH_H #define _SPARC64_TLBFLUSH_H -#include #include #include diff -puN include/asm-sparc64/tlb.h~git-hdrcleanup include/asm-sparc64/tlb.h --- devel/include/asm-sparc64/tlb.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/tlb.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _SPARC64_TLB_H #define _SPARC64_TLB_H -#include #include #include #include diff -puN include/asm-sparc64/ttable.h~git-hdrcleanup include/asm-sparc64/ttable.h --- devel/include/asm-sparc64/ttable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/ttable.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _SPARC64_TTABLE_H #define _SPARC64_TTABLE_H -#include #include #ifdef __ASSEMBLY__ diff -puN include/asm-sparc64/unistd.h~git-hdrcleanup include/asm-sparc64/unistd.h --- devel/include/asm-sparc64/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc64/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -319,6 +319,7 @@ #define __NR_ppoll 298 #define __NR_unshare 299 +#ifdef __KERNEL__ /* WARNING: You MAY NOT add syscall numbers larger than 299, since * all of the syscall tables in the Sparc kernel are * sized to have 299 entries (starting at zero). Therefore @@ -485,7 +486,6 @@ asmlinkage long sys_rt_sigaction(int sig #endif /* __KERNEL_SYSCALLS__ */ -#ifdef __KERNEL__ /* sysconf options, for SunOS compatibility */ #define _SC_ARG_MAX 1 #define _SC_CHILD_MAX 2 @@ -519,7 +519,6 @@ asmlinkage long sys_rt_sigaction(int sig #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGSUSPEND #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND -#endif /* * "Conditional" syscalls @@ -529,4 +528,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _SPARC64_UNISTD_H */ diff -puN include/asm-sparc/asmmacro.h~git-hdrcleanup include/asm-sparc/asmmacro.h --- devel/include/asm-sparc/asmmacro.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/asmmacro.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef _SPARC_ASMMACRO_H #define _SPARC_ASMMACRO_H -#include #include #include diff -puN include/asm-sparc/atomic.h~git-hdrcleanup include/asm-sparc/atomic.h --- devel/include/asm-sparc/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef __ARCH_SPARC_ATOMIC__ #define __ARCH_SPARC_ATOMIC__ -#include typedef struct { volatile int counter; } atomic_t; diff -puN include/asm-sparc/bugs.h~git-hdrcleanup include/asm-sparc/bugs.h --- devel/include/asm-sparc/bugs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/bugs.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ */ #include -#include extern unsigned long loops_per_jiffy; diff -puN include/asm-sparc/cacheflush.h~git-hdrcleanup include/asm-sparc/cacheflush.h --- devel/include/asm-sparc/cacheflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/cacheflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _SPARC_CACHEFLUSH_H #define _SPARC_CACHEFLUSH_H -#include #include /* Common for other includes */ // #include from pgalloc.h // #include from pgalloc.h diff -puN include/asm-sparc/delay.h~git-hdrcleanup include/asm-sparc/delay.h --- devel/include/asm-sparc/delay.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/delay.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef __SPARC_DELAY_H #define __SPARC_DELAY_H -#include #include static inline void __delay(unsigned long loops) diff -puN include/asm-sparc/dma.h~git-hdrcleanup include/asm-sparc/dma.h --- devel/include/asm-sparc/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _ASM_SPARC_DMA_H #define _ASM_SPARC_DMA_H -#include #include #include diff -puN include/asm-sparc/dma-mapping.h~git-hdrcleanup include/asm-sparc/dma-mapping.h --- devel/include/asm-sparc/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_SPARC_DMA_MAPPING_H #define _ASM_SPARC_DMA_MAPPING_H -#include #ifdef CONFIG_PCI #include diff -puN include/asm-sparc/elf.h~git-hdrcleanup include/asm-sparc/elf.h --- devel/include/asm-sparc/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * ELF register definitions.. */ -#include #include #ifdef __KERNEL__ diff -puN include/asm-sparc/fixmap.h~git-hdrcleanup include/asm-sparc/fixmap.h --- devel/include/asm-sparc/fixmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/fixmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include #include #include #ifdef CONFIG_HIGHMEM diff -puN include/asm-sparc/hardirq.h~git-hdrcleanup include/asm-sparc/hardirq.h --- devel/include/asm-sparc/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef __SPARC_HARDIRQ_H #define __SPARC_HARDIRQ_H -#include #include #include #include diff -puN include/asm-sparc/ide.h~git-hdrcleanup include/asm-sparc/ide.h --- devel/include/asm-sparc/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-sparc/irq.h~git-hdrcleanup include/asm-sparc/irq.h --- devel/include/asm-sparc/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _SPARC_IRQ_H #define _SPARC_IRQ_H -#include #include #include /* For NR_CPUS */ #include diff -puN include/asm-sparc/mostek.h~git-hdrcleanup include/asm-sparc/mostek.h --- devel/include/asm-sparc/mostek.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/mostek.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _SPARC_MOSTEK_H #define _SPARC_MOSTEK_H -#include #include #include diff -puN include/asm-sparc/page.h~git-hdrcleanup include/asm-sparc/page.h --- devel/include/asm-sparc/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _SPARC_PAGE_H #define _SPARC_PAGE_H -#include #ifdef CONFIG_SUN4 #define PAGE_SHIFT 13 #else diff -puN include/asm-sparc/pgalloc.h~git-hdrcleanup include/asm-sparc/pgalloc.h --- devel/include/asm-sparc/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _SPARC_PGALLOC_H #define _SPARC_PGALLOC_H -#include #include #include diff -puN include/asm-sparc/pgtable.h~git-hdrcleanup include/asm-sparc/pgtable.h --- devel/include/asm-sparc/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #include -#include #include #include #include diff -puN include/asm-sparc/sfp-machine.h~git-hdrcleanup include/asm-sparc/sfp-machine.h --- devel/include/asm-sparc/sfp-machine.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/sfp-machine.h 2006-05-14 02:02:38.000000000 -0700 @@ -25,7 +25,6 @@ #ifndef _SFP_MACHINE_H #define _SFP_MACHINE_H -#include #define _FP_W_TYPE_SIZE 32 #define _FP_W_TYPE unsigned long diff -puN include/asm-sparc/smp.h~git-hdrcleanup include/asm-sparc/smp.h --- devel/include/asm-sparc/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef _SPARC_SMP_H #define _SPARC_SMP_H -#include #include #include #include diff -puN include/asm-sparc/system.h~git-hdrcleanup include/asm-sparc/system.h --- devel/include/asm-sparc/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,10 +1,8 @@ /* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */ -#include #ifndef __SPARC_SYSTEM_H #define __SPARC_SYSTEM_H -#include #include #include /* NR_CPUS */ #include diff -puN include/asm-sparc/timer.h~git-hdrcleanup include/asm-sparc/timer.h --- devel/include/asm-sparc/timer.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/timer.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) */ -#include #ifndef _SPARC_TIMER_H #define _SPARC_TIMER_H diff -puN include/asm-sparc/tlbflush.h~git-hdrcleanup include/asm-sparc/tlbflush.h --- devel/include/asm-sparc/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _SPARC_TLBFLUSH_H #define _SPARC_TLBFLUSH_H -#include #include // #include diff -puN include/asm-sparc/unistd.h~git-hdrcleanup include/asm-sparc/unistd.h --- devel/include/asm-sparc/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -317,6 +317,7 @@ #define __NR_ppoll 298 #define __NR_unshare 299 +#ifdef __KERNEL__ /* WARNING: You MAY NOT add syscall numbers larger than 299, since * all of the syscall tables in the Sparc kernel are * sized to have 299 entries (starting at zero). Therefore @@ -453,7 +454,6 @@ errno = -__res; \ return -1; \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 @@ -475,7 +475,6 @@ return -1; \ #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGSUSPEND -#endif #ifdef __KERNEL_SYSCALLS__ @@ -532,4 +531,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif /* _SPARC_UNISTD_H */ diff -puN include/asm-sparc/vac-ops.h~git-hdrcleanup include/asm-sparc/vac-ops.h --- devel/include/asm-sparc/vac-ops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/vac-ops.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ * Copyright (C) 1994, David S. Miller (davem@caip.rutgers.edu) */ -#include #include #include #include diff -puN include/asm-sparc/winmacro.h~git-hdrcleanup include/asm-sparc/winmacro.h --- devel/include/asm-sparc/winmacro.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-sparc/winmacro.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _SPARC_WINMACRO_H #define _SPARC_WINMACRO_H -#include #include /* Store the register window onto the 8-byte aligned area starting diff -puN include/asm-um/a.out.h~git-hdrcleanup include/asm-um/a.out.h --- devel/include/asm-um/a.out.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/a.out.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __UM_A_OUT_H #define __UM_A_OUT_H -#include "linux/config.h" #include "asm/arch/a.out.h" #include "choose-mode.h" diff -puN include/asm-um/cache.h~git-hdrcleanup include/asm-um/cache.h --- devel/include/asm-um/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __UM_CACHE_H #define __UM_CACHE_H -#include #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT) # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) diff -puN include/asm-um/elf-ppc.h~git-hdrcleanup include/asm-um/elf-ppc.h --- devel/include/asm-um/elf-ppc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/elf-ppc.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __UM_ELF_PPC_H #define __UM_ELF_PPC_H -#include "linux/config.h" extern long elf_aux_hwcap; #define ELF_HWCAP (elf_aux_hwcap) diff -puN include/asm-um/fixmap.h~git-hdrcleanup include/asm-um/fixmap.h --- devel/include/asm-um/fixmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/fixmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __UM_FIXMAP_H #define __UM_FIXMAP_H -#include #include #include #include diff -puN include/asm-um/hardirq.h~git-hdrcleanup include/asm-um/hardirq.h --- devel/include/asm-um/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifndef __ASM_UM_HARDIRQ_H #define __ASM_UM_HARDIRQ_H -#include #include #include diff -puN include/asm-um/linkage.h~git-hdrcleanup include/asm-um/linkage.h --- devel/include/asm-um/linkage.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/linkage.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #include "asm/arch/linkage.h" -#include /* will pick sane defaults */ #ifdef CONFIG_GPROF diff -puN include/asm-um/mmu_context.h~git-hdrcleanup include/asm-um/mmu_context.h --- devel/include/asm-um/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #define __UM_MMU_CONTEXT_H #include "linux/sched.h" -#include "linux/config.h" #include "choose-mode.h" #include "um_mmu.h" diff -puN include/asm-um/page.h~git-hdrcleanup include/asm-um/page.h --- devel/include/asm-um/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ struct page; -#include #include /* PAGE_SHIFT determines the page size */ diff -puN include/asm-um/pgalloc.h~git-hdrcleanup include/asm-um/pgalloc.h --- devel/include/asm-um/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __UM_PGALLOC_H #define __UM_PGALLOC_H -#include "linux/config.h" #include "linux/mm.h" #include "asm/fixmap.h" diff -puN include/asm-um/processor-generic.h~git-hdrcleanup include/asm-um/processor-generic.h --- devel/include/asm-um/processor-generic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/processor-generic.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ struct pt_regs; struct task_struct; -#include "linux/config.h" #include "asm/ptrace.h" #include "choose-mode.h" #include "registers.h" diff -puN include/asm-um/ptrace-generic.h~git-hdrcleanup include/asm-um/ptrace-generic.h --- devel/include/asm-um/ptrace-generic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/ptrace-generic.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __ASSEMBLY__ -#include "linux/config.h" #define pt_regs pt_regs_subarch #define show_regs show_regs_subarch diff -puN include/asm-um/smp.h~git-hdrcleanup include/asm-um/smp.h --- devel/include/asm-um/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef CONFIG_SMP -#include "linux/config.h" #include "linux/bitops.h" #include "asm/current.h" #include "linux/cpumask.h" diff -puN include/asm-um/thread_info.h~git-hdrcleanup include/asm-um/thread_info.h --- devel/include/asm-um/thread_info.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-um/thread_info.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef __ASSEMBLY__ -#include #include #include diff -puN include/asm-v850/atomic.h~git-hdrcleanup include/asm-v850/atomic.h --- devel/include/asm-v850/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef __V850_ATOMIC_H__ #define __V850_ATOMIC_H__ -#include #include diff -puN include/asm-v850/bitops.h~git-hdrcleanup include/asm-v850/bitops.h --- devel/include/asm-v850/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #define __V850_BITOPS_H__ -#include #include /* unlikely */ #include /* swab32 */ #include /* interrupt enable/disable */ diff -puN include/asm-v850/dma-mapping.h~git-hdrcleanup include/asm-v850/dma-mapping.h --- devel/include/asm-v850/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __V850_DMA_MAPPING_H__ #define __V850_DMA_MAPPING_H__ -#include #ifdef CONFIG_PCI #include diff -puN include/asm-v850/hardirq.h~git-hdrcleanup include/asm-v850/hardirq.h --- devel/include/asm-v850/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __V850_HARDIRQ_H__ #define __V850_HARDIRQ_H__ -#include #include #include diff -puN include/asm-v850/machdep.h~git-hdrcleanup include/asm-v850/machdep.h --- devel/include/asm-v850/machdep.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/machdep.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef __V850_MACHDEP_H__ #define __V850_MACHDEP_H__ -#include /* chips */ #ifdef CONFIG_V850E_MA1 diff -puN include/asm-v850/pgtable.h~git-hdrcleanup include/asm-v850/pgtable.h --- devel/include/asm-v850/pgtable.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/pgtable.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #include -#include #include diff -puN include/asm-v850/processor.h~git-hdrcleanup include/asm-v850/processor.h --- devel/include/asm-v850/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef __V850_PROCESSOR_H__ #define __V850_PROCESSOR_H__ -#include #ifndef __ASSEMBLY__ /* is not asm-safe. */ #include #endif diff -puN include/asm-v850/serial.h~git-hdrcleanup include/asm-v850/serial.h --- devel/include/asm-v850/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Copyright (C) 1999 by Ralf Baechle * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ -#include #ifdef CONFIG_RTE_CB_ME2 diff -puN include/asm-v850/unistd.h~git-hdrcleanup include/asm-v850/unistd.h --- devel/include/asm-v850/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,8 +14,6 @@ #ifndef __V850_UNISTD_H__ #define __V850_UNISTD_H__ -#include - #define __NR_restart_syscall 0 #define __NR_exit 1 #define __NR_fork 2 @@ -237,10 +235,9 @@ except the syscall number (r12). */ #define SYSCALL_SHORT_CLOBBERS SYSCALL_CLOBBERS, "r13", "r14" +#ifdef __KERNEL__ -/* User programs sometimes end up including this header file - (indirectly, via uClibc header files), so I'm a bit nervous just - including . */ +#include #define __syscall_return(type, res) \ do { \ @@ -368,7 +365,6 @@ type name (atype a, btype b, ctype c, dt } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 @@ -389,7 +385,6 @@ type name (atype a, btype b, ctype c, dt #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -440,7 +435,7 @@ asmlinkage long sys_rt_sigaction(int sig struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -455,4 +450,5 @@ asmlinkage long sys_rt_sigaction(int sig void name (void) __attribute__ ((weak, alias ("sys_ni_syscall"))); #endif +#endif /* __KERNEL__ */ #endif /* __V850_UNISTD_H__ */ diff -puN include/asm-v850/v850e_uart.h~git-hdrcleanup include/asm-v850/v850e_uart.h --- devel/include/asm-v850/v850e_uart.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-v850/v850e_uart.h 2006-05-14 02:02:38.000000000 -0700 @@ -19,7 +19,6 @@ #ifndef __V850_V850E_UART_H__ #define __V850_V850E_UART_H__ -#include #include #include diff -puN include/asm-x86_64/apic.h~git-hdrcleanup include/asm-x86_64/apic.h --- devel/include/asm-x86_64/apic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/apic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_APIC_H #define __ASM_APIC_H -#include #include #include #include diff -puN include/asm-x86_64/atomic.h~git-hdrcleanup include/asm-x86_64/atomic.h --- devel/include/asm-x86_64/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ARCH_X86_64_ATOMIC__ #define __ARCH_X86_64_ATOMIC__ -#include #include /* atomic_t should be 32 bit signed type */ diff -puN include/asm-x86_64/bitops.h~git-hdrcleanup include/asm-x86_64/bitops.h --- devel/include/asm-x86_64/bitops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/bitops.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * Copyright 1992, Linus Torvalds. */ -#include #ifdef CONFIG_SMP #define LOCK_PREFIX "lock ; " diff -puN include/asm-x86_64/bugs.h~git-hdrcleanup include/asm-x86_64/bugs.h --- devel/include/asm-x86_64/bugs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/bugs.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ * void check_bugs(void); */ -#include #include #include #include diff -puN include/asm-x86_64/cache.h~git-hdrcleanup include/asm-x86_64/cache.h --- devel/include/asm-x86_64/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #ifndef __ARCH_X8664_CACHE_H #define __ARCH_X8664_CACHE_H -#include /* L1 cache line size */ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) diff -puN include/asm-x86_64/calling.h~git-hdrcleanup include/asm-x86_64/calling.h --- devel/include/asm-x86_64/calling.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/calling.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ * Some macros to handle stack frames in assembly. */ -#include #define R15 0 #define R14 8 diff -puN include/asm-x86_64/dma.h~git-hdrcleanup include/asm-x86_64/dma.h --- devel/include/asm-x86_64/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include #include /* And spinlocks */ #include /* need byte IO */ #include diff -puN include/asm-x86_64/dma-mapping.h~git-hdrcleanup include/asm-x86_64/dma-mapping.h --- devel/include/asm-x86_64/dma-mapping.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/dma-mapping.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * documentation. */ -#include #include #include diff -puN include/asm-x86_64/dwarf2.h~git-hdrcleanup include/asm-x86_64/dwarf2.h --- devel/include/asm-x86_64/dwarf2.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/dwarf2.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _DWARF2_H #define _DWARF2_H 1 -#include #ifndef __ASSEMBLY__ #warning "asm/dwarf2.h should be only included in pure assembly files" diff -puN include/asm-x86_64/fixmap.h~git-hdrcleanup include/asm-x86_64/fixmap.h --- devel/include/asm-x86_64/fixmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/fixmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include #include #include #include diff -puN include/asm-x86_64/hardirq.h~git-hdrcleanup include/asm-x86_64/hardirq.h --- devel/include/asm-x86_64/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include #include #include #include diff -puN include/asm-x86_64/hw_irq.h~git-hdrcleanup include/asm-x86_64/hw_irq.h --- devel/include/asm-x86_64/hw_irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/hw_irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ */ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-x86_64/ia32.h~git-hdrcleanup include/asm-x86_64/ia32.h --- devel/include/asm-x86_64/ia32.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/ia32.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_X86_64_IA32_H #define _ASM_X86_64_IA32_H -#include #ifdef CONFIG_IA32_EMULATION diff -puN include/asm-x86_64/io_apic.h~git-hdrcleanup include/asm-x86_64/io_apic.h --- devel/include/asm-x86_64/io_apic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/io_apic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_IO_APIC_H #define __ASM_IO_APIC_H -#include #include #include diff -puN include/asm-x86_64/io.h~git-hdrcleanup include/asm-x86_64/io.h --- devel/include/asm-x86_64/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#include /* * This file contains the definitions for the x86 IO instructions diff -puN include/asm-x86_64/mmu_context.h~git-hdrcleanup include/asm-x86_64/mmu_context.h --- devel/include/asm-x86_64/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __X86_64_MMU_CONTEXT_H #define __X86_64_MMU_CONTEXT_H -#include #include #include #include diff -puN include/asm-x86_64/mmzone.h~git-hdrcleanup include/asm-x86_64/mmzone.h --- devel/include/asm-x86_64/mmzone.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/mmzone.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #ifndef _ASM_X86_64_MMZONE_H #define _ASM_X86_64_MMZONE_H 1 -#include #ifdef CONFIG_NUMA diff -puN include/asm-x86_64/mtrr.h~git-hdrcleanup include/asm-x86_64/mtrr.h --- devel/include/asm-x86_64/mtrr.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/mtrr.h 2006-05-14 02:02:38.000000000 -0700 @@ -23,7 +23,6 @@ #ifndef _LINUX_MTRR_H #define _LINUX_MTRR_H -#include #include #include diff -puN include/asm-x86_64/page.h~git-hdrcleanup include/asm-x86_64/page.h --- devel/include/asm-x86_64/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _X86_64_PAGE_H #define _X86_64_PAGE_H -#include /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 @@ -136,9 +135,9 @@ typedef struct { unsigned long pgprot; } #define __HAVE_ARCH_GATE_AREA 1 -#endif /* __KERNEL__ */ - #include #include +#endif /* __KERNEL__ */ + #endif /* _X86_64_PAGE_H */ diff -puN include/asm-x86_64/param.h~git-hdrcleanup include/asm-x86_64/param.h --- devel/include/asm-x86_64/param.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/param.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _ASMx86_64_PARAM_H #ifdef __KERNEL__ -# include # define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define USER_HZ 100 /* .. some user interfaces are in "ticks */ #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ diff -puN include/asm-x86_64/pci.h~git-hdrcleanup include/asm-x86_64/pci.h --- devel/include/asm-x86_64/pci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/pci.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __x8664_PCI_H #define __x8664_PCI_H -#include #include #ifdef __KERNEL__ diff -puN include/asm-x86_64/processor.h~git-hdrcleanup include/asm-x86_64/processor.h --- devel/include/asm-x86_64/processor.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/processor.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff -puN include/asm-x86_64/serial.h~git-hdrcleanup include/asm-x86_64/serial.h --- devel/include/asm-x86_64/serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ * include/asm-x86_64/serial.h */ -#include /* * This assumes you have a 1.8432 MHz clock for your UART. diff -puN include/asm-x86_64/smp.h~git-hdrcleanup include/asm-x86_64/smp.h --- devel/include/asm-x86_64/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * We need the APIC definitions automatically as part of 'smp.h' */ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/asm-x86_64/spinlock.h~git-hdrcleanup include/asm-x86_64/spinlock.h --- devel/include/asm-x86_64/spinlock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/spinlock.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #include #include #include -#include /* * Your basic SMP spinlocks, allowing only a single CPU anywhere diff -puN include/asm-x86_64/swiotlb.h~git-hdrcleanup include/asm-x86_64/swiotlb.h --- devel/include/asm-x86_64/swiotlb.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/swiotlb.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_SWIOTLB_H #define _ASM_SWTIOLB_H 1 -#include #include diff -puN include/asm-x86_64/system.h~git-hdrcleanup include/asm-x86_64/system.h --- devel/include/asm-x86_64/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __ASM_SYSTEM_H #define __ASM_SYSTEM_H -#include #include #include diff -puN include/asm-x86_64/tlbflush.h~git-hdrcleanup include/asm-x86_64/tlbflush.h --- devel/include/asm-x86_64/tlbflush.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/tlbflush.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _X8664_TLBFLUSH_H #define _X8664_TLBFLUSH_H -#include #include #include diff -puN include/asm-x86_64/topology.h~git-hdrcleanup include/asm-x86_64/topology.h --- devel/include/asm-x86_64/topology.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/topology.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _ASM_X86_64_TOPOLOGY_H #define _ASM_X86_64_TOPOLOGY_H -#include #ifdef CONFIG_NUMA diff -puN include/asm-x86_64/uaccess.h~git-hdrcleanup include/asm-x86_64/uaccess.h --- devel/include/asm-x86_64/uaccess.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/uaccess.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ /* * User space memory access functions */ -#include #include #include #include diff -puN include/asm-x86_64/unistd.h~git-hdrcleanup include/asm-x86_64/unistd.h --- devel/include/asm-x86_64/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-x86_64/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -618,6 +618,8 @@ __SYSCALL(__NR_sync_file_range, sys_sync #define __NR_vmsplice 278 __SYSCALL(__NR_vmsplice, sys_vmsplice) +#ifdef __KERNEL__ + #define __NR_syscall_max __NR_vmsplice #ifndef __NO_STUBS @@ -635,7 +637,6 @@ do { \ return (type) (res); \ } while (0) -#ifdef __KERNEL__ #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT #define __ARCH_WANT_SYS_ALARM @@ -657,7 +658,6 @@ do { \ #define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_TIME #define __ARCH_WANT_COMPAT_SYS_TIME -#endif #ifndef __KERNEL_SYSCALLS__ @@ -821,7 +821,7 @@ asmlinkage long sys_pipe(int *fildes); #endif /* __KERNEL_SYSCALLS__ */ -#if !defined(__ASSEMBLY__) && defined(__KERNEL__) +#ifndef __ASSEMBLY__ #include #include @@ -848,4 +848,5 @@ asmlinkage long sys_rt_sigaction(int sig */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif /* __KERNEL__ */ #endif diff -puN include/asm-xtensa/atomic.h~git-hdrcleanup include/asm-xtensa/atomic.h --- devel/include/asm-xtensa/atomic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/atomic.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _XTENSA_ATOMIC_H #define _XTENSA_ATOMIC_H -#include #include typedef struct { volatile int counter; } atomic_t; diff -puN include/asm-xtensa/checksum.h~git-hdrcleanup include/asm-xtensa/checksum.h --- devel/include/asm-xtensa/checksum.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/checksum.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _XTENSA_CHECKSUM_H #define _XTENSA_CHECKSUM_H -#include #include #include diff -puN include/asm-xtensa/delay.h~git-hdrcleanup include/asm-xtensa/delay.h --- devel/include/asm-xtensa/delay.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/delay.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #ifndef _XTENSA_DELAY_H #define _XTENSA_DELAY_H -#include #include #include diff -puN include/asm-xtensa/dma.h~git-hdrcleanup include/asm-xtensa/dma.h --- devel/include/asm-xtensa/dma.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/dma.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _XTENSA_DMA_H #define _XTENSA_DMA_H -#include #include /* need byte IO */ #include diff -puN include/asm-xtensa/hardirq.h~git-hdrcleanup include/asm-xtensa/hardirq.h --- devel/include/asm-xtensa/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _XTENSA_HARDIRQ_H #define _XTENSA_HARDIRQ_H -#include #include #include diff -puN include/asm-xtensa/ide.h~git-hdrcleanup include/asm-xtensa/ide.h --- devel/include/asm-xtensa/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifdef __KERNEL__ -#include #ifndef MAX_HWIFS # define MAX_HWIFS 1 diff -puN include/asm-xtensa/io.h~git-hdrcleanup include/asm-xtensa/io.h --- devel/include/asm-xtensa/io.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/io.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,7 +12,6 @@ #define _XTENSA_IO_H #ifdef __KERNEL__ -#include #include #include diff -puN include/asm-xtensa/irq.h~git-hdrcleanup include/asm-xtensa/irq.h --- devel/include/asm-xtensa/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _XTENSA_IRQ_H #define _XTENSA_IRQ_H -#include #include #include diff -puN include/asm-xtensa/mmu_context.h~git-hdrcleanup include/asm-xtensa/mmu_context.h --- devel/include/asm-xtensa/mmu_context.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/mmu_context.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _XTENSA_MMU_CONTEXT_H #define _XTENSA_MMU_CONTEXT_H -#include #include #include diff -puN include/asm-xtensa/page.h~git-hdrcleanup include/asm-xtensa/page.h --- devel/include/asm-xtensa/page.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/page.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifdef __KERNEL__ #include -#include /* * PAGE_SHIFT determines the page size diff -puN include/asm-xtensa/pgalloc.h~git-hdrcleanup include/asm-xtensa/pgalloc.h --- devel/include/asm-xtensa/pgalloc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/pgalloc.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/asm-xtensa/platform.h~git-hdrcleanup include/asm-xtensa/platform.h --- devel/include/asm-xtensa/platform.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/platform.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _XTENSA_PLATFORM_H #define _XTENSA_PLATFORM_H -#include #include #include diff -puN include/asm-xtensa/system.h~git-hdrcleanup include/asm-xtensa/system.h --- devel/include/asm-xtensa/system.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/system.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _XTENSA_SYSTEM_H #define _XTENSA_SYSTEM_H -#include #include #include diff -puN include/asm-xtensa/unistd.h~git-hdrcleanup include/asm-xtensa/unistd.h --- devel/include/asm-xtensa/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/asm-xtensa/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,8 +11,6 @@ #ifndef _XTENSA_UNISTD_H #define _XTENSA_UNISTD_H -#include - #define __NR_spill 0 #define __NR_exit 1 #define __NR_read 3 @@ -221,21 +219,9 @@ #define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/ #ifdef __KERNEL__ -#define __syscall_return(type, res) return ((type)(res)) -#else -#define __syscall_return(type, res) \ -do { \ - if ((unsigned long)(res) >= (unsigned long)(-125)) { \ - /* Avoid using "res" which is declared to be in register r2; \ - * errno might expand to a function call and clobber it. */ \ - int __err = -(res); \ - errno = __err; \ - res = -1; \ - } \ - return (type) (res); \ -} while (0) -#endif +#include +#define __syscall_return(type, res) return ((type)(res)) /* Tensilica's xt-xcc compiler is much more agressive at code * optimization than gcc. Multiple __asm__ statements are @@ -429,11 +415,10 @@ static __inline__ _syscall3(int,execve,c */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall"); -#ifdef __KERNEL__ #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_UTIME #define __ARCH_WANT_SYS_LLSEEK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif +#endif /* __KERNEL__ */ #endif /* _XTENSA_UNISTD_H */ diff -puN include/linux/acct.h~git-hdrcleanup include/linux/acct.h --- devel/include/linux/acct.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/acct.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #define _LINUX_ACCT_H #include -#include #include #include @@ -116,7 +115,6 @@ struct acct_v3 #ifdef __KERNEL__ -#include #ifdef CONFIG_BSD_PROCESS_ACCT struct vfsmount; @@ -165,6 +163,7 @@ typedef struct acct acct_t; #endif /* __KERNEL */ #ifdef __KERNEL__ +#include /* * Yet another set of HZ to *HZ helper functions. * See for the original. diff -puN include/linux/acpi.h~git-hdrcleanup include/linux/acpi.h --- devel/include/linux/acpi.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/acpi.h 2006-05-14 02:02:38.000000000 -0700 @@ -25,7 +25,6 @@ #ifndef _LINUX_ACPI_H #define _LINUX_ACPI_H -#include #ifdef CONFIG_ACPI diff -puN include/linux/affs_hardblocks.h~git-hdrcleanup include/linux/affs_hardblocks.h --- devel/include/linux/affs_hardblocks.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/affs_hardblocks.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,45 +1,47 @@ #ifndef AFFS_HARDBLOCKS_H #define AFFS_HARDBLOCKS_H +#include + /* Just the needed definitions for the RDB of an Amiga HD. */ struct RigidDiskBlock { - u32 rdb_ID; + __u32 rdb_ID; __be32 rdb_SummedLongs; - s32 rdb_ChkSum; - u32 rdb_HostID; + __s32 rdb_ChkSum; + __u32 rdb_HostID; __be32 rdb_BlockBytes; - u32 rdb_Flags; - u32 rdb_BadBlockList; + __u32 rdb_Flags; + __u32 rdb_BadBlockList; __be32 rdb_PartitionList; - u32 rdb_FileSysHeaderList; - u32 rdb_DriveInit; - u32 rdb_Reserved1[6]; - u32 rdb_Cylinders; - u32 rdb_Sectors; - u32 rdb_Heads; - u32 rdb_Interleave; - u32 rdb_Park; - u32 rdb_Reserved2[3]; - u32 rdb_WritePreComp; - u32 rdb_ReducedWrite; - u32 rdb_StepRate; - u32 rdb_Reserved3[5]; - u32 rdb_RDBBlocksLo; - u32 rdb_RDBBlocksHi; - u32 rdb_LoCylinder; - u32 rdb_HiCylinder; - u32 rdb_CylBlocks; - u32 rdb_AutoParkSeconds; - u32 rdb_HighRDSKBlock; - u32 rdb_Reserved4; + __u32 rdb_FileSysHeaderList; + __u32 rdb_DriveInit; + __u32 rdb_Reserved1[6]; + __u32 rdb_Cylinders; + __u32 rdb_Sectors; + __u32 rdb_Heads; + __u32 rdb_Interleave; + __u32 rdb_Park; + __u32 rdb_Reserved2[3]; + __u32 rdb_WritePreComp; + __u32 rdb_ReducedWrite; + __u32 rdb_StepRate; + __u32 rdb_Reserved3[5]; + __u32 rdb_RDBBlocksLo; + __u32 rdb_RDBBlocksHi; + __u32 rdb_LoCylinder; + __u32 rdb_HiCylinder; + __u32 rdb_CylBlocks; + __u32 rdb_AutoParkSeconds; + __u32 rdb_HighRDSKBlock; + __u32 rdb_Reserved4; char rdb_DiskVendor[8]; char rdb_DiskProduct[16]; char rdb_DiskRevision[4]; char rdb_ControllerVendor[8]; char rdb_ControllerProduct[16]; char rdb_ControllerRevision[4]; - u32 rdb_Reserved5[10]; + __u32 rdb_Reserved5[10]; }; #define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */ @@ -47,16 +49,16 @@ struct RigidDiskBlock { struct PartitionBlock { __be32 pb_ID; __be32 pb_SummedLongs; - s32 pb_ChkSum; - u32 pb_HostID; + __s32 pb_ChkSum; + __u32 pb_HostID; __be32 pb_Next; - u32 pb_Flags; - u32 pb_Reserved1[2]; - u32 pb_DevFlags; - u8 pb_DriveName[32]; - u32 pb_Reserved2[15]; + __u32 pb_Flags; + __u32 pb_Reserved1[2]; + __u32 pb_DevFlags; + __u8 pb_DriveName[32]; + __u32 pb_Reserved2[15]; __be32 pb_Environment[17]; - u32 pb_EReserved[15]; + __u32 pb_EReserved[15]; }; #define IDNAME_PARTITION 0x50415254 /* "PART" */ diff -puN include/linux/agpgart.h~git-hdrcleanup include/linux/agpgart.h --- devel/include/linux/agpgart.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/agpgart.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,8 +27,6 @@ #ifndef _AGP_H #define _AGP_H 1 -#include - #define AGPIOC_BASE 'A' #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) #define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1) @@ -112,6 +110,7 @@ typedef struct _agp_unbind { #else /* __KERNEL__ */ #include +#include #define AGPGART_MINOR 175 diff -puN include/linux/amba/clcd.h~git-hdrcleanup include/linux/amba/clcd.h --- devel/include/linux/amba/clcd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/amba/clcd.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * License. See the file COPYING in the main directory of this archive * for more details. */ -#include #include /* diff -puN include/linux/atmdev.h~git-hdrcleanup include/linux/atmdev.h --- devel/include/linux/atmdev.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/atmdev.h 2006-05-14 02:02:38.000000000 -0700 @@ -209,7 +209,6 @@ struct atm_cirange { #ifdef __KERNEL__ -#include #include /* wait_queue_head_t */ #include /* struct timeval */ #include diff -puN include/linux/audit.h~git-hdrcleanup include/linux/audit.h --- devel/include/linux/audit.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/audit.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,8 +24,7 @@ #ifndef _LINUX_AUDIT_H_ #define _LINUX_AUDIT_H_ -#include -#include +#include /* The netlink messages for the audit system is divided into blocks: * 1000 - 1099 are for commanding the audit system @@ -273,6 +272,7 @@ struct audit_rule { /* for AUDIT_LIST, }; #ifdef __KERNEL__ +#include struct audit_sig_info { uid_t uid; diff -puN include/linux/blkdev.h~git-hdrcleanup include/linux/blkdev.h --- devel/include/linux/blkdev.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/blkdev.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_BLKDEV_H #define _LINUX_BLKDEV_H -#include #include #include #include diff -puN include/linux/blkpg.h~git-hdrcleanup include/linux/blkpg.h --- devel/include/linux/blkpg.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/blkpg.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,6 +24,7 @@ * * For today, only the partition stuff - aeb, 990515 */ +#include #include #define BLKPG _IO(0x12,105) diff -puN include/linux/blktrace_api.h~git-hdrcleanup include/linux/blktrace_api.h --- devel/include/linux/blktrace_api.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/blktrace_api.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef BLKTRACE_H #define BLKTRACE_H -#include #include #include diff -puN include/linux/blockgroup_lock.h~git-hdrcleanup include/linux/blockgroup_lock.h --- devel/include/linux/blockgroup_lock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/blockgroup_lock.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Simple hashed spinlocking. */ -#include #include #include diff -puN include/linux/cache.h~git-hdrcleanup include/linux/cache.h --- devel/include/linux/cache.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/cache.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define __LINUX_CACHE_H #include -#include #include #ifndef L1_CACHE_ALIGN diff -puN include/linux/coda.h~git-hdrcleanup include/linux/coda.h --- devel/include/linux/coda.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/coda.h 2006-05-14 02:02:38.000000000 -0700 @@ -59,7 +59,6 @@ Mellon the rights to redistribute these #ifndef _CODA_HEADER_ #define _CODA_HEADER_ -#include /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ #if defined(__NetBSD__) || \ diff -puN include/linux/compat.h~git-hdrcleanup include/linux/compat.h --- devel/include/linux/compat.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/compat.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ * These are the type definitions for the architecture specific * syscall compatibility layer. */ -#include #ifdef CONFIG_COMPAT diff -puN include/linux/compiler.h~git-hdrcleanup include/linux/compiler.h --- devel/include/linux/compiler.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/compiler.h 2006-05-14 02:02:38.000000000 -0700 @@ -78,6 +78,7 @@ extern void __chk_io_ptr(void __iomem *) #endif /* __ASSEMBLY__ */ +#ifdef __KERNEL__ /* * Allow us to mark functions as 'deprecated' and have gcc emit a nice * warning for each use, in hopes of speeding the functions removal. @@ -127,6 +128,16 @@ extern void __chk_io_ptr(void __iomem *) # define __attribute_pure__ /* unimplemented */ #endif +#ifndef noinline +#define noinline +#endif + +#ifndef __always_inline +#define __always_inline inline +#endif + +#endif /* __KERNEL__ */ + /* * From the GCC manual: * @@ -145,12 +156,4 @@ extern void __chk_io_ptr(void __iomem *) # define __attribute_const__ /* unimplemented */ #endif -#ifndef noinline -#define noinline -#endif - -#ifndef __always_inline -#define __always_inline inline -#endif - #endif /* __LINUX_COMPILER_H */ diff -puN include/linux/cpufreq.h~git-hdrcleanup include/linux/cpufreq.h --- devel/include/linux/cpufreq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/cpufreq.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #define _LINUX_CPUFREQ_H #include -#include #include #include #include diff -puN include/linux/cramfs_fs.h~git-hdrcleanup include/linux/cramfs_fs.h --- devel/include/linux/cramfs_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/cramfs_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,13 +1,7 @@ #ifndef __CRAMFS_H #define __CRAMFS_H -#ifndef __KERNEL__ - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; - -#endif +#include #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ #define CRAMFS_SIGNATURE "Compressed ROMFS" @@ -33,9 +27,9 @@ typedef unsigned int u32; * Reasonably terse representation of the inode data. */ struct cramfs_inode { - u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; + __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; /* SIZE for device files is i_rdev */ - u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; + __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; /* NAMELEN is the length of the file name, divided by 4 and rounded up. (cramfs doesn't support hard links.) */ /* OFFSET: For symlinks and non-empty regular files, this @@ -44,27 +38,27 @@ struct cramfs_inode { see README). For non-empty directories it is the offset (divided by 4) of the inode of the first file in that directory. For anything else, offset is zero. */ - u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; + __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; }; struct cramfs_info { - u32 crc; - u32 edition; - u32 blocks; - u32 files; + __u32 crc; + __u32 edition; + __u32 blocks; + __u32 files; }; /* * Superblock information at the beginning of the FS. */ struct cramfs_super { - u32 magic; /* 0x28cd3d45 - random number */ - u32 size; /* length in bytes */ - u32 flags; /* feature flags */ - u32 future; /* reserved for future use */ - u8 signature[16]; /* "Compressed ROMFS" */ + __u32 magic; /* 0x28cd3d45 - random number */ + __u32 size; /* length in bytes */ + __u32 flags; /* feature flags */ + __u32 future; /* reserved for future use */ + __u8 signature[16]; /* "Compressed ROMFS" */ struct cramfs_info fsid; /* unique filesystem info */ - u8 name[16]; /* user-defined name */ + __u8 name[16]; /* user-defined name */ struct cramfs_inode root; /* root inode data */ }; diff -puN include/linux/crypto.h~git-hdrcleanup include/linux/crypto.h --- devel/include/linux/crypto.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/crypto.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef _LINUX_CRYPTO_H #define _LINUX_CRYPTO_H -#include #include #include #include diff -puN include/linux/cyclomx.h~git-hdrcleanup include/linux/cyclomx.h --- devel/include/linux/cyclomx.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/cyclomx.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,7 +24,6 @@ * 1998/08/08 acme Version 0.0.1 */ -#include #include #include diff -puN include/linux/dcookies.h~git-hdrcleanup include/linux/dcookies.h --- devel/include/linux/dcookies.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/dcookies.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef DCOOKIES_H #define DCOOKIES_H -#include #ifdef CONFIG_PROFILING diff -puN include/linux/devfs_fs_kernel.h~git-hdrcleanup include/linux/devfs_fs_kernel.h --- devel/include/linux/devfs_fs_kernel.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/devfs_fs_kernel.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _LINUX_DEVFS_FS_KERNEL_H #include -#include #include #include diff -puN include/linux/device.h~git-hdrcleanup include/linux/device.h --- devel/include/linux/device.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/device.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifndef _DEVICE_H_ #define _DEVICE_H_ -#include #include #include #include diff -puN include/linux/divert.h~git-hdrcleanup include/linux/divert.h --- devel/include/linux/divert.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/divert.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,10 +27,10 @@ struct divert_blk { int divert; /* are we active */ unsigned int protos; /* protocols */ - u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */ - u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */ - u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */ - u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */ + __u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */ + __u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */ + __u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */ + __u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */ }; /* @@ -40,12 +40,12 @@ struct divert_blk typedef union _divert_cf_arg { - s16 int16; - u16 uint16; - s32 int32; - u32 uint32; - s64 int64; - u64 uint64; + __s16 int16; + __u16 uint16; + __s32 int32; + __u32 uint32; + __s64 int64; + __u64 uint64; void __user *ptr; } divert_cf_arg; diff -puN include/linux/dmi.h~git-hdrcleanup include/linux/dmi.h --- devel/include/linux/dmi.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/dmi.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define __DMI_H__ #include -#include enum dmi_field { DMI_NONE, diff -puN include/linux/dnotify.h~git-hdrcleanup include/linux/dnotify.h --- devel/include/linux/dnotify.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/dnotify.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ struct dnotify_struct { #ifdef __KERNEL__ -#include #ifdef CONFIG_DNOTIFY diff -puN /dev/null include/linux/elf-em.h --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ devel-akpm/include/linux/elf-em.h 2006-05-14 02:02:38.000000000 -0700 @@ -0,0 +1,44 @@ +#ifndef _LINUX_ELF_EM_H +#define _LINUX_ELF_EM_H + +/* These constants define the various ELF target machines */ +#define EM_NONE 0 +#define EM_M32 1 +#define EM_SPARC 2 +#define EM_386 3 +#define EM_68K 4 +#define EM_88K 5 +#define EM_486 6 /* Perhaps disused */ +#define EM_860 7 +#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ +#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ +#define EM_PARISC 15 /* HPPA */ +#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ +#define EM_PPC 20 /* PowerPC */ +#define EM_PPC64 21 /* PowerPC64 */ +#define EM_SH 42 /* SuperH */ +#define EM_SPARCV9 43 /* SPARC v9 64-bit */ +#define EM_IA_64 50 /* HP/Intel IA-64 */ +#define EM_X86_64 62 /* AMD x86-64 */ +#define EM_S390 22 /* IBM S/390 */ +#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ +#define EM_V850 87 /* NEC v850 */ +#define EM_M32R 88 /* Renesas M32R */ +#define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ +#define EM_FRV 0x5441 /* Fujitsu FR-V */ + +/* + * This is an interim value that we will use until the committee comes + * up with a final number. + */ +#define EM_ALPHA 0x9026 + +/* Bogus old v850 magic number, used by old tools. */ +#define EM_CYGNUS_V850 0x9080 +/* Bogus old m32r magic number, used by old tools. */ +#define EM_CYGNUS_M32R 0x9041 +/* This is the old interim value for S/390 architecture */ +#define EM_S390_OLD 0xA390 + + +#endif /* _LINUX_ELF_EM_H */ diff -puN include/linux/elf.h~git-hdrcleanup include/linux/elf.h --- devel/include/linux/elf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/elf.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,6 +3,7 @@ #include #include +#include #include #ifndef elf_read_implies_exec @@ -55,64 +56,6 @@ typedef __s64 Elf64_Sxword; #define ET_LOPROC 0xff00 #define ET_HIPROC 0xffff -/* These constants define the various ELF target machines */ -#define EM_NONE 0 -#define EM_M32 1 -#define EM_SPARC 2 -#define EM_386 3 -#define EM_68K 4 -#define EM_88K 5 -#define EM_486 6 /* Perhaps disused */ -#define EM_860 7 - -#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ - -#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ - -#define EM_PARISC 15 /* HPPA */ - -#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ - -#define EM_PPC 20 /* PowerPC */ -#define EM_PPC64 21 /* PowerPC64 */ - -#define EM_SH 42 /* SuperH */ - -#define EM_SPARCV9 43 /* SPARC v9 64-bit */ - -#define EM_IA_64 50 /* HP/Intel IA-64 */ - -#define EM_X86_64 62 /* AMD x86-64 */ - -#define EM_S390 22 /* IBM S/390 */ - -#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ - -#define EM_V850 87 /* NEC v850 */ - -#define EM_M32R 88 /* Renesas M32R */ - -#define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ - -/* - * This is an interim value that we will use until the committee comes - * up with a final number. - */ -#define EM_ALPHA 0x9026 - -/* Bogus old v850 magic number, used by old tools. */ -#define EM_CYGNUS_V850 0x9080 - -/* Bogus old m32r magic number, used by old tools. */ -#define EM_CYGNUS_M32R 0x9041 - -/* - * This is the old interim value for S/390 architecture - */ -#define EM_S390_OLD 0xA390 - -#define EM_FRV 0x5441 /* Fujitsu FR-V */ - /* This is the info that is needed to parse the dynamic section of the file */ #define DT_NULL 0 #define DT_NEEDED 1 diff -puN include/linux/errqueue.h~git-hdrcleanup include/linux/errqueue.h --- devel/include/linux/errqueue.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/errqueue.h 2006-05-14 02:02:38.000000000 -0700 @@ -21,7 +21,6 @@ struct sock_extended_err #ifdef __KERNEL__ -#include #include #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #include diff -puN include/linux/ethtool.h~git-hdrcleanup include/linux/ethtool.h --- devel/include/linux/ethtool.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ethtool.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,24 +15,24 @@ /* This should work for both 32 and 64 bit userland. */ struct ethtool_cmd { - u32 cmd; - u32 supported; /* Features this interface supports */ - u32 advertising; /* Features this interface advertises */ - u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ - u8 duplex; /* Duplex, half or full */ - u8 port; /* Which connector port */ - u8 phy_address; - u8 transceiver; /* Which transceiver to use */ - u8 autoneg; /* Enable or disable autonegotiation */ - u32 maxtxpkt; /* Tx pkts before generating tx int */ - u32 maxrxpkt; /* Rx pkts before generating rx int */ - u32 reserved[4]; + __u32 cmd; + __u32 supported; /* Features this interface supports */ + __u32 advertising; /* Features this interface advertises */ + __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ + __u8 duplex; /* Duplex, half or full */ + __u8 port; /* Which connector port */ + __u8 phy_address; + __u8 transceiver; /* Which transceiver to use */ + __u8 autoneg; /* Enable or disable autonegotiation */ + __u32 maxtxpkt; /* Tx pkts before generating tx int */ + __u32 maxrxpkt; /* Rx pkts before generating rx int */ + __u32 reserved[4]; }; #define ETHTOOL_BUSINFO_LEN 32 /* these strings are set to whatever the driver author decides... */ struct ethtool_drvinfo { - u32 cmd; + __u32 cmd; char driver[32]; /* driver short name, "tulip", "eepro100" */ char version[32]; /* driver version string */ char fw_version[32]; /* firmware version string, if applicable */ @@ -40,53 +40,53 @@ struct ethtool_drvinfo { /* For PCI devices, use pci_name(pci_dev). */ char reserved1[32]; char reserved2[16]; - u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ - u32 testinfo_len; - u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ - u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ + __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ + __u32 testinfo_len; + __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ + __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ }; #define SOPASS_MAX 6 /* wake-on-lan settings */ struct ethtool_wolinfo { - u32 cmd; - u32 supported; - u32 wolopts; - u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ + __u32 cmd; + __u32 supported; + __u32 wolopts; + __u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ }; /* for passing single values */ struct ethtool_value { - u32 cmd; - u32 data; + __u32 cmd; + __u32 data; }; /* for passing big chunks of data */ struct ethtool_regs { - u32 cmd; - u32 version; /* driver-specific, indicates different chips/revs */ - u32 len; /* bytes */ - u8 data[0]; + __u32 cmd; + __u32 version; /* driver-specific, indicates different chips/revs */ + __u32 len; /* bytes */ + __u8 data[0]; }; /* for passing EEPROM chunks */ struct ethtool_eeprom { - u32 cmd; - u32 magic; - u32 offset; /* in bytes */ - u32 len; /* in bytes */ - u8 data[0]; + __u32 cmd; + __u32 magic; + __u32 offset; /* in bytes */ + __u32 len; /* in bytes */ + __u8 data[0]; }; /* for configuring coalescing parameters of chip */ struct ethtool_coalesce { - u32 cmd; /* ETHTOOL_{G,S}COALESCE */ + __u32 cmd; /* ETHTOOL_{G,S}COALESCE */ /* How many usecs to delay an RX interrupt after * a packet arrives. If 0, only rx_max_coalesced_frames * is used. */ - u32 rx_coalesce_usecs; + __u32 rx_coalesce_usecs; /* How many packets to delay an RX interrupt after * a packet arrives. If 0, only rx_coalesce_usecs is @@ -94,21 +94,21 @@ struct ethtool_coalesce { * to zero as this would cause RX interrupts to never be * generated. */ - u32 rx_max_coalesced_frames; + __u32 rx_max_coalesced_frames; /* Same as above two parameters, except that these values * apply while an IRQ is being serviced by the host. Not * all cards support this feature and the values are ignored * in that case. */ - u32 rx_coalesce_usecs_irq; - u32 rx_max_coalesced_frames_irq; + __u32 rx_coalesce_usecs_irq; + __u32 rx_max_coalesced_frames_irq; /* How many usecs to delay a TX interrupt after * a packet is sent. If 0, only tx_max_coalesced_frames * is used. */ - u32 tx_coalesce_usecs; + __u32 tx_coalesce_usecs; /* How many packets to delay a TX interrupt after * a packet is sent. If 0, only tx_coalesce_usecs is @@ -116,22 +116,22 @@ struct ethtool_coalesce { * to zero as this would cause TX interrupts to never be * generated. */ - u32 tx_max_coalesced_frames; + __u32 tx_max_coalesced_frames; /* Same as above two parameters, except that these values * apply while an IRQ is being serviced by the host. Not * all cards support this feature and the values are ignored * in that case. */ - u32 tx_coalesce_usecs_irq; - u32 tx_max_coalesced_frames_irq; + __u32 tx_coalesce_usecs_irq; + __u32 tx_max_coalesced_frames_irq; /* How many usecs to delay in-memory statistics * block updates. Some drivers do not have an in-memory * statistic block, and in such cases this value is ignored. * This value must not be zero. */ - u32 stats_block_coalesce_usecs; + __u32 stats_block_coalesce_usecs; /* Adaptive RX/TX coalescing is an algorithm implemented by * some drivers to improve latency under low packet rates and @@ -140,18 +140,18 @@ struct ethtool_coalesce { * not implemented by the driver causes these values to be * silently ignored. */ - u32 use_adaptive_rx_coalesce; - u32 use_adaptive_tx_coalesce; + __u32 use_adaptive_rx_coalesce; + __u32 use_adaptive_tx_coalesce; /* When the packet rate (measured in packets per second) * is below pkt_rate_low, the {rx,tx}_*_low parameters are * used. */ - u32 pkt_rate_low; - u32 rx_coalesce_usecs_low; - u32 rx_max_coalesced_frames_low; - u32 tx_coalesce_usecs_low; - u32 tx_max_coalesced_frames_low; + __u32 pkt_rate_low; + __u32 rx_coalesce_usecs_low; + __u32 rx_max_coalesced_frames_low; + __u32 tx_coalesce_usecs_low; + __u32 tx_max_coalesced_frames_low; /* When the packet rate is below pkt_rate_high but above * pkt_rate_low (both measured in packets per second) the @@ -162,43 +162,43 @@ struct ethtool_coalesce { * is above pkt_rate_high, the {rx,tx}_*_high parameters are * used. */ - u32 pkt_rate_high; - u32 rx_coalesce_usecs_high; - u32 rx_max_coalesced_frames_high; - u32 tx_coalesce_usecs_high; - u32 tx_max_coalesced_frames_high; + __u32 pkt_rate_high; + __u32 rx_coalesce_usecs_high; + __u32 rx_max_coalesced_frames_high; + __u32 tx_coalesce_usecs_high; + __u32 tx_max_coalesced_frames_high; /* How often to do adaptive coalescing packet rate sampling, * measured in seconds. Must not be zero. */ - u32 rate_sample_interval; + __u32 rate_sample_interval; }; /* for configuring RX/TX ring parameters */ struct ethtool_ringparam { - u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ + __u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ /* Read only attributes. These indicate the maximum number * of pending RX/TX ring entries the driver will allow the * user to set. */ - u32 rx_max_pending; - u32 rx_mini_max_pending; - u32 rx_jumbo_max_pending; - u32 tx_max_pending; + __u32 rx_max_pending; + __u32 rx_mini_max_pending; + __u32 rx_jumbo_max_pending; + __u32 tx_max_pending; /* Values changeable by the user. The valid values are * in the range 1 to the "*_max_pending" counterpart above. */ - u32 rx_pending; - u32 rx_mini_pending; - u32 rx_jumbo_pending; - u32 tx_pending; + __u32 rx_pending; + __u32 rx_mini_pending; + __u32 rx_jumbo_pending; + __u32 tx_pending; }; /* for configuring link flow control parameters */ struct ethtool_pauseparam { - u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ + __u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ /* If the link is being auto-negotiated (via ethtool_cmd.autoneg * being true) the user may set 'autonet' here non-zero to have the @@ -210,9 +210,9 @@ struct ethtool_pauseparam { * then {rx,tx}_pause force the driver to use/not-use pause * flow control. */ - u32 autoneg; - u32 rx_pause; - u32 tx_pause; + __u32 autoneg; + __u32 rx_pause; + __u32 tx_pause; }; #define ETH_GSTRING_LEN 32 @@ -223,10 +223,10 @@ enum ethtool_stringset { /* for passing string sets for data tagging */ struct ethtool_gstrings { - u32 cmd; /* ETHTOOL_GSTRINGS */ - u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ - u32 len; /* number of strings in the string set */ - u8 data[0]; + __u32 cmd; /* ETHTOOL_GSTRINGS */ + __u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ + __u32 len; /* number of strings in the string set */ + __u8 data[0]; }; enum ethtool_test_flags { @@ -236,26 +236,28 @@ enum ethtool_test_flags { /* for requesting NIC test and getting results*/ struct ethtool_test { - u32 cmd; /* ETHTOOL_TEST */ - u32 flags; /* ETH_TEST_FL_xxx */ - u32 reserved; - u32 len; /* result length, in number of u64 elements */ - u64 data[0]; + __u32 cmd; /* ETHTOOL_TEST */ + __u32 flags; /* ETH_TEST_FL_xxx */ + __u32 reserved; + __u32 len; /* result length, in number of u64 elements */ + __u64 data[0]; }; /* for dumping NIC-specific statistics */ struct ethtool_stats { - u32 cmd; /* ETHTOOL_GSTATS */ - u32 n_stats; /* number of u64's being returned */ - u64 data[0]; + __u32 cmd; /* ETHTOOL_GSTATS */ + __u32 n_stats; /* number of u64's being returned */ + __u64 data[0]; }; struct ethtool_perm_addr { - u32 cmd; /* ETHTOOL_GPERMADDR */ - u32 size; - u8 data[0]; + __u32 cmd; /* ETHTOOL_GPERMADDR */ + __u32 size; + __u8 data[0]; }; +#ifdef __KERNEL__ + struct net_device; /* Some generic methods drivers may use in their ethtool_ops */ @@ -371,6 +373,7 @@ struct ethtool_ops { u32 (*get_ufo)(struct net_device *); int (*set_ufo)(struct net_device *, u32); }; +#endif /* __KERNEL__ */ /* CMDs currently supported */ #define ETHTOOL_GSET 0x00000001 /* Get settings. */ diff -puN include/linux/ext2_fs.h~git-hdrcleanup include/linux/ext2_fs.h --- devel/include/linux/ext2_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ext2_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #define _LINUX_EXT2_FS_H #include -#include /* * The second extended filesystem constants/structures @@ -70,6 +69,7 @@ #define EXT2_SUPER_MAGIC 0xEF53 #ifdef __KERNEL__ +#include static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) { return sb->s_fs_info; diff -puN include/linux/ext3_fs.h~git-hdrcleanup include/linux/ext3_fs.h --- devel/include/linux/ext3_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ext3_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,11 +17,6 @@ #define _LINUX_EXT3_FS_H #include -#include -#include - - -struct statfs; /* * The second extended filesystem constants/structures @@ -487,6 +482,8 @@ struct ext3_super_block { }; #ifdef __KERNEL__ +#include +#include static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb) { return sb->s_fs_info; @@ -664,6 +661,8 @@ struct ext3_dir_entry_2 { #define DX_HASH_HALF_MD4 1 #define DX_HASH_TEA 2 +#ifdef __KERNEL__ + /* hash info structure used by the directory hash */ struct dx_hash_info { @@ -675,7 +674,6 @@ struct dx_hash_info #define EXT3_HTREE_EOF 0x7fffffff -#ifdef __KERNEL__ /* * Control parameters used by ext3_htree_next_block */ diff -puN include/linux/fs.h~git-hdrcleanup include/linux/fs.h --- devel/include/linux/fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * structures etc. */ -#include #include #include diff -puN include/linux/ftape.h~git-hdrcleanup include/linux/ftape.h --- devel/include/linux/ftape.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ftape.h 2006-05-14 02:02:38.000000000 -0700 @@ -35,7 +35,6 @@ #include #endif #include -#include #include #define FT_SECTOR(x) (x+1) /* sector offset into real sector */ diff -puN include/linux/gameport.h~git-hdrcleanup include/linux/gameport.h --- devel/include/linux/gameport.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/gameport.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,6 +9,7 @@ * the Free Software Foundation. */ +#ifdef __KERNEL__ #include #include #include @@ -154,6 +155,8 @@ static inline void gameport_register_dri void gameport_unregister_driver(struct gameport_driver *drv); +#endif /* __KERNEL__ */ + #define GAMEPORT_MODE_DISABLED 0 #define GAMEPORT_MODE_RAW 1 #define GAMEPORT_MODE_COOKED 2 @@ -169,6 +172,8 @@ void gameport_unregister_driver(struct g #define GAMEPORT_ID_VENDOR_GRAVIS 0x0009 #define GAMEPORT_ID_VENDOR_GUILLEMOT 0x000a +#ifdef __KERNEL__ + static inline void gameport_trigger(struct gameport *gameport) { if (gameport->trigger) @@ -219,4 +224,5 @@ static inline void gameport_set_poll_int void gameport_start_polling(struct gameport *gameport); void gameport_stop_polling(struct gameport *gameport); +#endif /* __KERNEL__ */ #endif diff -puN include/linux/generic_serial.h~git-hdrcleanup include/linux/generic_serial.h --- devel/include/linux/generic_serial.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/generic_serial.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,6 +12,7 @@ #ifndef GENERIC_SERIAL_H #define GENERIC_SERIAL_H +#ifdef __KERNEL__ #include struct real_driver { @@ -54,6 +55,7 @@ struct gs_port { spinlock_t driver_lock; }; +#endif /* __KERNEL__ */ /* Flags */ /* Warning: serial.h defines some ASYNC_ flags, they say they are "only" @@ -75,7 +77,7 @@ struct gs_port { #define GS_DEBUG_FLOW 0x00000020 #define GS_DEBUG_WRITE 0x00000040 - +#ifdef __KERNEL__ void gs_put_char(struct tty_struct *tty, unsigned char ch); int gs_write(struct tty_struct *tty, const unsigned char *buf, int count); @@ -94,5 +96,5 @@ int gs_init_port(struct gs_port *port); int gs_setserial(struct gs_port *port, struct serial_struct __user *sp); int gs_getserial(struct gs_port *port, struct serial_struct __user *sp); void gs_got_break(struct gs_port *port); - +#endif /* __KERNEL__ */ #endif diff -puN include/linux/genhd.h~git-hdrcleanup include/linux/genhd.h --- devel/include/linux/genhd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/genhd.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,13 +9,7 @@ * */ -#include #include -#include -#include -#include -#include -#include enum { /* These three have identical behaviour; use the second one if DOS FDISK gets @@ -61,6 +55,12 @@ struct partition { #endif #ifdef __KERNEL__ +#include +#include +#include +#include +#include + struct partition { unsigned char boot_ind; /* 0x80 - active */ unsigned char head; /* starting head */ diff -puN include/linux/gfp.h~git-hdrcleanup include/linux/gfp.h --- devel/include/linux/gfp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/gfp.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #include #include #include -#include struct vm_area_struct; diff -puN include/linux/hardirq.h~git-hdrcleanup include/linux/hardirq.h --- devel/include/linux/hardirq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/hardirq.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef LINUX_HARDIRQ_H #define LINUX_HARDIRQ_H -#include #include #include #include diff -puN include/linux/highmem.h~git-hdrcleanup include/linux/highmem.h --- devel/include/linux/highmem.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/highmem.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_HIGHMEM_H #define _LINUX_HIGHMEM_H -#include #include #include diff -puN include/linux/highuid.h~git-hdrcleanup include/linux/highuid.h --- devel/include/linux/highuid.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/highuid.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_HIGHUID_H #define _LINUX_HIGHUID_H -#include #include /* diff -puN include/linux/i2c-algo-ite.h~git-hdrcleanup include/linux/i2c-algo-ite.h --- devel/include/linux/i2c-algo-ite.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/i2c-algo-ite.h 2006-05-14 02:02:38.000000000 -0700 @@ -29,7 +29,7 @@ #ifndef I2C_ALGO_ITE_H #define I2C_ALGO_ITE_H 1 -#include +#include /* Example of a sequential read request: struct i2c_iic_msg s_msg; @@ -49,6 +49,9 @@ struct i2c_iic_msg { char *buf; /* pointer to msg data */ }; +#ifdef __KERNEL__ +struct i2c_adapter; + struct i2c_algo_iic_data { void *data; /* private data for lolevel routines */ void (*setiic) (void *data, int ctl, int val); @@ -65,5 +68,5 @@ struct i2c_algo_iic_data { int i2c_iic_add_bus(struct i2c_adapter *); int i2c_iic_del_bus(struct i2c_adapter *); - +#endif /* __KERNEL__ */ #endif /* I2C_ALGO_ITE_H */ diff -puN include/linux/i2c.h~git-hdrcleanup include/linux/i2c.h --- devel/include/linux/i2c.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/i2c.h 2006-05-14 02:02:38.000000000 -0700 @@ -20,14 +20,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* ------------------------------------------------------------------------- */ -/* With some changes from Kyösti Mälkki and +/* With some changes from Kyösti Mälkki and Frodo Looijaard */ #ifndef _LINUX_I2C_H #define _LINUX_I2C_H -#include #include +#ifdef __KERNEL__ +#include #include #include #include /* for struct device */ @@ -358,6 +359,7 @@ static inline int i2c_adapter_id(struct { return adap->nr; } +#endif /* __KERNEL__ */ /* * I2C Message - used for pure i2c transaction, also from /dev interface @@ -489,6 +491,7 @@ int i2c_del_virt_adapter(struct i2c_adap #define I2C_SMBUS 0x0720 /* SMBus-level access */ /* ----- I2C-DEV: char device interface stuff ------------------------- */ +#ifdef __KERNEL__ #define I2C_MAJOR 89 /* Device major number */ @@ -666,5 +669,5 @@ static unsigned short *forces[] = { forc force_##chip6, force_##chip7, \ force_##chip8, NULL }; \ I2C_CLIENT_INSMOD_COMMON - +#endif /* __KERNEL__ */ #endif /* _LINUX_I2C_H */ diff -puN include/linux/i2o-dev.h~git-hdrcleanup include/linux/i2o-dev.h --- devel/include/linux/i2o-dev.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/i2o-dev.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,7 @@ * This header file defines the I2O APIs that are available to both * the kernel and user level applications. Kernel specific structures * are defined in i2o_osm. OSMs should include _only_ i2o_osm.h which - * automatically includs this file. + * automatically includes this file. * */ @@ -23,14 +23,7 @@ /* How many controllers are we allowing */ #define MAX_I2O_CONTROLLERS 32 -//#include -#ifndef __KERNEL__ - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; - -#endif /* __KERNEL__ */ +#include /* * I2O Control IOCTLs and structures @@ -53,7 +46,7 @@ typedef unsigned int u32; struct i2o_cmd_passthru32 { unsigned int iop; /* IOP unit number */ - u32 msg; /* message */ + __u32 msg; /* message */ }; struct i2o_cmd_passthru { @@ -138,53 +131,53 @@ typedef struct i2o_sg_io_hdr { #define I2O_BUS_UNKNOWN 0x80 typedef struct _i2o_pci_bus { - u8 PciFunctionNumber; - u8 PciDeviceNumber; - u8 PciBusNumber; - u8 reserved; - u16 PciVendorID; - u16 PciDeviceID; + __u8 PciFunctionNumber; + __u8 PciDeviceNumber; + __u8 PciBusNumber; + __u8 reserved; + __u16 PciVendorID; + __u16 PciDeviceID; } i2o_pci_bus; typedef struct _i2o_local_bus { - u16 LbBaseIOPort; - u16 reserved; - u32 LbBaseMemoryAddress; + __u16 LbBaseIOPort; + __u16 reserved; + __u32 LbBaseMemoryAddress; } i2o_local_bus; typedef struct _i2o_isa_bus { - u16 IsaBaseIOPort; - u8 CSN; - u8 reserved; - u32 IsaBaseMemoryAddress; + __u16 IsaBaseIOPort; + __u8 CSN; + __u8 reserved; + __u32 IsaBaseMemoryAddress; } i2o_isa_bus; typedef struct _i2o_eisa_bus_info { - u16 EisaBaseIOPort; - u8 reserved; - u8 EisaSlotNumber; - u32 EisaBaseMemoryAddress; + __u16 EisaBaseIOPort; + __u8 reserved; + __u8 EisaSlotNumber; + __u32 EisaBaseMemoryAddress; } i2o_eisa_bus; typedef struct _i2o_mca_bus { - u16 McaBaseIOPort; - u8 reserved; - u8 McaSlotNumber; - u32 McaBaseMemoryAddress; + __u16 McaBaseIOPort; + __u8 reserved; + __u8 McaSlotNumber; + __u32 McaBaseMemoryAddress; } i2o_mca_bus; typedef struct _i2o_other_bus { - u16 BaseIOPort; - u16 reserved; - u32 BaseMemoryAddress; + __u16 BaseIOPort; + __u16 reserved; + __u32 BaseMemoryAddress; } i2o_other_bus; typedef struct _i2o_hrt_entry { - u32 adapter_id; - u32 parent_tid:12; - u32 state:4; - u32 bus_num:8; - u32 bus_type:8; + __u32 adapter_id; + __u32 parent_tid:12; + __u32 state:4; + __u32 bus_num:8; + __u32 bus_type:8; union { i2o_pci_bus pci_bus; i2o_local_bus local_bus; @@ -196,66 +189,66 @@ typedef struct _i2o_hrt_entry { } i2o_hrt_entry; typedef struct _i2o_hrt { - u16 num_entries; - u8 entry_len; - u8 hrt_version; - u32 change_ind; + __u16 num_entries; + __u8 entry_len; + __u8 hrt_version; + __u32 change_ind; i2o_hrt_entry hrt_entry[1]; } i2o_hrt; typedef struct _i2o_lct_entry { - u32 entry_size:16; - u32 tid:12; - u32 reserved:4; - u32 change_ind; - u32 device_flags; - u32 class_id:12; - u32 version:4; - u32 vendor_id:16; - u32 sub_class; - u32 user_tid:12; - u32 parent_tid:12; - u32 bios_info:8; - u8 identity_tag[8]; - u32 event_capabilities; + __u32 entry_size:16; + __u32 tid:12; + __u32 reserved:4; + __u32 change_ind; + __u32 device_flags; + __u32 class_id:12; + __u32 version:4; + __u32 vendor_id:16; + __u32 sub_class; + __u32 user_tid:12; + __u32 parent_tid:12; + __u32 bios_info:8; + __u8 identity_tag[8]; + __u32 event_capabilities; } i2o_lct_entry; typedef struct _i2o_lct { - u32 table_size:16; - u32 boot_tid:12; - u32 lct_ver:4; - u32 iop_flags; - u32 change_ind; + __u32 table_size:16; + __u32 boot_tid:12; + __u32 lct_ver:4; + __u32 iop_flags; + __u32 change_ind; i2o_lct_entry lct_entry[1]; } i2o_lct; typedef struct _i2o_status_block { - u16 org_id; - u16 reserved; - u16 iop_id:12; - u16 reserved1:4; - u16 host_unit_id; - u16 segment_number:12; - u16 i2o_version:4; - u8 iop_state; - u8 msg_type; - u16 inbound_frame_size; - u8 init_code; - u8 reserved2; - u32 max_inbound_frames; - u32 cur_inbound_frames; - u32 max_outbound_frames; + __u16 org_id; + __u16 reserved; + __u16 iop_id:12; + __u16 reserved1:4; + __u16 host_unit_id; + __u16 segment_number:12; + __u16 i2o_version:4; + __u8 iop_state; + __u8 msg_type; + __u16 inbound_frame_size; + __u8 init_code; + __u8 reserved2; + __u32 max_inbound_frames; + __u32 cur_inbound_frames; + __u32 max_outbound_frames; char product_id[24]; - u32 expected_lct_size; - u32 iop_capabilities; - u32 desired_mem_size; - u32 current_mem_size; - u32 current_mem_base; - u32 desired_io_size; - u32 current_io_size; - u32 current_io_base; - u32 reserved3:24; - u32 cmd_status:8; + __u32 expected_lct_size; + __u32 iop_capabilities; + __u32 desired_mem_size; + __u32 current_mem_size; + __u32 current_mem_base; + __u32 desired_io_size; + __u32 current_io_size; + __u32 current_io_base; + __u32 reserved3:24; + __u32 cmd_status:8; } i2o_status_block; /* Event indicator mask flags */ diff -puN include/linux/ide.h~git-hdrcleanup include/linux/ide.h --- devel/include/linux/ide.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ide.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Copyright (C) 1994-2002 Linus Torvalds & authors */ -#include #include #include #include diff -puN include/linux/if_frad.h~git-hdrcleanup include/linux/if_frad.h --- devel/include/linux/if_frad.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/if_frad.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,7 +24,6 @@ #ifndef _FRAD_H_ #define _FRAD_H_ -#include #include #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) diff -puN include/linux/if_tr.h~git-hdrcleanup include/linux/if_tr.h --- devel/include/linux/if_tr.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/if_tr.h 2006-05-14 02:02:38.000000000 -0700 @@ -43,7 +43,6 @@ struct trh_hdr { }; #ifdef __KERNEL__ -#include #include static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb) diff -puN include/linux/init.h~git-hdrcleanup include/linux/init.h --- devel/include/linux/init.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/init.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_INIT_H #define _LINUX_INIT_H -#include #include /* These macros are used to mark some functions or diff -puN include/linux/inotify.h~git-hdrcleanup include/linux/inotify.h --- devel/include/linux/inotify.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/inotify.h 2006-05-14 02:02:38.000000000 -0700 @@ -67,7 +67,6 @@ struct inotify_event { #include #include -#include #ifdef CONFIG_INOTIFY diff -puN include/linux/interrupt.h~git-hdrcleanup include/linux/interrupt.h --- devel/include/linux/interrupt.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/interrupt.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #ifndef _LINUX_INTERRUPT_H #define _LINUX_INTERRUPT_H -#include #include #include #include diff -puN include/linux/ipmi.h~git-hdrcleanup include/linux/ipmi.h --- devel/include/linux/ipmi.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ipmi.h 2006-05-14 02:02:38.000000000 -0700 @@ -36,7 +36,6 @@ #include #include -#include /* * This file describes an interface to an IPMI driver. You have to @@ -210,6 +209,7 @@ struct kernel_ipmi_msg */ #include #include +#include #ifdef CONFIG_PROC_FS #include diff -puN include/linux/ipv6.h~git-hdrcleanup include/linux/ipv6.h --- devel/include/linux/ipv6.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ipv6.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _IPV6_H #define _IPV6_H -#include #include #include diff -puN include/linux/irq_cpustat.h~git-hdrcleanup include/linux/irq_cpustat.h --- devel/include/linux/irq_cpustat.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/irq_cpustat.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * Keith Owens July 2000. */ -#include /* * Simple wrappers reducing source bloat. Define all irq_stat fields diff -puN include/linux/irq.h~git-hdrcleanup include/linux/irq.h --- devel/include/linux/irq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/irq.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ * Thanks. --rmk */ -#include #include #if !defined(CONFIG_S390) diff -puN include/linux/isapnp.h~git-hdrcleanup include/linux/isapnp.h --- devel/include/linux/isapnp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/isapnp.h 2006-05-14 02:02:38.000000000 -0700 @@ -22,7 +22,6 @@ #ifndef LINUX_ISAPNP_H #define LINUX_ISAPNP_H -#include #include #include diff -puN include/linux/isdn.h~git-hdrcleanup include/linux/isdn.h --- devel/include/linux/isdn.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/isdn.h 2006-05-14 02:02:38.000000000 -0700 @@ -146,7 +146,6 @@ typedef struct { #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/isdnif.h~git-hdrcleanup include/linux/isdnif.h --- devel/include/linux/isdnif.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/isdnif.h 2006-05-14 02:02:38.000000000 -0700 @@ -54,7 +54,6 @@ #ifdef __KERNEL__ -#include #include /***************************************************************************/ diff -puN include/linux/isdn_ppp.h~git-hdrcleanup include/linux/isdn_ppp.h --- devel/include/linux/isdn_ppp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/isdn_ppp.h 2006-05-14 02:02:38.000000000 -0700 @@ -67,7 +67,6 @@ struct isdn_ppp_comp_data { #ifdef __KERNEL__ -#include #ifdef CONFIG_IPPP_FILTER #include diff -puN include/linux/isdn/tpam.h~git-hdrcleanup include/linux/isdn/tpam.h --- devel/include/linux/isdn/tpam.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/isdn/tpam.h 2006-05-14 02:02:38.000000000 -0700 @@ -26,7 +26,6 @@ #define _TPAM_H_ #include -#include /* IOCTL commands */ #define TPAM_CMD_DSPLOAD 0x0001 diff -puN include/linux/kallsyms.h~git-hdrcleanup include/linux/kallsyms.h --- devel/include/linux/kallsyms.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/kallsyms.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ #ifndef _LINUX_KALLSYMS_H #define _LINUX_KALLSYMS_H -#include #define KSYM_NAME_LEN 127 diff -puN include/linux/kernel_stat.h~git-hdrcleanup include/linux/kernel_stat.h --- devel/include/linux/kernel_stat.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/kernel_stat.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_KERNEL_STAT_H #define _LINUX_KERNEL_STAT_H -#include #include #include #include diff -puN include/linux/kmod.h~git-hdrcleanup include/linux/kmod.h --- devel/include/linux/kmod.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/kmod.h 2006-05-14 02:02:38.000000000 -0700 @@ -20,7 +20,6 @@ */ #include -#include #include #include diff -puN include/linux/kprobes.h~git-hdrcleanup include/linux/kprobes.h --- devel/include/linux/kprobes.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/kprobes.h 2006-05-14 02:02:38.000000000 -0700 @@ -29,7 +29,6 @@ * and Prasanna S Panchamukhi * added function-return probes. */ -#include #include #include #include diff -puN include/linux/linkage.h~git-hdrcleanup include/linux/linkage.h --- devel/include/linux/linkage.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/linkage.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_LINKAGE_H #define _LINUX_LINKAGE_H -#include #include #ifdef __cplusplus diff -puN include/linux/lockd/lockd.h~git-hdrcleanup include/linux/lockd/lockd.h --- devel/include/linux/lockd/lockd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/lockd/lockd.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/lockd/nlm.h~git-hdrcleanup include/linux/lockd/nlm.h --- devel/include/linux/lockd/nlm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/lockd/nlm.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef LINUX_LOCKD_NLM_H #define LINUX_LOCKD_NLM_H -#include /* Maximum file offset in file_lock.fl_end */ # define NLM_OFFSET_MAX ((s32) 0x7fffffff) diff -puN include/linux/mempolicy.h~git-hdrcleanup include/linux/mempolicy.h --- devel/include/linux/mempolicy.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mempolicy.h 2006-05-14 02:02:38.000000000 -0700 @@ -28,7 +28,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/migrate.h~git-hdrcleanup include/linux/migrate.h --- devel/include/linux/migrate.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/migrate.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_MIGRATE_H #define _LINUX_MIGRATE_H -#include #include #ifdef CONFIG_MIGRATION diff -puN include/linux/mii.h~git-hdrcleanup include/linux/mii.h --- devel/include/linux/mii.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mii.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #define __LINUX_MII_H__ #include -#include /* Generic MII registers. */ @@ -136,6 +135,20 @@ #define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */ #define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */ +/* This structure is used in all SIOCxMIIxxx ioctl calls */ +struct mii_ioctl_data { + __u16 phy_id; + __u16 reg_num; + __u16 val_in; + __u16 val_out; +}; + +#ifdef __KERNEL__ + +#include + +struct ethtool_cmd; + struct mii_if_info { int phy_id; int advertising; @@ -151,9 +164,6 @@ struct mii_if_info { void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); }; -struct ethtool_cmd; -struct mii_ioctl_data; - extern int mii_link_ok (struct mii_if_info *mii); extern int mii_nway_restart (struct mii_if_info *mii); extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); @@ -168,16 +178,6 @@ extern int generic_mii_ioctl(struct mii_ unsigned int *duplex_changed); - -/* This structure is used in all SIOCxMIIxxx ioctl calls */ -struct mii_ioctl_data { - u16 phy_id; - u16 reg_num; - u16 val_in; - u16 val_out; -}; - - static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) { return (struct mii_ioctl_data *) &rq->ifr_ifru; @@ -235,5 +235,5 @@ static inline unsigned int mii_duplex (u return 0; } - +#endif /* __KERNEL__ */ #endif /* __LINUX_MII_H__ */ diff -puN include/linux/mman.h~git-hdrcleanup include/linux/mman.h --- devel/include/linux/mman.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mman.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,10 +1,6 @@ #ifndef _LINUX_MMAN_H #define _LINUX_MMAN_H -#include -#include - -#include #include #define MREMAP_MAYMOVE 1 @@ -13,6 +9,12 @@ #define OVERCOMMIT_GUESS 0 #define OVERCOMMIT_ALWAYS 1 #define OVERCOMMIT_NEVER 2 + +#ifdef __KERNEL__ +#include + +#include + extern int sysctl_overcommit_memory; extern int sysctl_overcommit_ratio; extern atomic_t vm_committed_space; @@ -63,5 +65,5 @@ calc_vm_flag_bits(unsigned long flags) _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) | _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ); } - +#endif /* __KERNEL__ */ #endif /* _LINUX_MMAN_H */ diff -puN include/linux/mm.h~git-hdrcleanup include/linux/mm.h --- devel/include/linux/mm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mm.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/mmzone.h~git-hdrcleanup include/linux/mmzone.h --- devel/include/linux/mmzone.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mmzone.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #ifdef __KERNEL__ #ifndef __ASSEMBLY__ -#include #include #include #include diff -puN include/linux/module.h~git-hdrcleanup include/linux/module.h --- devel/include/linux/module.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/module.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Rewritten by Richard Henderson Dec 1996 * Rewritten again by Rusty Russell, 2002 */ -#include #include #include #include diff -puN include/linux/msg.h~git-hdrcleanup include/linux/msg.h --- devel/include/linux/msg.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/msg.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _LINUX_MSG_H #include -#include /* ipcs ctl commands */ #define MSG_STAT 11 @@ -63,6 +62,7 @@ struct msginfo { #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) #ifdef __KERNEL__ +#include /* one msg_msg structure for each message */ struct msg_msg { diff -puN include/linux/mtd/cfi.h~git-hdrcleanup include/linux/mtd/cfi.h --- devel/include/linux/mtd/cfi.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mtd/cfi.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef __MTD_CFI_H__ #define __MTD_CFI_H__ -#include #include #include #include diff -puN include/linux/mtd/map.h~git-hdrcleanup include/linux/mtd/map.h --- devel/include/linux/mtd/map.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mtd/map.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ #ifndef __LINUX_MTD_MAP_H__ #define __LINUX_MTD_MAP_H__ -#include #include #include #include diff -puN include/linux/mtd/mtd.h~git-hdrcleanup include/linux/mtd/mtd.h --- devel/include/linux/mtd/mtd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mtd/mtd.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #error This is a kernel header. Perhaps include mtd-user.h instead? #endif -#include #include #include #include diff -puN include/linux/mtd/nand.h~git-hdrcleanup include/linux/mtd/nand.h --- devel/include/linux/mtd/nand.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mtd/nand.h 2006-05-14 02:02:38.000000000 -0700 @@ -56,7 +56,6 @@ #ifndef __LINUX_MTD_NAND_H #define __LINUX_MTD_NAND_H -#include #include #include #include diff -puN include/linux/mtd/physmap.h~git-hdrcleanup include/linux/mtd/physmap.h --- devel/include/linux/mtd/physmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mtd/physmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #ifndef __LINUX_MTD_PHYSMAP__ -#include #if defined(CONFIG_MTD_PHYSMAP) diff -puN include/linux/mtd/xip.h~git-hdrcleanup include/linux/mtd/xip.h --- devel/include/linux/mtd/xip.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/mtd/xip.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef __LINUX_MTD_XIP_H__ #define __LINUX_MTD_XIP_H__ -#include #ifdef CONFIG_MTD_XIP diff -puN include/linux/nbd.h~git-hdrcleanup include/linux/nbd.h --- devel/include/linux/nbd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/nbd.h 2006-05-14 02:02:38.000000000 -0700 @@ -77,11 +77,11 @@ struct nbd_device { * server. All data are in network byte order. */ struct nbd_request { - u32 magic; - u32 type; /* == READ || == WRITE */ + __u32 magic; + __u32 type; /* == READ || == WRITE */ char handle[8]; - u64 from; - u32 len; + __u64 from; + __u32 len; } #ifdef __GNUC__ __attribute__ ((packed)) @@ -93,8 +93,8 @@ struct nbd_request { * it has completed an I/O request (or an error occurs). */ struct nbd_reply { - u32 magic; - u32 error; /* 0 = ok, else error */ + __u32 magic; + __u32 error; /* 0 = ok, else error */ char handle[8]; /* handle you got from request */ }; #endif diff -puN include/linux/ncp_fs.h~git-hdrcleanup include/linux/ncp_fs.h --- devel/include/linux/ncp_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ncp_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -12,8 +12,6 @@ #include #include -#include -#include #include #include @@ -146,7 +144,8 @@ struct ncp_nls_ioctl #ifdef __KERNEL__ -#include +#include +#include /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */ #undef PRINTK diff -puN include/linux/netdevice.h~git-hdrcleanup include/linux/netdevice.h --- devel/include/linux/netdevice.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netdevice.h 2006-05-14 02:02:38.000000000 -0700 @@ -34,7 +34,6 @@ #include #include -#include #include #include diff -puN include/linux/netfilter_arp.h~git-hdrcleanup include/linux/netfilter_arp.h --- devel/include/linux/netfilter_arp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netfilter_arp.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * (C)2002 Rusty Russell IBM -- This code is GPL. */ -#include #include /* There is no PF_ARP. */ diff -puN include/linux/netfilter_bridge.h~git-hdrcleanup include/linux/netfilter_bridge.h --- devel/include/linux/netfilter_bridge.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netfilter_bridge.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ /* bridge-specific defines for netfilter. */ -#include #include #if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER) #include diff -puN include/linux/netfilter.h~git-hdrcleanup include/linux/netfilter.h --- devel/include/linux/netfilter.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netfilter.h 2006-05-14 02:02:38.000000000 -0700 @@ -40,7 +40,6 @@ #endif #ifdef __KERNEL__ -#include #ifdef CONFIG_NETFILTER extern void netfilter_init(void); diff -puN include/linux/netfilter_ipv4.h~git-hdrcleanup include/linux/netfilter_ipv4.h --- devel/include/linux/netfilter_ipv4.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netfilter_ipv4.h 2006-05-14 02:02:38.000000000 -0700 @@ -5,7 +5,6 @@ * (C)1998 Rusty Russell -- This code is GPL. */ -#include #include /* only for userspace compatibility */ diff -puN include/linux/netfilter_ipv4/ip_conntrack.h~git-hdrcleanup include/linux/netfilter_ipv4/ip_conntrack.h --- devel/include/linux/netfilter_ipv4/ip_conntrack.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netfilter_ipv4/ip_conntrack.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #include #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/netfilter_ipv4/listhelp.h~git-hdrcleanup include/linux/netfilter_ipv4/listhelp.h --- devel/include/linux/netfilter_ipv4/listhelp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netfilter_ipv4/listhelp.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,6 +1,5 @@ #ifndef _LISTHELP_H #define _LISTHELP_H -#include #include /* Header to do more comprehensive job than linux/list.h; assume list diff -puN include/linux/netfilter/xt_conntrack.h~git-hdrcleanup include/linux/netfilter/xt_conntrack.h --- devel/include/linux/netfilter/xt_conntrack.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/netfilter/xt_conntrack.h 2006-05-14 02:02:38.000000000 -0700 @@ -42,7 +42,7 @@ struct ip_conntrack_old_tuple } u; /* The protocol. */ - u16 protonum; + __u16 protonum; } dst; }; diff -puN include/linux/net.h~git-hdrcleanup include/linux/net.h --- devel/include/linux/net.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/net.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,9 +18,7 @@ #ifndef _LINUX_NET_H #define _LINUX_NET_H -#include #include -#include #include struct poll_table_struct; @@ -57,6 +55,7 @@ typedef enum { #define __SO_ACCEPTCON (1 << 16) /* performed a listen */ #ifdef __KERNEL__ +#include #define SOCK_ASYNC_NOSPACE 0 #define SOCK_ASYNC_WAITDATA 1 diff -puN include/linux/nfs4.h~git-hdrcleanup include/linux/nfs4.h --- devel/include/linux/nfs4.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/nfs4.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #define _LINUX_NFS4_H #include -#include #define NFS4_VERIFIER_SIZE 8 #define NFS4_FHSIZE 128 @@ -97,6 +96,9 @@ enum nfs4_acl_whotype { NFS4_ACL_WHO_EVERYONE, }; +#ifdef __KERNEL__ +#include + struct nfs4_ace { uint32_t type; uint32_t flag; @@ -345,8 +347,6 @@ enum lock_type4 { #define NFS4_MINOR_VERSION 0 #define NFS4_DEBUG 1 -#ifdef __KERNEL__ - /* Index of predefined Linux client operations */ enum { diff -puN include/linux/nfsd/nfsd.h~git-hdrcleanup include/linux/nfsd/nfsd.h --- devel/include/linux/nfsd/nfsd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/nfsd/nfsd.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef LINUX_NFSD_NFSD_H #define LINUX_NFSD_NFSD_H -#include #include #include #include diff -puN include/linux/nfsd/nfsfh.h~git-hdrcleanup include/linux/nfsd/nfsfh.h --- devel/include/linux/nfsd/nfsfh.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/nfsd/nfsfh.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #include #ifdef __KERNEL__ -# include # include # include # include diff -puN include/linux/nfsd/syscall.h~git-hdrcleanup include/linux/nfsd/syscall.h --- devel/include/linux/nfsd/syscall.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/nfsd/syscall.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #include #ifdef __KERNEL__ -# include # include # include #endif diff -puN include/linux/nfs_fs.h~git-hdrcleanup include/linux/nfs_fs.h --- devel/include/linux/nfs_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/nfs_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,26 +9,6 @@ #ifndef _LINUX_NFS_FS_H #define _LINUX_NFS_FS_H -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include /* * Enable debugging support for nfs client. @@ -63,6 +43,25 @@ #define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ #ifdef __KERNEL__ +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include /* * NFSv3/v4 Access mode cache entry diff -puN include/linux/nfs.h~git-hdrcleanup include/linux/nfs.h --- devel/include/linux/nfs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/nfs.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,9 +7,6 @@ #ifndef _LINUX_NFS_H #define _LINUX_NFS_H -#include -#include - #define NFS_PROGRAM 100003 #define NFS_PORT 2049 #define NFS_MAXDATA 8192 @@ -129,7 +126,10 @@ enum nfs_ftype { NFFIFO = 8 }; -#if defined(__KERNEL__) +#ifdef __KERNEL__ +#include +#include + /* * This is the kernel NFS client file handle representation */ diff -puN include/linux/numa.h~git-hdrcleanup include/linux/numa.h --- devel/include/linux/numa.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/numa.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_NUMA_H #define _LINUX_NUMA_H -#include #ifdef CONFIG_NODES_SHIFT #define NODES_SHIFT CONFIG_NODES_SHIFT diff -puN include/linux/parport.h~git-hdrcleanup include/linux/parport.h --- devel/include/linux/parport.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/parport.h 2006-05-14 02:02:38.000000000 -0700 @@ -96,7 +96,6 @@ typedef enum { /* The rest is for the kernel only */ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/pci.h~git-hdrcleanup include/linux/pci.h --- devel/include/linux/pci.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/pci.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,8 +17,6 @@ #ifndef LINUX_PCI_H #define LINUX_PCI_H -#include - /* Include the pci register defines */ #include @@ -46,8 +44,9 @@ #ifdef __KERNEL__ +#include + #include -#include #include #include #include diff -puN include/linux/percpu_counter.h~git-hdrcleanup include/linux/percpu_counter.h --- devel/include/linux/percpu_counter.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/percpu_counter.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * WARNING: these things are HUGE. 4 kbytes per counter on 32-way P4. */ -#include #include #include #include diff -puN include/linux/pm.h~git-hdrcleanup include/linux/pm.h --- devel/include/linux/pm.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/pm.h 2006-05-14 02:02:38.000000000 -0700 @@ -23,7 +23,6 @@ #ifdef __KERNEL__ -#include #include #include diff -puN include/linux/pm_legacy.h~git-hdrcleanup include/linux/pm_legacy.h --- devel/include/linux/pm_legacy.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/pm_legacy.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __LINUX_PM_LEGACY_H__ #define __LINUX_PM_LEGACY_H__ -#include #ifdef CONFIG_PM_LEGACY diff -puN include/linux/pmu.h~git-hdrcleanup include/linux/pmu.h --- devel/include/linux/pmu.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/pmu.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Copyright (C) 1998 Paul Mackerras. */ -#include #define PMU_DRIVER_VERSION 2 diff -puN include/linux/ppp_defs.h~git-hdrcleanup include/linux/ppp_defs.h --- devel/include/linux/ppp_defs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ppp_defs.h 2006-05-14 02:02:38.000000000 -0700 @@ -42,8 +42,6 @@ #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ -#include - /* * The basic PPP frame. */ @@ -97,7 +95,11 @@ #define PPP_INITFCS 0xffff /* Initial FCS value */ #define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ + +#ifdef __KERNEL__ +#include #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c) +#endif /* * Extended asyncmap - allows any character to be escaped. @@ -179,12 +181,4 @@ struct ppp_idle { time_t recv_idle; /* time since last NP packet received */ }; -#ifndef __P -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif -#endif - #endif /* _PPP_DEFS_H_ */ diff -puN include/linux/preempt.h~git-hdrcleanup include/linux/preempt.h --- devel/include/linux/preempt.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/preempt.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * preempt_count (used for kernel preemption, interrupt count, etc.) */ -#include #include #include diff -puN include/linux/proc_fs.h~git-hdrcleanup include/linux/proc_fs.h --- devel/include/linux/proc_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/proc_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_PROC_FS_H #define _LINUX_PROC_FS_H -#include #include #include #include diff -puN include/linux/profile.h~git-hdrcleanup include/linux/profile.h --- devel/include/linux/profile.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/profile.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #ifdef __KERNEL__ #include -#include #include #include #include diff -puN include/linux/quota.h~git-hdrcleanup include/linux/quota.h --- devel/include/linux/quota.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/quota.h 2006-05-14 02:02:38.000000000 -0700 @@ -37,8 +37,6 @@ #include #include -#include -#include #define __DQUOT_VERSION__ "dquot_6.5.1" #define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 @@ -133,6 +131,8 @@ struct if_dqinfo { }; #ifdef __KERNEL__ +#include +#include #include #include diff -puN include/linux/quotaops.h~git-hdrcleanup include/linux/quotaops.h --- devel/include/linux/quotaops.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/quotaops.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _LINUX_QUOTAOPS_ #define _LINUX_QUOTAOPS_ -#include #include #include diff -puN include/linux/reiserfs_xattr.h~git-hdrcleanup include/linux/reiserfs_xattr.h --- devel/include/linux/reiserfs_xattr.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/reiserfs_xattr.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,8 +2,6 @@ File: linux/reiserfs_xattr.h */ -#include -#include #include /* Magic value in header */ @@ -15,6 +13,7 @@ struct reiserfs_xattr_header { }; #ifdef __KERNEL__ +#include struct reiserfs_xattr_handler { char *prefix; diff -puN include/linux/relay.h~git-hdrcleanup include/linux/relay.h --- devel/include/linux/relay.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/relay.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifndef _LINUX_RELAY_H #define _LINUX_RELAY_H -#include #include #include #include diff -puN include/linux/rio_drv.h~git-hdrcleanup include/linux/rio_drv.h --- devel/include/linux/rio_drv.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/rio_drv.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #ifdef __KERNEL__ #include -#include #include #include #include diff -puN include/linux/rio.h~git-hdrcleanup include/linux/rio.h --- devel/include/linux/rio.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/rio.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifdef __KERNEL__ #include -#include #include #include #include diff -puN include/linux/rmap.h~git-hdrcleanup include/linux/rmap.h --- devel/include/linux/rmap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/rmap.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ * Declarations for Reverse Mapping functions in mm/rmap.c */ -#include #include #include #include diff -puN include/linux/rtnetlink.h~git-hdrcleanup include/linux/rtnetlink.h --- devel/include/linux/rtnetlink.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/rtnetlink.h 2006-05-14 02:02:38.000000000 -0700 @@ -909,7 +909,6 @@ struct tcamsg #ifdef __KERNEL__ -#include #include extern size_t rtattr_strlcpy(char *dest, const struct rtattr *rta, size_t size); diff -puN include/linux/rwsem.h~git-hdrcleanup include/linux/rwsem.h --- devel/include/linux/rwsem.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/rwsem.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/scc.h~git-hdrcleanup include/linux/scc.h --- devel/include/linux/scc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/scc.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifndef _SCC_H #define _SCC_H -#include /* selection of hardware types */ diff -puN include/linux/sched.h~git-hdrcleanup include/linux/sched.h --- devel/include/linux/sched.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/sched.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,9 +1,46 @@ #ifndef _LINUX_SCHED_H #define _LINUX_SCHED_H +#include /* For AT_VECTOR_SIZE */ + +/* + * cloning flags: + */ +#define CSIGNAL 0x000000ff /* signal mask to be sent at exit */ +#define CLONE_VM 0x00000100 /* set if VM shared between processes */ +#define CLONE_FS 0x00000200 /* set if fs info shared between processes */ +#define CLONE_FILES 0x00000400 /* set if open files shared between processes */ +#define CLONE_SIGHAND 0x00000800 /* set if signal handlers and blocked signals shared */ +#define CLONE_PTRACE 0x00002000 /* set if we want to let tracing continue on the child too */ +#define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ +#define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ +#define CLONE_THREAD 0x00010000 /* Same thread group? */ +#define CLONE_NEWNS 0x00020000 /* New namespace group? */ +#define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ +#define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ +#define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ +#define CLONE_CHILD_CLEARTID 0x00200000 /* clear the TID in the child */ +#define CLONE_DETACHED 0x00400000 /* Unused, ignored */ +#define CLONE_UNTRACED 0x00800000 /* set if the tracing process can't force CLONE_PTRACE on this clone */ +#define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ +#define CLONE_STOPPED 0x02000000 /* Start in stopped state */ + +/* + * Scheduling policies + */ +#define SCHED_NORMAL 0 +#define SCHED_FIFO 1 +#define SCHED_RR 2 +#define SCHED_BATCH 3 + +#ifdef __KERNEL__ + +struct sched_param { + int sched_priority; +}; + #include /* for HZ */ -#include #include #include #include @@ -37,31 +74,15 @@ #include #include -#include /* For AT_VECTOR_SIZE */ +#include +#include +#include +#include +#include -struct exec_domain; +#include -/* - * cloning flags: - */ -#define CSIGNAL 0x000000ff /* signal mask to be sent at exit */ -#define CLONE_VM 0x00000100 /* set if VM shared between processes */ -#define CLONE_FS 0x00000200 /* set if fs info shared between processes */ -#define CLONE_FILES 0x00000400 /* set if open files shared between processes */ -#define CLONE_SIGHAND 0x00000800 /* set if signal handlers and blocked signals shared */ -#define CLONE_PTRACE 0x00002000 /* set if we want to let tracing continue on the child too */ -#define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ -#define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ -#define CLONE_THREAD 0x00010000 /* Same thread group? */ -#define CLONE_NEWNS 0x00020000 /* New namespace group? */ -#define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ -#define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ -#define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ -#define CLONE_CHILD_CLEARTID 0x00200000 /* clear the TID in the child */ -#define CLONE_DETACHED 0x00400000 /* Unused, ignored */ -#define CLONE_UNTRACED 0x00800000 /* set if the tracing process can't force CLONE_PTRACE on this clone */ -#define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ -#define CLONE_STOPPED 0x02000000 /* Start in stopped state */ +struct exec_domain; /* * List of flags we want to share for kernel threads, @@ -103,13 +124,6 @@ extern unsigned long nr_uninterruptible( extern unsigned long nr_active(void); extern unsigned long nr_iowait(void); -#include -#include -#include -#include -#include - -#include /* * Task state bitmask. NOTE! These bits are also @@ -156,20 +170,6 @@ extern unsigned long nr_iowait(void); /* Task command name length */ #define TASK_COMM_LEN 16 -/* - * Scheduling policies - */ -#define SCHED_NORMAL 0 -#define SCHED_FIFO 1 -#define SCHED_RR 2 -#define SCHED_BATCH 3 - -struct sched_param { - int sched_priority; -}; - -#ifdef __KERNEL__ - #include /* diff -puN include/linux/seccomp.h~git-hdrcleanup include/linux/seccomp.h --- devel/include/linux/seccomp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/seccomp.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_SECCOMP_H #define _LINUX_SECCOMP_H -#include #ifdef CONFIG_SECCOMP diff -puN include/linux/sem.h~git-hdrcleanup include/linux/sem.h --- devel/include/linux/sem.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/sem.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _LINUX_SEM_H #include -#include /* semop flags */ #define SEM_UNDO 0x1000 /* undo the operation on exit */ @@ -78,6 +77,7 @@ struct seminfo { #define SEMUSZ 20 /* sizeof struct sem_undo */ #ifdef __KERNEL__ +#include struct task_struct; diff -puN include/linux/seqlock.h~git-hdrcleanup include/linux/seqlock.h --- devel/include/linux/seqlock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/seqlock.h 2006-05-14 02:02:38.000000000 -0700 @@ -26,7 +26,6 @@ * by Keith Owens and Andrea Arcangeli */ -#include #include #include diff -puN include/linux/serial_core.h~git-hdrcleanup include/linux/serial_core.h --- devel/include/linux/serial_core.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/serial_core.h 2006-05-14 02:02:38.000000000 -0700 @@ -132,7 +132,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/serialP.h~git-hdrcleanup include/linux/serialP.h --- devel/include/linux/serialP.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/serialP.h 2006-05-14 02:02:38.000000000 -0700 @@ -19,7 +19,6 @@ * For definitions of the flags field, see tty.h */ -#include #include #include #include diff -puN include/linux/signal.h~git-hdrcleanup include/linux/signal.h --- devel/include/linux/signal.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/signal.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,12 +1,12 @@ #ifndef _LINUX_SIGNAL_H #define _LINUX_SIGNAL_H -#include -#include #include #include #ifdef __KERNEL__ +#include +#include /* * These values of sa_flags are used only by the kernel as part of the diff -puN include/linux/skbuff.h~git-hdrcleanup include/linux/skbuff.h --- devel/include/linux/skbuff.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/skbuff.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef _LINUX_SKBUFF_H #define _LINUX_SKBUFF_H -#include #include #include #include diff -puN include/linux/slab.h~git-hdrcleanup include/linux/slab.h --- devel/include/linux/slab.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/slab.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ typedef struct kmem_cache kmem_cache_t; -#include /* kmalloc_sizes.h needs CONFIG_ options */ #include #include #include diff -puN include/linux/smb_fs.h~git-hdrcleanup include/linux/smb_fs.h --- devel/include/linux/smb_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/smb_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,8 +10,6 @@ #define _LINUX_SMB_FS_H #include -#include -#include /* * ioctl commands @@ -24,6 +22,8 @@ #ifdef __KERNEL__ +#include +#include #include #include diff -puN include/linux/smp.h~git-hdrcleanup include/linux/smp.h --- devel/include/linux/smp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/smp.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * Alan Cox. */ -#include extern void cpu_idle(void); diff -puN include/linux/smp_lock.h~git-hdrcleanup include/linux/smp_lock.h --- devel/include/linux/smp_lock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/smp_lock.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __LINUX_SMPLOCK_H #define __LINUX_SMPLOCK_H -#include #ifdef CONFIG_LOCK_KERNEL #include #include diff -puN include/linux/socket.h~git-hdrcleanup include/linux/socket.h --- devel/include/linux/socket.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/socket.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,8 +18,6 @@ struct __kernel_sockaddr_storage { #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) -#include /* for CONFIG_COMPAT */ -#include #include /* arch-dependent defines */ #include /* the SIOCxxx I/O controls */ #include /* iovec support */ diff -puN include/linux/spinlock.h~git-hdrcleanup include/linux/spinlock.h --- devel/include/linux/spinlock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/spinlock.h 2006-05-14 02:02:38.000000000 -0700 @@ -46,7 +46,6 @@ * linux/spinlock.h: builds the final spin_*() APIs. */ -#include #include #include #include diff -puN include/linux/stop_machine.h~git-hdrcleanup include/linux/stop_machine.h --- devel/include/linux/stop_machine.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/stop_machine.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ very heavy lock, which is equivalent to grabbing every spinlock (and more). So the "read" side to such a lock is anything which diables preeempt. */ -#include #include #include diff -puN include/linux/sunrpc/auth.h~git-hdrcleanup include/linux/sunrpc/auth.h --- devel/include/linux/sunrpc/auth.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/sunrpc/auth.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/sunrpc/debug.h~git-hdrcleanup include/linux/sunrpc/debug.h --- devel/include/linux/sunrpc/debug.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/sunrpc/debug.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,19 +9,6 @@ #ifndef _LINUX_SUNRPC_DEBUG_H_ #define _LINUX_SUNRPC_DEBUG_H_ -#include - -#include -#include - -/* - * Enable RPC debugging/profiling. - */ -#ifdef CONFIG_SYSCTL -#define RPC_DEBUG -#endif -/* #define RPC_PROFILE */ - /* * RPC debug facilities */ @@ -41,6 +28,17 @@ #ifdef __KERNEL__ +#include +#include + +/* + * Enable RPC debugging/profiling. + */ +#ifdef CONFIG_SYSCTL +#define RPC_DEBUG +#endif +/* #define RPC_PROFILE */ + /* * Debugging macros etc */ diff -puN include/linux/sunrpc/stats.h~git-hdrcleanup include/linux/sunrpc/stats.h --- devel/include/linux/sunrpc/stats.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/sunrpc/stats.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef _LINUX_SUNRPC_STATS_H #define _LINUX_SUNRPC_STATS_H -#include #include struct rpc_stat { diff -puN include/linux/suspend.h~git-hdrcleanup include/linux/suspend.h --- devel/include/linux/suspend.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/suspend.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #endif #include #include -#include #include #include diff -puN include/linux/swap.h~git-hdrcleanup include/linux/swap.h --- devel/include/linux/swap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/swap.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_SWAP_H #define _LINUX_SWAP_H -#include #include #include #include diff -puN include/linux/syscalls.h~git-hdrcleanup include/linux/syscalls.h --- devel/include/linux/syscalls.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/syscalls.h 2006-05-14 02:02:38.000000000 -0700 @@ -53,7 +53,6 @@ struct mq_attr; struct compat_stat; struct compat_timeval; -#include #include #include #include diff -puN include/linux/sysrq.h~git-hdrcleanup include/linux/sysrq.h --- devel/include/linux/sysrq.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/sysrq.h 2006-05-14 02:02:38.000000000 -0700 @@ -11,7 +11,6 @@ * based upon discusions in irc://irc.openprojects.net/#kernelnewbies */ -#include struct pt_regs; struct tty_struct; diff -puN include/linux/tcp.h~git-hdrcleanup include/linux/tcp.h --- devel/include/linux/tcp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/tcp.h 2006-05-14 02:02:38.000000000 -0700 @@ -159,7 +159,6 @@ struct tcp_info #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/threads.h~git-hdrcleanup include/linux/threads.h --- devel/include/linux/threads.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/threads.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_THREADS_H #define _LINUX_THREADS_H -#include /* * The default limit for the nr of threads is now in diff -puN include/linux/timer.h~git-hdrcleanup include/linux/timer.h --- devel/include/linux/timer.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/timer.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef _LINUX_TIMER_H #define _LINUX_TIMER_H -#include #include #include #include diff -puN include/linux/timex.h~git-hdrcleanup include/linux/timex.h --- devel/include/linux/timex.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/timex.h 2006-05-14 02:02:38.000000000 -0700 @@ -53,7 +53,6 @@ #ifndef _LINUX_TIMEX_H #define _LINUX_TIMEX_H -#include #include #include diff -puN include/linux/tty.h~git-hdrcleanup include/linux/tty.h --- devel/include/linux/tty.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/tty.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ consoles 16 and higher (since it returns a short) */ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/types.h~git-hdrcleanup include/linux/types.h --- devel/include/linux/types.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/types.h 2006-05-14 02:02:38.000000000 -0700 @@ -2,7 +2,6 @@ #define _LINUX_TYPES_H #ifdef __KERNEL__ -#include #define BITS_TO_LONGS(bits) \ (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) diff -puN include/linux/udp.h~git-hdrcleanup include/linux/udp.h --- devel/include/linux/udp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/udp.h 2006-05-14 02:02:38.000000000 -0700 @@ -35,7 +35,6 @@ struct udphdr { #define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */ #ifdef __KERNEL__ -#include #include #include diff -puN include/linux/ufs_fs.h~git-hdrcleanup include/linux/ufs_fs.h --- devel/include/linux/ufs_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/ufs_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -32,7 +32,6 @@ #include #include -#include #include #include diff -puN include/linux/unistd.h~git-hdrcleanup include/linux/unistd.h --- devel/include/linux/unistd.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/unistd.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,9 @@ #ifndef _LINUX_UNISTD_H_ #define _LINUX_UNISTD_H_ +#ifdef __KERNEL__ extern int errno; +#endif /* * Include machine specific syscallX macros diff -puN include/linux/usbdevice_fs.h~git-hdrcleanup include/linux/usbdevice_fs.h --- devel/include/linux/usbdevice_fs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/usbdevice_fs.h 2006-05-14 02:02:38.000000000 -0700 @@ -123,6 +123,7 @@ struct usbdevfs_hub_portinfo { char port [127]; /* e.g. port 3 connects to device 27 */ }; +#ifdef __KERNEL__ #ifdef CONFIG_COMPAT #include struct usbdevfs_urb32 { @@ -147,6 +148,7 @@ struct usbdevfs_ioctl32 { compat_caddr_t data; }; #endif +#endif /* __KERNEL__ */ #define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer) #define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer) diff -puN include/linux/usb.h~git-hdrcleanup include/linux/usb.h --- devel/include/linux/usb.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/usb.h 2006-05-14 02:02:38.000000000 -0700 @@ -10,7 +10,6 @@ #ifdef __KERNEL__ -#include #include /* for -ENODEV */ #include /* for mdelay() */ #include /* for in_interrupt() */ diff -puN include/linux/usb_usual.h~git-hdrcleanup include/linux/usb_usual.h --- devel/include/linux/usb_usual.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/usb_usual.h 2006-05-14 02:02:38.000000000 -0700 @@ -9,7 +9,6 @@ #ifndef __LINUX_USB_USUAL_H #define __LINUX_USB_USUAL_H -#include /* We should do this for cleanliness... But other usb_foo.h do not do this. */ /* #include */ diff -puN include/linux/vt_buffer.h~git-hdrcleanup include/linux/vt_buffer.h --- devel/include/linux/vt_buffer.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/vt_buffer.h 2006-05-14 02:02:38.000000000 -0700 @@ -13,7 +13,6 @@ #ifndef _LINUX_VT_BUFFER_H_ #define _LINUX_VT_BUFFER_H_ -#include #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) #include diff -puN include/linux/vt_kern.h~git-hdrcleanup include/linux/vt_kern.h --- devel/include/linux/vt_kern.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/vt_kern.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ * with information needed by the vt package */ -#include #include #include #include diff -puN include/linux/wait.h~git-hdrcleanup include/linux/wait.h --- devel/include/linux/wait.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/wait.h 2006-05-14 02:02:38.000000000 -0700 @@ -19,7 +19,6 @@ #ifdef __KERNEL__ -#include #include #include #include diff -puN include/linux/wanrouter.h~git-hdrcleanup include/linux/wanrouter.h --- devel/include/linux/wanrouter.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/linux/wanrouter.h 2006-05-14 02:02:38.000000000 -0700 @@ -44,8 +44,6 @@ * Jan 02, 1997 Gene Kozin Initial version (based on wanpipe.h). *****************************************************************************/ -#include /* Support for SMP Locking */ - #ifndef _ROUTER_H #define _ROUTER_H @@ -457,6 +455,8 @@ typedef struct wanif_conf #include /* support for device drivers */ #include /* proc filesystem pragmatics */ #include /* support for network drivers */ +#include /* Support for SMP Locking */ + /*---------------------------------------------------------------------------- * WAN device data space. */ diff -puN include/mtd/mtd-abi.h~git-hdrcleanup include/mtd/mtd-abi.h --- devel/include/mtd/mtd-abi.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/mtd/mtd-abi.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,8 +7,9 @@ #ifndef __MTD_ABI_H__ #define __MTD_ABI_H__ -#ifndef __KERNEL__ /* Urgh. The whole point of splitting this out into - separate files was to avoid #ifdef __KERNEL__ */ +#ifndef __KERNEL__ +/* Urgh. The whole point of splitting this out into + separate files was to avoid #ifdef __KERNEL__ */ #define __user #endif diff -puN include/net/addrconf.h~git-hdrcleanup include/net/addrconf.h --- devel/include/net/addrconf.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/addrconf.h 2006-05-14 02:02:38.000000000 -0700 @@ -45,7 +45,6 @@ struct prefix_info { #ifdef __KERNEL__ -#include #include #include #include diff -puN include/net/af_unix.h~git-hdrcleanup include/net/af_unix.h --- devel/include/net/af_unix.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/af_unix.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __LINUX_NET_AFUNIX_H #define __LINUX_NET_AFUNIX_H -#include #include #include #include diff -puN include/net/ax25.h~git-hdrcleanup include/net/ax25.h --- devel/include/net/ax25.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/ax25.h 2006-05-14 02:02:38.000000000 -0700 @@ -6,7 +6,6 @@ #ifndef _AX25_H #define _AX25_H -#include #include #include #include diff -puN include/net/compat.h~git-hdrcleanup include/net/compat.h --- devel/include/net/compat.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/compat.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef NET_COMPAT_H #define NET_COMPAT_H -#include #if defined(CONFIG_COMPAT) diff -puN include/net/dst.h~git-hdrcleanup include/net/dst.h --- devel/include/net/dst.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/dst.h 2006-05-14 02:02:38.000000000 -0700 @@ -8,7 +8,6 @@ #ifndef _NET_DST_H #define _NET_DST_H -#include #include #include #include diff -puN include/net/icmp.h~git-hdrcleanup include/net/icmp.h --- devel/include/net/icmp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/icmp.h 2006-05-14 02:02:38.000000000 -0700 @@ -18,7 +18,6 @@ #ifndef _ICMP_H #define _ICMP_H -#include #include #include diff -puN include/net/inet6_hashtables.h~git-hdrcleanup include/net/inet6_hashtables.h --- devel/include/net/inet6_hashtables.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/inet6_hashtables.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef _INET6_HASHTABLES_H #define _INET6_HASHTABLES_H -#include #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #include diff -puN include/net/inet_hashtables.h~git-hdrcleanup include/net/inet_hashtables.h --- devel/include/net/inet_hashtables.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/inet_hashtables.h 2006-05-14 02:02:38.000000000 -0700 @@ -14,7 +14,6 @@ #ifndef _INET_HASHTABLES_H #define _INET_HASHTABLES_H -#include #include #include diff -puN include/net/inet_sock.h~git-hdrcleanup include/net/inet_sock.h --- devel/include/net/inet_sock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/inet_sock.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #ifndef _INET_SOCK_H #define _INET_SOCK_H -#include #include #include diff -puN include/net/inet_timewait_sock.h~git-hdrcleanup include/net/inet_timewait_sock.h --- devel/include/net/inet_timewait_sock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/inet_timewait_sock.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _INET_TIMEWAIT_SOCK_ #define _INET_TIMEWAIT_SOCK_ -#include #include #include diff -puN include/net/ip_fib.h~git-hdrcleanup include/net/ip_fib.h --- devel/include/net/ip_fib.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/ip_fib.h 2006-05-14 02:02:38.000000000 -0700 @@ -16,7 +16,6 @@ #ifndef _NET_IP_FIB_H #define _NET_IP_FIB_H -#include #include #include diff -puN include/net/ip.h~git-hdrcleanup include/net/ip.h --- devel/include/net/ip.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/ip.h 2006-05-14 02:02:38.000000000 -0700 @@ -22,7 +22,6 @@ #ifndef _IP_H #define _IP_H -#include #include #include #include diff -puN include/net/ip_mp_alg.h~git-hdrcleanup include/net/ip_mp_alg.h --- devel/include/net/ip_mp_alg.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/ip_mp_alg.h 2006-05-14 02:02:38.000000000 -0700 @@ -7,7 +7,6 @@ #ifndef _NET_IP_MP_ALG_H #define _NET_IP_MP_ALG_H -#include #include #include #include diff -puN include/net/ipv6.h~git-hdrcleanup include/net/ipv6.h --- devel/include/net/ipv6.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/ipv6.h 2006-05-14 02:02:38.000000000 -0700 @@ -104,7 +104,6 @@ struct frag_hdr { #ifdef __KERNEL__ -#include #include /* sysctls */ diff -puN include/net/ip_vs.h~git-hdrcleanup include/net/ip_vs.h --- devel/include/net/ip_vs.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/ip_vs.h 2006-05-14 02:02:38.000000000 -0700 @@ -248,7 +248,6 @@ struct ip_vs_daemon_user { #ifdef __KERNEL__ -#include #include /* for struct list_head */ #include /* for struct rwlock_t */ #include /* for struct atomic_t */ diff -puN include/net/irda/irda_device.h~git-hdrcleanup include/net/irda/irda_device.h --- devel/include/net/irda/irda_device.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/irda/irda_device.h 2006-05-14 02:02:38.000000000 -0700 @@ -39,7 +39,6 @@ #ifndef IRDA_DEVICE_H #define IRDA_DEVICE_H -#include #include #include #include diff -puN include/net/irda/irda.h~git-hdrcleanup include/net/irda/irda.h --- devel/include/net/irda/irda.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/irda/irda.h 2006-05-14 02:02:38.000000000 -0700 @@ -26,7 +26,6 @@ #ifndef NET_IRDA_H #define NET_IRDA_H -#include #include /* struct sk_buff */ #include #include /* sa_family_t in */ diff -puN include/net/irda/irlap.h~git-hdrcleanup include/net/irda/irlap.h --- devel/include/net/irda/irlap.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/irda/irlap.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,7 +27,6 @@ #ifndef IRLAP_H #define IRLAP_H -#include #include #include #include diff -puN include/net/irda/irlmp_frame.h~git-hdrcleanup include/net/irda/irlmp_frame.h --- devel/include/net/irda/irlmp_frame.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/irda/irlmp_frame.h 2006-05-14 02:02:38.000000000 -0700 @@ -26,7 +26,6 @@ #ifndef IRMLP_FRAME_H #define IRMLP_FRAME_H -#include #include #include diff -puN include/net/irda/irlmp.h~git-hdrcleanup include/net/irda/irlmp.h --- devel/include/net/irda/irlmp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/irda/irlmp.h 2006-05-14 02:02:38.000000000 -0700 @@ -29,7 +29,6 @@ #include /* for HZ */ -#include #include #include diff -puN include/net/irda/qos.h~git-hdrcleanup include/net/irda/qos.h --- devel/include/net/irda/qos.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/irda/qos.h 2006-05-14 02:02:38.000000000 -0700 @@ -31,7 +31,6 @@ #ifndef IRDA_QOS_H #define IRDA_QOS_H -#include #include #include diff -puN include/net/ndisc.h~git-hdrcleanup include/net/ndisc.h --- devel/include/net/ndisc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/ndisc.h 2006-05-14 02:02:38.000000000 -0700 @@ -37,7 +37,6 @@ enum { #ifdef __KERNEL__ -#include #include #include #include diff -puN include/net/netfilter/nf_conntrack.h~git-hdrcleanup include/net/netfilter/nf_conntrack.h --- devel/include/net/netfilter/nf_conntrack.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/netfilter/nf_conntrack.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #include #ifdef __KERNEL__ -#include #include #include #include diff -puN include/net/pkt_act.h~git-hdrcleanup include/net/pkt_act.h --- devel/include/net/pkt_act.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/pkt_act.h 2006-05-14 02:02:38.000000000 -0700 @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff -puN include/net/protocol.h~git-hdrcleanup include/net/protocol.h --- devel/include/net/protocol.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/protocol.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,7 +24,6 @@ #ifndef _PROTOCOL_H #define _PROTOCOL_H -#include #include #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #include diff -puN include/net/raw.h~git-hdrcleanup include/net/raw.h --- devel/include/net/raw.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/raw.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef _RAW_H #define _RAW_H -#include #include diff -puN include/net/red.h~git-hdrcleanup include/net/red.h --- devel/include/net/red.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/red.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __NET_SCHED_RED_H #define __NET_SCHED_RED_H -#include #include #include #include diff -puN include/net/route.h~git-hdrcleanup include/net/route.h --- devel/include/net/route.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/route.h 2006-05-14 02:02:38.000000000 -0700 @@ -24,7 +24,6 @@ #ifndef _ROUTE_H #define _ROUTE_H -#include #include #include #include diff -puN include/net/sch_generic.h~git-hdrcleanup include/net/sch_generic.h --- devel/include/net/sch_generic.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/sch_generic.h 2006-05-14 02:02:38.000000000 -0700 @@ -1,7 +1,6 @@ #ifndef __NET_SCHED_GENERIC_H #define __NET_SCHED_GENERIC_H -#include #include #include #include diff -puN include/net/sctp/sctp.h~git-hdrcleanup include/net/sctp/sctp.h --- devel/include/net/sctp/sctp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/sctp/sctp.h 2006-05-14 02:02:38.000000000 -0700 @@ -63,7 +63,6 @@ */ -#include #ifdef TEST_FRAME #undef CONFIG_PROC_FS diff -puN include/net/sock.h~git-hdrcleanup include/net/sock.h --- devel/include/net/sock.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/sock.h 2006-05-14 02:02:38.000000000 -0700 @@ -40,7 +40,6 @@ #ifndef _SOCK_H #define _SOCK_H -#include #include #include #include diff -puN include/net/tcp.h~git-hdrcleanup include/net/tcp.h --- devel/include/net/tcp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/net/tcp.h 2006-05-14 02:02:38.000000000 -0700 @@ -21,7 +21,6 @@ #define TCP_DEBUG 1 #define FASTRETRANS_DEBUG 1 -#include #include #include #include diff -puN include/pcmcia/ss.h~git-hdrcleanup include/pcmcia/ss.h --- devel/include/pcmcia/ss.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/pcmcia/ss.h 2006-05-14 02:02:38.000000000 -0700 @@ -15,7 +15,6 @@ #ifndef _LINUX_SS_H #define _LINUX_SS_H -#include #include #include /* task_struct, completion */ #include diff -puN include/scsi/scsi_transport_fc.h~git-hdrcleanup include/scsi/scsi_transport_fc.h --- devel/include/scsi/scsi_transport_fc.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/scsi/scsi_transport_fc.h 2006-05-14 02:02:38.000000000 -0700 @@ -27,7 +27,6 @@ #ifndef SCSI_TRANSPORT_FC_H #define SCSI_TRANSPORT_FC_H -#include #include #include diff -puN include/scsi/scsi_transport_spi.h~git-hdrcleanup include/scsi/scsi_transport_spi.h --- devel/include/scsi/scsi_transport_spi.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/scsi/scsi_transport_spi.h 2006-05-14 02:02:38.000000000 -0700 @@ -20,7 +20,6 @@ #ifndef SCSI_TRANSPORT_SPI_H #define SCSI_TRANSPORT_SPI_H -#include #include #include diff -puN include/sound/driver.h~git-hdrcleanup include/sound/driver.h --- devel/include/sound/driver.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/sound/driver.h 2006-05-14 02:02:38.000000000 -0700 @@ -26,7 +26,6 @@ #include "config.h" #endif -#include /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS diff -puN include/sound/hdsp.h~git-hdrcleanup include/sound/hdsp.h --- devel/include/sound/hdsp.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/sound/hdsp.h 2006-05-14 02:02:38.000000000 -0700 @@ -30,13 +30,13 @@ enum HDSP_IO_Type { }; struct hdsp_peak_rms { - u32 input_peaks[26]; - u32 playback_peaks[26]; - u32 output_peaks[28]; - u64 input_rms[26]; - u64 playback_rms[26]; + __u32 input_peaks[26]; + __u32 playback_peaks[26]; + __u32 output_peaks[28]; + __u64 input_rms[26]; + __u64 playback_rms[26]; /* These are only used for H96xx cards */ - u64 output_rms[26]; + __u64 output_rms[26]; }; #define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct hdsp_peak_rms) diff -puN include/video/edid.h~git-hdrcleanup include/video/edid.h --- devel/include/video/edid.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/video/edid.h 2006-05-14 02:02:38.000000000 -0700 @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #ifdef CONFIG_X86 struct edid_info { diff -puN include/video/vga.h~git-hdrcleanup include/video/vga.h --- devel/include/video/vga.h~git-hdrcleanup 2006-05-14 02:02:37.000000000 -0700 +++ devel-akpm/include/video/vga.h 2006-05-14 02:02:38.000000000 -0700 @@ -17,7 +17,6 @@ #ifndef __linux_video_vga_h__ #define __linux_video_vga_h__ -#include #include #include #ifndef CONFIG_AMIGA _