diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 18:10:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 18:10:08 -0400 |
| commit | cee4cca740d209bcb4b9857baa2253d5ba4e3fbe (patch) | |
| tree | 88a23004393ea4a32cad79839479c8e653e401d6 | |
| parent | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (diff) | |
| parent | 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 (diff) | |
Merge git://git.infradead.org/hdrcleanup-2.6
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
[S390] __FD_foo definitions.
Switch to __s32 types in joystick.h instead of C99 types for consistency.
Add <sys/types.h> to headers included for userspace in <linux/input.h>
Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
Remove struct fddi_statistics from user view in <linux/if_fddi.h>
Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
Use __uXX types in <linux/divert.h> for struct divert_blk et al.
Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
Use __uXX types in user-visible structures in <linux/nbd.h>
Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
Use __uXX types for S390 DASD volume label definitions which are user-visible
S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
Fix private integer types used in V4L2 ioctls.
...
Manually resolve conflict in include/linux/mtd/physmap.h
905 files changed, 842 insertions, 1648 deletions
diff --git a/drivers/s390/crypto/z90crypt.h b/drivers/s390/crypto/z90crypt.h index 5e6b1f535f62..0ca1d126ccb6 100644 --- a/drivers/s390/crypto/z90crypt.h +++ b/drivers/s390/crypto/z90crypt.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/drivers/s390/crypto/z90crypt.h | 2 | * linux/drivers/s390/crypto/z90crypt.h |
| 3 | * | 3 | * |
| 4 | * z90crypt 1.3.3 | 4 | * z90crypt 1.3.3 (kernel-private header) |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2001, 2005 IBM Corporation | 6 | * Copyright (C) 2001, 2005 IBM Corporation |
| 7 | * Author(s): Robert Burroughs (burrough@us.ibm.com) | 7 | * Author(s): Robert Burroughs (burrough@us.ibm.com) |
| @@ -27,188 +27,7 @@ | |||
| 27 | #ifndef _Z90CRYPT_H_ | 27 | #ifndef _Z90CRYPT_H_ |
| 28 | #define _Z90CRYPT_H_ | 28 | #define _Z90CRYPT_H_ |
| 29 | 29 | ||
| 30 | #include <linux/ioctl.h> | 30 | #include <asm/z90crypt.h> |
| 31 | |||
| 32 | #define z90crypt_VERSION 1 | ||
| 33 | #define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards | ||
| 34 | #define z90crypt_VARIANT 3 // 3 = CEX2A support | ||
| 35 | |||
| 36 | /** | ||
| 37 | * struct ica_rsa_modexpo | ||
| 38 | * | ||
| 39 | * Requirements: | ||
| 40 | * - outputdatalength is at least as large as inputdatalength. | ||
| 41 | * - All key parts are right justified in their fields, padded on | ||
| 42 | * the left with zeroes. | ||
| 43 | * - length(b_key) = inputdatalength | ||
| 44 | * - length(n_modulus) = inputdatalength | ||
| 45 | */ | ||
| 46 | struct ica_rsa_modexpo { | ||
| 47 | char __user * inputdata; | ||
| 48 | unsigned int inputdatalength; | ||
| 49 | char __user * outputdata; | ||
| 50 | unsigned int outputdatalength; | ||
| 51 | char __user * b_key; | ||
| 52 | char __user * n_modulus; | ||
| 53 | }; | ||
| 54 | |||
| 55 | /** | ||
| 56 | * struct ica_rsa_modexpo_crt | ||
| 57 | * | ||
| 58 | * Requirements: | ||
| 59 | * - inputdatalength is even. | ||
| 60 | * - outputdatalength is at least as large as inputdatalength. | ||
| 61 | * - All key parts are right justified in their fields, padded on | ||
| 62 | * the left with zeroes. | ||
| 63 | * - length(bp_key) = inputdatalength/2 + 8 | ||
| 64 | * - length(bq_key) = inputdatalength/2 | ||
| 65 | * - length(np_key) = inputdatalength/2 + 8 | ||
| 66 | * - length(nq_key) = inputdatalength/2 | ||
| 67 | * - length(u_mult_inv) = inputdatalength/2 + 8 | ||
| 68 | */ | ||
| 69 | struct ica_rsa_modexpo_crt { | ||
| 70 | char __user * inputdata; | ||
| 71 | unsigned int inputdatalength; | ||
| 72 | char __user * outputdata; | ||
| 73 | unsigned int outputdatalength; | ||
| 74 | char __user * bp_key; | ||
| 75 | char __user * bq_key; | ||
| 76 | char __user * np_prime; | ||
| 77 | char __user * nq_prime; | ||
| 78 | char __user * u_mult_inv; | ||
| 79 | }; | ||
| 80 | |||
| 81 | #define Z90_IOCTL_MAGIC 'z' // NOTE: Need to allocate from linux folks | ||
| 82 | |||
| 83 | /** | ||
| 84 | * Interface notes: | ||
| 85 | * | ||
| 86 | * The ioctl()s which are implemented (along with relevant details) | ||
| 87 | * are: | ||
| 88 | * | ||
| 89 | * ICARSAMODEXPO | ||
| 90 | * Perform an RSA operation using a Modulus-Exponent pair | ||
| 91 | * This takes an ica_rsa_modexpo struct as its arg. | ||
| 92 | * | ||
| 93 | * NOTE: please refer to the comments preceding this structure | ||
| 94 | * for the implementation details for the contents of the | ||
| 95 | * block | ||
| 96 | * | ||
| 97 | * ICARSACRT | ||
| 98 | * Perform an RSA operation using a Chinese-Remainder Theorem key | ||
| 99 | * This takes an ica_rsa_modexpo_crt struct as its arg. | ||
| 100 | * | ||
| 101 | * NOTE: please refer to the comments preceding this structure | ||
| 102 | * for the implementation details for the contents of the | ||
| 103 | * block | ||
| 104 | * | ||
| 105 | * Z90STAT_TOTALCOUNT | ||
| 106 | * Return an integer count of all device types together. | ||
| 107 | * | ||
| 108 | * Z90STAT_PCICACOUNT | ||
| 109 | * Return an integer count of all PCICAs. | ||
| 110 | * | ||
| 111 | * Z90STAT_PCICCCOUNT | ||
| 112 | * Return an integer count of all PCICCs. | ||
| 113 | * | ||
| 114 | * Z90STAT_PCIXCCMCL2COUNT | ||
| 115 | * Return an integer count of all MCL2 PCIXCCs. | ||
| 116 | * | ||
| 117 | * Z90STAT_PCIXCCMCL3COUNT | ||
| 118 | * Return an integer count of all MCL3 PCIXCCs. | ||
| 119 | * | ||
| 120 | * Z90STAT_CEX2CCOUNT | ||
| 121 | * Return an integer count of all CEX2Cs. | ||
| 122 | * | ||
| 123 | * Z90STAT_CEX2ACOUNT | ||
| 124 | * Return an integer count of all CEX2As. | ||
| 125 | * | ||
| 126 | * Z90STAT_REQUESTQ_COUNT | ||
| 127 | * Return an integer count of the number of entries waiting to be | ||
| 128 | * sent to a device. | ||
| 129 | * | ||
| 130 | * Z90STAT_PENDINGQ_COUNT | ||
| 131 | * Return an integer count of the number of entries sent to a | ||
| 132 | * device awaiting the reply. | ||
| 133 | * | ||
| 134 | * Z90STAT_TOTALOPEN_COUNT | ||
| 135 | * Return an integer count of the number of open file handles. | ||
| 136 | * | ||
| 137 | * Z90STAT_DOMAIN_INDEX | ||
| 138 | * Return the integer value of the Cryptographic Domain. | ||
| 139 | * | ||
| 140 | * Z90STAT_STATUS_MASK | ||
| 141 | * Return an 64 element array of unsigned chars for the status of | ||
| 142 | * all devices. | ||
| 143 | * 0x01: PCICA | ||
| 144 | * 0x02: PCICC | ||
| 145 | * 0x03: PCIXCC_MCL2 | ||
| 146 | * 0x04: PCIXCC_MCL3 | ||
| 147 | * 0x05: CEX2C | ||
| 148 | * 0x06: CEX2A | ||
| 149 | * 0x0d: device is disabled via the proc filesystem | ||
| 150 | * | ||
| 151 | * Z90STAT_QDEPTH_MASK | ||
| 152 | * Return an 64 element array of unsigned chars for the queue | ||
| 153 | * depth of all devices. | ||
| 154 | * | ||
| 155 | * Z90STAT_PERDEV_REQCNT | ||
| 156 | * Return an 64 element array of unsigned integers for the number | ||
| 157 | * of successfully completed requests per device since the device | ||
| 158 | * was detected and made available. | ||
| 159 | * | ||
| 160 | * ICAZ90STATUS (deprecated) | ||
| 161 | * Return some device driver status in a ica_z90_status struct | ||
| 162 | * This takes an ica_z90_status struct as its arg. | ||
| 163 | * | ||
| 164 | * NOTE: this ioctl() is deprecated, and has been replaced with | ||
| 165 | * single ioctl()s for each type of status being requested | ||
| 166 | * | ||
| 167 | * Z90STAT_PCIXCCCOUNT (deprecated) | ||
| 168 | * Return an integer count of all PCIXCCs (MCL2 + MCL3). | ||
| 169 | * This is DEPRECATED now that MCL3 PCIXCCs are treated differently from | ||
| 170 | * MCL2 PCIXCCs. | ||
| 171 | * | ||
| 172 | * Z90QUIESCE (not recommended) | ||
| 173 | * Quiesce the driver. This is intended to stop all new | ||
| 174 | * requests from being processed. Its use is NOT recommended, | ||
| 175 | * except in circumstances where there is no other way to stop | ||
| 176 | * callers from accessing the driver. Its original use was to | ||
| 177 | * allow the driver to be "drained" of work in preparation for | ||
| 178 | * a system shutdown. | ||
| 179 | * | ||
| 180 | * NOTE: once issued, this ban on new work cannot be undone | ||
| 181 | * except by unloading and reloading the driver. | ||
| 182 | */ | ||
| 183 | |||
| 184 | /** | ||
| 185 | * Supported ioctl calls | ||
| 186 | */ | ||
| 187 | #define ICARSAMODEXPO _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0) | ||
| 188 | #define ICARSACRT _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0) | ||
| 189 | |||
| 190 | /* DEPRECATED status calls (bound for removal at some point) */ | ||
| 191 | #define ICAZ90STATUS _IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status) | ||
| 192 | #define Z90STAT_PCIXCCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x43, int) | ||
| 193 | |||
| 194 | /* unrelated to ICA callers */ | ||
| 195 | #define Z90QUIESCE _IO(Z90_IOCTL_MAGIC, 0x11) | ||
| 196 | |||
| 197 | /* New status calls */ | ||
| 198 | #define Z90STAT_TOTALCOUNT _IOR(Z90_IOCTL_MAGIC, 0x40, int) | ||
| 199 | #define Z90STAT_PCICACOUNT _IOR(Z90_IOCTL_MAGIC, 0x41, int) | ||
| 200 | #define Z90STAT_PCICCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x42, int) | ||
| 201 | #define Z90STAT_PCIXCCMCL2COUNT _IOR(Z90_IOCTL_MAGIC, 0x4b, int) | ||
| 202 | #define Z90STAT_PCIXCCMCL3COUNT _IOR(Z90_IOCTL_MAGIC, 0x4c, int) | ||
| 203 | #define Z90STAT_CEX2CCOUNT _IOR(Z90_IOCTL_MAGIC, 0x4d, int) | ||
| 204 | #define Z90STAT_CEX2ACOUNT _IOR(Z90_IOCTL_MAGIC, 0x4e, int) | ||
| 205 | #define Z90STAT_REQUESTQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x44, int) | ||
| 206 | #define Z90STAT_PENDINGQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x45, int) | ||
| 207 | #define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int) | ||
| 208 | #define Z90STAT_DOMAIN_INDEX _IOR(Z90_IOCTL_MAGIC, 0x47, int) | ||
| 209 | #define Z90STAT_STATUS_MASK _IOR(Z90_IOCTL_MAGIC, 0x48, char[64]) | ||
| 210 | #define Z90STAT_QDEPTH_MASK _IOR(Z90_IOCTL_MAGIC, 0x49, char[64]) | ||
| 211 | #define Z90STAT_PERDEV_REQCNT _IOR(Z90_IOCTL_MAGIC, 0x4a, int[64]) | ||
| 212 | 31 | ||
| 213 | /** | 32 | /** |
| 214 | * local errno definitions | 33 | * local errno definitions |
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 2e6d54569ee8..3c6a6205853a 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | 49 | ||
| 50 | #ifdef __KERNEL__ | 50 | #ifdef __KERNEL__ |
| 51 | 51 | ||
| 52 | #include <linux/config.h> | ||
| 53 | #include <linux/string.h> | 52 | #include <linux/string.h> |
| 54 | #include <linux/kernel.h> | 53 | #include <linux/kernel.h> |
| 55 | #include <linux/ctype.h> | 54 | #include <linux/ctype.h> |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index badf0277b1be..ef7d83a41470 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __ACPI_PROCESSOR_H | 2 | #define __ACPI_PROCESSOR_H |
| 3 | 3 | ||
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | #include <asm/acpi.h> | 6 | #include <asm/acpi.h> |
| 8 | 7 | ||
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h index 3f88715e811e..4b6ef7f21b93 100644 --- a/include/asm-alpha/bitops.h +++ b/include/asm-alpha/bitops.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_BITOPS_H | 1 | #ifndef _ALPHA_BITOPS_H |
| 2 | #define _ALPHA_BITOPS_H | 2 | #define _ALPHA_BITOPS_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/compiler.h> | 4 | #include <asm/compiler.h> |
| 6 | 5 | ||
| 7 | /* | 6 | /* |
diff --git a/include/asm-alpha/cache.h b/include/asm-alpha/cache.h index e6d4d1695e25..f199e69a5d0b 100644 --- a/include/asm-alpha/cache.h +++ b/include/asm-alpha/cache.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifndef __ARCH_ALPHA_CACHE_H | 4 | #ifndef __ARCH_ALPHA_CACHE_H |
| 5 | #define __ARCH_ALPHA_CACHE_H | 5 | #define __ARCH_ALPHA_CACHE_H |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | /* Bytes per L1 (data) cache line. */ | 8 | /* Bytes per L1 (data) cache line. */ |
| 10 | #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6) | 9 | #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6) |
diff --git a/include/asm-alpha/cacheflush.h b/include/asm-alpha/cacheflush.h index 3fc6ef726d8c..805640b41078 100644 --- a/include/asm-alpha/cacheflush.h +++ b/include/asm-alpha/cacheflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_CACHEFLUSH_H | 1 | #ifndef _ALPHA_CACHEFLUSH_H |
| 2 | #define _ALPHA_CACHEFLUSH_H | 2 | #define _ALPHA_CACHEFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | 5 | ||
| 7 | /* Caches aren't brain-dead on the Alpha. */ | 6 | /* Caches aren't brain-dead on the Alpha. */ |
diff --git a/include/asm-alpha/core_cia.h b/include/asm-alpha/core_cia.h index 3a70d68bfce8..9e0516c0ca27 100644 --- a/include/asm-alpha/core_cia.h +++ b/include/asm-alpha/core_cia.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | /* Define to experiment with fitting everything into one 512MB HAE window. */ | 4 | /* Define to experiment with fitting everything into one 512MB HAE window. */ |
| 5 | #define CIA_ONE_HAE_WINDOW 1 | 5 | #define CIA_ONE_HAE_WINDOW 1 |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 9 | #include <asm/compiler.h> | 8 | #include <asm/compiler.h> |
| 10 | 9 | ||
diff --git a/include/asm-alpha/core_t2.h b/include/asm-alpha/core_t2.h index 5c1c40338c82..dba70c62a16c 100644 --- a/include/asm-alpha/core_t2.h +++ b/include/asm-alpha/core_t2.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ALPHA_T2__H__ | 1 | #ifndef __ALPHA_T2__H__ |
| 2 | #define __ALPHA_T2__H__ | 2 | #define __ALPHA_T2__H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
| 7 | #include <asm/compiler.h> | 6 | #include <asm/compiler.h> |
diff --git a/include/asm-alpha/dma-mapping.h b/include/asm-alpha/dma-mapping.h index 62d0d6681aa9..b9ff4d8cb33a 100644 --- a/include/asm-alpha/dma-mapping.h +++ b/include/asm-alpha/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_DMA_MAPPING_H | 1 | #ifndef _ALPHA_DMA_MAPPING_H |
| 2 | #define _ALPHA_DMA_MAPPING_H | 2 | #define _ALPHA_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PCI | 5 | #ifdef CONFIG_PCI |
| 7 | 6 | ||
diff --git a/include/asm-alpha/dma.h b/include/asm-alpha/dma.h index 683afaa3deed..87cfdbdf08fc 100644 --- a/include/asm-alpha/dma.h +++ b/include/asm-alpha/dma.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef _ASM_DMA_H | 18 | #ifndef _ASM_DMA_H |
| 19 | #define _ASM_DMA_H | 19 | #define _ASM_DMA_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | 23 | ||
diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h index 289a00d51a90..e177d4180f83 100644 --- a/include/asm-alpha/floppy.h +++ b/include/asm-alpha/floppy.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_ALPHA_FLOPPY_H | 10 | #ifndef __ASM_ALPHA_FLOPPY_H |
| 11 | #define __ASM_ALPHA_FLOPPY_H | 11 | #define __ASM_ALPHA_FLOPPY_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #define fd_inb(port) inb_p(port) | 14 | #define fd_inb(port) inb_p(port) |
| 16 | #define fd_outb(value,port) outb_p(value,port) | 15 | #define fd_outb(value,port) outb_p(value,port) |
diff --git a/include/asm-alpha/hardirq.h b/include/asm-alpha/hardirq.h index 7bb6a36c96a1..d953e234daa8 100644 --- a/include/asm-alpha/hardirq.h +++ b/include/asm-alpha/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_HARDIRQ_H | 1 | #ifndef _ALPHA_HARDIRQ_H |
| 2 | #define _ALPHA_HARDIRQ_H | 2 | #define _ALPHA_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/cache.h> | 5 | #include <linux/cache.h> |
| 7 | 6 | ||
diff --git a/include/asm-alpha/hw_irq.h b/include/asm-alpha/hw_irq.h index a310b9efc906..ca9d43b63502 100644 --- a/include/asm-alpha/hw_irq.h +++ b/include/asm-alpha/hw_irq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_HW_IRQ_H | 1 | #ifndef _ALPHA_HW_IRQ_H |
| 2 | #define _ALPHA_HW_IRQ_H | 2 | #define _ALPHA_HW_IRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {} | 5 | static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {} |
| 7 | 6 | ||
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h index 6126afe27380..2a5cc0b367ab 100644 --- a/include/asm-alpha/ide.h +++ b/include/asm-alpha/ide.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #define IDE_ARCH_OBSOLETE_DEFAULTS | 17 | #define IDE_ARCH_OBSOLETE_DEFAULTS |
| 19 | 18 | ||
diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h index 3ebbeee753e9..f5ae98c25d1f 100644 --- a/include/asm-alpha/io.h +++ b/include/asm-alpha/io.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 8 | #include <asm/compiler.h> | 7 | #include <asm/compiler.h> |
| 9 | #include <asm/system.h> | 8 | #include <asm/system.h> |
diff --git a/include/asm-alpha/irq.h b/include/asm-alpha/irq.h index 566db720000a..f6de033718a0 100644 --- a/include/asm-alpha/irq.h +++ b/include/asm-alpha/irq.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #if defined(CONFIG_ALPHA_GENERIC) | 12 | #if defined(CONFIG_ALPHA_GENERIC) |
| 14 | 13 | ||
diff --git a/include/asm-alpha/kmap_types.h b/include/asm-alpha/kmap_types.h index 3d10cd3ea75f..3e6735a34c57 100644 --- a/include/asm-alpha/kmap_types.h +++ b/include/asm-alpha/kmap_types.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* Dummy header just to define km_type. */ | 4 | /* Dummy header just to define km_type. */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifdef CONFIG_DEBUG_HIGHMEM | 7 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 9 | # define D(n) __KM_FENCE_##n , | 8 | # define D(n) __KM_FENCE_##n , |
diff --git a/include/asm-alpha/machvec.h b/include/asm-alpha/machvec.h index ece166a203ec..aced22f91752 100644 --- a/include/asm-alpha/machvec.h +++ b/include/asm-alpha/machvec.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ALPHA_MACHVEC_H | 1 | #ifndef __ALPHA_MACHVEC_H |
| 2 | #define __ALPHA_MACHVEC_H 1 | 2 | #define __ALPHA_MACHVEC_H 1 |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | 5 | ||
| 7 | /* | 6 | /* |
diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h index 0c017fc181c1..fe249e9d3360 100644 --- a/include/asm-alpha/mmu_context.h +++ b/include/asm-alpha/mmu_context.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1996, Linus Torvalds | 7 | * Copyright (C) 1996, Linus Torvalds |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/system.h> | 10 | #include <asm/system.h> |
| 12 | #include <asm/machvec.h> | 11 | #include <asm/machvec.h> |
| 13 | #include <asm/compiler.h> | 12 | #include <asm/compiler.h> |
diff --git a/include/asm-alpha/mmzone.h b/include/asm-alpha/mmzone.h index 192d80c875b0..64d0ab98fcd8 100644 --- a/include/asm-alpha/mmzone.h +++ b/include/asm-alpha/mmzone.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #ifndef _ASM_MMZONE_H_ | 5 | #ifndef _ASM_MMZONE_H_ |
| 6 | #define _ASM_MMZONE_H_ | 6 | #define _ASM_MMZONE_H_ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/smp.h> | 8 | #include <asm/smp.h> |
| 10 | 9 | ||
| 11 | struct bootmem_data_t; /* stupid forward decl. */ | 10 | struct bootmem_data_t; /* stupid forward decl. */ |
diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h index 61bcf70b5eac..8c7cd50d4eae 100644 --- a/include/asm-alpha/page.h +++ b/include/asm-alpha/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_PAGE_H | 1 | #ifndef _ALPHA_PAGE_H |
| 2 | #define _ALPHA_PAGE_H | 2 | #define _ALPHA_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/pal.h> | 4 | #include <asm/pal.h> |
| 6 | 5 | ||
| 7 | /* PAGE_SHIFT determines the page size */ | 6 | /* PAGE_SHIFT determines the page size */ |
diff --git a/include/asm-alpha/param.h b/include/asm-alpha/param.h index 3ed0b3b02e52..214e7996346f 100644 --- a/include/asm-alpha/param.h +++ b/include/asm-alpha/param.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | hardware ignores reprogramming. We also need userland buy-in to the | 5 | hardware ignores reprogramming. We also need userland buy-in to the |
| 6 | change in HZ, since this is visible in the wait4 resources etc. */ | 6 | change in HZ, since this is visible in the wait4 resources etc. */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #ifndef HZ | 9 | #ifndef HZ |
| 11 | # ifndef CONFIG_ALPHA_RAWHIDE | 10 | # ifndef CONFIG_ALPHA_RAWHIDE |
diff --git a/include/asm-alpha/pgalloc.h b/include/asm-alpha/pgalloc.h index 308475642913..471864e8d4c3 100644 --- a/include/asm-alpha/pgalloc.h +++ b/include/asm-alpha/pgalloc.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_PGALLOC_H | 1 | #ifndef _ALPHA_PGALLOC_H |
| 2 | #define _ALPHA_PGALLOC_H | 2 | #define _ALPHA_PGALLOC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <linux/mmzone.h> | 5 | #include <linux/mmzone.h> |
| 7 | 6 | ||
diff --git a/include/asm-alpha/pgtable.h b/include/asm-alpha/pgtable.h index a985cd29b6db..93eaa58b7961 100644 --- a/include/asm-alpha/pgtable.h +++ b/include/asm-alpha/pgtable.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * This hopefully works with any standard Alpha page-size, as defined | 10 | * This hopefully works with any standard Alpha page-size, as defined |
| 11 | * in <asm/page.h> (currently 8192). | 11 | * in <asm/page.h> (currently 8192). |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/mmzone.h> | 13 | #include <linux/mmzone.h> |
| 15 | 14 | ||
| 16 | #include <asm/page.h> | 15 | #include <asm/page.h> |
diff --git a/include/asm-alpha/serial.h b/include/asm-alpha/serial.h index 7e4b2987d453..9d263e8d8ccc 100644 --- a/include/asm-alpha/serial.h +++ b/include/asm-alpha/serial.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * include/asm-alpha/serial.h | 2 | * include/asm-alpha/serial.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | /* | 6 | /* |
| 8 | * This assumes you have a 1.8432 MHz clock for your UART. | 7 | * This assumes you have a 1.8432 MHz clock for your UART. |
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h index e1432102be05..a1a1eca6be45 100644 --- a/include/asm-alpha/smp.h +++ b/include/asm-alpha/smp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SMP_H | 1 | #ifndef __ASM_SMP_H |
| 2 | #define __ASM_SMP_H | 2 | #define __ASM_SMP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/cpumask.h> | 5 | #include <linux/cpumask.h> |
| 7 | #include <linux/bitops.h> | 6 | #include <linux/bitops.h> |
diff --git a/include/asm-alpha/spinlock.h b/include/asm-alpha/spinlock.h index 8197c69eff44..0c294c9b0c55 100644 --- a/include/asm-alpha/spinlock.h +++ b/include/asm-alpha/spinlock.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_SPINLOCK_H | 1 | #ifndef _ALPHA_SPINLOCK_H |
| 2 | #define _ALPHA_SPINLOCK_H | 2 | #define _ALPHA_SPINLOCK_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/system.h> | 4 | #include <asm/system.h> |
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <asm/current.h> | 6 | #include <asm/current.h> |
diff --git a/include/asm-alpha/system.h b/include/asm-alpha/system.h index f3b7b1a59c56..03e9c0e5ed74 100644 --- a/include/asm-alpha/system.h +++ b/include/asm-alpha/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ALPHA_SYSTEM_H | 1 | #ifndef __ALPHA_SYSTEM_H |
| 2 | #define __ALPHA_SYSTEM_H | 2 | #define __ALPHA_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/pal.h> | 4 | #include <asm/pal.h> |
| 6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
| 7 | #include <asm/barrier.h> | 6 | #include <asm/barrier.h> |
diff --git a/include/asm-alpha/tlbflush.h b/include/asm-alpha/tlbflush.h index 9d484c1fdc82..1ca3ed3bd6d3 100644 --- a/include/asm-alpha/tlbflush.h +++ b/include/asm-alpha/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ALPHA_TLBFLUSH_H | 1 | #ifndef _ALPHA_TLBFLUSH_H |
| 2 | #define _ALPHA_TLBFLUSH_H | 2 | #define _ALPHA_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/compiler.h> | 5 | #include <asm/compiler.h> |
| 7 | 6 | ||
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index ef25b6585119..bc6e6a9259dc 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h | |||
| @@ -383,6 +383,8 @@ | |||
| 383 | #define __NR_inotify_add_watch 445 | 383 | #define __NR_inotify_add_watch 445 |
| 384 | #define __NR_inotify_rm_watch 446 | 384 | #define __NR_inotify_rm_watch 446 |
| 385 | 385 | ||
| 386 | #ifdef __KERNEL__ | ||
| 387 | |||
| 386 | #define NR_SYSCALLS 447 | 388 | #define NR_SYSCALLS 447 |
| 387 | 389 | ||
| 388 | #if defined(__GNUC__) | 390 | #if defined(__GNUC__) |
| @@ -565,9 +567,8 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\ | |||
| 565 | _syscall_return(type); \ | 567 | _syscall_return(type); \ |
| 566 | } | 568 | } |
| 567 | 569 | ||
| 568 | #endif /* __LIBRARY__ && __GNUC__ */ | 570 | #endif /* __GNUC__ */ |
| 569 | 571 | ||
| 570 | #ifdef __KERNEL__ | ||
| 571 | #define __ARCH_WANT_IPC_PARSE_VERSION | 572 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 572 | #define __ARCH_WANT_OLD_READDIR | 573 | #define __ARCH_WANT_OLD_READDIR |
| 573 | #define __ARCH_WANT_STAT64 | 574 | #define __ARCH_WANT_STAT64 |
| @@ -578,7 +579,6 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\ | |||
| 578 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT | 579 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT |
| 579 | #define __ARCH_WANT_SYS_OLDUMOUNT | 580 | #define __ARCH_WANT_SYS_OLDUMOUNT |
| 580 | #define __ARCH_WANT_SYS_SIGPENDING | 581 | #define __ARCH_WANT_SYS_SIGPENDING |
| 581 | #endif | ||
| 582 | 582 | ||
| 583 | #ifdef __KERNEL_SYSCALLS__ | 583 | #ifdef __KERNEL_SYSCALLS__ |
| 584 | 584 | ||
| @@ -661,4 +661,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 661 | 661 | ||
| 662 | #define cond_syscall(x) asm(".weak\t" #x "\n" #x " = sys_ni_syscall") | 662 | #define cond_syscall(x) asm(".weak\t" #x "\n" #x " = sys_ni_syscall") |
| 663 | 663 | ||
| 664 | #endif /* __KERNEL__ */ | ||
| 664 | #endif /* _ALPHA_UNISTD_H */ | 665 | #endif /* _ALPHA_UNISTD_H */ |
diff --git a/include/asm-arm/apm.h b/include/asm-arm/apm.h index 3a50eb759c28..d09113b37e4a 100644 --- a/include/asm-arm/apm.h +++ b/include/asm-arm/apm.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef ARM_ASM_SA1100_APM_H | 13 | #ifndef ARM_ASM_SA1100_APM_H |
| 14 | #define ARM_ASM_SA1100_APM_H | 14 | #define ARM_ASM_SA1100_APM_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/apm_bios.h> | 16 | #include <linux/apm_bios.h> |
| 18 | 17 | ||
| 19 | /* | 18 | /* |
diff --git a/include/asm-arm/arch-aaec2000/memory.h b/include/asm-arm/arch-aaec2000/memory.h index d8209f8911d6..24b51cccde8f 100644 --- a/include/asm-arm/arch-aaec2000/memory.h +++ b/include/asm-arm/arch-aaec2000/memory.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_ARCH_MEMORY_H | 11 | #ifndef __ASM_ARCH_MEMORY_H |
| 12 | #define __ASM_ARCH_MEMORY_H | 12 | #define __ASM_ARCH_MEMORY_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #define PHYS_OFFSET UL(0xf0000000) | 15 | #define PHYS_OFFSET UL(0xf0000000) |
| 17 | 16 | ||
diff --git a/include/asm-arm/arch-cl7500/acornfb.h b/include/asm-arm/arch-cl7500/acornfb.h index 3867231a4470..aea6330c9745 100644 --- a/include/asm-arm/arch-cl7500/acornfb.h +++ b/include/asm-arm/arch-cl7500/acornfb.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #define acornfb_valid_pixrate(var) (var->pixclock >= 39325 && var->pixclock <= 40119) | 1 | #define acornfb_valid_pixrate(var) (var->pixclock >= 39325 && var->pixclock <= 40119) |
| 3 | 2 | ||
| 4 | static inline void | 3 | static inline void |
diff --git a/include/asm-arm/arch-clps711x/hardware.h b/include/asm-arm/arch-clps711x/hardware.h index 1386871e1a5a..0fdbe72fff2a 100644 --- a/include/asm-arm/arch-clps711x/hardware.h +++ b/include/asm-arm/arch-clps711x/hardware.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef __ASM_ARCH_HARDWARE_H | 22 | #ifndef __ASM_ARCH_HARDWARE_H |
| 23 | #define __ASM_ARCH_HARDWARE_H | 23 | #define __ASM_ARCH_HARDWARE_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | #define CLPS7111_VIRT_BASE 0xff000000 | 26 | #define CLPS7111_VIRT_BASE 0xff000000 |
| 28 | #define CLPS7111_BASE CLPS7111_VIRT_BASE | 27 | #define CLPS7111_BASE CLPS7111_VIRT_BASE |
diff --git a/include/asm-arm/arch-clps711x/memory.h b/include/asm-arm/arch-clps711x/memory.h index 61d8717406ce..c6e8dcf674de 100644 --- a/include/asm-arm/arch-clps711x/memory.h +++ b/include/asm-arm/arch-clps711x/memory.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __ASM_ARCH_MEMORY_H | 20 | #ifndef __ASM_ARCH_MEMORY_H |
| 21 | #define __ASM_ARCH_MEMORY_H | 21 | #define __ASM_ARCH_MEMORY_H |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | 23 | ||
| 25 | /* | 24 | /* |
| 26 | * Physical DRAM offset. | 25 | * Physical DRAM offset. |
diff --git a/include/asm-arm/arch-clps711x/uncompress.h b/include/asm-arm/arch-clps711x/uncompress.h index 07157b7e4b20..03d233ae87ce 100644 --- a/include/asm-arm/arch-clps711x/uncompress.h +++ b/include/asm-arm/arch-clps711x/uncompress.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * along with this program; if not, write to the Free Software | 17 | * along with this program; if not, write to the Free Software |
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/arch/io.h> | 20 | #include <asm/arch/io.h> |
| 22 | #include <asm/hardware.h> | 21 | #include <asm/hardware.h> |
| 23 | #include <asm/hardware/clps7111.h> | 22 | #include <asm/hardware/clps7111.h> |
diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/include/asm-arm/arch-ebsa285/hardware.h index ec51fe92483b..daad8ee2d194 100644 --- a/include/asm-arm/arch-ebsa285/hardware.h +++ b/include/asm-arm/arch-ebsa285/hardware.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_ARCH_HARDWARE_H | 12 | #ifndef __ASM_ARCH_HARDWARE_H |
| 13 | #define __ASM_ARCH_HARDWARE_H | 13 | #define __ASM_ARCH_HARDWARE_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/arch/memory.h> | 15 | #include <asm/arch/memory.h> |
| 17 | 16 | ||
| 18 | #ifdef CONFIG_ARCH_FOOTBRIDGE | 17 | #ifdef CONFIG_ARCH_FOOTBRIDGE |
diff --git a/include/asm-arm/arch-ebsa285/memory.h b/include/asm-arm/arch-ebsa285/memory.h index 99181ffc7e27..cbd7ae64bcc9 100644 --- a/include/asm-arm/arch-ebsa285/memory.h +++ b/include/asm-arm/arch-ebsa285/memory.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef __ASM_ARCH_MEMORY_H | 19 | #ifndef __ASM_ARCH_MEMORY_H |
| 20 | #define __ASM_ARCH_MEMORY_H | 20 | #define __ASM_ARCH_MEMORY_H |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #if defined(CONFIG_FOOTBRIDGE_ADDIN) | 23 | #if defined(CONFIG_FOOTBRIDGE_ADDIN) |
| 25 | /* | 24 | /* |
diff --git a/include/asm-arm/arch-ebsa285/vmalloc.h b/include/asm-arm/arch-ebsa285/vmalloc.h index d1ca955ce434..02598200997d 100644 --- a/include/asm-arm/arch-ebsa285/vmalloc.h +++ b/include/asm-arm/arch-ebsa285/vmalloc.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #ifdef CONFIG_ARCH_FOOTBRIDGE | 10 | #ifdef CONFIG_ARCH_FOOTBRIDGE |
| 12 | #define VMALLOC_END (PAGE_OFFSET + 0x30000000) | 11 | #define VMALLOC_END (PAGE_OFFSET + 0x30000000) |
diff --git a/include/asm-arm/arch-integrator/smp.h b/include/asm-arm/arch-integrator/smp.h index da6981efdc39..ab2c79bb9505 100644 --- a/include/asm-arm/arch-integrator/smp.h +++ b/include/asm-arm/arch-integrator/smp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef ASMARM_ARCH_SMP_H | 1 | #ifndef ASMARM_ARCH_SMP_H |
| 2 | #define ASMARM_ARCH_SMP_H | 2 | #define ASMARM_ARCH_SMP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include <asm/hardware.h> | 5 | #include <asm/hardware.h> |
| 7 | #include <asm/io.h> | 6 | #include <asm/io.h> |
diff --git a/include/asm-arm/arch-iop3xx/memory.h b/include/asm-arm/arch-iop3xx/memory.h index bc62f4b13235..e43ebd984745 100644 --- a/include/asm-arm/arch-iop3xx/memory.h +++ b/include/asm-arm/arch-iop3xx/memory.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #ifndef __ASM_ARCH_MEMORY_H | 5 | #ifndef __ASM_ARCH_MEMORY_H |
| 6 | #define __ASM_ARCH_MEMORY_H | 6 | #define __ASM_ARCH_MEMORY_H |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/hardware.h> | 8 | #include <asm/hardware.h> |
| 10 | 9 | ||
| 11 | /* | 10 | /* |
diff --git a/include/asm-arm/arch-iop3xx/timex.h b/include/asm-arm/arch-iop3xx/timex.h index 472badb451c4..14ca8d0f7b29 100644 --- a/include/asm-arm/arch-iop3xx/timex.h +++ b/include/asm-arm/arch-iop3xx/timex.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * IOP3xx architecture timex specifications | 4 | * IOP3xx architecture timex specifications |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/hardware.h> | 6 | #include <asm/hardware.h> |
| 8 | 7 | ||
| 9 | #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) | 8 | #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) |
diff --git a/include/asm-arm/arch-iop3xx/uncompress.h b/include/asm-arm/arch-iop3xx/uncompress.h index c98eb6254b1f..fbdd5af644fe 100644 --- a/include/asm-arm/arch-iop3xx/uncompress.h +++ b/include/asm-arm/arch-iop3xx/uncompress.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/include/asm-arm/arch-iop3xx/uncompress.h | 2 | * linux/include/asm-arm/arch-iop3xx/uncompress.h |
| 3 | */ | 3 | */ |
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| 6 | #include <asm/mach-types.h> | 5 | #include <asm/mach-types.h> |
| 7 | #include <linux/serial_reg.h> | 6 | #include <linux/serial_reg.h> |
diff --git a/include/asm-arm/arch-ixp4xx/dma.h b/include/asm-arm/arch-ixp4xx/dma.h index b1a071ecebc8..789f7f53c357 100644 --- a/include/asm-arm/arch-ixp4xx/dma.h +++ b/include/asm-arm/arch-ixp4xx/dma.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_ARCH_DMA_H | 11 | #ifndef __ASM_ARCH_DMA_H |
| 12 | #define __ASM_ARCH_DMA_H | 12 | #define __ASM_ARCH_DMA_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 16 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
diff --git a/include/asm-arm/arch-lh7a40x/constants.h b/include/asm-arm/arch-lh7a40x/constants.h index 2929e891ee03..51de96e87faf 100644 --- a/include/asm-arm/arch-lh7a40x/constants.h +++ b/include/asm-arm/arch-lh7a40x/constants.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_ARCH_CONSTANTS_H | 12 | #ifndef __ASM_ARCH_CONSTANTS_H |
| 13 | #define __ASM_ARCH_CONSTANTS_H | 13 | #define __ASM_ARCH_CONSTANTS_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* Addressing constants */ | 16 | /* Addressing constants */ |
| 18 | 17 | ||
diff --git a/include/asm-arm/arch-lh7a40x/irqs.h b/include/asm-arm/arch-lh7a40x/irqs.h index 7e8a217200e9..afe8c7cbad6a 100644 --- a/include/asm-arm/arch-lh7a40x/irqs.h +++ b/include/asm-arm/arch-lh7a40x/irqs.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __ASM_ARCH_IRQS_H | 18 | #ifndef __ASM_ARCH_IRQS_H |
| 19 | #define __ASM_ARCH_IRQS_H | 19 | #define __ASM_ARCH_IRQS_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | #define FIQ_START 80 | 22 | #define FIQ_START 80 |
| 24 | 23 | ||
diff --git a/include/asm-arm/arch-lh7a40x/registers.h b/include/asm-arm/arch-lh7a40x/registers.h index 544307bb87a2..b4f09b3e2d03 100644 --- a/include/asm-arm/arch-lh7a40x/registers.h +++ b/include/asm-arm/arch-lh7a40x/registers.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/arch/constants.h> | 12 | #include <asm/arch/constants.h> |
| 14 | 13 | ||
| 15 | #ifndef __ASM_ARCH_REGISTERS_H | 14 | #ifndef __ASM_ARCH_REGISTERS_H |
diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h index 6d6240a4681c..dfdbf06fd646 100644 --- a/include/asm-arm/arch-omap/board.h +++ b/include/asm-arm/arch-omap/board.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _OMAP_BOARD_H | 10 | #ifndef _OMAP_BOARD_H |
| 11 | #define _OMAP_BOARD_H | 11 | #define _OMAP_BOARD_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | 14 | ||
| 16 | /* Different peripheral ids */ | 15 | /* Different peripheral ids */ |
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index 7909b729826c..c7d9e857795d 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #define __ASM_ARCH_OMAP_HARDWARE_H | 37 | #define __ASM_ARCH_OMAP_HARDWARE_H |
| 38 | 38 | ||
| 39 | #include <asm/sizes.h> | 39 | #include <asm/sizes.h> |
| 40 | #include <linux/config.h> | ||
| 41 | #ifndef __ASSEMBLER__ | 40 | #ifndef __ASSEMBLER__ |
| 42 | #include <asm/types.h> | 41 | #include <asm/types.h> |
| 43 | #include <asm/arch/cpu.h> | 42 | #include <asm/arch/cpu.h> |
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h index 67970d1a2020..ac2bfa433f06 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | */ | 4 | */ |
| 5 | #ifndef __ASM_ARCH_SYSTEM_H | 5 | #ifndef __ASM_ARCH_SYSTEM_H |
| 6 | #define __ASM_ARCH_SYSTEM_H | 6 | #define __ASM_ARCH_SYSTEM_H |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/clk.h> | 7 | #include <linux/clk.h> |
| 9 | 8 | ||
| 10 | #include <asm/mach-types.h> | 9 | #include <asm/mach-types.h> |
diff --git a/include/asm-arm/arch-omap/uncompress.h b/include/asm-arm/arch-omap/uncompress.h index ca2c8bec82e7..aca0adfef1b8 100644 --- a/include/asm-arm/arch-omap/uncompress.h +++ b/include/asm-arm/arch-omap/uncompress.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * kind, whether express or implied. | 17 | * kind, whether express or implied. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/serial_reg.h> | 21 | #include <linux/serial_reg.h> |
| 23 | #include <asm/arch/serial.h> | 22 | #include <asm/arch/serial.h> |
diff --git a/include/asm-arm/arch-pxa/idp.h b/include/asm-arm/arch-pxa/idp.h index e7ef497417bb..b6952534a4e1 100644 --- a/include/asm-arm/arch-pxa/idp.h +++ b/include/asm-arm/arch-pxa/idp.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Changes for 2.6 kernel. | 15 | * Changes for 2.6 kernel. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | /* | 19 | /* |
| 21 | * Note: this file must be safe to include in assembly files | 20 | * Note: this file must be safe to include in assembly files |
diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h index 67af238a8f8e..f3bc70eee35b 100644 --- a/include/asm-arm/arch-pxa/irqs.h +++ b/include/asm-arm/arch-pxa/irqs.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #ifdef CONFIG_PXA27x | 14 | #ifdef CONFIG_PXA27x |
| 16 | #define PXA_IRQ_SKIP 0 | 15 | #define PXA_IRQ_SKIP 0 |
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h index c8f53a71c076..6650d4decaeb 100644 --- a/include/asm-arm/arch-pxa/pxa-regs.h +++ b/include/asm-arm/arch-pxa/pxa-regs.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef __PXA_REGS_H | 13 | #ifndef __PXA_REGS_H |
| 14 | #define __PXA_REGS_H | 14 | #define __PXA_REGS_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | /* | 17 | /* |
| 19 | * PXA Chip selects | 18 | * PXA Chip selects |
diff --git a/include/asm-arm/arch-pxa/timex.h b/include/asm-arm/arch-pxa/timex.h index aa125ec56a32..2473bb51d0a6 100644 --- a/include/asm-arm/arch-pxa/timex.h +++ b/include/asm-arm/arch-pxa/timex.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #if defined(CONFIG_PXA25x) | 14 | #if defined(CONFIG_PXA25x) |
| 16 | /* PXA250/210 timer base */ | 15 | /* PXA250/210 timer base */ |
diff --git a/include/asm-arm/arch-realview/smp.h b/include/asm-arm/arch-realview/smp.h index fc87783e8e8b..515819efd046 100644 --- a/include/asm-arm/arch-realview/smp.h +++ b/include/asm-arm/arch-realview/smp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef ASMARM_ARCH_SMP_H | 1 | #ifndef ASMARM_ARCH_SMP_H |
| 2 | #define ASMARM_ARCH_SMP_H | 2 | #define ASMARM_ARCH_SMP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include <asm/hardware/gic.h> | 5 | #include <asm/hardware/gic.h> |
| 7 | 6 | ||
diff --git a/include/asm-arm/arch-s3c2410/dma.h b/include/asm-arm/arch-s3c2410/dma.h index b011e14f3bc6..72964f9b8414 100644 --- a/include/asm-arm/arch-s3c2410/dma.h +++ b/include/asm-arm/arch-s3c2410/dma.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __ASM_ARCH_DMA_H | 18 | #ifndef __ASM_ARCH_DMA_H |
| 19 | #define __ASM_ARCH_DMA_H __FILE__ | 19 | #define __ASM_ARCH_DMA_H __FILE__ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/sysdev.h> | 21 | #include <linux/sysdev.h> |
| 23 | #include "hardware.h" | 22 | #include "hardware.h" |
| 24 | 23 | ||
diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/include/asm-arm/arch-s3c2410/uncompress.h index bbd9ee1ff75a..8e152a05e533 100644 --- a/include/asm-arm/arch-s3c2410/uncompress.h +++ b/include/asm-arm/arch-s3c2410/uncompress.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef __ASM_ARCH_UNCOMPRESS_H | 22 | #ifndef __ASM_ARCH_UNCOMPRESS_H |
| 23 | #define __ASM_ARCH_UNCOMPRESS_H | 23 | #define __ASM_ARCH_UNCOMPRESS_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | /* defines for UART registers */ | 26 | /* defines for UART registers */ |
| 28 | #include "asm/arch/regs-serial.h" | 27 | #include "asm/arch/regs-serial.h" |
diff --git a/include/asm-arm/arch-sa1100/assabet.h b/include/asm-arm/arch-sa1100/assabet.h index 1f59b368c3f6..d6a1bb5b4944 100644 --- a/include/asm-arm/arch-sa1100/assabet.h +++ b/include/asm-arm/arch-sa1100/assabet.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_ARCH_ASSABET_H | 12 | #ifndef __ASM_ARCH_ASSABET_H |
| 13 | #define __ASM_ARCH_ASSABET_H | 13 | #define __ASM_ARCH_ASSABET_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* System Configuration Register flags */ | 16 | /* System Configuration Register flags */ |
| 18 | 17 | ||
diff --git a/include/asm-arm/arch-sa1100/cerf.h b/include/asm-arm/arch-sa1100/cerf.h index 356d5ba88991..9a19c3d07c1e 100644 --- a/include/asm-arm/arch-sa1100/cerf.h +++ b/include/asm-arm/arch-sa1100/cerf.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _INCLUDE_CERF_H_ | 10 | #ifndef _INCLUDE_CERF_H_ |
| 11 | #define _INCLUDE_CERF_H_ | 11 | #define _INCLUDE_CERF_H_ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #define CERF_ETH_IO 0xf0000000 | 14 | #define CERF_ETH_IO 0xf0000000 |
| 16 | #define CERF_ETH_IRQ IRQ_GPIO26 | 15 | #define CERF_ETH_IRQ IRQ_GPIO26 |
diff --git a/include/asm-arm/arch-sa1100/collie.h b/include/asm-arm/arch-sa1100/collie.h index d49e5ff63ca4..14a344aa3cc7 100644 --- a/include/asm-arm/arch-sa1100/collie.h +++ b/include/asm-arm/arch-sa1100/collie.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef __ASM_ARCH_COLLIE_H | 13 | #ifndef __ASM_ARCH_COLLIE_H |
| 14 | #define __ASM_ARCH_COLLIE_H | 14 | #define __ASM_ARCH_COLLIE_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #define COLLIE_SCP_CHARGE_ON SCOOP_GPCR_PA11 | 17 | #define COLLIE_SCP_CHARGE_ON SCOOP_GPCR_PA11 |
| 19 | #define COLLIE_SCP_DIAG_BOOT1 SCOOP_GPCR_PA12 | 18 | #define COLLIE_SCP_DIAG_BOOT1 SCOOP_GPCR_PA12 |
diff --git a/include/asm-arm/arch-sa1100/dma.h b/include/asm-arm/arch-sa1100/dma.h index 02575d72ac6b..6b7917a2e77a 100644 --- a/include/asm-arm/arch-sa1100/dma.h +++ b/include/asm-arm/arch-sa1100/dma.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_ARCH_DMA_H | 10 | #ifndef __ASM_ARCH_DMA_H |
| 11 | #define __ASM_ARCH_DMA_H | 11 | #define __ASM_ARCH_DMA_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include "hardware.h" | 13 | #include "hardware.h" |
| 15 | 14 | ||
| 16 | 15 | ||
diff --git a/include/asm-arm/arch-sa1100/hardware.h b/include/asm-arm/arch-sa1100/hardware.h index ee008a5484f3..1abd7cfc8bce 100644 --- a/include/asm-arm/arch-sa1100/hardware.h +++ b/include/asm-arm/arch-sa1100/hardware.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_ARCH_HARDWARE_H | 12 | #ifndef __ASM_ARCH_HARDWARE_H |
| 13 | #define __ASM_ARCH_HARDWARE_H | 13 | #define __ASM_ARCH_HARDWARE_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #define UNCACHEABLE_ADDR 0xfa050000 | 16 | #define UNCACHEABLE_ADDR 0xfa050000 |
| 18 | 17 | ||
diff --git a/include/asm-arm/arch-sa1100/ide.h b/include/asm-arm/arch-sa1100/ide.h index 2153538069c7..98b10bcf9f1b 100644 --- a/include/asm-arm/arch-sa1100/ide.h +++ b/include/asm-arm/arch-sa1100/ide.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * architectures. | 9 | * architectures. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/irq.h> | 12 | #include <asm/irq.h> |
| 14 | #include <asm/hardware.h> | 13 | #include <asm/hardware.h> |
| 15 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
diff --git a/include/asm-arm/arch-sa1100/irqs.h b/include/asm-arm/arch-sa1100/irqs.h index eabd3be3d705..d7940683efb1 100644 --- a/include/asm-arm/arch-sa1100/irqs.h +++ b/include/asm-arm/arch-sa1100/irqs.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | * 2001/11/14 RMK Cleaned up and standardised a lot of the IRQs. | 8 | * 2001/11/14 RMK Cleaned up and standardised a lot of the IRQs. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #define IRQ_GPIO0 0 | 11 | #define IRQ_GPIO0 0 |
| 13 | #define IRQ_GPIO1 1 | 12 | #define IRQ_GPIO1 1 |
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h index a29fac1387ca..1ff172dc8e33 100644 --- a/include/asm-arm/arch-sa1100/memory.h +++ b/include/asm-arm/arch-sa1100/memory.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __ASM_ARCH_MEMORY_H | 7 | #ifndef __ASM_ARCH_MEMORY_H |
| 8 | #define __ASM_ARCH_MEMORY_H | 8 | #define __ASM_ARCH_MEMORY_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/sizes.h> | 10 | #include <asm/sizes.h> |
| 12 | 11 | ||
| 13 | /* | 12 | /* |
diff --git a/include/asm-arm/arch-sa1100/system.h b/include/asm-arm/arch-sa1100/system.h index 0f0612f79b2b..aef91e3b63fe 100644 --- a/include/asm-arm/arch-sa1100/system.h +++ b/include/asm-arm/arch-sa1100/system.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1999 Nicolas Pitre <nico@cam.org> | 4 | * Copyright (c) 1999 Nicolas Pitre <nico@cam.org> |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/hardware.h> | 6 | #include <asm/hardware.h> |
| 8 | 7 | ||
| 9 | static inline void arch_idle(void) | 8 | static inline void arch_idle(void) |
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h index 3d7283d84405..4b0ce3e7de9a 100644 --- a/include/asm-arm/atomic.h +++ b/include/asm-arm/atomic.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_ARM_ATOMIC_H | 11 | #ifndef __ASM_ARM_ATOMIC_H |
| 12 | #define __ASM_ARM_ATOMIC_H | 12 | #define __ASM_ARM_ATOMIC_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/compiler.h> | 14 | #include <linux/compiler.h> |
| 16 | 15 | ||
| 17 | typedef struct { volatile int counter; } atomic_t; | 16 | typedef struct { volatile int counter; } atomic_t; |
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h index 5ab8216f5204..7fb02138f585 100644 --- a/include/asm-arm/bug.h +++ b/include/asm-arm/bug.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASMARM_BUG_H | 2 | #define _ASMARM_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | 4 | #include <linux/config.h> |
| 5 | #include <linux/stddef.h> | ||
| 6 | 5 | ||
| 7 | #ifdef CONFIG_BUG | 6 | #ifdef CONFIG_BUG |
| 8 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 7 | #ifdef CONFIG_DEBUG_BUGVERBOSE |
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h index 746be56b1b70..fe0c744e0266 100644 --- a/include/asm-arm/cacheflush.h +++ b/include/asm-arm/cacheflush.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASMARM_CACHEFLUSH_H | 10 | #ifndef _ASMARM_CACHEFLUSH_H |
| 11 | #define _ASMARM_CACHEFLUSH_H | 11 | #define _ASMARM_CACHEFLUSH_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
| 16 | 15 | ||
diff --git a/include/asm-arm/cpu.h b/include/asm-arm/cpu.h index 751bc7462074..715426b9b08e 100644 --- a/include/asm-arm/cpu.h +++ b/include/asm-arm/cpu.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_ARM_CPU_H | 10 | #ifndef __ASM_ARM_CPU_H |
| 11 | #define __ASM_ARM_CPU_H | 11 | #define __ASM_ARM_CPU_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/percpu.h> | 13 | #include <linux/percpu.h> |
| 15 | 14 | ||
| 16 | struct cpuinfo_arm { | 15 | struct cpuinfo_arm { |
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h index 63ca7412a462..55eb4dc3253d 100644 --- a/include/asm-arm/dma-mapping.h +++ b/include/asm-arm/dma-mapping.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/mm.h> /* need struct page */ | 6 | #include <linux/mm.h> /* need struct page */ |
| 8 | 7 | ||
| 9 | #include <asm/scatterlist.h> | 8 | #include <asm/scatterlist.h> |
diff --git a/include/asm-arm/dma.h b/include/asm-arm/dma.h index 49c01e2bf7c8..9f2c5305c260 100644 --- a/include/asm-arm/dma.h +++ b/include/asm-arm/dma.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | typedef unsigned int dmach_t; | 4 | typedef unsigned int dmach_t; |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 8 | #include <asm/system.h> | 7 | #include <asm/system.h> |
| 9 | #include <asm/scatterlist.h> | 8 | #include <asm/scatterlist.h> |
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index 2d44b42d1847..71061ca5c5d0 100644 --- a/include/asm-arm/elf.h +++ b/include/asm-arm/elf.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASMARM_ELF_H | 1 | #ifndef __ASMARM_ELF_H |
| 2 | #define __ASMARM_ELF_H | 2 | #define __ASMARM_ELF_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * ELF register definitions.. | 6 | * ELF register definitions.. |
diff --git a/include/asm-arm/fpstate.h b/include/asm-arm/fpstate.h index 52bae088a185..132c3c5628b2 100644 --- a/include/asm-arm/fpstate.h +++ b/include/asm-arm/fpstate.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_ARM_FPSTATE_H | 11 | #ifndef __ASM_ARM_FPSTATE_H |
| 12 | #define __ASM_ARM_FPSTATE_H | 12 | #define __ASM_ARM_FPSTATE_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #ifndef __ASSEMBLY__ | 15 | #ifndef __ASSEMBLY__ |
| 17 | 16 | ||
diff --git a/include/asm-arm/glue.h b/include/asm-arm/glue.h index 223e0d6c41be..0cc5d3b10ce2 100644 --- a/include/asm-arm/glue.h +++ b/include/asm-arm/glue.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifdef __STDC__ | 19 | #ifdef __STDC__ |
| 21 | #define ____glue(name,fn) name##fn | 20 | #define ____glue(name,fn) name##fn |
diff --git a/include/asm-arm/hardirq.h b/include/asm-arm/hardirq.h index 1cbb173bf5b1..182310b99195 100644 --- a/include/asm-arm/hardirq.h +++ b/include/asm-arm/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_HARDIRQ_H | 1 | #ifndef __ASM_HARDIRQ_H |
| 2 | #define __ASM_HARDIRQ_H | 2 | #define __ASM_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/cache.h> | 4 | #include <linux/cache.h> |
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <asm/irq.h> | 6 | #include <asm/irq.h> |
diff --git a/include/asm-arm/hardware/dec21285.h b/include/asm-arm/hardware/dec21285.h index 6685e3fb97b1..546f7077be9c 100644 --- a/include/asm-arm/hardware/dec21285.h +++ b/include/asm-arm/hardware/dec21285.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #define DC21285_PCI_IO 0x7c000000 | 18 | #define DC21285_PCI_IO 0x7c000000 |
| 19 | #define DC21285_PCI_MEM 0x80000000 | 19 | #define DC21285_PCI_MEM 0x80000000 |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #ifndef __ASSEMBLY__ | 21 | #ifndef __ASSEMBLY__ |
| 23 | #include <asm/hardware.h> | 22 | #include <asm/hardware.h> |
| 24 | #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) | 23 | #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) |
diff --git a/include/asm-arm/hardware/iomd.h b/include/asm-arm/hardware/iomd.h index 82fa2c279a18..396e55ad06c6 100644 --- a/include/asm-arm/hardware/iomd.h +++ b/include/asm-arm/hardware/iomd.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef __ASMARM_HARDWARE_IOMD_H | 13 | #ifndef __ASMARM_HARDWARE_IOMD_H |
| 14 | #define __ASMARM_HARDWARE_IOMD_H | 14 | #define __ASMARM_HARDWARE_IOMD_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
| 19 | 18 | ||
diff --git a/include/asm-arm/leds.h b/include/asm-arm/leds.h index 88ce4124f854..12290ea55801 100644 --- a/include/asm-arm/leds.h +++ b/include/asm-arm/leds.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef ASM_ARM_LEDS_H | 13 | #ifndef ASM_ARM_LEDS_H |
| 14 | #define ASM_ARM_LEDS_H | 14 | #define ASM_ARM_LEDS_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | typedef enum { | 17 | typedef enum { |
| 19 | led_idle_start, | 18 | led_idle_start, |
diff --git a/include/asm-arm/mach/serial_at91rm9200.h b/include/asm-arm/mach/serial_at91rm9200.h index 98f4b0cb883c..a0269de12079 100644 --- a/include/asm-arm/mach/serial_at91rm9200.h +++ b/include/asm-arm/mach/serial_at91rm9200.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | * Low level machine dependent UART functions. | 8 | * Low level machine dependent UART functions. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | struct uart_port; | 11 | struct uart_port; |
| 13 | 12 | ||
diff --git a/include/asm-arm/mach/serial_sa1100.h b/include/asm-arm/mach/serial_sa1100.h index 9162018585df..20c22bb218d9 100644 --- a/include/asm-arm/mach/serial_sa1100.h +++ b/include/asm-arm/mach/serial_sa1100.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | * Low level machine dependent UART functions. | 8 | * Low level machine dependent UART functions. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | struct uart_port; | 11 | struct uart_port; |
| 13 | struct uart_info; | 12 | struct uart_info; |
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index 209289407595..731e321a57d1 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #define UL(x) (x) | 22 | #define UL(x) (x) |
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/compiler.h> | 25 | #include <linux/compiler.h> |
| 27 | #include <asm/arch/memory.h> | 26 | #include <asm/arch/memory.h> |
| 28 | #include <asm/sizes.h> | 27 | #include <asm/sizes.h> |
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index a404d2bf0c68..66cfeb5290ea 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASMARM_PAGE_H | 10 | #ifndef _ASMARM_PAGE_H |
| 11 | #define _ASMARM_PAGE_H | 11 | #define _ASMARM_PAGE_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | /* PAGE_SHIFT determines the page size */ | 14 | /* PAGE_SHIFT determines the page size */ |
| 16 | #define PAGE_SHIFT 12 | 15 | #define PAGE_SHIFT 12 |
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h index ead3ced38cb8..f21abd4ddac6 100644 --- a/include/asm-arm/pci.h +++ b/include/asm-arm/pci.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define ASMARM_PCI_H | 2 | #define ASMARM_PCI_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm-generic/pci-dma-compat.h> | 5 | #include <asm-generic/pci-dma-compat.h> |
| 7 | 6 | ||
| 8 | #include <asm/hardware.h> /* for PCIBIOS_MIN_* */ | 7 | #include <asm/hardware.h> /* for PCIBIOS_MIN_* */ |
diff --git a/include/asm-arm/proc-fns.h b/include/asm-arm/proc-fns.h index 106045edb862..e9310895e79d 100644 --- a/include/asm-arm/proc-fns.h +++ b/include/asm-arm/proc-fns.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | /* | 17 | /* |
| 19 | * Work out if we need multiple CPU support | 18 | * Work out if we need multiple CPU support |
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h index 77adb7fa169b..2bebe3dc0a30 100644 --- a/include/asm-arm/ptrace.h +++ b/include/asm-arm/ptrace.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_ARM_PTRACE_H | 10 | #ifndef __ASM_ARM_PTRACE_H |
| 11 | #define __ASM_ARM_PTRACE_H | 11 | #define __ASM_ARM_PTRACE_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #define PTRACE_GETREGS 12 | 14 | #define PTRACE_GETREGS 12 |
| 16 | #define PTRACE_SETREGS 13 | 15 | #define PTRACE_SETREGS 13 |
diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h index fe45f7f61223..f67acce387e7 100644 --- a/include/asm-arm/smp.h +++ b/include/asm-arm/smp.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_ARM_SMP_H | 10 | #ifndef __ASM_ARM_SMP_H |
| 11 | #define __ASM_ARM_SMP_H | 11 | #define __ASM_ARM_SMP_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/threads.h> | 13 | #include <linux/threads.h> |
| 15 | #include <linux/cpumask.h> | 14 | #include <linux/cpumask.h> |
| 16 | #include <linux/thread_info.h> | 15 | #include <linux/thread_info.h> |
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 7c9568d30307..9c744ae6c6e3 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #define CPU_ARCH_UNKNOWN 0 | 7 | #define CPU_ARCH_UNKNOWN 0 |
| 9 | #define CPU_ARCH_ARMv3 1 | 8 | #define CPU_ARCH_ARMv3 1 |
diff --git a/include/asm-arm/tlbflush.h b/include/asm-arm/tlbflush.h index 728992451dd1..d97fc76189a5 100644 --- a/include/asm-arm/tlbflush.h +++ b/include/asm-arm/tlbflush.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASMARM_TLBFLUSH_H | 10 | #ifndef _ASMARM_TLBFLUSH_H |
| 11 | #define _ASMARM_TLBFLUSH_H | 11 | #define _ASMARM_TLBFLUSH_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #ifndef CONFIG_MMU | 14 | #ifndef CONFIG_MMU |
| 16 | 15 | ||
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index cbf39a56dbe7..1e891f860ef3 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h | |||
| @@ -13,8 +13,6 @@ | |||
| 13 | #ifndef __ASM_ARM_UNISTD_H | 13 | #ifndef __ASM_ARM_UNISTD_H |
| 14 | #define __ASM_ARM_UNISTD_H | 14 | #define __ASM_ARM_UNISTD_H |
| 15 | 15 | ||
| 16 | #include <linux/linkage.h> | ||
| 17 | |||
| 18 | #define __NR_OABI_SYSCALL_BASE 0x900000 | 16 | #define __NR_OABI_SYSCALL_BASE 0x900000 |
| 19 | 17 | ||
| 20 | #if defined(__thumb__) || defined(__ARM_EABI__) | 18 | #if defined(__thumb__) || defined(__ARM_EABI__) |
| @@ -378,6 +376,9 @@ | |||
| 378 | #undef __NR_ipc | 376 | #undef __NR_ipc |
| 379 | #endif | 377 | #endif |
| 380 | 378 | ||
| 379 | #ifdef __KERNEL__ | ||
| 380 | #include <linux/linkage.h> | ||
| 381 | |||
| 381 | #define __sys2(x) #x | 382 | #define __sys2(x) #x |
| 382 | #define __sys1(x) __sys2(x) | 383 | #define __sys1(x) __sys2(x) |
| 383 | 384 | ||
| @@ -526,7 +527,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
| 526 | __syscall_return(type,__res); \ | 527 | __syscall_return(type,__res); \ |
| 527 | } | 528 | } |
| 528 | 529 | ||
| 529 | #ifdef __KERNEL__ | ||
| 530 | #define __ARCH_WANT_IPC_PARSE_VERSION | 530 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 531 | #define __ARCH_WANT_STAT64 | 531 | #define __ARCH_WANT_STAT64 |
| 532 | #define __ARCH_WANT_SYS_GETHOSTNAME | 532 | #define __ARCH_WANT_SYS_GETHOSTNAME |
| @@ -547,7 +547,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
| 547 | #define __ARCH_WANT_OLD_READDIR | 547 | #define __ARCH_WANT_OLD_READDIR |
| 548 | #define __ARCH_WANT_SYS_SOCKETCALL | 548 | #define __ARCH_WANT_SYS_SOCKETCALL |
| 549 | #endif | 549 | #endif |
| 550 | #endif | ||
| 551 | 550 | ||
| 552 | #ifdef __KERNEL_SYSCALLS__ | 551 | #ifdef __KERNEL_SYSCALLS__ |
| 553 | 552 | ||
| @@ -571,7 +570,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 571 | struct sigaction __user *oact, | 570 | struct sigaction __user *oact, |
| 572 | size_t sigsetsize); | 571 | size_t sigsetsize); |
| 573 | 572 | ||
| 574 | #endif | 573 | #endif /* __KERNEL_SYSCALLS__ */ |
| 575 | 574 | ||
| 576 | /* | 575 | /* |
| 577 | * "Conditional" syscalls | 576 | * "Conditional" syscalls |
| @@ -581,4 +580,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 581 | */ | 580 | */ |
| 582 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 581 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 583 | 582 | ||
| 583 | #endif /* __KERNEL__ */ | ||
| 584 | #endif /* __ASM_ARM_UNISTD_H */ | 584 | #endif /* __ASM_ARM_UNISTD_H */ |
diff --git a/include/asm-arm26/atomic.h b/include/asm-arm26/atomic.h index 1552c8653990..97e944fe1cff 100644 --- a/include/asm-arm26/atomic.h +++ b/include/asm-arm26/atomic.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __ASM_ARM_ATOMIC_H | 20 | #ifndef __ASM_ARM_ATOMIC_H |
| 21 | #define __ASM_ARM_ATOMIC_H | 21 | #define __ASM_ARM_ATOMIC_H |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | 23 | ||
| 25 | #ifdef CONFIG_SMP | 24 | #ifdef CONFIG_SMP |
| 26 | #error SMP is NOT supported | 25 | #error SMP is NOT supported |
diff --git a/include/asm-arm26/bug.h b/include/asm-arm26/bug.h index 7177c7399967..8545d58b0475 100644 --- a/include/asm-arm26/bug.h +++ b/include/asm-arm26/bug.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASMARM_BUG_H | 1 | #ifndef _ASMARM_BUG_H |
| 2 | #define _ASMARM_BUG_H | 2 | #define _ASMARM_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_BUG | 5 | #ifdef CONFIG_BUG |
| 7 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 6 | #ifdef CONFIG_DEBUG_BUGVERBOSE |
diff --git a/include/asm-arm26/dma.h b/include/asm-arm26/dma.h index 995e223e43a1..4326ba85eb72 100644 --- a/include/asm-arm26/dma.h +++ b/include/asm-arm26/dma.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | typedef unsigned int dmach_t; | 4 | typedef unsigned int dmach_t; |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 8 | #include <asm/system.h> | 7 | #include <asm/system.h> |
| 9 | #include <asm/memory.h> | 8 | #include <asm/memory.h> |
diff --git a/include/asm-arm26/hardirq.h b/include/asm-arm26/hardirq.h index 87c19d2bb6a8..e717742ffce0 100644 --- a/include/asm-arm26/hardirq.h +++ b/include/asm-arm26/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_HARDIRQ_H | 1 | #ifndef __ASM_HARDIRQ_H |
| 2 | #define __ASM_HARDIRQ_H | 2 | #define __ASM_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/cache.h> | 4 | #include <linux/cache.h> |
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <asm/irq.h> | 6 | #include <asm/irq.h> |
diff --git a/include/asm-arm26/hardware.h b/include/asm-arm26/hardware.h index 82fc55e2a009..801df0bde8b7 100644 --- a/include/asm-arm26/hardware.h +++ b/include/asm-arm26/hardware.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef __ASM_HARDWARE_H | 16 | #ifndef __ASM_HARDWARE_H |
| 17 | #define __ASM_HARDWARE_H | 17 | #define __ASM_HARDWARE_H |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | 19 | ||
| 21 | 20 | ||
| 22 | /* | 21 | /* |
diff --git a/include/asm-arm26/io.h b/include/asm-arm26/io.h index 02f94d88a124..2aa033bd0678 100644 --- a/include/asm-arm26/io.h +++ b/include/asm-arm26/io.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #ifdef __KERNEL__ | 23 | #ifdef __KERNEL__ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 27 | #include <asm/byteorder.h> | 26 | #include <asm/byteorder.h> |
| 28 | #include <asm/memory.h> | 27 | #include <asm/memory.h> |
diff --git a/include/asm-arm26/leds.h b/include/asm-arm26/leds.h index 88ce4124f854..12290ea55801 100644 --- a/include/asm-arm26/leds.h +++ b/include/asm-arm26/leds.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef ASM_ARM_LEDS_H | 13 | #ifndef ASM_ARM_LEDS_H |
| 14 | #define ASM_ARM_LEDS_H | 14 | #define ASM_ARM_LEDS_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | typedef enum { | 17 | typedef enum { |
| 19 | led_idle_start, | 18 | led_idle_start, |
diff --git a/include/asm-arm26/mach-types.h b/include/asm-arm26/mach-types.h index b34045b78128..0aeaedcbac96 100644 --- a/include/asm-arm26/mach-types.h +++ b/include/asm-arm26/mach-types.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef __ASM_ARM_MACH_TYPE_H | 6 | #ifndef __ASM_ARM_MACH_TYPE_H |
| 7 | #define __ASM_ARM_MACH_TYPE_H | 7 | #define __ASM_ARM_MACH_TYPE_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #ifndef __ASSEMBLY__ | 10 | #ifndef __ASSEMBLY__ |
| 12 | extern unsigned int __machine_arch_type; | 11 | extern unsigned int __machine_arch_type; |
diff --git a/include/asm-arm26/page.h b/include/asm-arm26/page.h index d3f23ac4d468..fa19de28fda0 100644 --- a/include/asm-arm26/page.h +++ b/include/asm-arm26/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASMARM_PAGE_H | 1 | #ifndef _ASMARM_PAGE_H |
| 2 | #define _ASMARM_PAGE_H | 2 | #define _ASMARM_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 7 | #ifndef __ASSEMBLY__ | 6 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-arm26/pgtable.h b/include/asm-arm26/pgtable.h index a590250277f8..19ac9101a6bb 100644 --- a/include/asm-arm26/pgtable.h +++ b/include/asm-arm26/pgtable.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include <asm-generic/4level-fixup.h> | 14 | #include <asm-generic/4level-fixup.h> |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/memory.h> | 16 | #include <asm/memory.h> |
| 18 | 17 | ||
| 19 | /* | 18 | /* |
diff --git a/include/asm-arm26/serial.h b/include/asm-arm26/serial.h index 5fc747d1b501..dd86a716cb0b 100644 --- a/include/asm-arm26/serial.h +++ b/include/asm-arm26/serial.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __ASM_SERIAL_H | 14 | #ifndef __ASM_SERIAL_H |
| 15 | #define __ASM_SERIAL_H | 15 | #define __ASM_SERIAL_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | /* | 18 | /* |
| 20 | * This assumes you have a 1.8432 MHz clock for your UART. | 19 | * This assumes you have a 1.8432 MHz clock for your UART. |
diff --git a/include/asm-arm26/smp.h b/include/asm-arm26/smp.h index 5ca771631fd8..38349ec8b61b 100644 --- a/include/asm-arm26/smp.h +++ b/include/asm-arm26/smp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SMP_H | 1 | #ifndef __ASM_SMP_H |
| 2 | #define __ASM_SMP_H | 2 | #define __ASM_SMP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_SMP | 5 | #ifdef CONFIG_SMP |
| 7 | #error SMP not supported | 6 | #error SMP not supported |
diff --git a/include/asm-arm26/sysirq.h b/include/asm-arm26/sysirq.h index cad250c7b9ec..81dca90d9a3f 100644 --- a/include/asm-arm26/sysirq.h +++ b/include/asm-arm26/sysirq.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 04-04-1998 PJB Merged arc and a5k versions | 11 | * 04-04-1998 PJB Merged arc and a5k versions |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #if defined(CONFIG_ARCH_A5K) | 15 | #if defined(CONFIG_ARCH_A5K) |
| 17 | #define IRQ_PRINTER 0 | 16 | #define IRQ_PRINTER 0 |
diff --git a/include/asm-arm26/system.h b/include/asm-arm26/system.h index 702884926a55..d1f69d706198 100644 --- a/include/asm-arm26/system.h +++ b/include/asm-arm26/system.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | /* | 7 | /* |
| 9 | * This is used to ensure the compiler did actually allocate the register we | 8 | * This is used to ensure the compiler did actually allocate the register we |
diff --git a/include/asm-arm26/unistd.h b/include/asm-arm26/unistd.h index be4c2fb9c049..70eb6d91cfd0 100644 --- a/include/asm-arm26/unistd.h +++ b/include/asm-arm26/unistd.h | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | #ifndef __ASM_ARM_UNISTD_H | 14 | #ifndef __ASM_ARM_UNISTD_H |
| 15 | #define __ASM_ARM_UNISTD_H | 15 | #define __ASM_ARM_UNISTD_H |
| 16 | 16 | ||
| 17 | #include <linux/linkage.h> | ||
| 18 | |||
| 19 | #define __NR_SYSCALL_BASE 0x900000 | 17 | #define __NR_SYSCALL_BASE 0x900000 |
| 20 | 18 | ||
| 21 | /* | 19 | /* |
| @@ -312,6 +310,9 @@ | |||
| 312 | #define __ARM_NR_cacheflush (__ARM_NR_BASE+2) | 310 | #define __ARM_NR_cacheflush (__ARM_NR_BASE+2) |
| 313 | #define __ARM_NR_usr26 (__ARM_NR_BASE+3) | 311 | #define __ARM_NR_usr26 (__ARM_NR_BASE+3) |
| 314 | 312 | ||
| 313 | #ifdef __KERNEL__ | ||
| 314 | #include <linux/linkage.h> | ||
| 315 | |||
| 315 | #define __sys2(x) #x | 316 | #define __sys2(x) #x |
| 316 | #define __sys1(x) __sys2(x) | 317 | #define __sys1(x) __sys2(x) |
| 317 | 318 | ||
| @@ -443,7 +444,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
| 443 | __syscall_return(type,__res); \ | 444 | __syscall_return(type,__res); \ |
| 444 | } | 445 | } |
| 445 | 446 | ||
| 446 | #ifdef __KERNEL__ | ||
| 447 | #define __ARCH_WANT_IPC_PARSE_VERSION | 447 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 448 | #define __ARCH_WANT_OLD_READDIR | 448 | #define __ARCH_WANT_OLD_READDIR |
| 449 | #define __ARCH_WANT_STAT64 | 449 | #define __ARCH_WANT_STAT64 |
| @@ -462,7 +462,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
| 462 | #define __ARCH_WANT_SYS_SIGPENDING | 462 | #define __ARCH_WANT_SYS_SIGPENDING |
| 463 | #define __ARCH_WANT_SYS_SIGPROCMASK | 463 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 464 | #define __ARCH_WANT_SYS_RT_SIGACTION | 464 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 465 | #endif | ||
| 466 | 465 | ||
| 467 | #ifdef __KERNEL_SYSCALLS__ | 466 | #ifdef __KERNEL_SYSCALLS__ |
| 468 | 467 | ||
| @@ -486,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 486 | struct sigaction __user *oact, | 485 | struct sigaction __user *oact, |
| 487 | size_t sigsetsize); | 486 | size_t sigsetsize); |
| 488 | 487 | ||
| 489 | #endif | 488 | #endif /* __KERNEL_SYSCALLS__ */ |
| 490 | 489 | ||
| 491 | /* | 490 | /* |
| 492 | * "Conditional" syscalls | 491 | * "Conditional" syscalls |
| @@ -496,4 +495,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 496 | */ | 495 | */ |
| 497 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 496 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 498 | 497 | ||
| 498 | #endif /* __KERNEL__ */ | ||
| 499 | #endif /* __ASM_ARM_UNISTD_H */ | 499 | #endif /* __ASM_ARM_UNISTD_H */ |
diff --git a/include/asm-cris/arch-v10/io.h b/include/asm-cris/arch-v10/io.h index dd39198ec67d..11ef5b53d84e 100644 --- a/include/asm-cris/arch-v10/io.h +++ b/include/asm-cris/arch-v10/io.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASM_ARCH_CRIS_IO_H | 2 | #define _ASM_ARCH_CRIS_IO_H |
| 3 | 3 | ||
| 4 | #include <asm/arch/svinto.h> | 4 | #include <asm/arch/svinto.h> |
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | /* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */ | 6 | /* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */ |
| 8 | 7 | ||
diff --git a/include/asm-cris/arch-v10/page.h b/include/asm-cris/arch-v10/page.h index 407e6e68f49e..7d8307aed7f3 100644 --- a/include/asm-cris/arch-v10/page.h +++ b/include/asm-cris/arch-v10/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _CRIS_ARCH_PAGE_H | 1 | #ifndef _CRIS_ARCH_PAGE_H |
| 2 | #define _CRIS_ARCH_PAGE_H | 2 | #define _CRIS_ARCH_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 7 | 6 | ||
diff --git a/include/asm-cris/arch-v10/system.h b/include/asm-cris/arch-v10/system.h index 1ac7b639b1b0..4a9cd36c9e16 100644 --- a/include/asm-cris/arch-v10/system.h +++ b/include/asm-cris/arch-v10/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_CRIS_ARCH_SYSTEM_H | 1 | #ifndef __ASM_CRIS_ARCH_SYSTEM_H |
| 2 | #define __ASM_CRIS_ARCH_SYSTEM_H | 2 | #define __ASM_CRIS_ARCH_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* read the CPU version register */ | 5 | /* read the CPU version register */ |
| 7 | 6 | ||
diff --git a/include/asm-cris/arch-v32/io.h b/include/asm-cris/arch-v32/io.h index 043c9ce5294e..5efe4d949001 100644 --- a/include/asm-cris/arch-v32/io.h +++ b/include/asm-cris/arch-v32/io.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <asm/arch/hwregs/reg_map.h> | 4 | #include <asm/arch/hwregs/reg_map.h> |
| 5 | #include <asm/arch/hwregs/reg_rdwr.h> | 5 | #include <asm/arch/hwregs/reg_rdwr.h> |
| 6 | #include <asm/arch/hwregs/gio_defs.h> | 6 | #include <asm/arch/hwregs/gio_defs.h> |
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | enum crisv32_io_dir | 8 | enum crisv32_io_dir |
| 10 | { | 9 | { |
diff --git a/include/asm-cris/arch-v32/irq.h b/include/asm-cris/arch-v32/irq.h index d35aa8174c2f..eeb0a80262c8 100644 --- a/include/asm-cris/arch-v32/irq.h +++ b/include/asm-cris/arch-v32/irq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_ARCH_IRQ_H | 1 | #ifndef _ASM_ARCH_IRQ_H |
| 2 | #define _ASM_ARCH_IRQ_H | 2 | #define _ASM_ARCH_IRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include "hwregs/intr_vect.h" | 4 | #include "hwregs/intr_vect.h" |
| 6 | 5 | ||
| 7 | /* Number of non-cpu interrupts. */ | 6 | /* Number of non-cpu interrupts. */ |
diff --git a/include/asm-cris/arch-v32/page.h b/include/asm-cris/arch-v32/page.h index 77827bc17cca..fa454fe12425 100644 --- a/include/asm-cris/arch-v32/page.h +++ b/include/asm-cris/arch-v32/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_CRIS_ARCH_PAGE_H | 1 | #ifndef _ASM_CRIS_ARCH_PAGE_H |
| 2 | #define _ASM_CRIS_ARCH_PAGE_H | 2 | #define _ASM_CRIS_ARCH_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 7 | 6 | ||
diff --git a/include/asm-cris/arch-v32/processor.h b/include/asm-cris/arch-v32/processor.h index 32bf2e538ced..5553b0cd02bf 100644 --- a/include/asm-cris/arch-v32/processor.h +++ b/include/asm-cris/arch-v32/processor.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_CRIS_ARCH_PROCESSOR_H | 1 | #ifndef _ASM_CRIS_ARCH_PROCESSOR_H |
| 2 | #define _ASM_CRIS_ARCH_PROCESSOR_H | 2 | #define _ASM_CRIS_ARCH_PROCESSOR_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* Return current instruction pointer. */ | 5 | /* Return current instruction pointer. */ |
| 7 | #define current_text_addr() \ | 6 | #define current_text_addr() \ |
diff --git a/include/asm-cris/arch-v32/system.h b/include/asm-cris/arch-v32/system.h index a3d75d581e2f..d20e2d6d64a3 100644 --- a/include/asm-cris/arch-v32/system.h +++ b/include/asm-cris/arch-v32/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_CRIS_ARCH_SYSTEM_H | 1 | #ifndef _ASM_CRIS_ARCH_SYSTEM_H |
| 2 | #define _ASM_CRIS_ARCH_SYSTEM_H | 2 | #define _ASM_CRIS_ARCH_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* Read the CPU version register. */ | 5 | /* Read the CPU version register. */ |
| 7 | static inline unsigned long rdvr(void) | 6 | static inline unsigned long rdvr(void) |
diff --git a/include/asm-cris/eshlibld.h b/include/asm-cris/eshlibld.h index 2b577cde17eb..10ce36cf79a9 100644 --- a/include/asm-cris/eshlibld.h +++ b/include/asm-cris/eshlibld.h | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | /* We have dependencies all over the place for the host system | 32 | /* We have dependencies all over the place for the host system |
| 33 | for xsim being a linux system, so let's not pretend anything | 33 | for xsim being a linux system, so let's not pretend anything |
| 34 | else with #ifdef:s here until fixed. */ | 34 | else with #ifdef:s here until fixed. */ |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/limits.h> | 35 | #include <linux/limits.h> |
| 37 | 36 | ||
| 38 | /* Maybe do sanity checking if file input. */ | 37 | /* Maybe do sanity checking if file input. */ |
diff --git a/include/asm-cris/etraxgpio.h b/include/asm-cris/etraxgpio.h index 80ee10f70d43..5d0028dba7c6 100644 --- a/include/asm-cris/etraxgpio.h +++ b/include/asm-cris/etraxgpio.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #ifndef _ASM_ETRAXGPIO_H | 25 | #ifndef _ASM_ETRAXGPIO_H |
| 26 | #define _ASM_ETRAXGPIO_H | 26 | #define _ASM_ETRAXGPIO_H |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | /* etraxgpio _IOC_TYPE, bits 8 to 15 in ioctl cmd */ | 28 | /* etraxgpio _IOC_TYPE, bits 8 to 15 in ioctl cmd */ |
| 30 | #ifdef CONFIG_ETRAX_ARCH_V10 | 29 | #ifdef CONFIG_ETRAX_ARCH_V10 |
| 31 | #define ETRAXGPIO_IOCTYPE 43 | 30 | #define ETRAXGPIO_IOCTYPE 43 |
diff --git a/include/asm-cris/fasttimer.h b/include/asm-cris/fasttimer.h index 69522028baa5..a3a77132ce32 100644 --- a/include/asm-cris/fasttimer.h +++ b/include/asm-cris/fasttimer.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * This may be useful in other OS than Linux so use 2 space indentation... | 5 | * This may be useful in other OS than Linux so use 2 space indentation... |
| 6 | * Copyright (C) 2000, 2002 Axis Communications AB | 6 | * Copyright (C) 2000, 2002 Axis Communications AB |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/time.h> /* struct timeval */ | 8 | #include <linux/time.h> /* struct timeval */ |
| 10 | #include <linux/timex.h> | 9 | #include <linux/timex.h> |
| 11 | 10 | ||
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h index 3787633e6209..81832e9e157f 100644 --- a/include/asm-cris/page.h +++ b/include/asm-cris/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _CRIS_PAGE_H | 1 | #ifndef _CRIS_PAGE_H |
| 2 | #define _CRIS_PAGE_H | 2 | #define _CRIS_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/arch/page.h> | 4 | #include <asm/arch/page.h> |
| 6 | 5 | ||
| 7 | /* PAGE_SHIFT determines the page size */ | 6 | /* PAGE_SHIFT determines the page size */ |
diff --git a/include/asm-cris/pci.h b/include/asm-cris/pci.h index 2064bc1de074..b2ac8a331da1 100644 --- a/include/asm-cris/pci.h +++ b/include/asm-cris/pci.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_CRIS_PCI_H | 1 | #ifndef __ASM_CRIS_PCI_H |
| 2 | #define __ASM_CRIS_PCI_H | 2 | #define __ASM_CRIS_PCI_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 7 | #include <linux/mm.h> /* for struct page */ | 6 | #include <linux/mm.h> /* for struct page */ |
diff --git a/include/asm-cris/pgtable.h b/include/asm-cris/pgtable.h index 70a832514f62..5d76c1c0d6c9 100644 --- a/include/asm-cris/pgtable.h +++ b/include/asm-cris/pgtable.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <asm-generic/pgtable-nopmd.h> | 9 | #include <asm-generic/pgtable-nopmd.h> |
| 10 | 10 | ||
| 11 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <asm/mmu.h> | 13 | #include <asm/mmu.h> |
| 15 | #endif | 14 | #endif |
diff --git a/include/asm-cris/processor.h b/include/asm-cris/processor.h index 961e2bceadbc..568da1deceb9 100644 --- a/include/asm-cris/processor.h +++ b/include/asm-cris/processor.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_CRIS_PROCESSOR_H | 10 | #ifndef __ASM_CRIS_PROCESSOR_H |
| 11 | #define __ASM_CRIS_PROCESSOR_H | 11 | #define __ASM_CRIS_PROCESSOR_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/system.h> | 13 | #include <asm/system.h> |
| 15 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 16 | #include <asm/ptrace.h> | 15 | #include <asm/ptrace.h> |
diff --git a/include/asm-cris/rtc.h b/include/asm-cris/rtc.h index 97c13039834a..cb4bf9217fee 100644 --- a/include/asm-cris/rtc.h +++ b/include/asm-cris/rtc.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #define __RTC_H__ | 4 | #define __RTC_H__ |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifdef CONFIG_ETRAX_DS1302 | 8 | #ifdef CONFIG_ETRAX_DS1302 |
| 10 | /* Dallas DS1302 clock/calendar register numbers. */ | 9 | /* Dallas DS1302 clock/calendar register numbers. */ |
diff --git a/include/asm-cris/tlbflush.h b/include/asm-cris/tlbflush.h index c52238005b55..0569612477e3 100644 --- a/include/asm-cris/tlbflush.h +++ b/include/asm-cris/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _CRIS_TLBFLUSH_H | 1 | #ifndef _CRIS_TLBFLUSH_H |
| 2 | #define _CRIS_TLBFLUSH_H | 2 | #define _CRIS_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
| 7 | #include <asm/pgtable.h> | 6 | #include <asm/pgtable.h> |
diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h index bb2dfe480213..c2954e90aa24 100644 --- a/include/asm-cris/unistd.h +++ b/include/asm-cris/unistd.h | |||
| @@ -295,11 +295,11 @@ | |||
| 295 | #define __NR_request_key 287 | 295 | #define __NR_request_key 287 |
| 296 | #define __NR_keyctl 288 | 296 | #define __NR_keyctl 288 |
| 297 | 297 | ||
| 298 | #define NR_syscalls 289 | 298 | #ifdef __KERNEL__ |
| 299 | 299 | ||
| 300 | #define NR_syscalls 289 | ||
| 300 | 301 | ||
| 301 | 302 | ||
| 302 | #ifdef __KERNEL__ | ||
| 303 | #define __ARCH_WANT_IPC_PARSE_VERSION | 303 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 304 | #define __ARCH_WANT_OLD_READDIR | 304 | #define __ARCH_WANT_OLD_READDIR |
| 305 | #define __ARCH_WANT_OLD_STAT | 305 | #define __ARCH_WANT_OLD_STAT |
| @@ -379,12 +379,10 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 379 | * complaints. We don't want to use -fno-builtin, so just use a | 379 | * complaints. We don't want to use -fno-builtin, so just use a |
| 380 | * different name when in the kernel. | 380 | * different name when in the kernel. |
| 381 | */ | 381 | */ |
| 382 | #ifdef __KERNEL__ | ||
| 383 | #define _exit kernel_syscall_exit | 382 | #define _exit kernel_syscall_exit |
| 384 | #endif | ||
| 385 | static inline _syscall1(int,_exit,int,exitcode) | 383 | static inline _syscall1(int,_exit,int,exitcode) |
| 386 | static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) | 384 | static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) |
| 387 | #endif | 385 | #endif /* __KERNEL_SYSCALLS__ */ |
| 388 | 386 | ||
| 389 | 387 | ||
| 390 | /* | 388 | /* |
| @@ -395,4 +393,5 @@ static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) | |||
| 395 | */ | 393 | */ |
| 396 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 394 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 397 | 395 | ||
| 396 | #endif /* __KERNEL__ */ | ||
| 398 | #endif /* _ASM_CRIS_UNISTD_H_ */ | 397 | #endif /* _ASM_CRIS_UNISTD_H_ */ |
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h index 5d9f84bfdcad..9a4ff03c3969 100644 --- a/include/asm-frv/atomic.h +++ b/include/asm-frv/atomic.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _ASM_ATOMIC_H | 14 | #ifndef _ASM_ATOMIC_H |
| 15 | #define _ASM_ATOMIC_H | 15 | #define _ASM_ATOMIC_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <asm/spr-regs.h> | 18 | #include <asm/spr-regs.h> |
| 20 | 19 | ||
diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h index 6344d06390b9..980ae1b0cd28 100644 --- a/include/asm-frv/bitops.h +++ b/include/asm-frv/bitops.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _ASM_BITOPS_H | 14 | #ifndef _ASM_BITOPS_H |
| 15 | #define _ASM_BITOPS_H | 15 | #define _ASM_BITOPS_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/compiler.h> | 17 | #include <linux/compiler.h> |
| 19 | #include <asm/byteorder.h> | 18 | #include <asm/byteorder.h> |
| 20 | #include <asm/system.h> | 19 | #include <asm/system.h> |
diff --git a/include/asm-frv/bug.h b/include/asm-frv/bug.h index 451712cc3060..6b1b44d71028 100644 --- a/include/asm-frv/bug.h +++ b/include/asm-frv/bug.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_BUG_H | 11 | #ifndef _ASM_BUG_H |
| 12 | #define _ASM_BUG_H | 12 | #define _ASM_BUG_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | 15 | ||
| 17 | #ifdef CONFIG_BUG | 16 | #ifdef CONFIG_BUG |
diff --git a/include/asm-frv/cache.h b/include/asm-frv/cache.h index cf69b6373b34..2797163b8f4f 100644 --- a/include/asm-frv/cache.h +++ b/include/asm-frv/cache.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_CACHE_H | 12 | #ifndef __ASM_CACHE_H |
| 13 | #define __ASM_CACHE_H | 13 | #define __ASM_CACHE_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* bytes per L1 cache line */ | 16 | /* bytes per L1 cache line */ |
| 18 | #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT) | 17 | #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT) |
diff --git a/include/asm-frv/dma.h b/include/asm-frv/dma.h index d8f9a2f21521..18d6bb8f84fc 100644 --- a/include/asm-frv/dma.h +++ b/include/asm-frv/dma.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | //#define DMA_DEBUG 1 | 15 | //#define DMA_DEBUG 1 |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 19 | 18 | ||
| 20 | #undef MAX_DMA_CHANNELS /* don't use kernel/dma.c */ | 19 | #undef MAX_DMA_CHANNELS /* don't use kernel/dma.c */ |
diff --git a/include/asm-frv/elf.h b/include/asm-frv/elf.h index 7d2098f0476b..38656da00e40 100644 --- a/include/asm-frv/elf.h +++ b/include/asm-frv/elf.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_ELF_H | 12 | #ifndef __ASM_ELF_H |
| 13 | #define __ASM_ELF_H | 13 | #define __ASM_ELF_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/ptrace.h> | 15 | #include <asm/ptrace.h> |
| 17 | #include <asm/user.h> | 16 | #include <asm/user.h> |
| 18 | 17 | ||
diff --git a/include/asm-frv/fpu.h b/include/asm-frv/fpu.h index b1178f8ca5ce..d73c60b56641 100644 --- a/include/asm-frv/fpu.h +++ b/include/asm-frv/fpu.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_FPU_H | 1 | #ifndef __ASM_FPU_H |
| 2 | #define __ASM_FPU_H | 2 | #define __ASM_FPU_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * MAX floating point unit state size (FSAVE/FRESTORE) | 6 | * MAX floating point unit state size (FSAVE/FRESTORE) |
diff --git a/include/asm-frv/hardirq.h b/include/asm-frv/hardirq.h index 685123981e8b..7581b5a7559a 100644 --- a/include/asm-frv/hardirq.h +++ b/include/asm-frv/hardirq.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_HARDIRQ_H | 12 | #ifndef __ASM_HARDIRQ_H |
| 13 | #define __ASM_HARDIRQ_H | 13 | #define __ASM_HARDIRQ_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
| 17 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
| 18 | 17 | ||
diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h index 295f74a57f22..cfbf7d3a1feb 100644 --- a/include/asm-frv/highmem.h +++ b/include/asm-frv/highmem.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <asm/mem-layout.h> | 21 | #include <asm/mem-layout.h> |
| 23 | #include <asm/spr-regs.h> | 22 | #include <asm/spr-regs.h> |
diff --git a/include/asm-frv/ide.h b/include/asm-frv/ide.h index ae031eaa3dd2..f0bd2cb250c1 100644 --- a/include/asm-frv/ide.h +++ b/include/asm-frv/ide.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/setup.h> | 17 | #include <asm/setup.h> |
| 19 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 20 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
diff --git a/include/asm-frv/io.h b/include/asm-frv/io.h index 01247cb2bc39..b56eba59e3cd 100644 --- a/include/asm-frv/io.h +++ b/include/asm-frv/io.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <asm/virtconvert.h> | 21 | #include <asm/virtconvert.h> |
| 23 | #include <asm/string.h> | 22 | #include <asm/string.h> |
diff --git a/include/asm-frv/irq.h b/include/asm-frv/irq.h index 2c16d8dc02fd..58b619215a50 100644 --- a/include/asm-frv/irq.h +++ b/include/asm-frv/irq.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_IRQ_H_ | 12 | #ifndef _ASM_IRQ_H_ |
| 13 | #define _ASM_IRQ_H_ | 13 | #define _ASM_IRQ_H_ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * the system has an on-CPU PIC and another PIC on the FPGA and other PICs on other peripherals, | 17 | * the system has an on-CPU PIC and another PIC on the FPGA and other PICs on other peripherals, |
diff --git a/include/asm-frv/mmu_context.h b/include/asm-frv/mmu_context.h index 4fb9ea3c5bc9..72edcaaccd5d 100644 --- a/include/asm-frv/mmu_context.h +++ b/include/asm-frv/mmu_context.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_MMU_CONTEXT_H | 12 | #ifndef _ASM_MMU_CONTEXT_H |
| 13 | #define _ASM_MMU_CONTEXT_H | 13 | #define _ASM_MMU_CONTEXT_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/setup.h> | 15 | #include <asm/setup.h> |
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
| 18 | #include <asm/pgalloc.h> | 17 | #include <asm/pgalloc.h> |
diff --git a/include/asm-frv/page.h b/include/asm-frv/page.h index dc0f7e08a4c2..134cc0cdf6c2 100644 --- a/include/asm-frv/page.h +++ b/include/asm-frv/page.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/virtconvert.h> | 6 | #include <asm/virtconvert.h> |
| 8 | #include <asm/mem-layout.h> | 7 | #include <asm/mem-layout.h> |
| 9 | #include <asm/sections.h> | 8 | #include <asm/sections.h> |
diff --git a/include/asm-frv/pci.h b/include/asm-frv/pci.h index 598b0c6b695d..f35a4511e7b9 100644 --- a/include/asm-frv/pci.h +++ b/include/asm-frv/pci.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef ASM_PCI_H | 13 | #ifndef ASM_PCI_H |
| 14 | #define ASM_PCI_H | 14 | #define ASM_PCI_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 18 | #include <asm/scatterlist.h> | 17 | #include <asm/scatterlist.h> |
| 19 | #include <asm-generic/pci-dma-compat.h> | 18 | #include <asm-generic/pci-dma-compat.h> |
diff --git a/include/asm-frv/pgalloc.h b/include/asm-frv/pgalloc.h index 1bd28f41bfa8..ce982a6c610f 100644 --- a/include/asm-frv/pgalloc.h +++ b/include/asm-frv/pgalloc.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _ASM_PGALLOC_H | 15 | #ifndef _ASM_PGALLOC_H |
| 16 | #define _ASM_PGALLOC_H | 16 | #define _ASM_PGALLOC_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
| 20 | #include <asm/virtconvert.h> | 19 | #include <asm/virtconvert.h> |
| 21 | 20 | ||
diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h index d1c3b182c691..7af7485e889e 100644 --- a/include/asm-frv/pgtable.h +++ b/include/asm-frv/pgtable.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef _ASM_PGTABLE_H | 16 | #ifndef _ASM_PGTABLE_H |
| 17 | #define _ASM_PGTABLE_H | 17 | #define _ASM_PGTABLE_H |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <asm/mem-layout.h> | 19 | #include <asm/mem-layout.h> |
| 21 | #include <asm/setup.h> | 20 | #include <asm/setup.h> |
| 22 | #include <asm/processor.h> | 21 | #include <asm/processor.h> |
diff --git a/include/asm-frv/processor.h b/include/asm-frv/processor.h index 5228c18b7f78..1c4dba1c5f57 100644 --- a/include/asm-frv/processor.h +++ b/include/asm-frv/processor.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_PROCESSOR_H | 12 | #ifndef _ASM_PROCESSOR_H |
| 13 | #define _ASM_PROCESSOR_H | 13 | #define _ASM_PROCESSOR_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/mem-layout.h> | 15 | #include <asm/mem-layout.h> |
| 17 | 16 | ||
| 18 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-frv/segment.h b/include/asm-frv/segment.h index 61222f00dfc1..e3616a6f941d 100644 --- a/include/asm-frv/segment.h +++ b/include/asm-frv/segment.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_SEGMENT_H | 12 | #ifndef _ASM_SEGMENT_H |
| 13 | #define _ASM_SEGMENT_H | 13 | #define _ASM_SEGMENT_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
| 18 | 17 | ||
diff --git a/include/asm-frv/serial.h b/include/asm-frv/serial.h index 6917d556a1e1..dbb825998689 100644 --- a/include/asm-frv/serial.h +++ b/include/asm-frv/serial.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Based on linux/include/asm-i386/serial.h | 7 | * Based on linux/include/asm-i386/serial.h |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/serial-regs.h> | 9 | #include <asm/serial-regs.h> |
| 11 | 10 | ||
| 12 | /* | 11 | /* |
diff --git a/include/asm-frv/smp.h b/include/asm-frv/smp.h index 5ca771631fd8..38349ec8b61b 100644 --- a/include/asm-frv/smp.h +++ b/include/asm-frv/smp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SMP_H | 1 | #ifndef __ASM_SMP_H |
| 2 | #define __ASM_SMP_H | 2 | #define __ASM_SMP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_SMP | 5 | #ifdef CONFIG_SMP |
| 7 | #error SMP not supported | 6 | #error SMP not supported |
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index 1734ed91bcdc..351863dfd06e 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_SYSTEM_H | 12 | #ifndef _ASM_SYSTEM_H |
| 13 | #define _ASM_SYSTEM_H | 13 | #define _ASM_SYSTEM_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> /* get configuration macros */ | ||
| 16 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 17 | #include <asm/atomic.h> | 16 | #include <asm/atomic.h> |
| 18 | 17 | ||
diff --git a/include/asm-frv/tlbflush.h b/include/asm-frv/tlbflush.h index bc3462625084..da3a3179a85d 100644 --- a/include/asm-frv/tlbflush.h +++ b/include/asm-frv/tlbflush.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_TLBFLUSH_H | 12 | #ifndef _ASM_TLBFLUSH_H |
| 13 | #define _ASM_TLBFLUSH_H | 13 | #define _ASM_TLBFLUSH_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
| 18 | 17 | ||
diff --git a/include/asm-frv/types.h b/include/asm-frv/types.h index 2560f596a75d..1b6d1923b25b 100644 --- a/include/asm-frv/types.h +++ b/include/asm-frv/types.h | |||
| @@ -46,7 +46,6 @@ typedef unsigned long long __u64; | |||
| 46 | 46 | ||
| 47 | #ifndef __ASSEMBLY__ | 47 | #ifndef __ASSEMBLY__ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | 49 | ||
| 51 | typedef signed char s8; | 50 | typedef signed char s8; |
| 52 | typedef unsigned char u8; | 51 | typedef unsigned char u8; |
diff --git a/include/asm-frv/unaligned.h b/include/asm-frv/unaligned.h index a0d199bf01d9..dc8e9c9bf6bd 100644 --- a/include/asm-frv/unaligned.h +++ b/include/asm-frv/unaligned.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_UNALIGNED_H | 12 | #ifndef _ASM_UNALIGNED_H |
| 13 | #define _ASM_UNALIGNED_H | 13 | #define _ASM_UNALIGNED_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Unaligned accesses on uClinux can't be performed in a fault handler - the | 17 | * Unaligned accesses on uClinux can't be performed in a fault handler - the |
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h index 2662a3e12dc4..7c2e712c3b73 100644 --- a/include/asm-frv/unistd.h +++ b/include/asm-frv/unistd.h | |||
| @@ -317,6 +317,8 @@ | |||
| 317 | #define __NR_pselect6 308 | 317 | #define __NR_pselect6 308 |
| 318 | #define __NR_ppoll 309 | 318 | #define __NR_ppoll 309 |
| 319 | 319 | ||
| 320 | #ifdef __KERNEL__ | ||
| 321 | |||
| 320 | #define NR_syscalls 310 | 322 | #define NR_syscalls 310 |
| 321 | 323 | ||
| 322 | /* | 324 | /* |
| @@ -477,9 +479,8 @@ static inline pid_t wait(int * wait_stat) | |||
| 477 | return waitpid(-1,wait_stat,0); | 479 | return waitpid(-1,wait_stat,0); |
| 478 | } | 480 | } |
| 479 | 481 | ||
| 480 | #endif | 482 | #endif /* __KERNEL_SYSCALLS__ */ |
| 481 | 483 | ||
| 482 | #ifdef __KERNEL__ | ||
| 483 | #define __ARCH_WANT_IPC_PARSE_VERSION | 484 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 484 | /* #define __ARCH_WANT_OLD_READDIR */ | 485 | /* #define __ARCH_WANT_OLD_READDIR */ |
| 485 | #define __ARCH_WANT_OLD_STAT | 486 | #define __ARCH_WANT_OLD_STAT |
| @@ -503,7 +504,6 @@ static inline pid_t wait(int * wait_stat) | |||
| 503 | #define __ARCH_WANT_SYS_SIGPROCMASK | 504 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 504 | #define __ARCH_WANT_SYS_RT_SIGACTION | 505 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 505 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 506 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
| 506 | #endif | ||
| 507 | 507 | ||
| 508 | /* | 508 | /* |
| 509 | * "Conditional" syscalls | 509 | * "Conditional" syscalls |
| @@ -515,4 +515,5 @@ static inline pid_t wait(int * wait_stat) | |||
| 515 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 515 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 516 | #endif | 516 | #endif |
| 517 | 517 | ||
| 518 | #endif /* __KERNEL__ */ | ||
| 518 | #endif /* _ASM_UNISTD_H_ */ | 519 | #endif /* _ASM_UNISTD_H_ */ |
diff --git a/include/asm-frv/virtconvert.h b/include/asm-frv/virtconvert.h index a29a0aec291f..59788fa2a813 100644 --- a/include/asm-frv/virtconvert.h +++ b/include/asm-frv/virtconvert.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/setup.h> | 20 | #include <asm/setup.h> |
| 22 | 21 | ||
| 23 | #ifdef CONFIG_MMU | 22 | #ifdef CONFIG_MMU |
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 1a565a9d2fa7..0cd9711895fa 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASM_GENERIC_BUG_H | 2 | #define _ASM_GENERIC_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | #ifdef CONFIG_BUG | 6 | #ifdef CONFIG_BUG |
| 8 | #ifndef HAVE_ARCH_BUG | 7 | #ifndef HAVE_ARCH_BUG |
diff --git a/include/asm-generic/dma-mapping.h b/include/asm-generic/dma-mapping.h index 1b356207712c..b541e48cc545 100644 --- a/include/asm-generic/dma-mapping.h +++ b/include/asm-generic/dma-mapping.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _ASM_GENERIC_DMA_MAPPING_H | 7 | #ifndef _ASM_GENERIC_DMA_MAPPING_H |
| 8 | #define _ASM_GENERIC_DMA_MAPPING_H | 8 | #define _ASM_GENERIC_DMA_MAPPING_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #ifdef CONFIG_PCI | 11 | #ifdef CONFIG_PCI |
| 13 | 12 | ||
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index b663520dcdc4..c154b9d6e7e5 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_GENERIC_FCNTL_H | 1 | #ifndef _ASM_GENERIC_FCNTL_H |
| 2 | #define _ASM_GENERIC_FCNTL_H | 2 | #define _ASM_GENERIC_FCNTL_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | 5 | ||
| 7 | /* open/fcntl - O_SYNC is only implemented on blocks devices and on files | 6 | /* open/fcntl - O_SYNC is only implemented on blocks devices and on files |
diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h index 9291c24f5819..ab469297272c 100644 --- a/include/asm-generic/local.h +++ b/include/asm-generic/local.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_GENERIC_LOCAL_H | 1 | #ifndef _ASM_GENERIC_LOCAL_H |
| 2 | #define _ASM_GENERIC_LOCAL_H | 2 | #define _ASM_GENERIC_LOCAL_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/percpu.h> | 4 | #include <linux/percpu.h> |
| 6 | #include <linux/hardirq.h> | 5 | #include <linux/hardirq.h> |
| 7 | #include <asm/atomic.h> | 6 | #include <asm/atomic.h> |
diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal.h index 9418d6e9b8cd..dae1d8720076 100644 --- a/include/asm-generic/signal.h +++ b/include/asm-generic/signal.h | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | #ifndef __ASM_GENERIC_SIGNAL_H | ||
| 2 | #define __ASM_GENERIC_SIGNAL_H | ||
| 3 | |||
| 4 | #include <linux/compiler.h> | ||
| 5 | |||
| 1 | #ifndef SIG_BLOCK | 6 | #ifndef SIG_BLOCK |
| 2 | #define SIG_BLOCK 0 /* for blocking signals */ | 7 | #define SIG_BLOCK 0 /* for blocking signals */ |
| 3 | #endif | 8 | #endif |
| @@ -19,3 +24,5 @@ typedef __restorefn_t __user *__sigrestore_t; | |||
| 19 | #define SIG_IGN ((__force __sighandler_t)1) /* ignore signal */ | 24 | #define SIG_IGN ((__force __sighandler_t)1) /* ignore signal */ |
| 20 | #define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ | 25 | #define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ |
| 21 | #endif | 26 | #endif |
| 27 | |||
| 28 | #endif /* __ASM_GENERIC_SIGNAL_H */ | ||
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index cdd4145243cd..867d9008fafa 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ASM_GENERIC__TLB_H | 13 | #ifndef _ASM_GENERIC__TLB_H |
| 14 | #define _ASM_GENERIC__TLB_H | 14 | #define _ASM_GENERIC__TLB_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/swap.h> | 16 | #include <linux/swap.h> |
| 18 | #include <asm/pgalloc.h> | 17 | #include <asm/pgalloc.h> |
| 19 | #include <asm/tlbflush.h> | 18 | #include <asm/tlbflush.h> |
diff --git a/include/asm-h8300/bitops.h b/include/asm-h8300/bitops.h index 574f57b6c4d1..d76299c98b81 100644 --- a/include/asm-h8300/bitops.h +++ b/include/asm-h8300/bitops.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright 2002, Yoshinori Sato | 6 | * Copyright 2002, Yoshinori Sato |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/compiler.h> | 9 | #include <linux/compiler.h> |
| 11 | #include <asm/system.h> | 10 | #include <asm/system.h> |
| 12 | 11 | ||
diff --git a/include/asm-h8300/dma.h b/include/asm-h8300/dma.h index 3708681b7ddc..3edbaaaedf5b 100644 --- a/include/asm-h8300/dma.h +++ b/include/asm-h8300/dma.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _H8300_DMA_H | 1 | #ifndef _H8300_DMA_H |
| 2 | #define _H8300_DMA_H | 2 | #define _H8300_DMA_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Set number of channels of DMA on ColdFire for different implementations. | 6 | * Set number of channels of DMA on ColdFire for different implementations. |
diff --git a/include/asm-h8300/elf.h b/include/asm-h8300/elf.h index f4af1553a55f..7ba6a0af447c 100644 --- a/include/asm-h8300/elf.h +++ b/include/asm-h8300/elf.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * ELF register definitions.. | 5 | * ELF register definitions.. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/ptrace.h> | 8 | #include <asm/ptrace.h> |
| 10 | #include <asm/user.h> | 9 | #include <asm/user.h> |
| 11 | 10 | ||
diff --git a/include/asm-h8300/hardirq.h b/include/asm-h8300/hardirq.h index e961bfe201b8..18fa7931e09f 100644 --- a/include/asm-h8300/hardirq.h +++ b/include/asm-h8300/hardirq.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __H8300_HARDIRQ_H | 2 | #define __H8300_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 8 | #include <linux/irq.h> | 7 | #include <linux/irq.h> |
diff --git a/include/asm-h8300/io.h b/include/asm-h8300/io.h index 1773e373e9c6..91b7487cb7ae 100644 --- a/include/asm-h8300/io.h +++ b/include/asm-h8300/io.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/virtconvert.h> | 6 | #include <asm/virtconvert.h> |
| 8 | 7 | ||
| 9 | #if defined(CONFIG_H83007) || defined(CONFIG_H83068) | 8 | #if defined(CONFIG_H83007) || defined(CONFIG_H83068) |
diff --git a/include/asm-h8300/keyboard.h b/include/asm-h8300/keyboard.h index b05d11387ae5..fbad65e8a5c0 100644 --- a/include/asm-h8300/keyboard.h +++ b/include/asm-h8300/keyboard.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _H8300_KEYBOARD_H | 7 | #ifndef _H8300_KEYBOARD_H |
| 8 | #define _H8300_KEYBOARD_H | 8 | #define _H8300_KEYBOARD_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | /* dummy i.e. no real keyboard */ | 11 | /* dummy i.e. no real keyboard */ |
| 13 | #define kbd_setkeycode(x...) (-ENOSYS) | 12 | #define kbd_setkeycode(x...) (-ENOSYS) |
diff --git a/include/asm-h8300/mmu_context.h b/include/asm-h8300/mmu_context.h index 23b555b7b4b9..855721a5dcc9 100644 --- a/include/asm-h8300/mmu_context.h +++ b/include/asm-h8300/mmu_context.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __H8300_MMU_CONTEXT_H | 1 | #ifndef __H8300_MMU_CONTEXT_H |
| 2 | #define __H8300_MMU_CONTEXT_H | 2 | #define __H8300_MMU_CONTEXT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/setup.h> | 4 | #include <asm/setup.h> |
| 6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
| 7 | #include <asm/pgalloc.h> | 6 | #include <asm/pgalloc.h> |
diff --git a/include/asm-h8300/page.h b/include/asm-h8300/page.h index 6472c9f88227..f9f9d3eea8ed 100644 --- a/include/asm-h8300/page.h +++ b/include/asm-h8300/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _H8300_PAGE_H | 1 | #ifndef _H8300_PAGE_H |
| 2 | #define _H8300_PAGE_H | 2 | #define _H8300_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* PAGE_SHIFT determines the page size */ | 5 | /* PAGE_SHIFT determines the page size */ |
| 7 | 6 | ||
diff --git a/include/asm-h8300/page_offset.h b/include/asm-h8300/page_offset.h index 8cc6e17218a8..f8706463008c 100644 --- a/include/asm-h8300/page_offset.h +++ b/include/asm-h8300/page_offset.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/config.h> | ||
| 3 | #define PAGE_OFFSET_RAW 0x00000000 | 2 | #define PAGE_OFFSET_RAW 0x00000000 |
| 4 | 3 | ||
diff --git a/include/asm-h8300/param.h b/include/asm-h8300/param.h index 126dddf72359..c25806ed1fb3 100644 --- a/include/asm-h8300/param.h +++ b/include/asm-h8300/param.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _H8300_PARAM_H | 1 | #ifndef _H8300_PARAM_H |
| 2 | #define _H8300_PARAM_H | 2 | #define _H8300_PARAM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifndef HZ | 5 | #ifndef HZ |
| 7 | #define HZ 100 | 6 | #define HZ 100 |
diff --git a/include/asm-h8300/pgtable.h b/include/asm-h8300/pgtable.h index f6e296fc1297..8b7c6857998b 100644 --- a/include/asm-h8300/pgtable.h +++ b/include/asm-h8300/pgtable.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm-generic/4level-fixup.h> | 4 | #include <asm-generic/4level-fixup.h> |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
| 8 | #include <asm/processor.h> | 7 | #include <asm/processor.h> |
| 9 | #include <asm/page.h> | 8 | #include <asm/page.h> |
diff --git a/include/asm-h8300/processor.h b/include/asm-h8300/processor.h index c6f0a7108ef3..c7e2f454b83a 100644 --- a/include/asm-h8300/processor.h +++ b/include/asm-h8300/processor.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) | 18 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/segment.h> | 20 | #include <asm/segment.h> |
| 22 | #include <asm/fpu.h> | 21 | #include <asm/fpu.h> |
| 23 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
diff --git a/include/asm-h8300/semaphore-helper.h b/include/asm-h8300/semaphore-helper.h index 29e0fbf1acb7..4fea36be5fd8 100644 --- a/include/asm-h8300/semaphore-helper.h +++ b/include/asm-h8300/semaphore-helper.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * m68k version by Andreas Schwab | 10 | * m68k version by Andreas Schwab |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | 14 | ||
| 16 | /* | 15 | /* |
diff --git a/include/asm-h8300/shm.h b/include/asm-h8300/shm.h index bec758524839..ed6623c0545d 100644 --- a/include/asm-h8300/shm.h +++ b/include/asm-h8300/shm.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _H8300_SHM_H | 1 | #ifndef _H8300_SHM_H |
| 2 | #define _H8300_SHM_H | 2 | #define _H8300_SHM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* format of page table entries that correspond to shared memory pages | 5 | /* format of page table entries that correspond to shared memory pages |
| 7 | currently out in swap space (see also mm/swap.c): | 6 | currently out in swap space (see also mm/swap.c): |
diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h index 8e81cf665e75..134e0929fce5 100644 --- a/include/asm-h8300/system.h +++ b/include/asm-h8300/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _H8300_SYSTEM_H | 1 | #ifndef _H8300_SYSTEM_H |
| 2 | #define _H8300_SYSTEM_H | 2 | #define _H8300_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> /* get configuration macros */ | ||
| 5 | #include <linux/linkage.h> | 4 | #include <linux/linkage.h> |
| 6 | 5 | ||
| 7 | /* | 6 | /* |
diff --git a/include/asm-h8300/unaligned.h b/include/asm-h8300/unaligned.h index 8a93961173c3..ffb67f472070 100644 --- a/include/asm-h8300/unaligned.h +++ b/include/asm-h8300/unaligned.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __H8300_UNALIGNED_H | 1 | #ifndef __H8300_UNALIGNED_H |
| 2 | #define __H8300_UNALIGNED_H | 2 | #define __H8300_UNALIGNED_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* Use memmove here, so gcc does not insert a __builtin_memcpy. */ | 5 | /* Use memmove here, so gcc does not insert a __builtin_memcpy. */ |
| 7 | 6 | ||
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h index adb05159379b..226dd596c2da 100644 --- a/include/asm-h8300/unistd.h +++ b/include/asm-h8300/unistd.h | |||
| @@ -292,6 +292,8 @@ | |||
| 292 | #define __NR_request_key 287 | 292 | #define __NR_request_key 287 |
| 293 | #define __NR_keyctl 288 | 293 | #define __NR_keyctl 288 |
| 294 | 294 | ||
| 295 | #ifdef __KERNEL__ | ||
| 296 | |||
| 295 | #define NR_syscalls 289 | 297 | #define NR_syscalls 289 |
| 296 | 298 | ||
| 297 | 299 | ||
| @@ -460,7 +462,6 @@ type name(atype a, btype b, ctype c, dtype d, etype e, ftype f) \ | |||
| 460 | __syscall_return(type, __res); \ | 462 | __syscall_return(type, __res); \ |
| 461 | } | 463 | } |
| 462 | 464 | ||
| 463 | #ifdef __KERNEL__ | ||
| 464 | #define __ARCH_WANT_IPC_PARSE_VERSION | 465 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 465 | #define __ARCH_WANT_OLD_READDIR | 466 | #define __ARCH_WANT_OLD_READDIR |
| 466 | #define __ARCH_WANT_OLD_STAT | 467 | #define __ARCH_WANT_OLD_STAT |
| @@ -483,7 +484,6 @@ type name(atype a, btype b, ctype c, dtype d, etype e, ftype f) \ | |||
| 483 | #define __ARCH_WANT_SYS_SIGPENDING | 484 | #define __ARCH_WANT_SYS_SIGPENDING |
| 484 | #define __ARCH_WANT_SYS_SIGPROCMASK | 485 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 485 | #define __ARCH_WANT_SYS_RT_SIGACTION | 486 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 486 | #endif | ||
| 487 | 487 | ||
| 488 | #ifdef __KERNEL_SYSCALLS__ | 488 | #ifdef __KERNEL_SYSCALLS__ |
| 489 | 489 | ||
| @@ -534,7 +534,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 534 | struct sigaction __user *oact, | 534 | struct sigaction __user *oact, |
| 535 | size_t sigsetsize); | 535 | size_t sigsetsize); |
| 536 | 536 | ||
| 537 | #endif | 537 | #endif /* __KERNEL_SYSCALLS__ */ |
| 538 | 538 | ||
| 539 | /* | 539 | /* |
| 540 | * "Conditional" syscalls | 540 | * "Conditional" syscalls |
| @@ -543,4 +543,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 543 | asm (".weak\t_" #name "\n" \ | 543 | asm (".weak\t_" #name "\n" \ |
| 544 | ".set\t_" #name ",_sys_ni_syscall"); | 544 | ".set\t_" #name ",_sys_ni_syscall"); |
| 545 | 545 | ||
| 546 | #endif /* __KERNEL__ */ | ||
| 546 | #endif /* _ASM_H8300_UNISTD_H_ */ | 547 | #endif /* _ASM_H8300_UNISTD_H_ */ |
diff --git a/include/asm-h8300/virtconvert.h b/include/asm-h8300/virtconvert.h index 3b344c1dfe0f..ee7d5ea10065 100644 --- a/include/asm-h8300/virtconvert.h +++ b/include/asm-h8300/virtconvert.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/setup.h> | 10 | #include <asm/setup.h> |
| 12 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 13 | 12 | ||
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h index 288233fd77d7..cc9b940fb7e8 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_APIC_H | 1 | #ifndef __ASM_APIC_H |
| 2 | #define __ASM_APIC_H | 2 | #define __ASM_APIC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/pm.h> | 4 | #include <linux/pm.h> |
| 6 | #include <asm/fixmap.h> | 5 | #include <asm/fixmap.h> |
| 7 | #include <asm/apicdef.h> | 6 | #include <asm/apicdef.h> |
diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h index 4ddce5296a78..4f061fa73794 100644 --- a/include/asm-i386/atomic.h +++ b/include/asm-i386/atomic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ARCH_I386_ATOMIC__ | 1 | #ifndef __ARCH_I386_ATOMIC__ |
| 2 | #define __ARCH_I386_ATOMIC__ | 2 | #define __ARCH_I386_ATOMIC__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 6 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
| 7 | 6 | ||
diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h index 08deaeee6be9..1c780fa1e762 100644 --- a/include/asm-i386/bitops.h +++ b/include/asm-i386/bitops.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright 1992, Linus Torvalds. | 5 | * Copyright 1992, Linus Torvalds. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/compiler.h> | 8 | #include <linux/compiler.h> |
| 10 | #include <asm/alternative.h> | 9 | #include <asm/alternative.h> |
| 11 | 10 | ||
diff --git a/include/asm-i386/bug.h b/include/asm-i386/bug.h index 8f79de19eb94..8062cdbf2587 100644 --- a/include/asm-i386/bug.h +++ b/include/asm-i386/bug.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _I386_BUG_H | 1 | #ifndef _I386_BUG_H |
| 2 | #define _I386_BUG_H | 2 | #define _I386_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Tell the user there is some problem. | 6 | * Tell the user there is some problem. |
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h index 50233e0345fb..2a9e4ee5904d 100644 --- a/include/asm-i386/bugs.h +++ b/include/asm-i386/bugs.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * void check_bugs(void); | 17 | * void check_bugs(void); |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <asm/processor.h> | 21 | #include <asm/processor.h> |
| 23 | #include <asm/i387.h> | 22 | #include <asm/i387.h> |
diff --git a/include/asm-i386/byteorder.h b/include/asm-i386/byteorder.h index a0d73f48d5be..a45470a8b74a 100644 --- a/include/asm-i386/byteorder.h +++ b/include/asm-i386/byteorder.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | /* For avoiding bswap on i386 */ | 9 | /* For avoiding bswap on i386 */ |
| 10 | #ifdef __KERNEL__ | 10 | #ifdef __KERNEL__ |
| 11 | #include <linux/config.h> | ||
| 12 | #endif | 11 | #endif |
| 13 | 12 | ||
| 14 | static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) | 13 | static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) |
diff --git a/include/asm-i386/cache.h b/include/asm-i386/cache.h index ca15c9c665cf..57c62f414158 100644 --- a/include/asm-i386/cache.h +++ b/include/asm-i386/cache.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifndef __ARCH_I386_CACHE_H | 4 | #ifndef __ARCH_I386_CACHE_H |
| 5 | #define __ARCH_I386_CACHE_H | 5 | #define __ARCH_I386_CACHE_H |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | /* L1 cache line size */ | 8 | /* L1 cache line size */ |
| 10 | #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) | 9 | #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) |
diff --git a/include/asm-i386/dma.h b/include/asm-i386/dma.h index f24b2bba2831..d23aac8e1a50 100644 --- a/include/asm-i386/dma.h +++ b/include/asm-i386/dma.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_DMA_H | 8 | #ifndef _ASM_DMA_H |
| 9 | #define _ASM_DMA_H | 9 | #define _ASM_DMA_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/spinlock.h> /* And spinlocks */ | 11 | #include <linux/spinlock.h> /* And spinlocks */ |
| 13 | #include <asm/io.h> /* need byte IO */ | 12 | #include <asm/io.h> /* need byte IO */ |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
diff --git a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h index cfb1c61d3b9c..f7e068f4d2f9 100644 --- a/include/asm-i386/fixmap.h +++ b/include/asm-i386/fixmap.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ASM_FIXMAP_H | 13 | #ifndef _ASM_FIXMAP_H |
| 14 | #define _ASM_FIXMAP_H | 14 | #define _ASM_FIXMAP_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | /* used by vmalloc.c, vsyscall.lds.S. | 17 | /* used by vmalloc.c, vsyscall.lds.S. |
| 19 | * | 18 | * |
diff --git a/include/asm-i386/hardirq.h b/include/asm-i386/hardirq.h index ee754d359734..0e358dc405f8 100644 --- a/include/asm-i386/hardirq.h +++ b/include/asm-i386/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_HARDIRQ_H | 1 | #ifndef __ASM_HARDIRQ_H |
| 2 | #define __ASM_HARDIRQ_H | 2 | #define __ASM_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
| 7 | 6 | ||
diff --git a/include/asm-i386/highmem.h b/include/asm-i386/highmem.h index 0fd331306b60..e9a34ebc25d5 100644 --- a/include/asm-i386/highmem.h +++ b/include/asm-i386/highmem.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #ifdef __KERNEL__ | 21 | #ifdef __KERNEL__ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/threads.h> | 24 | #include <linux/threads.h> |
| 26 | #include <asm/kmap_types.h> | 25 | #include <asm/kmap_types.h> |
diff --git a/include/asm-i386/hpet.h b/include/asm-i386/hpet.h index 7f1a8a6ee32f..af5d435519d1 100644 --- a/include/asm-i386/hpet.h +++ b/include/asm-i386/hpet.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <asm/processor.h> | 27 | #include <asm/processor.h> |
| 28 | 28 | ||
| 29 | #include <linux/timex.h> | 29 | #include <linux/timex.h> |
| 30 | #include <linux/config.h> | ||
| 31 | 30 | ||
| 32 | #include <asm/fixmap.h> | 31 | #include <asm/fixmap.h> |
| 33 | 32 | ||
diff --git a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h index 622815bf3243..95d3fd090298 100644 --- a/include/asm-i386/hw_irq.h +++ b/include/asm-i386/hw_irq.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * <tomsoft@informatik.tu-chemnitz.de> | 12 | * <tomsoft@informatik.tu-chemnitz.de> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/profile.h> | 15 | #include <linux/profile.h> |
| 17 | #include <asm/atomic.h> | 16 | #include <asm/atomic.h> |
| 18 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h index 454440193eac..73465d2892b9 100644 --- a/include/asm-i386/ide.h +++ b/include/asm-i386/ide.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #ifndef MAX_HWIFS | 17 | #ifndef MAX_HWIFS |
| 19 | # ifdef CONFIG_BLK_DEV_IDEPCI | 18 | # ifdef CONFIG_BLK_DEV_IDEPCI |
diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h index 79670bb4b0c7..b3724fe93ff1 100644 --- a/include/asm-i386/io.h +++ b/include/asm-i386/io.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_IO_H | 1 | #ifndef _ASM_IO_H |
| 2 | #define _ASM_IO_H | 2 | #define _ASM_IO_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/string.h> | 4 | #include <linux/string.h> |
| 6 | #include <linux/compiler.h> | 5 | #include <linux/compiler.h> |
| 7 | 6 | ||
diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h index d92e253f7f6f..5092e819b8a2 100644 --- a/include/asm-i386/io_apic.h +++ b/include/asm-i386/io_apic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_IO_APIC_H | 1 | #ifndef __ASM_IO_APIC_H |
| 2 | #define __ASM_IO_APIC_H | 2 | #define __ASM_IO_APIC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| 6 | #include <asm/mpspec.h> | 5 | #include <asm/mpspec.h> |
| 7 | 6 | ||
diff --git a/include/asm-i386/irq.h b/include/asm-i386/irq.h index 5169d7af456f..331726b41128 100644 --- a/include/asm-i386/irq.h +++ b/include/asm-i386/irq.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * <tomsoft@informatik.tu-chemnitz.de> | 10 | * <tomsoft@informatik.tu-chemnitz.de> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | /* include comes from machine specific directory */ | 14 | /* include comes from machine specific directory */ |
| 16 | #include "irq_vectors.h" | 15 | #include "irq_vectors.h" |
diff --git a/include/asm-i386/kmap_types.h b/include/asm-i386/kmap_types.h index 6886a0c3fedf..806aae3c5338 100644 --- a/include/asm-i386/kmap_types.h +++ b/include/asm-i386/kmap_types.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_KMAP_TYPES_H | 1 | #ifndef _ASM_KMAP_TYPES_H |
| 2 | #define _ASM_KMAP_TYPES_H | 2 | #define _ASM_KMAP_TYPES_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_DEBUG_HIGHMEM | 5 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 7 | # define D(n) __KM_FENCE_##n , | 6 | # define D(n) __KM_FENCE_##n , |
diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h index 3d6d12937e1f..9fd073286289 100644 --- a/include/asm-i386/mach-summit/mach_apic.h +++ b/include/asm-i386/mach-summit/mach_apic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_MACH_APIC_H | 1 | #ifndef __ASM_MACH_APIC_H |
| 2 | #define __ASM_MACH_APIC_H | 2 | #define __ASM_MACH_APIC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/smp.h> | 4 | #include <asm/smp.h> |
| 6 | 5 | ||
| 7 | #define esr_disable (1) | 6 | #define esr_disable (1) |
diff --git a/include/asm-i386/mmu_context.h b/include/asm-i386/mmu_context.h index bf08218357ea..62b7bf184094 100644 --- a/include/asm-i386/mmu_context.h +++ b/include/asm-i386/mmu_context.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __I386_SCHED_H | 1 | #ifndef __I386_SCHED_H |
| 2 | #define __I386_SCHED_H | 2 | #define __I386_SCHED_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/desc.h> | 4 | #include <asm/desc.h> |
| 6 | #include <asm/atomic.h> | 5 | #include <asm/atomic.h> |
| 7 | #include <asm/pgalloc.h> | 6 | #include <asm/pgalloc.h> |
diff --git a/include/asm-i386/mtrr.h b/include/asm-i386/mtrr.h index 64cf937c7e33..5a46de08efea 100644 --- a/include/asm-i386/mtrr.h +++ b/include/asm-i386/mtrr.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #ifndef _LINUX_MTRR_H | 23 | #ifndef _LINUX_MTRR_H |
| 24 | #define _LINUX_MTRR_H | 24 | #define _LINUX_MTRR_H |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | 28 | ||
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h index 30f52a2263ba..e3a552fa5538 100644 --- a/include/asm-i386/page.h +++ b/include/asm-i386/page.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #ifdef CONFIG_X86_USE_3DNOW | 16 | #ifdef CONFIG_X86_USE_3DNOW |
| 18 | 17 | ||
| @@ -137,9 +136,9 @@ extern int page_is_ram(unsigned long pagenr); | |||
| 137 | ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ | 136 | ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ |
| 138 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 137 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 139 | 138 | ||
| 140 | #endif /* __KERNEL__ */ | ||
| 141 | |||
| 142 | #include <asm-generic/memory_model.h> | 139 | #include <asm-generic/memory_model.h> |
| 143 | #include <asm-generic/page.h> | 140 | #include <asm-generic/page.h> |
| 144 | 141 | ||
| 142 | #endif /* __KERNEL__ */ | ||
| 143 | |||
| 145 | #endif /* _I386_PAGE_H */ | 144 | #endif /* _I386_PAGE_H */ |
diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h index 095580f3a45c..745dc5bd0fbc 100644 --- a/include/asm-i386/param.h +++ b/include/asm-i386/param.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASMi386_PARAM_H | 2 | #define _ASMi386_PARAM_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | # include <linux/config.h> | ||
| 6 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | 5 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
| 7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 6 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
| 8 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | 7 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h index 78c85985aee3..64b6d0baedbc 100644 --- a/include/asm-i386/pci.h +++ b/include/asm-i386/pci.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __i386_PCI_H | 1 | #ifndef __i386_PCI_H |
| 2 | #define __i386_PCI_H | 2 | #define __i386_PCI_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 7 | #include <linux/mm.h> /* for struct page */ | 6 | #include <linux/mm.h> /* for struct page */ |
diff --git a/include/asm-i386/pgalloc.h b/include/asm-i386/pgalloc.h index 0380c3dc1f7e..4b1e61359f89 100644 --- a/include/asm-i386/pgalloc.h +++ b/include/asm-i386/pgalloc.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _I386_PGALLOC_H | 1 | #ifndef _I386_PGALLOC_H |
| 2 | #define _I386_PGALLOC_H | 2 | #define _I386_PGALLOC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/fixmap.h> | 4 | #include <asm/fixmap.h> |
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <linux/mm.h> /* for struct page */ | 6 | #include <linux/mm.h> /* for struct page */ |
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h index 672c3f76b9df..09697fec3d2b 100644 --- a/include/asm-i386/pgtable.h +++ b/include/asm-i386/pgtable.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _I386_PGTABLE_H | 1 | #ifndef _I386_PGTABLE_H |
| 2 | #define _I386_PGTABLE_H | 2 | #define _I386_PGTABLE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * The Linux memory management assumes a three-level page table setup. On | 6 | * The Linux memory management assumes a three-level page table setup. On |
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index 805f0dcda468..4df3818e4122 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/msr.h> | 17 | #include <asm/msr.h> |
| 18 | #include <asm/system.h> | 18 | #include <asm/system.h> |
| 19 | #include <linux/cache.h> | 19 | #include <linux/cache.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/threads.h> | 20 | #include <linux/threads.h> |
| 22 | #include <asm/percpu.h> | 21 | #include <asm/percpu.h> |
| 23 | #include <linux/cpumask.h> | 22 | #include <linux/cpumask.h> |
diff --git a/include/asm-i386/serial.h b/include/asm-i386/serial.h index e1ecfccb743b..bd67480ca109 100644 --- a/include/asm-i386/serial.h +++ b/include/asm-i386/serial.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * include/asm-i386/serial.h | 2 | * include/asm-i386/serial.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | /* | 6 | /* |
| 8 | * This assumes you have a 1.8432 MHz clock for your UART. | 7 | * This assumes you have a 1.8432 MHz clock for your UART. |
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index 61d3ab9db70c..142d10e34ade 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * We need the APIC definitions automatically as part of 'smp.h' | 5 | * We need the APIC definitions automatically as part of 'smp.h' |
| 6 | */ | 6 | */ |
| 7 | #ifndef __ASSEMBLY__ | 7 | #ifndef __ASSEMBLY__ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/threads.h> | 9 | #include <linux/threads.h> |
| 11 | #include <linux/cpumask.h> | 10 | #include <linux/cpumask.h> |
diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h index d76b7693cf1d..04ba30234c48 100644 --- a/include/asm-i386/spinlock.h +++ b/include/asm-i386/spinlock.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <asm/atomic.h> | 4 | #include <asm/atomic.h> |
| 5 | #include <asm/rwlock.h> | 5 | #include <asm/rwlock.h> |
| 6 | #include <asm/page.h> | 6 | #include <asm/page.h> |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/compiler.h> | 7 | #include <linux/compiler.h> |
| 9 | 8 | ||
| 10 | /* | 9 | /* |
diff --git a/include/asm-i386/string.h b/include/asm-i386/string.h index bb5f88a27f7a..b9277361954b 100644 --- a/include/asm-i386/string.h +++ b/include/asm-i386/string.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _I386_STRING_H_ | 2 | #define _I386_STRING_H_ |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | #include <linux/config.h> | ||
| 6 | /* | 5 | /* |
| 7 | * On a 486 or Pentium, we are better off not using the | 6 | * On a 486 or Pentium, we are better off not using the |
| 8 | * byte string operations. But on a 386 or a PPro the | 7 | * byte string operations. But on a 386 or a PPro the |
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h index 19cc79c9a35d..0249f912a29c 100644 --- a/include/asm-i386/system.h +++ b/include/asm-i386/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SYSTEM_H | 1 | #ifndef __ASM_SYSTEM_H |
| 2 | #define __ASM_SYSTEM_H | 2 | #define __ASM_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 6 | #include <asm/segment.h> | 5 | #include <asm/segment.h> |
| 7 | #include <asm/cpufeature.h> | 6 | #include <asm/cpufeature.h> |
diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h index 1f7d48c9ba3f..8420ed12491e 100644 --- a/include/asm-i386/thread_info.h +++ b/include/asm-i386/thread_info.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #ifdef __KERNEL__ | 10 | #ifdef __KERNEL__ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/compiler.h> | 12 | #include <linux/compiler.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 15 | 14 | ||
diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h index 292b5a68f627..d434984303ca 100644 --- a/include/asm-i386/timex.h +++ b/include/asm-i386/timex.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _ASMi386_TIMEX_H | 6 | #ifndef _ASMi386_TIMEX_H |
| 7 | #define _ASMi386_TIMEX_H | 7 | #define _ASMi386_TIMEX_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/processor.h> | 9 | #include <asm/processor.h> |
| 11 | 10 | ||
| 12 | #ifdef CONFIG_X86_ELAN | 11 | #ifdef CONFIG_X86_ELAN |
diff --git a/include/asm-i386/tlbflush.h b/include/asm-i386/tlbflush.h index ab216e1370ef..d57ca5c540b6 100644 --- a/include/asm-i386/tlbflush.h +++ b/include/asm-i386/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _I386_TLBFLUSH_H | 1 | #ifndef _I386_TLBFLUSH_H |
| 2 | #define _I386_TLBFLUSH_H | 2 | #define _I386_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
| 7 | 6 | ||
diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h index e50a08bd7ced..4b4b295ccdb9 100644 --- a/include/asm-i386/types.h +++ b/include/asm-i386/types.h | |||
| @@ -35,7 +35,6 @@ typedef unsigned long long __u64; | |||
| 35 | 35 | ||
| 36 | #ifndef __ASSEMBLY__ | 36 | #ifndef __ASSEMBLY__ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | 38 | ||
| 40 | typedef signed char s8; | 39 | typedef signed char s8; |
| 41 | typedef unsigned char u8; | 40 | typedef unsigned char u8; |
diff --git a/include/asm-i386/uaccess.h b/include/asm-i386/uaccess.h index 371457b1ceb6..1ec65523ea5e 100644 --- a/include/asm-i386/uaccess.h +++ b/include/asm-i386/uaccess.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | /* | 4 | /* |
| 5 | * User space memory access functions | 5 | * User space memory access functions |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
| 9 | #include <linux/thread_info.h> | 8 | #include <linux/thread_info.h> |
| 10 | #include <linux/prefetch.h> | 9 | #include <linux/prefetch.h> |
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index eb4b152c82fc..de2ccc149e34 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h | |||
| @@ -323,6 +323,8 @@ | |||
| 323 | #define __NR_tee 315 | 323 | #define __NR_tee 315 |
| 324 | #define __NR_vmsplice 316 | 324 | #define __NR_vmsplice 316 |
| 325 | 325 | ||
| 326 | #ifdef __KERNEL__ | ||
| 327 | |||
| 326 | #define NR_syscalls 317 | 328 | #define NR_syscalls 317 |
| 327 | 329 | ||
| 328 | /* | 330 | /* |
| @@ -422,7 +424,6 @@ __asm__ volatile ("push %%ebp ; push %%ebx ; movl 4(%2),%%ebp ; " \ | |||
| 422 | __syscall_return(type,__res); \ | 424 | __syscall_return(type,__res); \ |
| 423 | } | 425 | } |
| 424 | 426 | ||
| 425 | #ifdef __KERNEL__ | ||
| 426 | #define __ARCH_WANT_IPC_PARSE_VERSION | 427 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 427 | #define __ARCH_WANT_OLD_READDIR | 428 | #define __ARCH_WANT_OLD_READDIR |
| 428 | #define __ARCH_WANT_OLD_STAT | 429 | #define __ARCH_WANT_OLD_STAT |
| @@ -446,7 +447,6 @@ __syscall_return(type,__res); \ | |||
| 446 | #define __ARCH_WANT_SYS_SIGPROCMASK | 447 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 447 | #define __ARCH_WANT_SYS_RT_SIGACTION | 448 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 448 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 449 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
| 449 | #endif | ||
| 450 | 450 | ||
| 451 | #ifdef __KERNEL_SYSCALLS__ | 451 | #ifdef __KERNEL_SYSCALLS__ |
| 452 | 452 | ||
| @@ -485,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 485 | struct sigaction __user *oact, | 485 | struct sigaction __user *oact, |
| 486 | size_t sigsetsize); | 486 | size_t sigsetsize); |
| 487 | 487 | ||
| 488 | #endif | 488 | #endif /* __KERNEL_SYSCALLS__ */ |
| 489 | 489 | ||
| 490 | /* | 490 | /* |
| 491 | * "Conditional" syscalls | 491 | * "Conditional" syscalls |
| @@ -497,4 +497,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 497 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 497 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 498 | #endif | 498 | #endif |
| 499 | 499 | ||
| 500 | #endif /* __KERNEL__ */ | ||
| 500 | #endif /* _ASM_I386_UNISTD_H_ */ | 501 | #endif /* _ASM_I386_UNISTD_H_ */ |
diff --git a/include/asm-ia64/asmmacro.h b/include/asm-ia64/asmmacro.h index edf2cebb2969..c22b4658fc61 100644 --- a/include/asm-ia64/asmmacro.h +++ b/include/asm-ia64/asmmacro.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #define ENTRY(name) \ | 10 | #define ENTRY(name) \ |
| 12 | .align 32; \ | 11 | .align 32; \ |
diff --git a/include/asm-ia64/cache.h b/include/asm-ia64/cache.h index f0a104db8f20..e7482bd628ff 100644 --- a/include/asm-ia64/cache.h +++ b/include/asm-ia64/cache.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_IA64_CACHE_H | 1 | #ifndef _ASM_IA64_CACHE_H |
| 2 | #define _ASM_IA64_CACHE_H | 2 | #define _ASM_IA64_CACHE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Copyright (C) 1998-2000 Hewlett-Packard Co | 6 | * Copyright (C) 1998-2000 Hewlett-Packard Co |
diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h index bba702076391..a30a62f235e1 100644 --- a/include/asm-ia64/delay.h +++ b/include/asm-ia64/delay.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> | 12 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 18 | #include <linux/compiler.h> | 17 | #include <linux/compiler.h> |
diff --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h index df67d40801de..99a8f8e1218c 100644 --- a/include/asm-ia64/dma-mapping.h +++ b/include/asm-ia64/dma-mapping.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2003-2004 Hewlett-Packard Co | 5 | * Copyright (C) 2003-2004 Hewlett-Packard Co |
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/machvec.h> | 8 | #include <asm/machvec.h> |
| 10 | 9 | ||
| 11 | #define dma_alloc_coherent platform_dma_alloc_coherent | 10 | #define dma_alloc_coherent platform_dma_alloc_coherent |
diff --git a/include/asm-ia64/dma.h b/include/asm-ia64/dma.h index 3be1b4925e18..dad3a735df8b 100644 --- a/include/asm-ia64/dma.h +++ b/include/asm-ia64/dma.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #include <asm/io.h> /* need byte IO */ | 10 | #include <asm/io.h> /* need byte IO */ |
| 12 | 11 | ||
diff --git a/include/asm-ia64/elf.h b/include/asm-ia64/elf.h index 446fce036fd9..25f9835d5459 100644 --- a/include/asm-ia64/elf.h +++ b/include/asm-ia64/elf.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * David Mosberger-Tang <davidm@hpl.hp.com> | 8 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <asm/fpu.h> | 12 | #include <asm/fpu.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
diff --git a/include/asm-ia64/hardirq.h b/include/asm-ia64/hardirq.h index 33ef8f096d95..140e495b8e0e 100644 --- a/include/asm-ia64/hardirq.h +++ b/include/asm-ia64/hardirq.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #include <linux/threads.h> | 10 | #include <linux/threads.h> |
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h index f8044a1169cd..5ff8d74c3e00 100644 --- a/include/asm-ia64/ia32.h +++ b/include/asm-ia64/ia32.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_IA64_IA32_H | 1 | #ifndef _ASM_IA64_IA32_H |
| 2 | #define _ASM_IA64_IA32_H | 2 | #define _ASM_IA64_IA32_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include <asm/ptrace.h> | 5 | #include <asm/ptrace.h> |
| 7 | #include <asm/signal.h> | 6 | #include <asm/signal.h> |
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h index 93f45c5f189f..e928675de352 100644 --- a/include/asm-ia64/ide.h +++ b/include/asm-ia64/ide.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
| 19 | 18 | ||
diff --git a/include/asm-ia64/intrinsics.h b/include/asm-ia64/intrinsics.h index 8089f955e5d2..3a95aa432e99 100644 --- a/include/asm-ia64/intrinsics.h +++ b/include/asm-ia64/intrinsics.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* include compiler specific intrinsics */ | 13 | /* include compiler specific intrinsics */ |
| 15 | #include <asm/ia64regs.h> | 14 | #include <asm/ia64regs.h> |
diff --git a/include/asm-ia64/kmap_types.h b/include/asm-ia64/kmap_types.h index bc777525fa12..5d1658aa2b3b 100644 --- a/include/asm-ia64/kmap_types.h +++ b/include/asm-ia64/kmap_types.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_IA64_KMAP_TYPES_H | 1 | #ifndef _ASM_IA64_KMAP_TYPES_H |
| 2 | #define _ASM_IA64_KMAP_TYPES_H | 2 | #define _ASM_IA64_KMAP_TYPES_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_DEBUG_HIGHMEM | 5 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 7 | # define D(n) __KM_FENCE_##n , | 6 | # define D(n) __KM_FENCE_##n , |
diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h index a9c995a86c21..0df72a134c8b 100644 --- a/include/asm-ia64/machvec.h +++ b/include/asm-ia64/machvec.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_IA64_MACHVEC_H | 10 | #ifndef _ASM_IA64_MACHVEC_H |
| 11 | #define _ASM_IA64_MACHVEC_H | 11 | #define _ASM_IA64_MACHVEC_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | 14 | ||
| 16 | /* forward declarations: */ | 15 | /* forward declarations: */ |
diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h index 46501b01a5c5..894bc4d89dc0 100644 --- a/include/asm-ia64/meminit.h +++ b/include/asm-ia64/meminit.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * for more details. | 7 | * for more details. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | /* | 11 | /* |
| 13 | * Entries defined so far: | 12 | * Entries defined so far: |
diff --git a/include/asm-ia64/nodedata.h b/include/asm-ia64/nodedata.h index 9978c7ce7549..a140310bf84d 100644 --- a/include/asm-ia64/nodedata.h +++ b/include/asm-ia64/nodedata.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_IA64_NODEDATA_H | 11 | #ifndef _ASM_IA64_NODEDATA_H |
| 12 | #define _ASM_IA64_NODEDATA_H | 12 | #define _ASM_IA64_NODEDATA_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/numa.h> | 14 | #include <linux/numa.h> |
| 16 | 15 | ||
| 17 | #include <asm/percpu.h> | 16 | #include <asm/percpu.h> |
diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h index dae6aeb7b119..e5a8260593a5 100644 --- a/include/asm-ia64/numa.h +++ b/include/asm-ia64/numa.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_IA64_NUMA_H | 11 | #ifndef _ASM_IA64_NUMA_H |
| 12 | #define _ASM_IA64_NUMA_H | 12 | #define _ASM_IA64_NUMA_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #ifdef CONFIG_NUMA | 15 | #ifdef CONFIG_NUMA |
| 17 | 16 | ||
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 2087825eefa4..f5a949ec6e1e 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * David Mosberger-Tang <davidm@hpl.hp.com> | 7 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/intrinsics.h> | 11 | #include <asm/intrinsics.h> |
| 13 | #include <asm/types.h> | 12 | #include <asm/types.h> |
diff --git a/include/asm-ia64/param.h b/include/asm-ia64/param.h index 5e1e0d2d7baf..49c62dd5eccf 100644 --- a/include/asm-ia64/param.h +++ b/include/asm-ia64/param.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | 19 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ |
| 20 | 20 | ||
| 21 | #ifdef __KERNEL__ | 21 | #ifdef __KERNEL__ |
| 22 | # include <linux/config.h> /* mustn't include <linux/config.h> outside of #ifdef __KERNEL__ */ | ||
| 23 | # ifdef CONFIG_IA64_HP_SIM | 22 | # ifdef CONFIG_IA64_HP_SIM |
| 24 | /* | 23 | /* |
| 25 | * Yeah, simulating stuff is slow, so let us catch some breath between | 24 | * Yeah, simulating stuff is slow, so let us catch some breath between |
diff --git a/include/asm-ia64/percpu.h b/include/asm-ia64/percpu.h index 2b14dee29ce7..ae357d504fba 100644 --- a/include/asm-ia64/percpu.h +++ b/include/asm-ia64/percpu.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | # define THIS_CPU(var) (per_cpu__##var) /* use this to mark accesses to per-CPU variables... */ | 12 | # define THIS_CPU(var) (per_cpu__##var) /* use this to mark accesses to per-CPU variables... */ |
| 13 | #else /* !__ASSEMBLY__ */ | 13 | #else /* !__ASSEMBLY__ */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
| 18 | 17 | ||
diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h index f2f233846476..9cb68e9b377e 100644 --- a/include/asm-ia64/pgalloc.h +++ b/include/asm-ia64/pgalloc.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Copyright (C) 2000, Goutham Rao <goutham.rao@intel.com> | 13 | * Copyright (C) 2000, Goutham Rao <goutham.rao@intel.com> |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #include <linux/compiler.h> | 17 | #include <linux/compiler.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h index c0f8144f2349..eaac08d5e0bd 100644 --- a/include/asm-ia64/pgtable.h +++ b/include/asm-ia64/pgtable.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * David Mosberger-Tang <davidm@hpl.hp.com> | 12 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #include <asm/mman.h> | 16 | #include <asm/mman.h> |
| 18 | #include <asm/page.h> | 17 | #include <asm/page.h> |
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h index b3bd58e80690..265f4824db0e 100644 --- a/include/asm-ia64/processor.h +++ b/include/asm-ia64/processor.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 06/16/00 A. Mallick added csd/ssd/tssd for ia32 support | 13 | * 06/16/00 A. Mallick added csd/ssd/tssd for ia32 support |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #include <asm/intrinsics.h> | 17 | #include <asm/intrinsics.h> |
| 19 | #include <asm/kregs.h> | 18 | #include <asm/kregs.h> |
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h index 9471cdc3f4c0..415abb23b210 100644 --- a/include/asm-ia64/ptrace.h +++ b/include/asm-ia64/ptrace.h | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | * This is because ar.ec is saved as part of ar.pfs. | 54 | * This is because ar.ec is saved as part of ar.pfs. |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | 57 | ||
| 59 | #include <asm/fpu.h> | 58 | #include <asm/fpu.h> |
| 60 | #ifndef ASM_OFFSETS_C | 59 | #ifndef ASM_OFFSETS_C |
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h index a3914352c995..719ff309ce09 100644 --- a/include/asm-ia64/smp.h +++ b/include/asm-ia64/smp.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_IA64_SMP_H | 10 | #ifndef _ASM_IA64_SMP_H |
| 11 | #define _ASM_IA64_SMP_H | 11 | #define _ASM_IA64_SMP_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/threads.h> | 14 | #include <linux/threads.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/include/asm-ia64/sn/simulator.h b/include/asm-ia64/sn/simulator.h index 16a48b5a039c..c3fd3eb25768 100644 --- a/include/asm-ia64/sn/simulator.h +++ b/include/asm-ia64/sn/simulator.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_IA64_SN_SIMULATOR_H | 8 | #ifndef _ASM_IA64_SN_SIMULATOR_H |
| 9 | #define _ASM_IA64_SN_SIMULATOR_H | 9 | #define _ASM_IA64_SN_SIMULATOR_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #define SNMAGIC 0xaeeeeeee8badbeefL | 12 | #define SNMAGIC 0xaeeeeeee8badbeefL |
| 14 | #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) | 13 | #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) |
diff --git a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h index 749deb2ca6c1..a676dd9ace3e 100644 --- a/include/asm-ia64/sn/sn_cpuid.h +++ b/include/asm-ia64/sn/sn_cpuid.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_IA64_SN_SN_CPUID_H | 11 | #ifndef _ASM_IA64_SN_SN_CPUID_H |
| 12 | #define _ASM_IA64_SN_SN_CPUID_H | 12 | #define _ASM_IA64_SN_SN_CPUID_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
| 16 | #include <asm/sn/addrs.h> | 15 | #include <asm/sn/addrs.h> |
| 17 | #include <asm/sn/pda.h> | 16 | #include <asm/sn/pda.h> |
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h index 51aca022cf39..8c865e43f609 100644 --- a/include/asm-ia64/sn/sn_sal.h +++ b/include/asm-ia64/sn/sn_sal.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/sal.h> | 15 | #include <asm/sal.h> |
| 17 | #include <asm/sn/sn_cpuid.h> | 16 | #include <asm/sn/sn_cpuid.h> |
| 18 | #include <asm/sn/arch.h> | 17 | #include <asm/sn/arch.h> |
diff --git a/include/asm-ia64/sn/xpc.h b/include/asm-ia64/sn/xpc.h index aa3b8ace9030..8406f1ef4caf 100644 --- a/include/asm-ia64/sn/xpc.h +++ b/include/asm-ia64/sn/xpc.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #define _ASM_IA64_SN_XPC_H | 15 | #define _ASM_IA64_SN_XPC_H |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 20 | #include <linux/sysctl.h> | 19 | #include <linux/sysctl.h> |
| 21 | #include <linux/device.h> | 20 | #include <linux/device.h> |
diff --git a/include/asm-ia64/string.h b/include/asm-ia64/string.h index 43502d3b57e5..85fd65c52a8c 100644 --- a/include/asm-ia64/string.h +++ b/include/asm-ia64/string.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * David Mosberger-Tang <davidm@hpl.hp.com> | 9 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> /* remove this once we remove the A-step workaround... */ | ||
| 13 | 12 | ||
| 14 | #define __HAVE_ARCH_STRLEN 1 /* see arch/ia64/lib/strlen.S */ | 13 | #define __HAVE_ARCH_STRLEN 1 /* see arch/ia64/lib/strlen.S */ |
| 15 | #define __HAVE_ARCH_MEMSET 1 /* see arch/ia64/lib/memset.S */ | 14 | #define __HAVE_ARCH_MEMSET 1 /* see arch/ia64/lib/memset.S */ |
diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h index 2f3620593687..65db43ce4de6 100644 --- a/include/asm-ia64/system.h +++ b/include/asm-ia64/system.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 1999 Asit Mallick <asit.k.mallick@intel.com> | 12 | * Copyright (C) 1999 Asit Mallick <asit.k.mallick@intel.com> |
| 13 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> | 13 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #include <asm/kregs.h> | 16 | #include <asm/kregs.h> |
| 18 | #include <asm/page.h> | 17 | #include <asm/page.h> |
diff --git a/include/asm-ia64/tlb.h b/include/asm-ia64/tlb.h index 834370b9dea1..26edcb750f9f 100644 --- a/include/asm-ia64/tlb.h +++ b/include/asm-ia64/tlb.h | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * } | 37 | * } |
| 38 | * tlb_finish_mmu(tlb, start, end); // finish unmap for address space MM | 38 | * tlb_finish_mmu(tlb, start, end); // finish unmap for address space MM |
| 39 | */ | 39 | */ |
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/mm.h> | 40 | #include <linux/mm.h> |
| 42 | #include <linux/pagemap.h> | 41 | #include <linux/pagemap.h> |
| 43 | #include <linux/swap.h> | 42 | #include <linux/swap.h> |
diff --git a/include/asm-ia64/tlbflush.h b/include/asm-ia64/tlbflush.h index a35b323bae4c..cf9acb9bb1fb 100644 --- a/include/asm-ia64/tlbflush.h +++ b/include/asm-ia64/tlbflush.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 12 | 11 | ||
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 7107763168bf..632f2eedf72c 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -294,7 +294,6 @@ | |||
| 294 | 294 | ||
| 295 | #ifdef __KERNEL__ | 295 | #ifdef __KERNEL__ |
| 296 | 296 | ||
| 297 | #include <linux/config.h> | ||
| 298 | 297 | ||
| 299 | #define NR_syscalls 279 /* length of syscall table */ | 298 | #define NR_syscalls 279 /* length of syscall table */ |
| 300 | 299 | ||
diff --git a/include/asm-m32r/assembler.h b/include/asm-m32r/assembler.h index 1a1aa17edd33..47041d19d4a8 100644 --- a/include/asm-m32r/assembler.h +++ b/include/asm-m32r/assembler.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * This file contains M32R architecture specific macro definitions. | 9 | * This file contains M32R architecture specific macro definitions. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #ifndef __STR | 13 | #ifndef __STR |
| 15 | #ifdef __ASSEMBLY__ | 14 | #ifdef __ASSEMBLY__ |
diff --git a/include/asm-m32r/atomic.h b/include/asm-m32r/atomic.h index 3122fe106f05..f5a7d7301c72 100644 --- a/include/asm-m32r/atomic.h +++ b/include/asm-m32r/atomic.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org> | 9 | * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/assembler.h> | 12 | #include <asm/assembler.h> |
| 14 | #include <asm/system.h> | 13 | #include <asm/system.h> |
| 15 | 14 | ||
diff --git a/include/asm-m32r/bitops.h b/include/asm-m32r/bitops.h index 902a366101a5..66ab672162cd 100644 --- a/include/asm-m32r/bitops.h +++ b/include/asm-m32r/bitops.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org> | 11 | * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/compiler.h> | 14 | #include <linux/compiler.h> |
| 16 | #include <asm/assembler.h> | 15 | #include <asm/assembler.h> |
| 17 | #include <asm/system.h> | 16 | #include <asm/system.h> |
diff --git a/include/asm-m32r/cacheflush.h b/include/asm-m32r/cacheflush.h index e57427b6e249..8b261b49149e 100644 --- a/include/asm-m32r/cacheflush.h +++ b/include/asm-m32r/cacheflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_M32R_CACHEFLUSH_H | 1 | #ifndef _ASM_M32R_CACHEFLUSH_H |
| 2 | #define _ASM_M32R_CACHEFLUSH_H | 2 | #define _ASM_M32R_CACHEFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | 5 | ||
| 7 | extern void _flush_cache_all(void); | 6 | extern void _flush_cache_all(void); |
diff --git a/include/asm-m32r/hardirq.h b/include/asm-m32r/hardirq.h index 5da830ec1587..cb8aa762f235 100644 --- a/include/asm-m32r/hardirq.h +++ b/include/asm-m32r/hardirq.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef __ASM_HARDIRQ_H | 2 | #ifndef __ASM_HARDIRQ_H |
| 3 | #define __ASM_HARDIRQ_H | 3 | #define __ASM_HARDIRQ_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <linux/irq.h> | 6 | #include <linux/irq.h> |
| 8 | 7 | ||
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h index f7aa96970d18..219a0f74eff3 100644 --- a/include/asm-m32r/ide.h +++ b/include/asm-m32r/ide.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifndef MAX_HWIFS | 19 | #ifndef MAX_HWIFS |
| 21 | # ifdef CONFIG_BLK_DEV_IDEPCI | 20 | # ifdef CONFIG_BLK_DEV_IDEPCI |
diff --git a/include/asm-m32r/irq.h b/include/asm-m32r/irq.h index ca943954572a..2f93f4743add 100644 --- a/include/asm-m32r/irq.h +++ b/include/asm-m32r/irq.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _ASM_M32R_IRQ_H | 2 | #ifndef _ASM_M32R_IRQ_H |
| 3 | #define _ASM_M32R_IRQ_H | 3 | #define _ASM_M32R_IRQ_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_USRV) | 6 | #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_USRV) |
| 8 | /* | 7 | /* |
diff --git a/include/asm-m32r/kmap_types.h b/include/asm-m32r/kmap_types.h index 7429591010b6..0524d89edb0f 100644 --- a/include/asm-m32r/kmap_types.h +++ b/include/asm-m32r/kmap_types.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* Dummy header just to define km_type. */ | 4 | /* Dummy header just to define km_type. */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifdef CONFIG_DEBUG_HIGHMEM | 7 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 9 | # define D(n) __KM_FENCE_##n , | 8 | # define D(n) __KM_FENCE_##n , |
diff --git a/include/asm-m32r/m32104ut/m32104ut_pld.h b/include/asm-m32r/m32104ut/m32104ut_pld.h index a4eac20553df..6ba4ddf7dcf7 100644 --- a/include/asm-m32r/m32104ut/m32104ut_pld.h +++ b/include/asm-m32r/m32104ut/m32104ut_pld.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _M32104UT_M32104UT_PLD_H | 15 | #ifndef _M32104UT_M32104UT_PLD_H |
| 16 | #define _M32104UT_M32104UT_PLD_H | 16 | #define _M32104UT_M32104UT_PLD_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #if defined(CONFIG_PLAT_M32104UT) | 19 | #if defined(CONFIG_PLAT_M32104UT) |
| 21 | #define PLD_PLAT_BASE 0x02c00000 | 20 | #define PLD_PLAT_BASE 0x02c00000 |
diff --git a/include/asm-m32r/m32700ut/m32700ut_lan.h b/include/asm-m32r/m32700ut/m32700ut_lan.h index 50545ec9c42c..c050b19e8101 100644 --- a/include/asm-m32r/m32700ut/m32700ut_lan.h +++ b/include/asm-m32r/m32700ut/m32700ut_lan.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _M32700UT_M32700UT_LAN_H | 15 | #ifndef _M32700UT_M32700UT_LAN_H |
| 16 | #define _M32700UT_M32700UT_LAN_H | 16 | #define _M32700UT_M32700UT_LAN_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
| 21 | /* | 20 | /* |
diff --git a/include/asm-m32r/m32700ut/m32700ut_lcd.h b/include/asm-m32r/m32700ut/m32700ut_lcd.h index ede6c77bd5e6..4da4e822e2f3 100644 --- a/include/asm-m32r/m32700ut/m32700ut_lcd.h +++ b/include/asm-m32r/m32700ut/m32700ut_lcd.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _M32700UT_M32700UT_LCD_H | 15 | #ifndef _M32700UT_M32700UT_LCD_H |
| 16 | #define _M32700UT_M32700UT_LCD_H | 16 | #define _M32700UT_M32700UT_LCD_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
| 21 | /* | 20 | /* |
diff --git a/include/asm-m32r/m32700ut/m32700ut_pld.h b/include/asm-m32r/m32700ut/m32700ut_pld.h index f5e479486696..f35f9159acff 100644 --- a/include/asm-m32r/m32700ut/m32700ut_pld.h +++ b/include/asm-m32r/m32700ut/m32700ut_pld.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _M32700UT_M32700UT_PLD_H | 15 | #ifndef _M32700UT_M32700UT_PLD_H |
| 16 | #define _M32700UT_M32700UT_PLD_H | 16 | #define _M32700UT_M32700UT_PLD_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #if defined(CONFIG_PLAT_M32700UT_Alpha) | 19 | #if defined(CONFIG_PLAT_M32700UT_Alpha) |
| 21 | #define PLD_PLAT_BASE 0x08c00000 | 20 | #define PLD_PLAT_BASE 0x08c00000 |
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h index b133ca61acf1..decfc59907c7 100644 --- a/include/asm-m32r/m32r.h +++ b/include/asm-m32r/m32r.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 2003, 2004 Renesas Technology Corp. | 7 | * Copyright (C) 2003, 2004 Renesas Technology Corp. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | /* Chip type */ | 11 | /* Chip type */ |
| 13 | #if defined(CONFIG_CHIP_XNUX_MP) || defined(CONFIG_CHIP_XNUX2_MP) | 12 | #if defined(CONFIG_CHIP_XNUX_MP) || defined(CONFIG_CHIP_XNUX2_MP) |
diff --git a/include/asm-m32r/mmu.h b/include/asm-m32r/mmu.h index 9c00eb78ee50..cf3f6d78ac66 100644 --- a/include/asm-m32r/mmu.h +++ b/include/asm-m32r/mmu.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_M32R_MMU_H | 1 | #ifndef _ASM_M32R_MMU_H |
| 2 | #define _ASM_M32R_MMU_H | 2 | #define _ASM_M32R_MMU_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #if !defined(CONFIG_MMU) | 5 | #if !defined(CONFIG_MMU) |
| 7 | typedef struct { | 6 | typedef struct { |
diff --git a/include/asm-m32r/mmu_context.h b/include/asm-m32r/mmu_context.h index 3634c5361a9b..542302eb6bcb 100644 --- a/include/asm-m32r/mmu_context.h +++ b/include/asm-m32r/mmu_context.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #include <asm/m32r.h> | 7 | #include <asm/m32r.h> |
| 9 | 8 | ||
| @@ -15,7 +14,6 @@ | |||
| 15 | 14 | ||
| 16 | #ifndef __ASSEMBLY__ | 15 | #ifndef __ASSEMBLY__ |
| 17 | 16 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <asm/atomic.h> | 17 | #include <asm/atomic.h> |
| 20 | #include <asm/pgalloc.h> | 18 | #include <asm/pgalloc.h> |
| 21 | #include <asm/mmu.h> | 19 | #include <asm/mmu.h> |
diff --git a/include/asm-m32r/opsput/opsput_lan.h b/include/asm-m32r/opsput/opsput_lan.h index 7a2a839eedab..61948296f445 100644 --- a/include/asm-m32r/opsput/opsput_lan.h +++ b/include/asm-m32r/opsput/opsput_lan.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _OPSPUT_OPSPUT_LAN_H | 15 | #ifndef _OPSPUT_OPSPUT_LAN_H |
| 16 | #define _OPSPUT_OPSPUT_LAN_H | 16 | #define _OPSPUT_OPSPUT_LAN_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
| 21 | /* | 20 | /* |
diff --git a/include/asm-m32r/opsput/opsput_lcd.h b/include/asm-m32r/opsput/opsput_lcd.h index 3a883e3d7187..44cfd7fe2d88 100644 --- a/include/asm-m32r/opsput/opsput_lcd.h +++ b/include/asm-m32r/opsput/opsput_lcd.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _OPSPUT_OPSPUT_LCD_H | 15 | #ifndef _OPSPUT_OPSPUT_LCD_H |
| 16 | #define _OPSPUT_OPSPUT_LCD_H | 16 | #define _OPSPUT_OPSPUT_LCD_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
| 21 | /* | 20 | /* |
diff --git a/include/asm-m32r/opsput/opsput_pld.h b/include/asm-m32r/opsput/opsput_pld.h index 2018e6925035..46296fe1ec1a 100644 --- a/include/asm-m32r/opsput/opsput_pld.h +++ b/include/asm-m32r/opsput/opsput_pld.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _OPSPUT_OPSPUT_PLD_H | 15 | #ifndef _OPSPUT_OPSPUT_PLD_H |
| 16 | #define _OPSPUT_OPSPUT_PLD_H | 16 | #define _OPSPUT_OPSPUT_PLD_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #define PLD_PLAT_BASE 0x1cc00000 | 19 | #define PLD_PLAT_BASE 0x1cc00000 |
| 21 | 20 | ||
diff --git a/include/asm-m32r/page.h b/include/asm-m32r/page.h index 9ddbc087dbc5..9688be003620 100644 --- a/include/asm-m32r/page.h +++ b/include/asm-m32r/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_M32R_PAGE_H | 1 | #ifndef _ASM_M32R_PAGE_H |
| 2 | #define _ASM_M32R_PAGE_H | 2 | #define _ASM_M32R_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* PAGE_SHIFT determines the page size */ | 5 | /* PAGE_SHIFT determines the page size */ |
| 7 | #define PAGE_SHIFT 12 | 6 | #define PAGE_SHIFT 12 |
diff --git a/include/asm-m32r/pgalloc.h b/include/asm-m32r/pgalloc.h index 6da309b6fda7..e09a86c3cadf 100644 --- a/include/asm-m32r/pgalloc.h +++ b/include/asm-m32r/pgalloc.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* $Id$ */ | 4 | /* $Id$ */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/mm.h> | 6 | #include <linux/mm.h> |
| 8 | 7 | ||
| 9 | #include <asm/io.h> | 8 | #include <asm/io.h> |
diff --git a/include/asm-m32r/pgtable-2level.h b/include/asm-m32r/pgtable-2level.h index 861727c20e8f..be0f167e344a 100644 --- a/include/asm-m32r/pgtable-2level.h +++ b/include/asm-m32r/pgtable-2level.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | /* | 7 | /* |
| 9 | * traditional M32R two-level paging structure: | 8 | * traditional M32R two-level paging structure: |
diff --git a/include/asm-m32r/pgtable.h b/include/asm-m32r/pgtable.h index 75740debcd01..1983b7f4527a 100644 --- a/include/asm-m32r/pgtable.h +++ b/include/asm-m32r/pgtable.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #ifndef __ASSEMBLY__ | 21 | #ifndef __ASSEMBLY__ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/threads.h> | 23 | #include <linux/threads.h> |
| 25 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
| 26 | #include <asm/addrspace.h> | 25 | #include <asm/addrspace.h> |
diff --git a/include/asm-m32r/processor.h b/include/asm-m32r/processor.h index 09fd1813e780..32755bf136de 100644 --- a/include/asm-m32r/processor.h +++ b/include/asm-m32r/processor.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/cache.h> | 17 | #include <asm/cache.h> |
| 19 | #include <asm/ptrace.h> /* pt_regs */ | 18 | #include <asm/ptrace.h> /* pt_regs */ |
| 20 | 19 | ||
diff --git a/include/asm-m32r/ptrace.h b/include/asm-m32r/ptrace.h index 53c792452dfc..a07fa90314d2 100644 --- a/include/asm-m32r/ptrace.h +++ b/include/asm-m32r/ptrace.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 2001-2002, 2004 Hirokazu Takata <takata at linux-m32r.org> | 12 | * Copyright (C) 2001-2002, 2004 Hirokazu Takata <takata at linux-m32r.org> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */ | 15 | #include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */ |
| 17 | 16 | ||
| 18 | /* 0 - 13 are integer registers (general purpose registers). */ | 17 | /* 0 - 13 are integer registers (general purpose registers). */ |
diff --git a/include/asm-m32r/rtc.h b/include/asm-m32r/rtc.h index ec3cdf666c68..6b2b837c5978 100644 --- a/include/asm-m32r/rtc.h +++ b/include/asm-m32r/rtc.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #define __RTC_H__ | 4 | #define __RTC_H__ |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | /* Dallas DS1302 clock/calendar register numbers. */ | 8 | /* Dallas DS1302 clock/calendar register numbers. */ |
| 10 | # define RTC_SECONDS 0 | 9 | # define RTC_SECONDS 0 |
diff --git a/include/asm-m32r/semaphore.h b/include/asm-m32r/semaphore.h index 81750edc8916..41e45d7b87ef 100644 --- a/include/asm-m32r/semaphore.h +++ b/include/asm-m32r/semaphore.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 2004, 2006 Hirokazu Takata <takata at linux-m32r.org> | 12 | * Copyright (C) 2004, 2006 Hirokazu Takata <takata at linux-m32r.org> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
| 17 | #include <linux/rwsem.h> | 16 | #include <linux/rwsem.h> |
| 18 | #include <asm/assembler.h> | 17 | #include <asm/assembler.h> |
diff --git a/include/asm-m32r/serial.h b/include/asm-m32r/serial.h index 1bf480f58493..5ac244c72f15 100644 --- a/include/asm-m32r/serial.h +++ b/include/asm-m32r/serial.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* include/asm-m32r/serial.h */ | 4 | /* include/asm-m32r/serial.h */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #define BASE_BAUD 115200 | 7 | #define BASE_BAUD 115200 |
| 9 | 8 | ||
diff --git a/include/asm-m32r/sigcontext.h b/include/asm-m32r/sigcontext.h index 942b8a30937d..73025c0c41a1 100644 --- a/include/asm-m32r/sigcontext.h +++ b/include/asm-m32r/sigcontext.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* $Id$ */ | 4 | /* $Id$ */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | struct sigcontext { | 7 | struct sigcontext { |
| 9 | /* CPU registers */ | 8 | /* CPU registers */ |
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h index 1184293e5712..650d2558c304 100644 --- a/include/asm-m32r/smp.h +++ b/include/asm-m32r/smp.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* $Id$ */ | 4 | /* $Id$ */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifdef CONFIG_SMP | 7 | #ifdef CONFIG_SMP |
| 9 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-m32r/spinlock.h b/include/asm-m32r/spinlock.h index 7de7def28da9..f94c1a673569 100644 --- a/include/asm-m32r/spinlock.h +++ b/include/asm-m32r/spinlock.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org> | 9 | * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> /* CONFIG_DEBUG_SPINLOCK, CONFIG_SMP */ | ||
| 13 | #include <linux/compiler.h> | 12 | #include <linux/compiler.h> |
| 14 | #include <asm/atomic.h> | 13 | #include <asm/atomic.h> |
| 15 | #include <asm/page.h> | 14 | #include <asm/page.h> |
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h index e55013f378e5..33567e8bfe6b 100644 --- a/include/asm-m32r/system.h +++ b/include/asm-m32r/system.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) 2004, 2006 Hirokazu Takata <takata at linux-m32r.org> | 10 | * Copyright (C) 2004, 2006 Hirokazu Takata <takata at linux-m32r.org> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
| 15 | 14 | ||
| 16 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
diff --git a/include/asm-m32r/timex.h b/include/asm-m32r/timex.h index abf12e7ffbf3..e89bfd17db51 100644 --- a/include/asm-m32r/timex.h +++ b/include/asm-m32r/timex.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * m32r architecture timex specifications | 9 | * m32r architecture timex specifications |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE) | 13 | #define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE) |
| 15 | #define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ | 14 | #define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ |
diff --git a/include/asm-m32r/tlbflush.h b/include/asm-m32r/tlbflush.h index bc7c407dbd92..ae4494960593 100644 --- a/include/asm-m32r/tlbflush.h +++ b/include/asm-m32r/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_M32R_TLBFLUSH_H | 1 | #ifndef _ASM_M32R_TLBFLUSH_H |
| 2 | #define _ASM_M32R_TLBFLUSH_H | 2 | #define _ASM_M32R_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/m32r.h> | 4 | #include <asm/m32r.h> |
| 6 | 5 | ||
| 7 | /* | 6 | /* |
diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h index 819cc28a94f7..26e978c7e3b4 100644 --- a/include/asm-m32r/uaccess.h +++ b/include/asm-m32r/uaccess.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | /* | 11 | /* |
| 12 | * User space memory access functions | 12 | * User space memory access functions |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 16 | #include <linux/thread_info.h> | 15 | #include <linux/thread_info.h> |
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h index be0eb014c3b0..cc31790d8077 100644 --- a/include/asm-m32r/unistd.h +++ b/include/asm-m32r/unistd.h | |||
| @@ -295,6 +295,8 @@ | |||
| 295 | #define __NR_kexec_load 283 | 295 | #define __NR_kexec_load 283 |
| 296 | #define __NR_waitid 284 | 296 | #define __NR_waitid 284 |
| 297 | 297 | ||
| 298 | #ifdef __KERNEL__ | ||
| 299 | |||
| 298 | #define NR_syscalls 285 | 300 | #define NR_syscalls 285 |
| 299 | 301 | ||
| 300 | /* user-visible error numbers are in the range -1 - -124: see | 302 | /* user-visible error numbers are in the range -1 - -124: see |
| @@ -405,7 +407,6 @@ __asm__ __volatile__ (\ | |||
| 405 | __syscall_return(type,__res); \ | 407 | __syscall_return(type,__res); \ |
| 406 | } | 408 | } |
| 407 | 409 | ||
| 408 | #ifdef __KERNEL__ | ||
| 409 | #define __ARCH_WANT_IPC_PARSE_VERSION | 410 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 410 | #define __ARCH_WANT_STAT64 | 411 | #define __ARCH_WANT_STAT64 |
| 411 | #define __ARCH_WANT_SYS_ALARM | 412 | #define __ARCH_WANT_SYS_ALARM |
| @@ -421,7 +422,6 @@ __syscall_return(type,__res); \ | |||
| 421 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/ | 422 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/ |
| 422 | #define __ARCH_WANT_SYS_OLDUMOUNT | 423 | #define __ARCH_WANT_SYS_OLDUMOUNT |
| 423 | #define __ARCH_WANT_SYS_RT_SIGACTION | 424 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 424 | #endif | ||
| 425 | 425 | ||
| 426 | #ifdef __KERNEL_SYSCALLS__ | 426 | #ifdef __KERNEL_SYSCALLS__ |
| 427 | 427 | ||
| @@ -470,4 +470,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 470 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 470 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 471 | #endif | 471 | #endif |
| 472 | 472 | ||
| 473 | #endif /* __KERNEL__ */ | ||
| 473 | #endif /* _ASM_M32R_UNISTD_H */ | 474 | #endif /* _ASM_M32R_UNISTD_H */ |
diff --git a/include/asm-m68k/atomic.h b/include/asm-m68k/atomic.h index 732d696d31a6..d5eed64cb833 100644 --- a/include/asm-m68k/atomic.h +++ b/include/asm-m68k/atomic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ARCH_M68K_ATOMIC__ | 1 | #ifndef __ARCH_M68K_ATOMIC__ |
| 2 | #define __ARCH_M68K_ATOMIC__ | 2 | #define __ARCH_M68K_ATOMIC__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include <asm/system.h> /* local_irq_XXX() */ | 5 | #include <asm/system.h> /* local_irq_XXX() */ |
| 7 | 6 | ||
diff --git a/include/asm-m68k/bug.h b/include/asm-m68k/bug.h index 072ce274d537..7b60776cc966 100644 --- a/include/asm-m68k/bug.h +++ b/include/asm-m68k/bug.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_BUG_H | 1 | #ifndef _M68K_BUG_H |
| 2 | #define _M68K_BUG_H | 2 | #define _M68K_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_BUG | 5 | #ifdef CONFIG_BUG |
| 7 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 6 | #ifdef CONFIG_DEBUG_BUGVERBOSE |
diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h index b1920c703d82..dffd59cf1364 100644 --- a/include/asm-m68k/dma-mapping.h +++ b/include/asm-m68k/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_DMA_MAPPING_H | 1 | #ifndef _M68K_DMA_MAPPING_H |
| 2 | #define _M68K_DMA_MAPPING_H | 2 | #define _M68K_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PCI | 5 | #ifdef CONFIG_PCI |
| 7 | #include <asm-generic/dma-mapping.h> | 6 | #include <asm-generic/dma-mapping.h> |
diff --git a/include/asm-m68k/dma.h b/include/asm-m68k/dma.h index d5266a886226..d0c9e61e57b4 100644 --- a/include/asm-m68k/dma.h +++ b/include/asm-m68k/dma.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_DMA_H | 1 | #ifndef _M68K_DMA_H |
| 2 | #define _M68K_DMA_H 1 | 2 | #define _M68K_DMA_H 1 |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* it's useless on the m68k, but unfortunately needed by the new | 5 | /* it's useless on the m68k, but unfortunately needed by the new |
| 7 | bootmem allocator (but this should do it for this) */ | 6 | bootmem allocator (but this should do it for this) */ |
diff --git a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h index 5978f87b0a8a..e1112de5a5e3 100644 --- a/include/asm-m68k/dvma.h +++ b/include/asm-m68k/dvma.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __M68K_DVMA_H | 9 | #ifndef __M68K_DVMA_H |
| 10 | #define __M68K_DVMA_H | 10 | #define __M68K_DVMA_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #define DVMA_PAGE_SHIFT 13 | 13 | #define DVMA_PAGE_SHIFT 13 |
| 15 | #define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT) | 14 | #define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT) |
diff --git a/include/asm-m68k/elf.h b/include/asm-m68k/elf.h index 38bf8347f14d..eb63b85f9336 100644 --- a/include/asm-m68k/elf.h +++ b/include/asm-m68k/elf.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * ELF register definitions.. | 5 | * ELF register definitions.. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/ptrace.h> | 8 | #include <asm/ptrace.h> |
| 10 | #include <asm/user.h> | 9 | #include <asm/user.h> |
| 11 | 10 | ||
diff --git a/include/asm-m68k/entry.h b/include/asm-m68k/entry.h index 0396495cd97d..f8f6b185d793 100644 --- a/include/asm-m68k/entry.h +++ b/include/asm-m68k/entry.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68K_ENTRY_H | 1 | #ifndef __M68K_ENTRY_H |
| 2 | #define __M68K_ENTRY_H | 2 | #define __M68K_ENTRY_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/setup.h> | 4 | #include <asm/setup.h> |
| 6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
| 7 | 6 | ||
diff --git a/include/asm-m68k/fpu.h b/include/asm-m68k/fpu.h index 3bcf85065c19..59701d7b4e78 100644 --- a/include/asm-m68k/fpu.h +++ b/include/asm-m68k/fpu.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68K_FPU_H | 1 | #ifndef __M68K_FPU_H |
| 2 | #define __M68K_FPU_H | 2 | #define __M68K_FPU_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * MAX floating point unit state size (FSAVE/FRESTORE) | 6 | * MAX floating point unit state size (FSAVE/FRESTORE) |
diff --git a/include/asm-m68k/hardirq.h b/include/asm-m68k/hardirq.h index 5e1c5826c83d..394ee946015c 100644 --- a/include/asm-m68k/hardirq.h +++ b/include/asm-m68k/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68K_HARDIRQ_H | 1 | #ifndef __M68K_HARDIRQ_H |
| 2 | #define __M68K_HARDIRQ_H | 2 | #define __M68K_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/cache.h> | 5 | #include <linux/cache.h> |
| 7 | 6 | ||
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index 36118fd01867..365f76fb8013 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | 31 | ||
| 32 | #ifdef __KERNEL__ | 32 | #ifdef __KERNEL__ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | 34 | ||
| 36 | #include <asm/setup.h> | 35 | #include <asm/setup.h> |
| 37 | #include <asm/io.h> | 36 | #include <asm/io.h> |
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h index dcfaa352d34c..5e0fcf41804d 100644 --- a/include/asm-m68k/io.h +++ b/include/asm-m68k/io.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | #ifdef __KERNEL__ | 24 | #ifdef __KERNEL__ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/compiler.h> | 26 | #include <linux/compiler.h> |
| 28 | #include <asm/raw_io.h> | 27 | #include <asm/raw_io.h> |
| 29 | #include <asm/virtconvert.h> | 28 | #include <asm/virtconvert.h> |
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h index 9ac047c400c4..b4f48b2a6a57 100644 --- a/include/asm-m68k/irq.h +++ b/include/asm-m68k/irq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_IRQ_H_ | 1 | #ifndef _M68K_IRQ_H_ |
| 2 | #define _M68K_IRQ_H_ | 2 | #define _M68K_IRQ_H_ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
| 6 | 5 | ||
| 7 | /* | 6 | /* |
diff --git a/include/asm-m68k/mc146818rtc.h b/include/asm-m68k/mc146818rtc.h index 11442095a8cf..11fe12ddb913 100644 --- a/include/asm-m68k/mc146818rtc.h +++ b/include/asm-m68k/mc146818rtc.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifndef _ASM_MC146818RTC_H | 4 | #ifndef _ASM_MC146818RTC_H |
| 5 | #define _ASM_MC146818RTC_H | 5 | #define _ASM_MC146818RTC_H |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifdef CONFIG_ATARI | 8 | #ifdef CONFIG_ATARI |
| 10 | /* RTC in Atari machines */ | 9 | /* RTC in Atari machines */ |
diff --git a/include/asm-m68k/mmu_context.h b/include/asm-m68k/mmu_context.h index 661191d15c81..231d11bd8e32 100644 --- a/include/asm-m68k/mmu_context.h +++ b/include/asm-m68k/mmu_context.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68K_MMU_CONTEXT_H | 1 | #ifndef __M68K_MMU_CONTEXT_H |
| 2 | #define __M68K_MMU_CONTEXT_H | 2 | #define __M68K_MMU_CONTEXT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) | 5 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) |
| 7 | { | 6 | { |
diff --git a/include/asm-m68k/motorola_pgtable.h b/include/asm-m68k/motorola_pgtable.h index 1628723458f5..1ccc7338a54b 100644 --- a/include/asm-m68k/motorola_pgtable.h +++ b/include/asm-m68k/motorola_pgtable.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _MOTOROLA_PGTABLE_H | 1 | #ifndef _MOTOROLA_PGTABLE_H |
| 2 | #define _MOTOROLA_PGTABLE_H | 2 | #define _MOTOROLA_PGTABLE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Definitions for MMU descriptors | 6 | * Definitions for MMU descriptors |
diff --git a/include/asm-m68k/openprom.h b/include/asm-m68k/openprom.h index efbfb0bec6e2..869ab9176e9f 100644 --- a/include/asm-m68k/openprom.h +++ b/include/asm-m68k/openprom.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 8 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | /* Empirical constants... */ | 12 | /* Empirical constants... */ |
| 14 | #ifdef CONFIG_SUN3 | 13 | #ifdef CONFIG_SUN3 |
diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index f206dfbc1d48..db017f838c29 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_PAGE_H | 1 | #ifndef _M68K_PAGE_H |
| 2 | #define _M68K_PAGE_H | 2 | #define _M68K_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* PAGE_SHIFT determines the page size */ | 5 | /* PAGE_SHIFT determines the page size */ |
| 7 | #ifndef CONFIG_SUN3 | 6 | #ifndef CONFIG_SUN3 |
diff --git a/include/asm-m68k/page_offset.h b/include/asm-m68k/page_offset.h index 86d3c2845ad4..1cbdb7f30ac2 100644 --- a/include/asm-m68k/page_offset.h +++ b/include/asm-m68k/page_offset.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | /* This handles the memory map.. */ | 2 | /* This handles the memory map.. */ |
| 4 | #ifndef CONFIG_SUN3 | 3 | #ifndef CONFIG_SUN3 |
diff --git a/include/asm-m68k/pgalloc.h b/include/asm-m68k/pgalloc.h index b468b7958aaa..a9cfb4b99d88 100644 --- a/include/asm-m68k/pgalloc.h +++ b/include/asm-m68k/pgalloc.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef M68K_PGALLOC_H | 2 | #ifndef M68K_PGALLOC_H |
| 3 | #define M68K_PGALLOC_H | 3 | #define M68K_PGALLOC_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 7 | #include <linux/highmem.h> | 6 | #include <linux/highmem.h> |
| 8 | #include <asm/setup.h> | 7 | #include <asm/setup.h> |
diff --git a/include/asm-m68k/pgtable.h b/include/asm-m68k/pgtable.h index add129e93fd7..f3aa05377987 100644 --- a/include/asm-m68k/pgtable.h +++ b/include/asm-m68k/pgtable.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm-generic/4level-fixup.h> | 4 | #include <asm-generic/4level-fixup.h> |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/setup.h> | 6 | #include <asm/setup.h> |
| 8 | 7 | ||
| 9 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h index 7982285e84ed..352799e71f08 100644 --- a/include/asm-m68k/processor.h +++ b/include/asm-m68k/processor.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) | 14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/thread_info.h> | 16 | #include <linux/thread_info.h> |
| 18 | #include <asm/segment.h> | 17 | #include <asm/segment.h> |
| 19 | #include <asm/fpu.h> | 18 | #include <asm/fpu.h> |
diff --git a/include/asm-m68k/semaphore-helper.h b/include/asm-m68k/semaphore-helper.h index 1516a642f9a5..eef30ba0b499 100644 --- a/include/asm-m68k/semaphore-helper.h +++ b/include/asm-m68k/semaphore-helper.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * m68k version by Andreas Schwab | 9 | * m68k version by Andreas Schwab |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | 13 | ||
| 15 | /* | 14 | /* |
diff --git a/include/asm-m68k/serial.h b/include/asm-m68k/serial.h index 3fe29f8b0194..2b90d6e69070 100644 --- a/include/asm-m68k/serial.h +++ b/include/asm-m68k/serial.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | /* | 10 | /* |
| 12 | * This assumes you have a 1.8432 MHz clock for your UART. | 11 | * This assumes you have a 1.8432 MHz clock for your UART. |
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h index a89aa84073e5..7facc9a46e74 100644 --- a/include/asm-m68k/setup.h +++ b/include/asm-m68k/setup.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #ifndef _M68K_SETUP_H | 23 | #ifndef _M68K_SETUP_H |
| 24 | #define _M68K_SETUP_H | 24 | #define _M68K_SETUP_H |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | 27 | ||
| 29 | /* | 28 | /* |
diff --git a/include/asm-m68k/shm.h b/include/asm-m68k/shm.h index 3fa2f368fc1a..fa56ec84a126 100644 --- a/include/asm-m68k/shm.h +++ b/include/asm-m68k/shm.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_SHM_H | 1 | #ifndef _M68K_SHM_H |
| 2 | #define _M68K_SHM_H | 2 | #define _M68K_SHM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* format of page table entries that correspond to shared memory pages | 5 | /* format of page table entries that correspond to shared memory pages |
| 7 | currently out in swap space (see also mm/swap.c): | 6 | currently out in swap space (see also mm/swap.c): |
diff --git a/include/asm-m68k/system.h b/include/asm-m68k/system.h index 64d3481df74c..d6dd8052cd6f 100644 --- a/include/asm-m68k/system.h +++ b/include/asm-m68k/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_SYSTEM_H | 1 | #ifndef _M68K_SYSTEM_H |
| 2 | #define _M68K_SYSTEM_H | 2 | #define _M68K_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> /* get configuration macros */ | ||
| 5 | #include <linux/linkage.h> | 4 | #include <linux/linkage.h> |
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <asm/segment.h> | 6 | #include <asm/segment.h> |
diff --git a/include/asm-m68k/tlbflush.h b/include/asm-m68k/tlbflush.h index 8e61ccffe13a..31678831ee47 100644 --- a/include/asm-m68k/tlbflush.h +++ b/include/asm-m68k/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_TLBFLUSH_H | 1 | #ifndef _M68K_TLBFLUSH_H |
| 2 | #define _M68K_TLBFLUSH_H | 2 | #define _M68K_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifndef CONFIG_SUN3 | 5 | #ifndef CONFIG_SUN3 |
| 7 | 6 | ||
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h index c2554bcd1747..f236fe92156f 100644 --- a/include/asm-m68k/unistd.h +++ b/include/asm-m68k/unistd.h | |||
| @@ -285,6 +285,8 @@ | |||
| 285 | #define __NR_request_key 280 | 285 | #define __NR_request_key 280 |
| 286 | #define __NR_keyctl 281 | 286 | #define __NR_keyctl 281 |
| 287 | 287 | ||
| 288 | #ifdef __KERNEL__ | ||
| 289 | |||
| 288 | #define NR_syscalls 282 | 290 | #define NR_syscalls 282 |
| 289 | 291 | ||
| 290 | /* user-visible error numbers are in the range -1 - -124: see | 292 | /* user-visible error numbers are in the range -1 - -124: see |
| @@ -383,7 +385,6 @@ __asm__ __volatile__ ("trap #0" \ | |||
| 383 | __syscall_return(type,__res); \ | 385 | __syscall_return(type,__res); \ |
| 384 | } | 386 | } |
| 385 | 387 | ||
| 386 | #ifdef __KERNEL__ | ||
| 387 | #define __ARCH_WANT_IPC_PARSE_VERSION | 388 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 388 | #define __ARCH_WANT_OLD_READDIR | 389 | #define __ARCH_WANT_OLD_READDIR |
| 389 | #define __ARCH_WANT_OLD_STAT | 390 | #define __ARCH_WANT_OLD_STAT |
| @@ -406,7 +407,6 @@ __syscall_return(type,__res); \ | |||
| 406 | #define __ARCH_WANT_SYS_SIGPENDING | 407 | #define __ARCH_WANT_SYS_SIGPENDING |
| 407 | #define __ARCH_WANT_SYS_SIGPROCMASK | 408 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 408 | #define __ARCH_WANT_SYS_RT_SIGACTION | 409 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 409 | #endif | ||
| 410 | 410 | ||
| 411 | #ifdef __KERNEL_SYSCALLS__ | 411 | #ifdef __KERNEL_SYSCALLS__ |
| 412 | 412 | ||
| @@ -451,7 +451,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 451 | struct sigaction __user *oact, | 451 | struct sigaction __user *oact, |
| 452 | size_t sigsetsize); | 452 | size_t sigsetsize); |
| 453 | 453 | ||
| 454 | #endif | 454 | #endif /* __KERNEL_SYSCALLS__ */ |
| 455 | 455 | ||
| 456 | /* | 456 | /* |
| 457 | * "Conditional" syscalls | 457 | * "Conditional" syscalls |
| @@ -461,4 +461,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 461 | */ | 461 | */ |
| 462 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 462 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 463 | 463 | ||
| 464 | #endif /* __KERNEL__ */ | ||
| 464 | #endif /* _ASM_M68K_UNISTD_H_ */ | 465 | #endif /* _ASM_M68K_UNISTD_H_ */ |
diff --git a/include/asm-m68k/virtconvert.h b/include/asm-m68k/virtconvert.h index 8c4e8037b898..83a87c9b1a16 100644 --- a/include/asm-m68k/virtconvert.h +++ b/include/asm-m68k/virtconvert.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/compiler.h> | 10 | #include <linux/compiler.h> |
| 12 | #include <asm/setup.h> | 11 | #include <asm/setup.h> |
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
diff --git a/include/asm-m68knommu/bitops.h b/include/asm-m68knommu/bitops.h index 0b68ccd327f7..d7fa7d9c0e0f 100644 --- a/include/asm-m68knommu/bitops.h +++ b/include/asm-m68knommu/bitops.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright 1992, Linus Torvalds. | 5 | * Copyright 1992, Linus Torvalds. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/compiler.h> | 8 | #include <linux/compiler.h> |
| 10 | #include <asm/byteorder.h> /* swab32 */ | 9 | #include <asm/byteorder.h> /* swab32 */ |
| 11 | #include <asm/system.h> /* save_flags */ | 10 | #include <asm/system.h> /* save_flags */ |
diff --git a/include/asm-m68knommu/coldfire.h b/include/asm-m68knommu/coldfire.h index 6190f77b1e6c..2fabca91df83 100644 --- a/include/asm-m68knommu/coldfire.h +++ b/include/asm-m68knommu/coldfire.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define coldfire_h | 12 | #define coldfire_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Define the processor support peripherals base address. | 17 | * Define the processor support peripherals base address. |
diff --git a/include/asm-m68knommu/commproc.h b/include/asm-m68knommu/commproc.h index e522ca8193a2..0161ebb5d883 100644 --- a/include/asm-m68knommu/commproc.h +++ b/include/asm-m68knommu/commproc.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __CPM_360__ | 17 | #ifndef __CPM_360__ |
| 18 | #define __CPM_360__ | 18 | #define __CPM_360__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | /* CPM Command register masks: */ | 21 | /* CPM Command register masks: */ |
| 23 | #define CPM_CR_RST ((ushort)0x8000) | 22 | #define CPM_CR_RST ((ushort)0x8000) |
diff --git a/include/asm-m68knommu/dma-mapping.h b/include/asm-m68knommu/dma-mapping.h index a6c42ba48da6..5622b855a577 100644 --- a/include/asm-m68knommu/dma-mapping.h +++ b/include/asm-m68knommu/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68KNOMMU_DMA_MAPPING_H | 1 | #ifndef _M68KNOMMU_DMA_MAPPING_H |
| 2 | #define _M68KNOMMU_DMA_MAPPING_H | 2 | #define _M68KNOMMU_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PCI | 5 | #ifdef CONFIG_PCI |
| 7 | #include <asm-generic/dma-mapping.h> | 6 | #include <asm-generic/dma-mapping.h> |
diff --git a/include/asm-m68knommu/dma.h b/include/asm-m68knommu/dma.h index 43e98c96a5c2..3338001abb40 100644 --- a/include/asm-m68knommu/dma.h +++ b/include/asm-m68knommu/dma.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | //#define DMA_DEBUG 1 | 4 | //#define DMA_DEBUG 1 |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifdef CONFIG_COLDFIRE | 7 | #ifdef CONFIG_COLDFIRE |
| 9 | /* | 8 | /* |
diff --git a/include/asm-m68knommu/elf.h b/include/asm-m68knommu/elf.h index 9919487703bc..40b1ed6827db 100644 --- a/include/asm-m68knommu/elf.h +++ b/include/asm-m68knommu/elf.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * ELF register definitions.. | 5 | * ELF register definitions.. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/ptrace.h> | 8 | #include <asm/ptrace.h> |
| 10 | #include <asm/user.h> | 9 | #include <asm/user.h> |
| 11 | 10 | ||
diff --git a/include/asm-m68knommu/elia.h b/include/asm-m68knommu/elia.h index f18b8e9d8c36..e037d4e2de33 100644 --- a/include/asm-m68knommu/elia.h +++ b/include/asm-m68knommu/elia.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define elia_h | 12 | #define elia_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/coldfire.h> | 15 | #include <asm/coldfire.h> |
| 17 | 16 | ||
| 18 | #ifdef CONFIG_eLIA | 17 | #ifdef CONFIG_eLIA |
diff --git a/include/asm-m68knommu/entry.h b/include/asm-m68knommu/entry.h index 06f5aa70b0b5..c2553d26273d 100644 --- a/include/asm-m68knommu/entry.h +++ b/include/asm-m68knommu/entry.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68KNOMMU_ENTRY_H | 1 | #ifndef __M68KNOMMU_ENTRY_H |
| 2 | #define __M68KNOMMU_ENTRY_H | 2 | #define __M68KNOMMU_ENTRY_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/setup.h> | 4 | #include <asm/setup.h> |
| 6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
| 7 | 6 | ||
diff --git a/include/asm-m68knommu/fpu.h b/include/asm-m68knommu/fpu.h index 225082991a03..b16b2e4fca2a 100644 --- a/include/asm-m68knommu/fpu.h +++ b/include/asm-m68knommu/fpu.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68KNOMMU_FPU_H | 1 | #ifndef __M68KNOMMU_FPU_H |
| 2 | #define __M68KNOMMU_FPU_H | 2 | #define __M68KNOMMU_FPU_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * MAX floating point unit state size (FSAVE/FRESTORE) | 6 | * MAX floating point unit state size (FSAVE/FRESTORE) |
diff --git a/include/asm-m68knommu/hardirq.h b/include/asm-m68knommu/hardirq.h index 476180f4cba2..980075bab792 100644 --- a/include/asm-m68knommu/hardirq.h +++ b/include/asm-m68knommu/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68K_HARDIRQ_H | 1 | #ifndef __M68K_HARDIRQ_H |
| 2 | #define __M68K_HARDIRQ_H | 2 | #define __M68K_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/cache.h> | 4 | #include <linux/cache.h> |
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <asm/irq.h> | 6 | #include <asm/irq.h> |
diff --git a/include/asm-m68knommu/io.h b/include/asm-m68knommu/io.h index e08f2ee4b4a2..8df4cee2a0cd 100644 --- a/include/asm-m68knommu/io.h +++ b/include/asm-m68knommu/io.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | /* | 7 | /* |
| 9 | * These are for ISA/PCI shared memory _only_ and should never be used | 8 | * These are for ISA/PCI shared memory _only_ and should never be used |
diff --git a/include/asm-m68knommu/irq.h b/include/asm-m68knommu/irq.h index 20c48ec858a4..2b408842a30e 100644 --- a/include/asm-m68knommu/irq.h +++ b/include/asm-m68knommu/irq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68K_IRQ_H_ | 1 | #ifndef _M68K_IRQ_H_ |
| 2 | #define _M68K_IRQ_H_ | 2 | #define _M68K_IRQ_H_ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/ptrace.h> | 4 | #include <asm/ptrace.h> |
| 6 | 5 | ||
| 7 | #ifdef CONFIG_COLDFIRE | 6 | #ifdef CONFIG_COLDFIRE |
diff --git a/include/asm-m68knommu/m5206sim.h b/include/asm-m68knommu/m5206sim.h index d1e7509021c5..7e3594dea88b 100644 --- a/include/asm-m68knommu/m5206sim.h +++ b/include/asm-m68knommu/m5206sim.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define m5206sim_h | 12 | #define m5206sim_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Define the 5206 SIM register set addresses. | 17 | * Define the 5206 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m520xsim.h b/include/asm-m68knommu/m520xsim.h index 6dc62869e62b..1dac22ea95ba 100644 --- a/include/asm-m68knommu/m520xsim.h +++ b/include/asm-m68knommu/m520xsim.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define m520xsim_h | 11 | #define m520xsim_h |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * Define the 5282 SIM register set addresses. | 16 | * Define the 5282 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m523xsim.h b/include/asm-m68knommu/m523xsim.h index 926cfb805df7..bf397313e93f 100644 --- a/include/asm-m68knommu/m523xsim.h +++ b/include/asm-m68knommu/m523xsim.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define m523xsim_h | 11 | #define m523xsim_h |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * Define the 523x SIM register set addresses. | 16 | * Define the 523x SIM register set addresses. |
diff --git a/include/asm-m68knommu/m5272sim.h b/include/asm-m68knommu/m5272sim.h index b40875362f46..6217edc21139 100644 --- a/include/asm-m68knommu/m5272sim.h +++ b/include/asm-m68knommu/m5272sim.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define m5272sim_h | 12 | #define m5272sim_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Define the 5272 SIM register set addresses. | 17 | * Define the 5272 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m527xsim.h b/include/asm-m68knommu/m527xsim.h index e7878d0f7d7a..1f63ab3fb3e6 100644 --- a/include/asm-m68knommu/m527xsim.h +++ b/include/asm-m68knommu/m527xsim.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define m527xsim_h | 11 | #define m527xsim_h |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * Define the 5270/5271 SIM register set addresses. | 16 | * Define the 5270/5271 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m528xsim.h b/include/asm-m68knommu/m528xsim.h index 610774a17f70..1a3b1ae06b1e 100644 --- a/include/asm-m68knommu/m528xsim.h +++ b/include/asm-m68knommu/m528xsim.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define m528xsim_h | 11 | #define m528xsim_h |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * Define the 5280/5282 SIM register set addresses. | 16 | * Define the 5280/5282 SIM register set addresses. |
diff --git a/include/asm-m68knommu/mcfcache.h b/include/asm-m68knommu/mcfcache.h index 9cb401421835..45d1ac57ea82 100644 --- a/include/asm-m68knommu/mcfcache.h +++ b/include/asm-m68knommu/mcfcache.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define __M68KNOMMU_MCFCACHE_H | 11 | #define __M68KNOMMU_MCFCACHE_H |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * The different ColdFire families have different cache arrangments. | 16 | * The different ColdFire families have different cache arrangments. |
diff --git a/include/asm-m68knommu/mcfdma.h b/include/asm-m68knommu/mcfdma.h index b93f8ba8a248..ea729e81a6be 100644 --- a/include/asm-m68knommu/mcfdma.h +++ b/include/asm-m68knommu/mcfdma.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define mcfdma_h | 11 | #define mcfdma_h |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * Get address specific defines for this Coldfire member. | 16 | * Get address specific defines for this Coldfire member. |
diff --git a/include/asm-m68knommu/mcfmbus.h b/include/asm-m68knommu/mcfmbus.h index 4762589e858a..13df9d41bd1a 100644 --- a/include/asm-m68knommu/mcfmbus.h +++ b/include/asm-m68knommu/mcfmbus.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #ifndef mcfmbus_h | 12 | #ifndef mcfmbus_h |
| 13 | #define mcfmbus_h | 13 | #define mcfmbus_h |
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | 15 | ||
| 17 | #define MCFMBUS_BASE 0x280 | 16 | #define MCFMBUS_BASE 0x280 |
diff --git a/include/asm-m68knommu/mcfne.h b/include/asm-m68knommu/mcfne.h index a71b1c8cb4f8..c920ccdb61fe 100644 --- a/include/asm-m68knommu/mcfne.h +++ b/include/asm-m68knommu/mcfne.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #define mcfne_h | 18 | #define mcfne_h |
| 19 | /****************************************************************************/ | 19 | /****************************************************************************/ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | /* | 22 | /* |
| 24 | * Support for NE2000 clones devices in ColdFire based boards. | 23 | * Support for NE2000 clones devices in ColdFire based boards. |
diff --git a/include/asm-m68knommu/mcfpci.h b/include/asm-m68knommu/mcfpci.h index d6229047d06e..f1507dd06ec6 100644 --- a/include/asm-m68knommu/mcfpci.h +++ b/include/asm-m68knommu/mcfpci.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define mcfpci_h | 12 | #define mcfpci_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #ifdef CONFIG_PCI | 16 | #ifdef CONFIG_PCI |
| 18 | 17 | ||
diff --git a/include/asm-m68knommu/mcfpit.h b/include/asm-m68knommu/mcfpit.h index a685f1b45401..0d2672dd518a 100644 --- a/include/asm-m68knommu/mcfpit.h +++ b/include/asm-m68knommu/mcfpit.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define mcfpit_h | 11 | #define mcfpit_h |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * Get address specific defines for the 5270/5271, 5280/5282, and 5208. | 16 | * Get address specific defines for the 5270/5271, 5280/5282, and 5208. |
diff --git a/include/asm-m68knommu/mcfsim.h b/include/asm-m68knommu/mcfsim.h index 81d74a31dc43..97a0c2734a72 100644 --- a/include/asm-m68knommu/mcfsim.h +++ b/include/asm-m68knommu/mcfsim.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define mcfsim_h | 12 | #define mcfsim_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282, | 17 | * Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282, |
diff --git a/include/asm-m68knommu/mcfsmc.h b/include/asm-m68knommu/mcfsmc.h index 2583900b9591..2d7a4dbd9683 100644 --- a/include/asm-m68knommu/mcfsmc.h +++ b/include/asm-m68knommu/mcfsmc.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * allow 8 bit accesses. So this code is 16bit access only. | 17 | * allow 8 bit accesses. So this code is 16bit access only. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #undef outb | 21 | #undef outb |
| 23 | #undef inb | 22 | #undef inb |
diff --git a/include/asm-m68knommu/mcftimer.h b/include/asm-m68knommu/mcftimer.h index 0f47164c33a9..68bf33ac10d1 100644 --- a/include/asm-m68knommu/mcftimer.h +++ b/include/asm-m68knommu/mcftimer.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define mcftimer_h | 12 | #define mcftimer_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Get address specific defines for this ColdFire member. | 17 | * Get address specific defines for this ColdFire member. |
diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h index b016fad83119..8040e43786be 100644 --- a/include/asm-m68knommu/mcfuart.h +++ b/include/asm-m68knommu/mcfuart.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define mcfuart_h | 12 | #define mcfuart_h |
| 13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Define the base address of the UARTS within the MBAR address | 17 | * Define the base address of the UARTS within the MBAR address |
diff --git a/include/asm-m68knommu/mcfwdebug.h b/include/asm-m68knommu/mcfwdebug.h index 6ceae103596b..27f70e45d700 100644 --- a/include/asm-m68knommu/mcfwdebug.h +++ b/include/asm-m68knommu/mcfwdebug.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef mcfdebug_h | 10 | #ifndef mcfdebug_h |
| 11 | #define mcfdebug_h | 11 | #define mcfdebug_h |
| 12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | /* Define the debug module registers */ | 14 | /* Define the debug module registers */ |
| 16 | #define MCFDEBUG_CSR 0x0 /* Configuration status */ | 15 | #define MCFDEBUG_CSR 0x0 /* Configuration status */ |
diff --git a/include/asm-m68knommu/mmu_context.h b/include/asm-m68knommu/mmu_context.h index 1e080eca9ca8..6c077d3a2572 100644 --- a/include/asm-m68knommu/mmu_context.h +++ b/include/asm-m68knommu/mmu_context.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68KNOMMU_MMU_CONTEXT_H | 1 | #ifndef __M68KNOMMU_MMU_CONTEXT_H |
| 2 | #define __M68KNOMMU_MMU_CONTEXT_H | 2 | #define __M68KNOMMU_MMU_CONTEXT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/setup.h> | 4 | #include <asm/setup.h> |
| 6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
| 7 | #include <asm/pgalloc.h> | 6 | #include <asm/pgalloc.h> |
diff --git a/include/asm-m68knommu/nettel.h b/include/asm-m68knommu/nettel.h index 9bda307e6544..0299f6a2deeb 100644 --- a/include/asm-m68knommu/nettel.h +++ b/include/asm-m68knommu/nettel.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define nettel_h | 13 | #define nettel_h |
| 14 | /****************************************************************************/ | 14 | /****************************************************************************/ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | /****************************************************************************/ | 17 | /****************************************************************************/ |
| 19 | #ifdef CONFIG_NETtel | 18 | #ifdef CONFIG_NETtel |
diff --git a/include/asm-m68knommu/page.h b/include/asm-m68knommu/page.h index 942dfbead27f..a22bf5a88160 100644 --- a/include/asm-m68knommu/page.h +++ b/include/asm-m68knommu/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68KNOMMU_PAGE_H | 1 | #ifndef _M68KNOMMU_PAGE_H |
| 2 | #define _M68KNOMMU_PAGE_H | 2 | #define _M68KNOMMU_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* PAGE_SHIFT determines the page size */ | 5 | /* PAGE_SHIFT determines the page size */ |
| 7 | 6 | ||
diff --git a/include/asm-m68knommu/page_offset.h b/include/asm-m68knommu/page_offset.h index 2b45645e9b29..8ed6d7b7d9d1 100644 --- a/include/asm-m68knommu/page_offset.h +++ b/include/asm-m68knommu/page_offset.h | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/config.h> | ||
| 3 | 2 | ||
| 4 | /* This handles the memory map.. */ | 3 | /* This handles the memory map.. */ |
| 5 | 4 | ||
diff --git a/include/asm-m68knommu/param.h b/include/asm-m68knommu/param.h index 3f57d5db81f5..4c9904d6512e 100644 --- a/include/asm-m68knommu/param.h +++ b/include/asm-m68knommu/param.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68KNOMMU_PARAM_H | 1 | #ifndef _M68KNOMMU_PARAM_H |
| 2 | #define _M68KNOMMU_PARAM_H | 2 | #define _M68KNOMMU_PARAM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #if defined(CONFIG_CLEOPATRA) | 5 | #if defined(CONFIG_CLEOPATRA) |
| 7 | #define HZ 1000 | 6 | #define HZ 1000 |
diff --git a/include/asm-m68knommu/pgtable.h b/include/asm-m68knommu/pgtable.h index 00893055e6c2..549ad231efad 100644 --- a/include/asm-m68knommu/pgtable.h +++ b/include/asm-m68knommu/pgtable.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * (C) Copyright 2000-2002, Greg Ungerer <gerg@snapgear.com> | 7 | * (C) Copyright 2000-2002, Greg Ungerer <gerg@snapgear.com> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
| 12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
diff --git a/include/asm-m68knommu/processor.h b/include/asm-m68knommu/processor.h index ba393b1a023b..278b00bc60c5 100644 --- a/include/asm-m68knommu/processor.h +++ b/include/asm-m68knommu/processor.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) | 14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
| 18 | #include <asm/types.h> | 17 | #include <asm/types.h> |
| 19 | #include <asm/segment.h> | 18 | #include <asm/segment.h> |
diff --git a/include/asm-m68knommu/semaphore-helper.h b/include/asm-m68knommu/semaphore-helper.h index a6586417c1c2..43da7bc483c7 100644 --- a/include/asm-m68knommu/semaphore-helper.h +++ b/include/asm-m68knommu/semaphore-helper.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * m68k version by Andreas Schwab | 9 | * m68k version by Andreas Schwab |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * These two _must_ execute atomically wrt each other. | 14 | * These two _must_ execute atomically wrt each other. |
diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h index 6338afc850ba..2bbe2db00a22 100644 --- a/include/asm-m68knommu/system.h +++ b/include/asm-m68knommu/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _M68KNOMMU_SYSTEM_H | 1 | #ifndef _M68KNOMMU_SYSTEM_H |
| 2 | #define _M68KNOMMU_SYSTEM_H | 2 | #define _M68KNOMMU_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> /* get configuration macros */ | ||
| 5 | #include <linux/linkage.h> | 4 | #include <linux/linkage.h> |
| 6 | #include <asm/segment.h> | 5 | #include <asm/segment.h> |
| 7 | #include <asm/entry.h> | 6 | #include <asm/entry.h> |
diff --git a/include/asm-m68knommu/unaligned.h b/include/asm-m68knommu/unaligned.h index 8876f034ea64..869e9dd24f54 100644 --- a/include/asm-m68knommu/unaligned.h +++ b/include/asm-m68knommu/unaligned.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __M68K_UNALIGNED_H | 1 | #ifndef __M68K_UNALIGNED_H |
| 2 | #define __M68K_UNALIGNED_H | 2 | #define __M68K_UNALIGNED_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_COLDFIRE | 5 | #ifdef CONFIG_COLDFIRE |
| 7 | 6 | ||
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h index 5373988a7e51..1b2abdf281e1 100644 --- a/include/asm-m68knommu/unistd.h +++ b/include/asm-m68knommu/unistd.h | |||
| @@ -286,6 +286,8 @@ | |||
| 286 | #define __NR_request_key 280 | 286 | #define __NR_request_key 280 |
| 287 | #define __NR_keyctl 281 | 287 | #define __NR_keyctl 281 |
| 288 | 288 | ||
| 289 | #ifdef __KERNEL__ | ||
| 290 | |||
| 289 | #define NR_syscalls 282 | 291 | #define NR_syscalls 282 |
| 290 | 292 | ||
| 291 | /* user-visible error numbers are in the range -1 - -122: see | 293 | /* user-visible error numbers are in the range -1 - -122: see |
| @@ -437,7 +439,6 @@ type name(atype a, btype b, ctype c, dtype d, etype e) \ | |||
| 437 | return (type)__res; \ | 439 | return (type)__res; \ |
| 438 | } | 440 | } |
| 439 | 441 | ||
| 440 | #ifdef __KERNEL__ | ||
| 441 | #define __ARCH_WANT_IPC_PARSE_VERSION | 442 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 442 | #define __ARCH_WANT_OLD_READDIR | 443 | #define __ARCH_WANT_OLD_READDIR |
| 443 | #define __ARCH_WANT_OLD_STAT | 444 | #define __ARCH_WANT_OLD_STAT |
| @@ -460,7 +461,6 @@ type name(atype a, btype b, ctype c, dtype d, etype e) \ | |||
| 460 | #define __ARCH_WANT_SYS_SIGPENDING | 461 | #define __ARCH_WANT_SYS_SIGPENDING |
| 461 | #define __ARCH_WANT_SYS_SIGPROCMASK | 462 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 462 | #define __ARCH_WANT_SYS_RT_SIGACTION | 463 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 463 | #endif | ||
| 464 | 464 | ||
| 465 | #ifdef __KERNEL_SYSCALLS__ | 465 | #ifdef __KERNEL_SYSCALLS__ |
| 466 | 466 | ||
| @@ -515,7 +515,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 515 | struct sigaction __user *oact, | 515 | struct sigaction __user *oact, |
| 516 | size_t sigsetsize); | 516 | size_t sigsetsize); |
| 517 | 517 | ||
| 518 | #endif | 518 | #endif /* __KERNEL_SYSCALLS__ */ |
| 519 | 519 | ||
| 520 | /* | 520 | /* |
| 521 | * "Conditional" syscalls | 521 | * "Conditional" syscalls |
| @@ -525,4 +525,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 525 | */ | 525 | */ |
| 526 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 526 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 527 | 527 | ||
| 528 | #endif /* __KERNEL__ */ | ||
| 528 | #endif /* _ASM_M68K_UNISTD_H_ */ | 529 | #endif /* _ASM_M68K_UNISTD_H_ */ |
diff --git a/include/asm-mips/a.out.h b/include/asm-mips/a.out.h index 2b3dc3bed4da..ef33c3f13484 100644 --- a/include/asm-mips/a.out.h +++ b/include/asm-mips/a.out.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #endif | 14 | #endif |
| 16 | 15 | ||
diff --git a/include/asm-mips/addrspace.h b/include/asm-mips/addrspace.h index 0cc6c7060f3c..45c706e34df1 100644 --- a/include/asm-mips/addrspace.h +++ b/include/asm-mips/addrspace.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_ADDRSPACE_H | 10 | #ifndef _ASM_ADDRSPACE_H |
| 11 | #define _ASM_ADDRSPACE_H | 11 | #define _ASM_ADDRSPACE_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <spaces.h> | 13 | #include <spaces.h> |
| 15 | 14 | ||
| 16 | /* | 15 | /* |
diff --git a/include/asm-mips/arc/types.h b/include/asm-mips/arc/types.h index bbb725c366fb..b9adcd6f0860 100644 --- a/include/asm-mips/arc/types.h +++ b/include/asm-mips/arc/types.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_ARC_TYPES_H | 9 | #ifndef _ASM_ARC_TYPES_H |
| 10 | #define _ASM_ARC_TYPES_H | 10 | #define _ASM_ARC_TYPES_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #ifdef CONFIG_ARC32 | 13 | #ifdef CONFIG_ARC32 |
| 15 | 14 | ||
diff --git a/include/asm-mips/asm.h b/include/asm-mips/asm.h index 4b090f3142e0..e3038a4599ee 100644 --- a/include/asm-mips/asm.h +++ b/include/asm-mips/asm.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __ASM_ASM_H | 17 | #ifndef __ASM_ASM_H |
| 18 | #define __ASM_ASM_H | 18 | #define __ASM_ASM_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/sgidefs.h> | 20 | #include <asm/sgidefs.h> |
| 22 | 21 | ||
| 23 | #ifndef CAT | 22 | #ifndef CAT |
diff --git a/include/asm-mips/asmmacro.h b/include/asm-mips/asmmacro.h index f54aa147ec19..2c42f6b00a49 100644 --- a/include/asm-mips/asmmacro.h +++ b/include/asm-mips/asmmacro.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_ASMMACRO_H | 8 | #ifndef _ASM_ASMMACRO_H |
| 9 | #define _ASM_ASMMACRO_H | 9 | #define _ASM_ASMMACRO_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm/hazards.h> | 11 | #include <asm/hazards.h> |
| 13 | 12 | ||
| 14 | #ifdef CONFIG_32BIT | 13 | #ifdef CONFIG_32BIT |
diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h index 2c8b853376c9..13d44e14025a 100644 --- a/include/asm-mips/atomic.h +++ b/include/asm-mips/atomic.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * <linux/spinlock.h> we have to include <linux/spinlock.h> outside the | 17 | * <linux/spinlock.h> we have to include <linux/spinlock.h> outside the |
| 18 | * main big wrapper ... | 18 | * main big wrapper ... |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
| 22 | 21 | ||
| 23 | #ifndef _ASM_ATOMIC_H | 22 | #ifndef _ASM_ATOMIC_H |
diff --git a/include/asm-mips/bcache.h b/include/asm-mips/bcache.h index 446102b34f4e..3646a3f2ed38 100644 --- a/include/asm-mips/bcache.h +++ b/include/asm-mips/bcache.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_BCACHE_H | 9 | #ifndef _ASM_BCACHE_H |
| 10 | #define _ASM_BCACHE_H | 10 | #define _ASM_BCACHE_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* Some R4000 / R4400 / R4600 / R5000 machines may have a non-dma-coherent, | 13 | /* Some R4000 / R4400 / R4600 / R5000 machines may have a non-dma-coherent, |
| 15 | chipset implemented caches. On machines with other CPUs the CPU does the | 14 | chipset implemented caches. On machines with other CPUs the CPU does the |
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index d2f444537e4b..098cec263681 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_BITOPS_H | 9 | #ifndef _ASM_BITOPS_H |
| 10 | #define _ASM_BITOPS_H | 10 | #define _ASM_BITOPS_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/compiler.h> | 12 | #include <linux/compiler.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <asm/bug.h> | 14 | #include <asm/bug.h> |
diff --git a/include/asm-mips/bug.h b/include/asm-mips/bug.h index 87d49a5bdc63..7b4739dc8f3f 100644 --- a/include/asm-mips/bug.h +++ b/include/asm-mips/bug.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_BUG_H | 1 | #ifndef __ASM_BUG_H |
| 2 | #define __ASM_BUG_H | 2 | #define __ASM_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_BUG | 5 | #ifdef CONFIG_BUG |
| 7 | 6 | ||
diff --git a/include/asm-mips/bugs.h b/include/asm-mips/bugs.h index cb2ea7c15c7a..0d7f9c1f5546 100644 --- a/include/asm-mips/bugs.h +++ b/include/asm-mips/bugs.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _ASM_BUGS_H | 7 | #ifndef _ASM_BUGS_H |
| 8 | #define _ASM_BUGS_H | 8 | #define _ASM_BUGS_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 12 | #include <asm/cpu.h> | 11 | #include <asm/cpu.h> |
| 13 | #include <asm/cpu-info.h> | 12 | #include <asm/cpu-info.h> |
diff --git a/include/asm-mips/byteorder.h b/include/asm-mips/byteorder.h index aefc02f16fd8..eee83cbdf2b0 100644 --- a/include/asm-mips/byteorder.h +++ b/include/asm-mips/byteorder.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_BYTEORDER_H | 8 | #ifndef _ASM_BYTEORDER_H |
| 9 | #define _ASM_BYTEORDER_H | 9 | #define _ASM_BYTEORDER_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/compiler.h> | 11 | #include <linux/compiler.h> |
| 13 | #include <asm/types.h> | 12 | #include <asm/types.h> |
| 14 | 13 | ||
diff --git a/include/asm-mips/cache.h b/include/asm-mips/cache.h index 55e19f2ff0e0..37f175c42bb5 100644 --- a/include/asm-mips/cache.h +++ b/include/asm-mips/cache.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_CACHE_H | 9 | #ifndef _ASM_CACHE_H |
| 10 | #define _ASM_CACHE_H | 10 | #define _ASM_CACHE_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <kmalloc.h> | 12 | #include <kmalloc.h> |
| 14 | 13 | ||
| 15 | #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT | 14 | #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT |
diff --git a/include/asm-mips/checksum.h b/include/asm-mips/checksum.h index b09f8971e95d..a5e6050ec0f3 100644 --- a/include/asm-mips/checksum.h +++ b/include/asm-mips/checksum.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_CHECKSUM_H | 11 | #ifndef _ASM_CHECKSUM_H |
| 12 | #define _ASM_CHECKSUM_H | 12 | #define _ASM_CHECKSUM_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/in6.h> | 14 | #include <linux/in6.h> |
| 16 | 15 | ||
| 17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h index 254e11ed247b..881ce1f9803d 100644 --- a/include/asm-mips/cpu-features.h +++ b/include/asm-mips/cpu-features.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __ASM_CPU_FEATURES_H | 9 | #ifndef __ASM_CPU_FEATURES_H |
| 10 | #define __ASM_CPU_FEATURES_H | 10 | #define __ASM_CPU_FEATURES_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <asm/cpu.h> | 13 | #include <asm/cpu.h> |
| 15 | #include <asm/cpu-info.h> | 14 | #include <asm/cpu-info.h> |
diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h index 6572ac703662..a2f0c8ea9160 100644 --- a/include/asm-mips/cpu-info.h +++ b/include/asm-mips/cpu-info.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_CPU_INFO_H | 12 | #ifndef __ASM_CPU_INFO_H |
| 13 | #define __ASM_CPU_INFO_H | 13 | #define __ASM_CPU_INFO_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/cache.h> | 15 | #include <asm/cache.h> |
| 17 | 16 | ||
| 18 | #ifdef CONFIG_SGI_IP27 | 17 | #ifdef CONFIG_SGI_IP27 |
diff --git a/include/asm-mips/ddb5xxx/ddb5477.h b/include/asm-mips/ddb5xxx/ddb5477.h index a438548e6ef3..c5af4b73fdd7 100644 --- a/include/asm-mips/ddb5xxx/ddb5477.h +++ b/include/asm-mips/ddb5xxx/ddb5477.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __ASM_DDB5XXX_DDB5477_H | 17 | #ifndef __ASM_DDB5XXX_DDB5477_H |
| 18 | #define __ASM_DDB5XXX_DDB5477_H | 18 | #define __ASM_DDB5XXX_DDB5477_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | /* | 21 | /* |
| 23 | * This contains macros that are specific to DDB5477 or renamed from | 22 | * This contains macros that are specific to DDB5477 or renamed from |
diff --git a/include/asm-mips/ddb5xxx/ddb5xxx.h b/include/asm-mips/ddb5xxx/ddb5xxx.h index 2f1b191c6fff..e97fcc8d548b 100644 --- a/include/asm-mips/ddb5xxx/ddb5xxx.h +++ b/include/asm-mips/ddb5xxx/ddb5xxx.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __ASM_DDB5XXX_DDB5XXX_H | 18 | #ifndef __ASM_DDB5XXX_DDB5XXX_H |
| 19 | #define __ASM_DDB5XXX_DDB5XXX_H | 19 | #define __ASM_DDB5XXX_DDB5XXX_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | 22 | ||
| 24 | /* | 23 | /* |
diff --git a/include/asm-mips/debug.h b/include/asm-mips/debug.h index 930f2b75e766..1fd5a2b39445 100644 --- a/include/asm-mips/debug.h +++ b/include/asm-mips/debug.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _ASM_DEBUG_H | 15 | #ifndef _ASM_DEBUG_H |
| 16 | #define _ASM_DEBUG_H | 16 | #define _ASM_DEBUG_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | /* | 19 | /* |
| 21 | * run-time macros for catching spurious errors. Eable CONFIG_RUNTIME_DEBUG in | 20 | * run-time macros for catching spurious errors. Eable CONFIG_RUNTIME_DEBUG in |
diff --git a/include/asm-mips/dec/prom.h b/include/asm-mips/dec/prom.h index 1384dd0964b9..b9c8203688d5 100644 --- a/include/asm-mips/dec/prom.h +++ b/include/asm-mips/dec/prom.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _ASM_DEC_PROM_H | 15 | #ifndef _ASM_DEC_PROM_H |
| 16 | #define _ASM_DEC_PROM_H | 16 | #define _ASM_DEC_PROM_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | 19 | ||
| 21 | #include <asm/addrspace.h> | 20 | #include <asm/addrspace.h> |
diff --git a/include/asm-mips/delay.h b/include/asm-mips/delay.h index 928f30f8c45c..ea77050f8e3a 100644 --- a/include/asm-mips/delay.h +++ b/include/asm-mips/delay.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_DELAY_H | 10 | #ifndef _ASM_DELAY_H |
| 11 | #define _ASM_DELAY_H | 11 | #define _ASM_DELAY_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/param.h> | 13 | #include <linux/param.h> |
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
| 16 | #include <asm/compiler.h> | 15 | #include <asm/compiler.h> |
diff --git a/include/asm-mips/dma.h b/include/asm-mips/dma.h index 6aaf9939a716..e85849ac165f 100644 --- a/include/asm-mips/dma.h +++ b/include/asm-mips/dma.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_DMA_H | 12 | #ifndef _ASM_DMA_H |
| 13 | #define _ASM_DMA_H | 13 | #define _ASM_DMA_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/io.h> /* need byte IO */ | 15 | #include <asm/io.h> /* need byte IO */ |
| 17 | #include <linux/spinlock.h> /* And spinlocks */ | 16 | #include <linux/spinlock.h> /* And spinlocks */ |
| 18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
diff --git a/include/asm-mips/elf.h b/include/asm-mips/elf.h index bdc9de2df1ef..ebd6bfb19d66 100644 --- a/include/asm-mips/elf.h +++ b/include/asm-mips/elf.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_ELF_H | 8 | #ifndef _ASM_ELF_H |
| 9 | #define _ASM_ELF_H | 9 | #define _ASM_ELF_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | /* ELF header e_flags defines. */ | 12 | /* ELF header e_flags defines. */ |
| 14 | /* MIPS architecture level. */ | 13 | /* MIPS architecture level. */ |
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h index 43d047a9a6af..787220e6c1fc 100644 --- a/include/asm-mips/fcntl.h +++ b/include/asm-mips/fcntl.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_FCNTL_H | 8 | #ifndef _ASM_FCNTL_H |
| 9 | #define _ASM_FCNTL_H | 9 | #define _ASM_FCNTL_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #define O_APPEND 0x0008 | 12 | #define O_APPEND 0x0008 |
| 14 | #define O_SYNC 0x0010 | 13 | #define O_SYNC 0x0010 |
diff --git a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h index 73a3028dd9f9..1cadefbbc037 100644 --- a/include/asm-mips/fixmap.h +++ b/include/asm-mips/fixmap.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ASM_FIXMAP_H | 13 | #ifndef _ASM_FIXMAP_H |
| 14 | #define _ASM_FIXMAP_H | 14 | #define _ASM_FIXMAP_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
| 18 | #ifdef CONFIG_HIGHMEM | 17 | #ifdef CONFIG_HIGHMEM |
| 19 | #include <linux/threads.h> | 18 | #include <linux/threads.h> |
diff --git a/include/asm-mips/fpu.h b/include/asm-mips/fpu.h index 8bf510a27c64..58c561a9ec6b 100644 --- a/include/asm-mips/fpu.h +++ b/include/asm-mips/fpu.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_FPU_H | 10 | #ifndef _ASM_FPU_H |
| 11 | #define _ASM_FPU_H | 11 | #define _ASM_FPU_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/thread_info.h> | 14 | #include <linux/thread_info.h> |
| 16 | 15 | ||
diff --git a/include/asm-mips/futex.h b/include/asm-mips/futex.h index 1f94640becc4..ed023eae0674 100644 --- a/include/asm-mips/futex.h +++ b/include/asm-mips/futex.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/futex.h> | 6 | #include <linux/futex.h> |
| 8 | #include <asm/errno.h> | 7 | #include <asm/errno.h> |
| 9 | #include <asm/uaccess.h> | 8 | #include <asm/uaccess.h> |
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h index dadc05188db7..66943c451c1d 100644 --- a/include/asm-mips/hazards.h +++ b/include/asm-mips/hazards.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_HAZARDS_H | 10 | #ifndef _ASM_HAZARDS_H |
| 11 | #define _ASM_HAZARDS_H | 11 | #define _ASM_HAZARDS_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #ifdef __ASSEMBLY__ | 14 | #ifdef __ASSEMBLY__ |
| 16 | 15 | ||
diff --git a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h index 8cf598402492..c976bfaaba83 100644 --- a/include/asm-mips/highmem.h +++ b/include/asm-mips/highmem.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <asm/kmap_types.h> | 24 | #include <asm/kmap_types.h> |
diff --git a/include/asm-mips/interrupt.h b/include/asm-mips/interrupt.h index 4bb9c06f4410..a99d6867510f 100644 --- a/include/asm-mips/interrupt.h +++ b/include/asm-mips/interrupt.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_INTERRUPT_H | 11 | #ifndef _ASM_INTERRUPT_H |
| 12 | #define _ASM_INTERRUPT_H | 12 | #define _ASM_INTERRUPT_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/hazards.h> | 14 | #include <asm/hazards.h> |
| 16 | 15 | ||
| 17 | __asm__ ( | 16 | __asm__ ( |
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index 6b17eb9d79a5..df624e1ee6e2 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_IO_H | 12 | #ifndef _ASM_IO_H |
| 13 | #define _ASM_IO_H | 13 | #define _ASM_IO_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/compiler.h> | 15 | #include <linux/compiler.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/include/asm-mips/ip32/machine.h b/include/asm-mips/ip32/machine.h index e440fdf4b232..1b631b8da6f8 100644 --- a/include/asm-mips/ip32/machine.h +++ b/include/asm-mips/ip32/machine.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_IP32_MACHINE_H | 10 | #ifndef _ASM_IP32_MACHINE_H |
| 11 | #define _ASM_IP32_MACHINE_H | 11 | #define _ASM_IP32_MACHINE_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #ifdef CONFIG_SGI_IP32 | 14 | #ifdef CONFIG_SGI_IP32 |
| 16 | 15 | ||
diff --git a/include/asm-mips/irq.h b/include/asm-mips/irq.h index dde677f02bc0..d35c61776a02 100644 --- a/include/asm-mips/irq.h +++ b/include/asm-mips/irq.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_IRQ_H | 9 | #ifndef _ASM_IRQ_H |
| 10 | #define _ASM_IRQ_H | 10 | #define _ASM_IRQ_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | 13 | ||
| 15 | #include <asm/mipsmtregs.h> | 14 | #include <asm/mipsmtregs.h> |
diff --git a/include/asm-mips/isadep.h b/include/asm-mips/isadep.h index 7bb003511d9e..24c6cda79377 100644 --- a/include/asm-mips/isadep.h +++ b/include/asm-mips/isadep.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (c) 1998 Harald Koerfgen | 6 | * Copyright (c) 1998 Harald Koerfgen |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #ifndef __ASM_ISADEP_H | 9 | #ifndef __ASM_ISADEP_H |
| 11 | #define __ASM_ISADEP_H | 10 | #define __ASM_ISADEP_H |
diff --git a/include/asm-mips/jmr3927/irq.h b/include/asm-mips/jmr3927/irq.h index b0c325a22343..fe551f33a74f 100644 --- a/include/asm-mips/jmr3927/irq.h +++ b/include/asm-mips/jmr3927/irq.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
| 17 | 16 | ||
| 18 | struct tb_irq_space { | 17 | struct tb_irq_space { |
diff --git a/include/asm-mips/kmap_types.h b/include/asm-mips/kmap_types.h index 6886a0c3fedf..806aae3c5338 100644 --- a/include/asm-mips/kmap_types.h +++ b/include/asm-mips/kmap_types.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_KMAP_TYPES_H | 1 | #ifndef _ASM_KMAP_TYPES_H |
| 2 | #define _ASM_KMAP_TYPES_H | 2 | #define _ASM_KMAP_TYPES_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_DEBUG_HIGHMEM | 5 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 7 | # define D(n) __KM_FENCE_##n , | 6 | # define D(n) __KM_FENCE_##n , |
diff --git a/include/asm-mips/local.h b/include/asm-mips/local.h index c38844f615fc..9e2d43bae388 100644 --- a/include/asm-mips/local.h +++ b/include/asm-mips/local.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_LOCAL_H | 1 | #ifndef _ASM_LOCAL_H |
| 2 | #define _ASM_LOCAL_H | 2 | #define _ASM_LOCAL_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/percpu.h> | 4 | #include <linux/percpu.h> |
| 6 | #include <asm/atomic.h> | 5 | #include <asm/atomic.h> |
| 7 | 6 | ||
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 4686e17c206c..582acd8adb81 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #ifndef _AU1000_H_ | 35 | #ifndef _AU1000_H_ |
| 36 | #define _AU1000_H_ | 36 | #define _AU1000_H_ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | 38 | ||
| 40 | #ifndef _LANGUAGE_ASSEMBLY | 39 | #ifndef _LANGUAGE_ASSEMBLY |
| 41 | 40 | ||
diff --git a/include/asm-mips/mach-au1x00/au1xxx.h b/include/asm-mips/mach-au1x00/au1xxx.h index b7b46dd9b929..947135941033 100644 --- a/include/asm-mips/mach-au1x00/au1xxx.h +++ b/include/asm-mips/mach-au1x00/au1xxx.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #ifndef _AU1XXX_H_ | 23 | #ifndef _AU1XXX_H_ |
| 24 | #define _AU1XXX_H_ | 24 | #define _AU1XXX_H_ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | #include <asm/mach-au1x00/au1000.h> | 27 | #include <asm/mach-au1x00/au1000.h> |
| 29 | 28 | ||
diff --git a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h index b327bcd3fee1..d5b38a247e5a 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h +++ b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #ifndef _AU1000_DBDMA_H_ | 34 | #ifndef _AU1000_DBDMA_H_ |
| 35 | #define _AU1000_DBDMA_H_ | 35 | #define _AU1000_DBDMA_H_ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | 37 | ||
| 39 | #ifndef _LANGUAGE_ASSEMBLY | 38 | #ifndef _LANGUAGE_ASSEMBLY |
| 40 | 39 | ||
diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/include/asm-mips/mach-au1x00/au1xxx_ide.h index e867b4ef96d1..301e71300779 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_ide.h +++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE | 29 | * Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE |
| 30 | * Interface and Linux Device Driver" Application Note. | 30 | * Interface and Linux Device Driver" Application Note. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/config.h> | ||
| 33 | 32 | ||
| 34 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 33 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
| 35 | #define DMA_WAIT_TIMEOUT 100 | 34 | #define DMA_WAIT_TIMEOUT 100 |
diff --git a/include/asm-mips/mach-au1x00/au1xxx_psc.h b/include/asm-mips/mach-au1x00/au1xxx_psc.h index 8e5fb3c7da4d..5c3e2a38ce12 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_psc.h +++ b/include/asm-mips/mach-au1x00/au1xxx_psc.h | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #ifndef _AU1000_PSC_H_ | 33 | #ifndef _AU1000_PSC_H_ |
| 34 | #define _AU1000_PSC_H_ | 34 | #define _AU1000_PSC_H_ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | 36 | ||
| 38 | /* The PSC base addresses. */ | 37 | /* The PSC base addresses. */ |
| 39 | #ifdef CONFIG_SOC_AU1550 | 38 | #ifdef CONFIG_SOC_AU1550 |
diff --git a/include/asm-mips/mach-au1x00/ioremap.h b/include/asm-mips/mach-au1x00/ioremap.h index d3ec6274575a..098fca4289bb 100644 --- a/include/asm-mips/mach-au1x00/ioremap.h +++ b/include/asm-mips/mach-au1x00/ioremap.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __ASM_MACH_AU1X00_IOREMAP_H | 9 | #ifndef __ASM_MACH_AU1X00_IOREMAP_H |
| 10 | #define __ASM_MACH_AU1X00_IOREMAP_H | 10 | #define __ASM_MACH_AU1X00_IOREMAP_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | 13 | ||
| 15 | #ifdef CONFIG_64BIT_PHYS_ADDR | 14 | #ifdef CONFIG_64BIT_PHYS_ADDR |
diff --git a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h b/include/asm-mips/mach-cobalt/cpu-feature-overrides.h index ace8c5ef9701..e0e08fc5d7f7 100644 --- a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h +++ b/include/asm-mips/mach-cobalt/cpu-feature-overrides.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __ASM_COBALT_CPU_FEATURE_OVERRIDES_H | 8 | #ifndef __ASM_COBALT_CPU_FEATURE_OVERRIDES_H |
| 9 | #define __ASM_COBALT_CPU_FEATURE_OVERRIDES_H | 9 | #define __ASM_COBALT_CPU_FEATURE_OVERRIDES_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #define cpu_has_tlb 1 | 12 | #define cpu_has_tlb 1 |
| 14 | #define cpu_has_4kex 1 | 13 | #define cpu_has_4kex 1 |
diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h index 7b28b23f91ce..8fbb4b42a8b5 100644 --- a/include/asm-mips/mach-db1x00/db1x00.h +++ b/include/asm-mips/mach-db1x00/db1x00.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #ifndef __ASM_DB1X00_H | 28 | #ifndef __ASM_DB1X00_H |
| 29 | #define __ASM_DB1X00_H | 29 | #define __ASM_DB1X00_H |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | 31 | ||
| 33 | #ifdef CONFIG_MIPS_DB1550 | 32 | #ifdef CONFIG_MIPS_DB1550 |
| 34 | #define BCSR_KSEG1_ADDR 0xAF000000 | 33 | #define BCSR_KSEG1_ADDR 0xAF000000 |
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index e3315359500a..6eba2e576aaa 100644 --- a/include/asm-mips/mach-generic/ide.h +++ b/include/asm-mips/mach-generic/ide.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 20 | #include <linux/stddef.h> | 19 | #include <linux/stddef.h> |
| 21 | #include <asm/processor.h> | 20 | #include <asm/processor.h> |
diff --git a/include/asm-mips/mach-generic/kmalloc.h b/include/asm-mips/mach-generic/kmalloc.h index 373d66dee9d7..410ab5f6c563 100644 --- a/include/asm-mips/mach-generic/kmalloc.h +++ b/include/asm-mips/mach-generic/kmalloc.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_MACH_GENERIC_KMALLOC_H | 1 | #ifndef __ASM_MACH_GENERIC_KMALLOC_H |
| 2 | #define __ASM_MACH_GENERIC_KMALLOC_H | 2 | #define __ASM_MACH_GENERIC_KMALLOC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifndef CONFIG_DMA_COHERENT | 5 | #ifndef CONFIG_DMA_COHERENT |
| 7 | /* | 6 | /* |
diff --git a/include/asm-mips/mach-generic/spaces.h b/include/asm-mips/mach-generic/spaces.h index b849d8dd7e78..0ae9997bc9a8 100644 --- a/include/asm-mips/mach-generic/spaces.h +++ b/include/asm-mips/mach-generic/spaces.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_MACH_GENERIC_SPACES_H | 10 | #ifndef _ASM_MACH_GENERIC_SPACES_H |
| 11 | #define _ASM_MACH_GENERIC_SPACES_H | 11 | #define _ASM_MACH_GENERIC_SPACES_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #ifdef CONFIG_32BIT | 14 | #ifdef CONFIG_32BIT |
| 16 | 15 | ||
diff --git a/include/asm-mips/mach-ip22/spaces.h b/include/asm-mips/mach-ip22/spaces.h index 8385f716798d..ab20c026fd19 100644 --- a/include/asm-mips/mach-ip22/spaces.h +++ b/include/asm-mips/mach-ip22/spaces.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_MACH_IP22_SPACES_H | 10 | #ifndef _ASM_MACH_IP22_SPACES_H |
| 11 | #define _ASM_MACH_IP22_SPACES_H | 11 | #define _ASM_MACH_IP22_SPACES_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #ifdef CONFIG_32BIT | 14 | #ifdef CONFIG_32BIT |
| 16 | 15 | ||
diff --git a/include/asm-mips/mach-ip32/cpu-feature-overrides.h b/include/asm-mips/mach-ip32/cpu-feature-overrides.h index f0ef1ac9ecd7..2a3de092bf13 100644 --- a/include/asm-mips/mach-ip32/cpu-feature-overrides.h +++ b/include/asm-mips/mach-ip32/cpu-feature-overrides.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H | 9 | #ifndef __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H |
| 10 | #define __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H | 10 | #define __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * R5000 has an interesting "restriction": ll(d)/sc(d) | 14 | * R5000 has an interesting "restriction": ll(d)/sc(d) |
diff --git a/include/asm-mips/mach-ip32/kmalloc.h b/include/asm-mips/mach-ip32/kmalloc.h index 9d2d4d9ac036..f6198a21fba1 100644 --- a/include/asm-mips/mach-ip32/kmalloc.h +++ b/include/asm-mips/mach-ip32/kmalloc.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_MACH_IP32_KMALLOC_H | 1 | #ifndef __ASM_MACH_IP32_KMALLOC_H |
| 2 | #define __ASM_MACH_IP32_KMALLOC_H | 2 | #define __ASM_MACH_IP32_KMALLOC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #if defined(CONFIG_CPU_R5000) || defined (CONFIG_CPU_RM7000) | 5 | #if defined(CONFIG_CPU_R5000) || defined (CONFIG_CPU_RM7000) |
| 7 | #define ARCH_KMALLOC_MINALIGN 32 | 6 | #define ARCH_KMALLOC_MINALIGN 32 |
diff --git a/include/asm-mips/mach-mips/cpu-feature-overrides.h b/include/asm-mips/mach-mips/cpu-feature-overrides.h index 12c937283bb4..e960679f54ba 100644 --- a/include/asm-mips/mach-mips/cpu-feature-overrides.h +++ b/include/asm-mips/mach-mips/cpu-feature-overrides.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H | 9 | #ifndef __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H |
| 10 | #define __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H | 10 | #define __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * CPU feature overrides for MIPS boards | 14 | * CPU feature overrides for MIPS boards |
diff --git a/include/asm-mips/mach-mips/irq.h b/include/asm-mips/mach-mips/irq.h index f8579696ca54..083d9c512a04 100644 --- a/include/asm-mips/mach-mips/irq.h +++ b/include/asm-mips/mach-mips/irq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_MACH_MIPS_IRQ_H | 1 | #ifndef __ASM_MACH_MIPS_IRQ_H |
| 2 | #define __ASM_MACH_MIPS_IRQ_H | 2 | #define __ASM_MACH_MIPS_IRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #define NR_IRQS 256 | 5 | #define NR_IRQS 256 |
| 7 | 6 | ||
diff --git a/include/asm-mips/mach-pb1x00/pb1550.h b/include/asm-mips/mach-pb1x00/pb1550.h index 9578ead11e8a..9a4955ce3b4a 100644 --- a/include/asm-mips/mach-pb1x00/pb1550.h +++ b/include/asm-mips/mach-pb1x00/pb1550.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #ifndef __ASM_PB1550_H | 27 | #ifndef __ASM_PB1550_H |
| 28 | #define __ASM_PB1550_H | 28 | #define __ASM_PB1550_H |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | 31 | ||
| 33 | #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX | 32 | #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX |
diff --git a/include/asm-mips/mach-sim/cpu-feature-overrides.h b/include/asm-mips/mach-sim/cpu-feature-overrides.h index d9653e47d5fc..d736bdadb6df 100644 --- a/include/asm-mips/mach-sim/cpu-feature-overrides.h +++ b/include/asm-mips/mach-sim/cpu-feature-overrides.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __ASM_MACH_SIM_CPU_FEATURE_OVERRIDES_H | 8 | #ifndef __ASM_MACH_SIM_CPU_FEATURE_OVERRIDES_H |
| 9 | #define __ASM_MACH_SIM_CPU_FEATURE_OVERRIDES_H | 9 | #define __ASM_MACH_SIM_CPU_FEATURE_OVERRIDES_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | /* | 12 | /* |
| 14 | * CPU feature overrides for MIPS boards | 13 | * CPU feature overrides for MIPS boards |
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h index fa8b913cc3e0..b98f1658cfd0 100644 --- a/include/asm-mips/mips-boards/generic.h +++ b/include/asm-mips/mips-boards/generic.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __ASM_MIPS_BOARDS_GENERIC_H | 20 | #ifndef __ASM_MIPS_BOARDS_GENERIC_H |
| 21 | #define __ASM_MIPS_BOARDS_GENERIC_H | 21 | #define __ASM_MIPS_BOARDS_GENERIC_H |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <asm/addrspace.h> | 23 | #include <asm/addrspace.h> |
| 25 | #include <asm/byteorder.h> | 24 | #include <asm/byteorder.h> |
| 26 | #include <asm/mips-boards/bonito64.h> | 25 | #include <asm/mips-boards/bonito64.h> |
diff --git a/include/asm-mips/mipsregs.h b/include/asm-mips/mipsregs.h index 98b68089aa53..673977901ed3 100644 --- a/include/asm-mips/mipsregs.h +++ b/include/asm-mips/mipsregs.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ASM_MIPSREGS_H | 13 | #ifndef _ASM_MIPSREGS_H |
| 14 | #define _ASM_MIPSREGS_H | 14 | #define _ASM_MIPSREGS_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
| 18 | #include <asm/hazards.h> | 17 | #include <asm/hazards.h> |
| 19 | 18 | ||
diff --git a/include/asm-mips/mmu_context.h b/include/asm-mips/mmu_context.h index 6e09f4c87211..18b69de87daa 100644 --- a/include/asm-mips/mmu_context.h +++ b/include/asm-mips/mmu_context.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_MMU_CONTEXT_H | 11 | #ifndef _ASM_MMU_CONTEXT_H |
| 12 | #define _ASM_MMU_CONTEXT_H | 12 | #define _ASM_MMU_CONTEXT_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
diff --git a/include/asm-mips/mmzone.h b/include/asm-mips/mmzone.h index f6bd2e0c45a1..dc231c89bef9 100644 --- a/include/asm-mips/mmzone.h +++ b/include/asm-mips/mmzone.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #ifndef _ASM_MMZONE_H_ | 5 | #ifndef _ASM_MMZONE_H_ |
| 6 | #define _ASM_MMZONE_H_ | 6 | #define _ASM_MMZONE_H_ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/page.h> | 8 | #include <asm/page.h> |
| 10 | #include <mmzone.h> | 9 | #include <mmzone.h> |
| 11 | 10 | ||
diff --git a/include/asm-mips/module.h b/include/asm-mips/module.h index 2af496c78c12..399d03f1c4fc 100644 --- a/include/asm-mips/module.h +++ b/include/asm-mips/module.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_MODULE_H | 1 | #ifndef _ASM_MODULE_H |
| 2 | #define _ASM_MODULE_H | 2 | #define _ASM_MODULE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/list.h> | 4 | #include <linux/list.h> |
| 6 | #include <asm/uaccess.h> | 5 | #include <asm/uaccess.h> |
| 7 | 6 | ||
diff --git a/include/asm-mips/msgbuf.h b/include/asm-mips/msgbuf.h index a1533959742e..0d6c7f14de31 100644 --- a/include/asm-mips/msgbuf.h +++ b/include/asm-mips/msgbuf.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_MSGBUF_H | 1 | #ifndef _ASM_MSGBUF_H |
| 2 | #define _ASM_MSGBUF_H | 2 | #define _ASM_MSGBUF_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * The msqid64_ds structure for the MIPS architecture. | 6 | * The msqid64_ds structure for the MIPS architecture. |
diff --git a/include/asm-mips/paccess.h b/include/asm-mips/paccess.h index 46f2d23d2697..147844ef103b 100644 --- a/include/asm-mips/paccess.h +++ b/include/asm-mips/paccess.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ASM_PACCESS_H | 13 | #ifndef _ASM_PACCESS_H |
| 14 | #define _ASM_PACCESS_H | 14 | #define _ASM_PACCESS_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 18 | 17 | ||
| 19 | #ifdef CONFIG_32BIT | 18 | #ifdef CONFIG_32BIT |
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index 3d262c01521c..6b97744f00cd 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_PAGE_H | 9 | #ifndef _ASM_PAGE_H |
| 10 | #define _ASM_PAGE_H | 10 | #define _ASM_PAGE_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #ifdef __KERNEL__ | 13 | #ifdef __KERNEL__ |
| 15 | 14 | ||
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h index 6c9ad8171a77..c4d68bebdca6 100644 --- a/include/asm-mips/pci.h +++ b/include/asm-mips/pci.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _ASM_PCI_H | 6 | #ifndef _ASM_PCI_H |
| 7 | #define _ASM_PCI_H | 7 | #define _ASM_PCI_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | 10 | ||
| 12 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
diff --git a/include/asm-mips/pgalloc.h b/include/asm-mips/pgalloc.h index fe1df572318b..582c1fe6cc4a 100644 --- a/include/asm-mips/pgalloc.h +++ b/include/asm-mips/pgalloc.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_PGALLOC_H | 9 | #ifndef _ASM_PGALLOC_H |
| 10 | #define _ASM_PGALLOC_H | 10 | #define _ASM_PGALLOC_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/highmem.h> | 12 | #include <linux/highmem.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | 14 | ||
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 087c20769256..4b26d8528133 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_PGTABLE_32_H | 9 | #ifndef _ASM_PGTABLE_32_H |
| 10 | #define _ASM_PGTABLE_32_H | 10 | #define _ASM_PGTABLE_32_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/addrspace.h> | 12 | #include <asm/addrspace.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 15 | 14 | ||
diff --git a/include/asm-mips/pgtable-64.h b/include/asm-mips/pgtable-64.h index 2faf5c9ff127..e3db93212eab 100644 --- a/include/asm-mips/pgtable-64.h +++ b/include/asm-mips/pgtable-64.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_PGTABLE_64_H | 9 | #ifndef _ASM_PGTABLE_64_H |
| 10 | #define _ASM_PGTABLE_64_H | 10 | #define _ASM_PGTABLE_64_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | 13 | ||
| 15 | #include <asm/addrspace.h> | 14 | #include <asm/addrspace.h> |
diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 01e76e932e3f..7494ba91112a 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_PGTABLE_BITS_H | 10 | #ifndef _ASM_PGTABLE_BITS_H |
| 11 | #define _ASM_PGTABLE_BITS_H | 11 | #define _ASM_PGTABLE_BITS_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | /* | 14 | /* |
| 16 | * Note that we shift the lower 32bits of each EntryLo[01] entry | 15 | * Note that we shift the lower 32bits of each EntryLo[01] entry |
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index be75cca20e8d..a36ca1be17f2 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_PGTABLE_H | 8 | #ifndef _ASM_PGTABLE_H |
| 9 | #define _ASM_PGTABLE_H | 9 | #define _ASM_PGTABLE_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #ifdef CONFIG_32BIT | 11 | #ifdef CONFIG_32BIT |
| 13 | #include <asm/pgtable-32.h> | 12 | #include <asm/pgtable-32.h> |
| 14 | #endif | 13 | #endif |
diff --git a/include/asm-mips/prefetch.h b/include/asm-mips/prefetch.h index 71293ec1657c..17850834ccb0 100644 --- a/include/asm-mips/prefetch.h +++ b/include/asm-mips/prefetch.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __ASM_PREFETCH_H | 8 | #ifndef __ASM_PREFETCH_H |
| 9 | #define __ASM_PREFETCH_H | 9 | #define __ASM_PREFETCH_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | /* | 12 | /* |
| 14 | * R5000 and RM5200 implements pref and prefx instructions but they're nops, so | 13 | * R5000 and RM5200 implements pref and prefx instructions but they're nops, so |
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h index 83936469fe87..5f80ba71ab92 100644 --- a/include/asm-mips/processor.h +++ b/include/asm-mips/processor.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_PROCESSOR_H | 11 | #ifndef _ASM_PROCESSOR_H |
| 12 | #define _ASM_PROCESSOR_H | 12 | #define _ASM_PROCESSOR_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/cpumask.h> | 14 | #include <linux/cpumask.h> |
| 16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
| 17 | 16 | ||
diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h index fa9d8713c12a..4113316ee0da 100644 --- a/include/asm-mips/ptrace.h +++ b/include/asm-mips/ptrace.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_PTRACE_H | 9 | #ifndef _ASM_PTRACE_H |
| 10 | #define _ASM_PTRACE_H | 10 | #define _ASM_PTRACE_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <asm/isadep.h> | 13 | #include <asm/isadep.h> |
| 15 | 14 | ||
diff --git a/include/asm-mips/reg.h b/include/asm-mips/reg.h index 6173004cc88e..634b55d7e7f6 100644 --- a/include/asm-mips/reg.h +++ b/include/asm-mips/reg.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_MIPS_REG_H | 12 | #ifndef __ASM_MIPS_REG_H |
| 13 | #define __ASM_MIPS_REG_H | 13 | #define __ASM_MIPS_REG_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #if defined(CONFIG_32BIT) || defined(WANT_COMPAT_REG_H) | 16 | #if defined(CONFIG_32BIT) || defined(WANT_COMPAT_REG_H) |
| 18 | 17 | ||
diff --git a/include/asm-mips/resource.h b/include/asm-mips/resource.h index 1fba00c22077..87cb3085269c 100644 --- a/include/asm-mips/resource.h +++ b/include/asm-mips/resource.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_RESOURCE_H | 9 | #ifndef _ASM_RESOURCE_H |
| 10 | #define _ASM_RESOURCE_H | 10 | #define _ASM_RESOURCE_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * These five resource limit IDs have a MIPS/Linux-specific ordering, | 14 | * These five resource limit IDs have a MIPS/Linux-specific ordering, |
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h index 7196ceb0e948..584bd9c0ab2e 100644 --- a/include/asm-mips/serial.h +++ b/include/asm-mips/serial.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SERIAL_H | 9 | #ifndef _ASM_SERIAL_H |
| 10 | #define _ASM_SERIAL_H | 10 | #define _ASM_SERIAL_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * This assumes you have a 1.8432 MHz clock for your UART. | 14 | * This assumes you have a 1.8432 MHz clock for your UART. |
diff --git a/include/asm-mips/sgiarcs.h b/include/asm-mips/sgiarcs.h index 722b77a8c5e5..ddb859d05257 100644 --- a/include/asm-mips/sgiarcs.h +++ b/include/asm-mips/sgiarcs.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_SGIARCS_H | 12 | #ifndef _ASM_SGIARCS_H |
| 13 | #define _ASM_SGIARCS_H | 13 | #define _ASM_SGIARCS_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/types.h> | 15 | #include <asm/types.h> |
| 17 | #include <asm/arc/types.h> | 16 | #include <asm/arc/types.h> |
| 18 | 17 | ||
diff --git a/include/asm-mips/sibyte/board.h b/include/asm-mips/sibyte/board.h index 900edcbeec37..3dfe29ed42a8 100644 --- a/include/asm-mips/sibyte/board.h +++ b/include/asm-mips/sibyte/board.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef _SIBYTE_BOARD_H | 19 | #ifndef _SIBYTE_BOARD_H |
| 20 | #define _SIBYTE_BOARD_H | 20 | #define _SIBYTE_BOARD_H |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #if defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_PTSWARM) || \ | 23 | #if defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_PTSWARM) || \ |
| 25 | defined(CONFIG_SIBYTE_CRHONE) || defined(CONFIG_SIBYTE_CRHINE) || \ | 24 | defined(CONFIG_SIBYTE_CRHONE) || defined(CONFIG_SIBYTE_CRHINE) || \ |
diff --git a/include/asm-mips/sibyte/carmel.h b/include/asm-mips/sibyte/carmel.h index b5e7dae19f0f..57c53e62a37a 100644 --- a/include/asm-mips/sibyte/carmel.h +++ b/include/asm-mips/sibyte/carmel.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __ASM_SIBYTE_CARMEL_H | 18 | #ifndef __ASM_SIBYTE_CARMEL_H |
| 19 | #define __ASM_SIBYTE_CARMEL_H | 19 | #define __ASM_SIBYTE_CARMEL_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | #include <asm/sibyte/sb1250.h> | 22 | #include <asm/sibyte/sb1250.h> |
| 24 | #include <asm/sibyte/sb1250_int.h> | 23 | #include <asm/sibyte/sb1250_int.h> |
diff --git a/include/asm-mips/sibyte/sentosa.h b/include/asm-mips/sibyte/sentosa.h index 824605847af4..64c47874f32d 100644 --- a/include/asm-mips/sibyte/sentosa.h +++ b/include/asm-mips/sibyte/sentosa.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __ASM_SIBYTE_SENTOSA_H | 18 | #ifndef __ASM_SIBYTE_SENTOSA_H |
| 19 | #define __ASM_SIBYTE_SENTOSA_H | 19 | #define __ASM_SIBYTE_SENTOSA_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <asm/sibyte/sb1250.h> | 21 | #include <asm/sibyte/sb1250.h> |
| 23 | #include <asm/sibyte/sb1250_int.h> | 22 | #include <asm/sibyte/sb1250_int.h> |
| 24 | 23 | ||
diff --git a/include/asm-mips/sibyte/swarm.h b/include/asm-mips/sibyte/swarm.h index 06e1d528e03a..86db37e5ad85 100644 --- a/include/asm-mips/sibyte/swarm.h +++ b/include/asm-mips/sibyte/swarm.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __ASM_SIBYTE_SWARM_H | 18 | #ifndef __ASM_SIBYTE_SWARM_H |
| 19 | #define __ASM_SIBYTE_SWARM_H | 19 | #define __ASM_SIBYTE_SWARM_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <asm/sibyte/sb1250.h> | 21 | #include <asm/sibyte/sb1250.h> |
| 23 | #include <asm/sibyte/sb1250_int.h> | 22 | #include <asm/sibyte/sb1250_int.h> |
| 24 | 23 | ||
diff --git a/include/asm-mips/siginfo.h b/include/asm-mips/siginfo.h index 2ba313d94a78..2e32949bd674 100644 --- a/include/asm-mips/siginfo.h +++ b/include/asm-mips/siginfo.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SIGINFO_H | 9 | #ifndef _ASM_SIGINFO_H |
| 10 | #define _ASM_SIGINFO_H | 10 | #define _ASM_SIGINFO_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int)) | 13 | #define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int)) |
| 15 | #undef __ARCH_SI_TRAPNO /* exception code needs to fill this ... */ | 14 | #undef __ARCH_SI_TRAPNO /* exception code needs to fill this ... */ |
diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h index d8349e4b55ee..a1f3a3fa9bd6 100644 --- a/include/asm-mips/signal.h +++ b/include/asm-mips/signal.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SIGNAL_H | 9 | #ifndef _ASM_SIGNAL_H |
| 10 | #define _ASM_SIGNAL_H | 10 | #define _ASM_SIGNAL_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | 13 | ||
| 15 | #define _NSIG 128 | 14 | #define _NSIG 128 |
diff --git a/include/asm-mips/sim.h b/include/asm-mips/sim.h index 9c2af1b00e19..67c4fe52bb42 100644 --- a/include/asm-mips/sim.h +++ b/include/asm-mips/sim.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SIM_H | 9 | #ifndef _ASM_SIM_H |
| 10 | #define _ASM_SIM_H | 10 | #define _ASM_SIM_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <asm/asm-offsets.h> | 13 | #include <asm/asm-offsets.h> |
| 15 | 14 | ||
diff --git a/include/asm-mips/smp.h b/include/asm-mips/smp.h index e14e4b69de21..1608fd71d6f7 100644 --- a/include/asm-mips/smp.h +++ b/include/asm-mips/smp.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_SMP_H | 11 | #ifndef __ASM_SMP_H |
| 12 | #define __ASM_SMP_H | 12 | #define __ASM_SMP_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #ifdef CONFIG_SMP | 15 | #ifdef CONFIG_SMP |
| 17 | 16 | ||
diff --git a/include/asm-mips/sn/addrs.h b/include/asm-mips/sn/addrs.h index 6c8a5577ddf1..8fa0af6b68d2 100644 --- a/include/asm-mips/sn/addrs.h +++ b/include/asm-mips/sn/addrs.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SN_ADDRS_H | 9 | #ifndef _ASM_SN_ADDRS_H |
| 10 | #define _ASM_SN_ADDRS_H | 10 | #define _ASM_SN_ADDRS_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
diff --git a/include/asm-mips/sn/agent.h b/include/asm-mips/sn/agent.h index d6df13aaed49..ac4ea85c3a5c 100644 --- a/include/asm-mips/sn/agent.h +++ b/include/asm-mips/sn/agent.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_SGI_SN_AGENT_H | 11 | #ifndef _ASM_SGI_SN_AGENT_H |
| 12 | #define _ASM_SGI_SN_AGENT_H | 12 | #define _ASM_SGI_SN_AGENT_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/topology.h> | 14 | #include <linux/topology.h> |
| 16 | #include <asm/sn/addrs.h> | 15 | #include <asm/sn/addrs.h> |
| 17 | #include <asm/sn/arch.h> | 16 | #include <asm/sn/arch.h> |
diff --git a/include/asm-mips/sn/arch.h b/include/asm-mips/sn/arch.h index d247a819de7f..51174af6ac52 100644 --- a/include/asm-mips/sn/arch.h +++ b/include/asm-mips/sn/arch.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_SN_ARCH_H | 11 | #ifndef _ASM_SN_ARCH_H |
| 12 | #define _ASM_SN_ARCH_H | 12 | #define _ASM_SN_ARCH_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <asm/sn/types.h> | 15 | #include <asm/sn/types.h> |
| 17 | #ifdef CONFIG_SGI_IP27 | 16 | #ifdef CONFIG_SGI_IP27 |
diff --git a/include/asm-mips/sn/io.h b/include/asm-mips/sn/io.h index 13326453efc9..ab2fa8cd2627 100644 --- a/include/asm-mips/sn/io.h +++ b/include/asm-mips/sn/io.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SN_IO_H | 9 | #ifndef _ASM_SN_IO_H |
| 10 | #define _ASM_SN_IO_H | 10 | #define _ASM_SN_IO_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #if defined (CONFIG_SGI_IP27) | 12 | #if defined (CONFIG_SGI_IP27) |
| 14 | #include <asm/sn/sn0/hubio.h> | 13 | #include <asm/sn/sn0/hubio.h> |
| 15 | #endif | 14 | #endif |
diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h index dc706268d2cf..52238e65af8e 100644 --- a/include/asm-mips/sn/klconfig.h +++ b/include/asm-mips/sn/klconfig.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * that offsets of existing fields do not change. | 27 | * that offsets of existing fields do not change. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <asm/sn/types.h> | 31 | #include <asm/sn/types.h> |
| 33 | 32 | ||
diff --git a/include/asm-mips/sn/kldir.h b/include/asm-mips/sn/kldir.h index 97ad52e3cbc7..0573cbffc104 100644 --- a/include/asm-mips/sn/kldir.h +++ b/include/asm-mips/sn/kldir.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_SN_KLDIR_H | 11 | #ifndef _ASM_SN_KLDIR_H |
| 12 | #define _ASM_SN_KLDIR_H | 12 | #define _ASM_SN_KLDIR_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * The kldir memory area resides at a fixed place in each node's memory and | 16 | * The kldir memory area resides at a fixed place in each node's memory and |
diff --git a/include/asm-mips/sn/launch.h b/include/asm-mips/sn/launch.h index b67699c0c475..b7c2226312c6 100644 --- a/include/asm-mips/sn/launch.h +++ b/include/asm-mips/sn/launch.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_SN_LAUNCH_H | 9 | #ifndef _ASM_SN_LAUNCH_H |
| 10 | #define _ASM_SN_LAUNCH_H | 10 | #define _ASM_SN_LAUNCH_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/sn/types.h> | 12 | #include <asm/sn/types.h> |
| 14 | #include <asm/sn/addrs.h> | 13 | #include <asm/sn/addrs.h> |
| 15 | 14 | ||
diff --git a/include/asm-mips/sn/mapped_kernel.h b/include/asm-mips/sn/mapped_kernel.h index 59edb20f8ec5..c3dd5d0d525f 100644 --- a/include/asm-mips/sn/mapped_kernel.h +++ b/include/asm-mips/sn/mapped_kernel.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * code. So no jumps can be done before we have switched to using | 20 | * code. So no jumps can be done before we have switched to using |
| 21 | * cksseg addresses. | 21 | * cksseg addresses. |
| 22 | */ | 22 | */ |
| 23 | #include <linux/config.h> | ||
| 24 | #include <asm/addrspace.h> | 23 | #include <asm/addrspace.h> |
| 25 | 24 | ||
| 26 | #define REP_BASE CAC_BASE | 25 | #define REP_BASE CAC_BASE |
diff --git a/include/asm-mips/sn/sn0/addrs.h b/include/asm-mips/sn/sn0/addrs.h index 2c4b758f6736..9e8cc52910f6 100644 --- a/include/asm-mips/sn/sn0/addrs.h +++ b/include/asm-mips/sn/sn0/addrs.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_SN_SN0_ADDRS_H | 11 | #ifndef _ASM_SN_SN0_ADDRS_H |
| 12 | #define _ASM_SN_SN0_ADDRS_H | 12 | #define _ASM_SN_SN0_ADDRS_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * SN0 (on a T5) Address map | 16 | * SN0 (on a T5) Address map |
diff --git a/include/asm-mips/sn/sn0/arch.h b/include/asm-mips/sn/sn0/arch.h index f7c43fa24aa8..f734f2007f24 100644 --- a/include/asm-mips/sn/sn0/arch.h +++ b/include/asm-mips/sn/sn0/arch.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_SN_SN0_ARCH_H | 11 | #ifndef _ASM_SN_SN0_ARCH_H |
| 12 | #define _ASM_SN_SN0_ARCH_H | 12 | #define _ASM_SN_SN0_ARCH_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #ifndef SN0XXL /* 128 cpu SMP max */ | 15 | #ifndef SN0XXL /* 128 cpu SMP max */ |
| 17 | /* | 16 | /* |
diff --git a/include/asm-mips/sn/sn0/hubmd.h b/include/asm-mips/sn/sn0/hubmd.h index 1006aa26d771..14c225d80664 100644 --- a/include/asm-mips/sn/sn0/hubmd.h +++ b/include/asm-mips/sn/sn0/hubmd.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_SN_SN0_HUBMD_H | 11 | #ifndef _ASM_SN_SN0_HUBMD_H |
| 12 | #define _ASM_SN_SN0_HUBMD_H | 12 | #define _ASM_SN_SN0_HUBMD_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* | 15 | /* |
| 17 | * Hub Memory/Directory interface registers | 16 | * Hub Memory/Directory interface registers |
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h index c4856a874965..513aa5133830 100644 --- a/include/asm-mips/stackframe.h +++ b/include/asm-mips/stackframe.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_STACKFRAME_H | 10 | #ifndef _ASM_STACKFRAME_H |
| 11 | #define _ASM_STACKFRAME_H | 11 | #define _ASM_STACKFRAME_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/threads.h> | 13 | #include <linux/threads.h> |
| 15 | 14 | ||
| 16 | #include <asm/asm.h> | 15 | #include <asm/asm.h> |
diff --git a/include/asm-mips/string.h b/include/asm-mips/string.h index 907da600fddd..436e3ad352d9 100644 --- a/include/asm-mips/string.h +++ b/include/asm-mips/string.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_STRING_H | 10 | #ifndef _ASM_STRING_H |
| 11 | #define _ASM_STRING_H | 11 | #define _ASM_STRING_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | /* | 14 | /* |
| 16 | * Most of the inline functions are rather naive implementations so I just | 15 | * Most of the inline functions are rather naive implementations so I just |
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 261f71d16a07..130333d7c4ee 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_SYSTEM_H | 12 | #ifndef _ASM_SYSTEM_H |
| 13 | #define _ASM_SYSTEM_H | 13 | #define _ASM_SYSTEM_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | 16 | ||
| 18 | #include <asm/addrspace.h> | 17 | #include <asm/addrspace.h> |
diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h index f8d97dafd2f4..ae8ada5b42a9 100644 --- a/include/asm-mips/thread_info.h +++ b/include/asm-mips/thread_info.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #ifdef __KERNEL__ | 10 | #ifdef __KERNEL__ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
| 15 | 14 | ||
diff --git a/include/asm-mips/tlbflush.h b/include/asm-mips/tlbflush.h index bb4ae3cdcbf1..276be77c3e85 100644 --- a/include/asm-mips/tlbflush.h +++ b/include/asm-mips/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_TLBFLUSH_H | 1 | #ifndef __ASM_TLBFLUSH_H |
| 2 | #define __ASM_TLBFLUSH_H | 2 | #define __ASM_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | 5 | ||
| 7 | /* | 6 | /* |
diff --git a/include/asm-mips/tx4927/toshiba_rbtx4927.h b/include/asm-mips/tx4927/toshiba_rbtx4927.h index 6ce1e9475f99..94bef03d9635 100644 --- a/include/asm-mips/tx4927/toshiba_rbtx4927.h +++ b/include/asm-mips/tx4927/toshiba_rbtx4927.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #ifndef __ASM_TX4927_TOSHIBA_RBTX4927_H | 27 | #ifndef __ASM_TX4927_TOSHIBA_RBTX4927_H |
| 28 | #define __ASM_TX4927_TOSHIBA_RBTX4927_H | 28 | #define __ASM_TX4927_TOSHIBA_RBTX4927_H |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <asm/tx4927/tx4927.h> | 30 | #include <asm/tx4927/tx4927.h> |
| 32 | #include <asm/tx4927/tx4927_mips.h> | 31 | #include <asm/tx4927/tx4927_mips.h> |
| 33 | #ifdef CONFIG_PCI | 32 | #ifdef CONFIG_PCI |
diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h index cd2813d8e136..2b52e180c6f2 100644 --- a/include/asm-mips/types.h +++ b/include/asm-mips/types.h | |||
| @@ -52,7 +52,6 @@ typedef unsigned long long __u64; | |||
| 52 | 52 | ||
| 53 | #ifndef __ASSEMBLY__ | 53 | #ifndef __ASSEMBLY__ |
| 54 | 54 | ||
| 55 | #include <linux/config.h> | ||
| 56 | 55 | ||
| 57 | typedef __signed char s8; | 56 | typedef __signed char s8; |
| 58 | typedef unsigned char u8; | 57 | typedef unsigned char u8; |
diff --git a/include/asm-mips/uaccess.h b/include/asm-mips/uaccess.h index b96f3e0f3933..1cdd4eeb2f73 100644 --- a/include/asm-mips/uaccess.h +++ b/include/asm-mips/uaccess.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_UACCESS_H | 9 | #ifndef _ASM_UACCESS_H |
| 10 | #define _ASM_UACCESS_H | 10 | #define _ASM_UACCESS_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/thread_info.h> | 14 | #include <linux/thread_info.h> |
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 1068fe9a0a58..8bb0bb9b2e68 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
| @@ -905,6 +905,8 @@ | |||
| 905 | #define __NR_N32_Linux 6000 | 905 | #define __NR_N32_Linux 6000 |
| 906 | #define __NR_N32_Linux_syscalls 268 | 906 | #define __NR_N32_Linux_syscalls 268 |
| 907 | 907 | ||
| 908 | #ifdef __KERNEL__ | ||
| 909 | |||
| 908 | #ifndef __ASSEMBLY__ | 910 | #ifndef __ASSEMBLY__ |
| 909 | 911 | ||
| 910 | /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */ | 912 | /* 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 d,etype e,ftype f) \ | |||
| 1168 | 1170 | ||
| 1169 | #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ | 1171 | #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ |
| 1170 | 1172 | ||
| 1171 | #ifdef __KERNEL__ | ||
| 1172 | |||
| 1173 | #include <linux/config.h> | ||
| 1174 | 1173 | ||
| 1175 | #define __ARCH_WANT_IPC_PARSE_VERSION | 1174 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 1176 | #define __ARCH_WANT_OLD_READDIR | 1175 | #define __ARCH_WANT_OLD_READDIR |
| @@ -1197,7 +1196,6 @@ type name (atype a,btype b,ctype c,dtype d,etype e,ftype f) \ | |||
| 1197 | # ifdef CONFIG_MIPS32_O32 | 1196 | # ifdef CONFIG_MIPS32_O32 |
| 1198 | # define __ARCH_WANT_COMPAT_SYS_TIME | 1197 | # define __ARCH_WANT_COMPAT_SYS_TIME |
| 1199 | # endif | 1198 | # endif |
| 1200 | #endif | ||
| 1201 | 1199 | ||
| 1202 | #ifdef __KERNEL_SYSCALLS__ | 1200 | #ifdef __KERNEL_SYSCALLS__ |
| 1203 | 1201 | ||
| @@ -1248,4 +1246,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 1248 | */ | 1246 | */ |
| 1249 | #define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall") | 1247 | #define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall") |
| 1250 | 1248 | ||
| 1249 | #endif /* __KERNEL__ */ | ||
| 1251 | #endif /* _ASM_UNISTD_H */ | 1250 | #endif /* _ASM_UNISTD_H */ |
diff --git a/include/asm-mips/vr41xx/vrc4173.h b/include/asm-mips/vr41xx/vrc4173.h index 4d41a9c091d4..96fdcd54cec7 100644 --- a/include/asm-mips/vr41xx/vrc4173.h +++ b/include/asm-mips/vr41xx/vrc4173.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef __NEC_VRC4173_H | 24 | #ifndef __NEC_VRC4173_H |
| 25 | #define __NEC_VRC4173_H | 25 | #define __NEC_VRC4173_H |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 29 | 28 | ||
| 30 | /* | 29 | /* |
diff --git a/include/asm-mips/war.h b/include/asm-mips/war.h index 70636b41832c..3ac146c019c9 100644 --- a/include/asm-mips/war.h +++ b/include/asm-mips/war.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_WAR_H | 8 | #ifndef _ASM_WAR_H |
| 9 | #define _ASM_WAR_H | 9 | #define _ASM_WAR_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | /* | 12 | /* |
| 14 | * Another R4600 erratum. Due to the lack of errata information the exact | 13 | * Another R4600 erratum. Due to the lack of errata information the exact |
diff --git a/include/asm-mips/wbflush.h b/include/asm-mips/wbflush.h index c3bef50f37a8..eadc0ac47e24 100644 --- a/include/asm-mips/wbflush.h +++ b/include/asm-mips/wbflush.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_WBFLUSH_H | 11 | #ifndef _ASM_WBFLUSH_H |
| 12 | #define _ASM_WBFLUSH_H | 12 | #define _ASM_WBFLUSH_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #ifdef CONFIG_CPU_HAS_WB | 15 | #ifdef CONFIG_CPU_HAS_WB |
| 17 | 16 | ||
diff --git a/include/asm-parisc/atomic.h b/include/asm-parisc/atomic.h index 403ea97316cf..48bf9b8ab8ff 100644 --- a/include/asm-parisc/atomic.h +++ b/include/asm-parisc/atomic.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #ifndef _ASM_PARISC_ATOMIC_H_ | 5 | #ifndef _ASM_PARISC_ATOMIC_H_ |
| 6 | #define _ASM_PARISC_ATOMIC_H_ | 6 | #define _ASM_PARISC_ATOMIC_H_ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <asm/system.h> | 9 | #include <asm/system.h> |
| 11 | 10 | ||
diff --git a/include/asm-parisc/cache.h b/include/asm-parisc/cache.h index c831665473cb..7d22fa206fc4 100644 --- a/include/asm-parisc/cache.h +++ b/include/asm-parisc/cache.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #ifndef __ARCH_PARISC_CACHE_H | 5 | #ifndef __ARCH_PARISC_CACHE_H |
| 6 | #define __ARCH_PARISC_CACHE_H | 6 | #define __ARCH_PARISC_CACHE_H |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | /* | 9 | /* |
| 11 | * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have | 10 | * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have |
diff --git a/include/asm-parisc/cacheflush.h b/include/asm-parisc/cacheflush.h index 76b6b7d6046a..0b459cdfbd6f 100644 --- a/include/asm-parisc/cacheflush.h +++ b/include/asm-parisc/cacheflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _PARISC_CACHEFLUSH_H | 1 | #ifndef _PARISC_CACHEFLUSH_H |
| 2 | #define _PARISC_CACHEFLUSH_H | 2 | #define _PARISC_CACHEFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/cache.h> /* for flush_user_dcache_range_asm() proto */ | 5 | #include <asm/cache.h> /* for flush_user_dcache_range_asm() proto */ |
| 7 | 6 | ||
diff --git a/include/asm-parisc/dma-mapping.h b/include/asm-parisc/dma-mapping.h index 74d4ac6f2151..1e387e1dad30 100644 --- a/include/asm-parisc/dma-mapping.h +++ b/include/asm-parisc/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _PARISC_DMA_MAPPING_H | 1 | #ifndef _PARISC_DMA_MAPPING_H |
| 2 | #define _PARISC_DMA_MAPPING_H | 2 | #define _PARISC_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/cacheflush.h> | 5 | #include <asm/cacheflush.h> |
| 7 | #include <asm/scatterlist.h> | 6 | #include <asm/scatterlist.h> |
diff --git a/include/asm-parisc/dma.h b/include/asm-parisc/dma.h index 31fd10df43a7..9979c3cb3745 100644 --- a/include/asm-parisc/dma.h +++ b/include/asm-parisc/dma.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _ASM_DMA_H | 9 | #ifndef _ASM_DMA_H |
| 10 | #define _ASM_DMA_H | 10 | #define _ASM_DMA_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/io.h> /* need byte IO */ | 12 | #include <asm/io.h> /* need byte IO */ |
| 14 | #include <asm/system.h> | 13 | #include <asm/system.h> |
| 15 | 14 | ||
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h index 244f6b8883f4..b9eb245b8874 100644 --- a/include/asm-parisc/io.h +++ b/include/asm-parisc/io.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_IO_H | 1 | #ifndef _ASM_IO_H |
| 2 | #define _ASM_IO_H | 2 | #define _ASM_IO_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | #include <asm/pgtable.h> | 5 | #include <asm/pgtable.h> |
| 7 | 6 | ||
diff --git a/include/asm-parisc/irq.h b/include/asm-parisc/irq.h index b0a30e2c9813..377ba90c7d02 100644 --- a/include/asm-parisc/irq.h +++ b/include/asm-parisc/irq.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _ASM_PARISC_IRQ_H | 7 | #ifndef _ASM_PARISC_IRQ_H |
| 8 | #define _ASM_PARISC_IRQ_H | 8 | #define _ASM_PARISC_IRQ_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/cpumask.h> | 10 | #include <linux/cpumask.h> |
| 12 | #include <asm/types.h> | 11 | #include <asm/types.h> |
| 13 | 12 | ||
diff --git a/include/asm-parisc/kmap_types.h b/include/asm-parisc/kmap_types.h index 6886a0c3fedf..806aae3c5338 100644 --- a/include/asm-parisc/kmap_types.h +++ b/include/asm-parisc/kmap_types.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_KMAP_TYPES_H | 1 | #ifndef _ASM_KMAP_TYPES_H |
| 2 | #define _ASM_KMAP_TYPES_H | 2 | #define _ASM_KMAP_TYPES_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_DEBUG_HIGHMEM | 5 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 7 | # define D(n) __KM_FENCE_##n , | 6 | # define D(n) __KM_FENCE_##n , |
diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h index c0dd461fb8f1..0695bc958d56 100644 --- a/include/asm-parisc/page.h +++ b/include/asm-parisc/page.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) | 14 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) |
| 16 | # define PAGE_SHIFT 12 /* 4k */ | 15 | # define PAGE_SHIFT 12 /* 4k */ |
diff --git a/include/asm-parisc/param.h b/include/asm-parisc/param.h index f4694d452dd6..07cb9b93cfe2 100644 --- a/include/asm-parisc/param.h +++ b/include/asm-parisc/param.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASMPARISC_PARAM_H | 2 | #define _ASMPARISC_PARAM_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | #include <linux/config.h> | ||
| 6 | # ifdef CONFIG_PA20 | 5 | # ifdef CONFIG_PA20 |
| 7 | # define HZ 1000 /* Faster machines */ | 6 | # define HZ 1000 /* Faster machines */ |
| 8 | # else | 7 | # else |
diff --git a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h index 77bbafb7f73e..8b631f47eb25 100644 --- a/include/asm-parisc/pci.h +++ b/include/asm-parisc/pci.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_PARISC_PCI_H | 1 | #ifndef __ASM_PARISC_PCI_H |
| 2 | #define __ASM_PARISC_PCI_H | 2 | #define __ASM_PARISC_PCI_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/scatterlist.h> | 4 | #include <asm/scatterlist.h> |
| 6 | 5 | ||
| 7 | 6 | ||
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h index 0a3face6c480..08364f957e7a 100644 --- a/include/asm-parisc/pdc.h +++ b/include/asm-parisc/pdc.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _PARISC_PDC_H | 1 | #ifndef _PARISC_PDC_H |
| 2 | #define _PARISC_PDC_H | 2 | #define _PARISC_PDC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * PDC return values ... | 6 | * PDC return values ... |
diff --git a/include/asm-parisc/pgtable.h b/include/asm-parisc/pgtable.h index aec089eb8b85..b6bcc672ba80 100644 --- a/include/asm-parisc/pgtable.h +++ b/include/asm-parisc/pgtable.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm-generic/4level-fixup.h> | 4 | #include <asm-generic/4level-fixup.h> |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/fixmap.h> | 6 | #include <asm/fixmap.h> |
| 8 | 7 | ||
| 9 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h index 89f2f1c16c12..ca49dc91f4fc 100644 --- a/include/asm-parisc/processor.h +++ b/include/asm-parisc/processor.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #define __ASM_PARISC_PROCESSOR_H | 9 | #define __ASM_PARISC_PROCESSOR_H |
| 10 | 10 | ||
| 11 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/threads.h> | 12 | #include <linux/threads.h> |
| 14 | #include <linux/spinlock_types.h> | 13 | #include <linux/spinlock_types.h> |
| 15 | 14 | ||
diff --git a/include/asm-parisc/psw.h b/include/asm-parisc/psw.h index 4334d6ca2add..5a3e23c9ce63 100644 --- a/include/asm-parisc/psw.h +++ b/include/asm-parisc/psw.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #ifndef _PARISC_PSW_H | 1 | #ifndef _PARISC_PSW_H |
| 2 | 2 | ||
| 3 | #include <linux/config.h> | ||
| 4 | 3 | ||
| 5 | #define PSW_I 0x00000001 | 4 | #define PSW_I 0x00000001 |
| 6 | #define PSW_D 0x00000002 | 5 | #define PSW_D 0x00000002 |
diff --git a/include/asm-parisc/smp.h b/include/asm-parisc/smp.h index dbdbd2e9fdf9..d4c0e26afcd1 100644 --- a/include/asm-parisc/smp.h +++ b/include/asm-parisc/smp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SMP_H | 1 | #ifndef __ASM_SMP_H |
| 2 | #define __ASM_SMP_H | 2 | #define __ASM_SMP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #if defined(CONFIG_SMP) | 5 | #if defined(CONFIG_SMP) |
| 7 | 6 | ||
diff --git a/include/asm-parisc/system.h b/include/asm-parisc/system.h index a5a973c0c07f..863876134b2c 100644 --- a/include/asm-parisc/system.h +++ b/include/asm-parisc/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __PARISC_SYSTEM_H | 1 | #ifndef __PARISC_SYSTEM_H |
| 2 | #define __PARISC_SYSTEM_H | 2 | #define __PARISC_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/psw.h> | 4 | #include <asm/psw.h> |
| 6 | 5 | ||
| 7 | /* The program status word as bitfields. */ | 6 | /* The program status word as bitfields. */ |
diff --git a/include/asm-parisc/tlbflush.h b/include/asm-parisc/tlbflush.h index 825994a90e2d..f662e837dea1 100644 --- a/include/asm-parisc/tlbflush.h +++ b/include/asm-parisc/tlbflush.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* TLB flushing routines.... */ | 4 | /* TLB flushing routines.... */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/mm.h> | 6 | #include <linux/mm.h> |
| 8 | #include <asm/mmu_context.h> | 7 | #include <asm/mmu_context.h> |
| 9 | 8 | ||
diff --git a/include/asm-parisc/unistd.h b/include/asm-parisc/unistd.h index 0e1a30be2e30..12b867238a47 100644 --- a/include/asm-parisc/unistd.h +++ b/include/asm-parisc/unistd.h | |||
| @@ -792,6 +792,7 @@ | |||
| 792 | #define HPUX_GATEWAY_ADDR 0xC0000004 | 792 | #define HPUX_GATEWAY_ADDR 0xC0000004 |
| 793 | #define LINUX_GATEWAY_ADDR 0x100 | 793 | #define LINUX_GATEWAY_ADDR 0x100 |
| 794 | 794 | ||
| 795 | #ifdef __KERNEL__ | ||
| 795 | #ifndef __ASSEMBLY__ | 796 | #ifndef __ASSEMBLY__ |
| 796 | 797 | ||
| 797 | #define SYS_ify(syscall_name) __NR_##syscall_name | 798 | #define SYS_ify(syscall_name) __NR_##syscall_name |
| @@ -934,7 +935,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ | |||
| 934 | return K_INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5); \ | 935 | return K_INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5); \ |
| 935 | } | 936 | } |
| 936 | 937 | ||
| 937 | #ifdef __KERNEL__ | ||
| 938 | #define __ARCH_WANT_OLD_READDIR | 938 | #define __ARCH_WANT_OLD_READDIR |
| 939 | #define __ARCH_WANT_STAT64 | 939 | #define __ARCH_WANT_STAT64 |
| 940 | #define __ARCH_WANT_SYS_ALARM | 940 | #define __ARCH_WANT_SYS_ALARM |
| @@ -956,7 +956,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ | |||
| 956 | #define __ARCH_WANT_SYS_SIGPENDING | 956 | #define __ARCH_WANT_SYS_SIGPENDING |
| 957 | #define __ARCH_WANT_SYS_SIGPROCMASK | 957 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 958 | #define __ARCH_WANT_SYS_RT_SIGACTION | 958 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 959 | #endif | ||
| 960 | 959 | ||
| 961 | /* mmap & mmap2 take 6 arguments */ | 960 | /* mmap & mmap2 take 6 arguments */ |
| 962 | #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \ | 961 | #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, | |||
| 1056 | */ | 1055 | */ |
| 1057 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 1056 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 1058 | 1057 | ||
| 1058 | #endif /* __KERNEL__ */ | ||
| 1059 | #endif /* _ASM_PARISC_UNISTD_H_ */ | 1059 | #endif /* _ASM_PARISC_UNISTD_H_ */ |
diff --git a/include/asm-powerpc/abs_addr.h b/include/asm-powerpc/abs_addr.h index c5c3259e0f86..4aa220718b19 100644 --- a/include/asm-powerpc/abs_addr.h +++ b/include/asm-powerpc/abs_addr.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASM_POWERPC_ABS_ADDR_H | 2 | #define _ASM_POWERPC_ABS_ADDR_H |
| 3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | /* | 6 | /* |
| 8 | * c 2001 PPC 64 Team, IBM Corp | 7 | * c 2001 PPC 64 Team, IBM Corp |
diff --git a/include/asm-powerpc/cache.h b/include/asm-powerpc/cache.h index 6379c2df5c40..642be62cf393 100644 --- a/include/asm-powerpc/cache.h +++ b/include/asm-powerpc/cache.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | /* bytes per L1 cache line */ | 7 | /* bytes per L1 cache line */ |
| 9 | #if defined(CONFIG_8xx) || defined(CONFIG_403GCX) | 8 | #if defined(CONFIG_8xx) || defined(CONFIG_403GCX) |
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h index 2ac63f569592..2ab9baf78bb4 100644 --- a/include/asm-powerpc/dma-mapping.h +++ b/include/asm-powerpc/dma-mapping.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #define _ASM_DMA_MAPPING_H | 8 | #define _ASM_DMA_MAPPING_H |
| 9 | #ifdef __KERNEL__ | 9 | #ifdef __KERNEL__ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/cache.h> | 12 | #include <linux/cache.h> |
| 14 | /* need struct page definitions */ | 13 | /* need struct page definitions */ |
diff --git a/include/asm-powerpc/dma.h b/include/asm-powerpc/dma.h index 4bb57fe37097..7a4374bdbef4 100644 --- a/include/asm-powerpc/dma.h +++ b/include/asm-powerpc/dma.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * with a grain of salt. | 22 | * with a grain of salt. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 27 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
diff --git a/include/asm-powerpc/eeh.h b/include/asm-powerpc/eeh.h index 868c7139dbff..e9c86b1eedab 100644 --- a/include/asm-powerpc/eeh.h +++ b/include/asm-powerpc/eeh.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #define _PPC64_EEH_H | 21 | #define _PPC64_EEH_H |
| 22 | #ifdef __KERNEL__ | 22 | #ifdef __KERNEL__ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/list.h> | 25 | #include <linux/list.h> |
| 27 | #include <linux/string.h> | 26 | #include <linux/string.h> |
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h index 94d228f9c6ac..99c18b71aa82 100644 --- a/include/asm-powerpc/elf.h +++ b/include/asm-powerpc/elf.h | |||
| @@ -3,14 +3,14 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | #include <linux/sched.h> /* for task_struct */ | 5 | #include <linux/sched.h> /* for task_struct */ |
| 6 | #include <asm/page.h> | ||
| 7 | #include <asm/string.h> | ||
| 6 | #endif | 8 | #endif |
| 7 | 9 | ||
| 8 | #include <asm/types.h> | 10 | #include <asm/types.h> |
| 9 | #include <asm/ptrace.h> | 11 | #include <asm/ptrace.h> |
| 10 | #include <asm/cputable.h> | 12 | #include <asm/cputable.h> |
| 11 | #include <asm/auxvec.h> | 13 | #include <asm/auxvec.h> |
| 12 | #include <asm/page.h> | ||
| 13 | #include <asm/string.h> | ||
| 14 | 14 | ||
| 15 | /* PowerPC relocations defined by the ABIs */ | 15 | /* PowerPC relocations defined by the ABIs */ |
| 16 | #define R_PPC_NONE 0 | 16 | #define R_PPC_NONE 0 |
| @@ -129,7 +129,7 @@ typedef elf_greg_t32 elf_gregset_t32[ELF_NGREG]; | |||
| 129 | /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */ | 129 | /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */ |
| 130 | typedef elf_greg_t32 elf_greg_t; | 130 | typedef elf_greg_t32 elf_greg_t; |
| 131 | typedef elf_gregset_t32 elf_gregset_t; | 131 | typedef elf_gregset_t32 elf_gregset_t; |
| 132 | # define elf_addr_t u32 | 132 | # define elf_addr_t __u32 |
| 133 | #endif /* ELF_ARCH */ | 133 | #endif /* ELF_ARCH */ |
| 134 | 134 | ||
| 135 | /* Floating point registers */ | 135 | /* Floating point registers */ |
| @@ -161,6 +161,7 @@ typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG]; | |||
| 161 | typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; | 161 | typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; |
| 162 | #endif | 162 | #endif |
| 163 | 163 | ||
| 164 | #ifdef __KERNEL__ | ||
| 164 | /* | 165 | /* |
| 165 | * This is used to ensure we don't load something for the wrong architecture. | 166 | * This is used to ensure we don't load something for the wrong architecture. |
| 166 | */ | 167 | */ |
| @@ -176,8 +177,6 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32]; | |||
| 176 | 177 | ||
| 177 | #define ELF_ET_DYN_BASE (0x08000000) | 178 | #define ELF_ET_DYN_BASE (0x08000000) |
| 178 | 179 | ||
| 179 | #ifdef __KERNEL__ | ||
| 180 | |||
| 181 | /* Common routine for both 32-bit and 64-bit processes */ | 180 | /* Common routine for both 32-bit and 64-bit processes */ |
| 182 | static inline void ppc_elf_core_copy_regs(elf_gregset_t elf_regs, | 181 | static inline void ppc_elf_core_copy_regs(elf_gregset_t elf_regs, |
| 183 | struct pt_regs *regs) | 182 | struct pt_regs *regs) |
diff --git a/include/asm-powerpc/floppy.h b/include/asm-powerpc/floppy.h index 608164c39efb..7e2d169ee856 100644 --- a/include/asm-powerpc/floppy.h +++ b/include/asm-powerpc/floppy.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define __ASM_POWERPC_FLOPPY_H | 11 | #define __ASM_POWERPC_FLOPPY_H |
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/machdep.h> | 14 | #include <asm/machdep.h> |
| 16 | 15 | ||
| 17 | #define fd_inb(port) inb_p(port) | 16 | #define fd_inb(port) inb_p(port) |
diff --git a/include/asm-powerpc/hw_irq.h b/include/asm-powerpc/hw_irq.h index 26b89d859c56..ce0f7db63c16 100644 --- a/include/asm-powerpc/hw_irq.h +++ b/include/asm-powerpc/hw_irq.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #ifdef __KERNEL__ | 7 | #ifdef __KERNEL__ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
| 12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h index da5f640480cf..b09b42af6a1e 100644 --- a/include/asm-powerpc/ide.h +++ b/include/asm-powerpc/ide.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #endif | 22 | #endif |
| 23 | 23 | ||
| 24 | #ifndef __powerpc64__ | 24 | #ifndef __powerpc64__ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/hdreg.h> | 25 | #include <linux/hdreg.h> |
| 27 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
| 28 | #include <asm/io.h> | 27 | #include <asm/io.h> |
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h index 18ca29e9105a..2acf7b29ef06 100644 --- a/include/asm-powerpc/iommu.h +++ b/include/asm-powerpc/iommu.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #define _ASM_IOMMU_H | 22 | #define _ASM_IOMMU_H |
| 23 | #ifdef __KERNEL__ | 23 | #ifdef __KERNEL__ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <asm/types.h> | 25 | #include <asm/types.h> |
| 27 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
| 28 | #include <linux/device.h> | 27 | #include <linux/device.h> |
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h index 7bc6d73b2823..1e9f25330307 100644 --- a/include/asm-powerpc/irq.h +++ b/include/asm-powerpc/irq.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/threads.h> | 12 | #include <linux/threads.h> |
| 14 | 13 | ||
| 15 | #include <asm/types.h> | 14 | #include <asm/types.h> |
diff --git a/include/asm-powerpc/iseries/iseries_io.h b/include/asm-powerpc/iseries/iseries_io.h index 496aa852b617..f29009bd63c9 100644 --- a/include/asm-powerpc/iseries/iseries_io.h +++ b/include/asm-powerpc/iseries/iseries_io.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_ISERIES_ISERIES_IO_H | 1 | #ifndef _ASM_POWERPC_ISERIES_ISERIES_IO_H |
| 2 | #define _ASM_POWERPC_ISERIES_ISERIES_IO_H | 2 | #define _ASM_POWERPC_ISERIES_ISERIES_IO_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PPC_ISERIES | 5 | #ifdef CONFIG_PPC_ISERIES |
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h index 0f9254c18914..3e7d37aa4a6d 100644 --- a/include/asm-powerpc/machdep.h +++ b/include/asm-powerpc/machdep.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/seq_file.h> | 12 | #include <linux/seq_file.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/dma-mapping.h> | 14 | #include <linux/dma-mapping.h> |
diff --git a/include/asm-powerpc/mmzone.h b/include/asm-powerpc/mmzone.h index 88d70bae7769..d484ca94cb7c 100644 --- a/include/asm-powerpc/mmzone.h +++ b/include/asm-powerpc/mmzone.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #define _ASM_MMZONE_H_ | 8 | #define _ASM_MMZONE_H_ |
| 9 | #ifdef __KERNEL__ | 9 | #ifdef __KERNEL__ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | /* | 12 | /* |
| 14 | * generic non-linear memory support: | 13 | * generic non-linear memory support: |
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h index 706325f99a84..3c6f644d49b4 100644 --- a/include/asm-powerpc/paca.h +++ b/include/asm-powerpc/paca.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #define _ASM_POWERPC_PACA_H | 16 | #define _ASM_POWERPC_PACA_H |
| 17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <asm/types.h> | 19 | #include <asm/types.h> |
| 21 | #include <asm/lppaca.h> | 20 | #include <asm/lppaca.h> |
| 22 | #include <asm/mmu.h> | 21 | #include <asm/mmu.h> |
diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h index 2fbecebe1c92..f0469b961359 100644 --- a/include/asm-powerpc/page.h +++ b/include/asm-powerpc/page.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #ifdef __KERNEL__ | 13 | #ifdef __KERNEL__ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/asm-compat.h> | 14 | #include <asm/asm-compat.h> |
| 16 | 15 | ||
| 17 | /* | 16 | /* |
diff --git a/include/asm-powerpc/pgtable.h b/include/asm-powerpc/pgtable.h index e9f1f4627e6b..964e312a1ffc 100644 --- a/include/asm-powerpc/pgtable.h +++ b/include/asm-powerpc/pgtable.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #ifndef __ASSEMBLY__ | 14 | #ifndef __ASSEMBLY__ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/stddef.h> | 15 | #include <linux/stddef.h> |
| 17 | #include <asm/processor.h> /* For TASK_SIZE */ | 16 | #include <asm/processor.h> /* For TASK_SIZE */ |
| 18 | #include <asm/mmu.h> | 17 | #include <asm/mmu.h> |
diff --git a/include/asm-powerpc/ppc_asm.h b/include/asm-powerpc/ppc_asm.h index dd1c0a913d5f..a940cfe040da 100644 --- a/include/asm-powerpc/ppc_asm.h +++ b/include/asm-powerpc/ppc_asm.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #define _ASM_POWERPC_PPC_ASM_H | 5 | #define _ASM_POWERPC_PPC_ASM_H |
| 6 | 6 | ||
| 7 | #include <linux/stringify.h> | 7 | #include <linux/stringify.h> |
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/asm-compat.h> | 8 | #include <asm/asm-compat.h> |
| 10 | 9 | ||
| 11 | #ifndef __ASSEMBLY__ | 10 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index 97ef1cd71a4d..f4e2ca6fd53f 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * as published by the Free Software Foundation; either version | 15 | * as published by the Free Software Foundation; either version |
| 16 | * 2 of the License, or (at your option) any later version. | 16 | * 2 of the License, or (at your option) any later version. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/proc_fs.h> | 19 | #include <linux/proc_fs.h> |
| 21 | #include <asm/atomic.h> | 20 | #include <asm/atomic.h> |
diff --git a/include/asm-powerpc/smp.h b/include/asm-powerpc/smp.h index 4a716f707cf6..068f119aa298 100644 --- a/include/asm-powerpc/smp.h +++ b/include/asm-powerpc/smp.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #define _ASM_POWERPC_SMP_H | 17 | #define _ASM_POWERPC_SMP_H |
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/threads.h> | 20 | #include <linux/threads.h> |
| 22 | #include <linux/cpumask.h> | 21 | #include <linux/cpumask.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/include/asm-powerpc/smu.h b/include/asm-powerpc/smu.h index 2dc93632f210..51e65fc46a03 100644 --- a/include/asm-powerpc/smu.h +++ b/include/asm-powerpc/smu.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Definitions for talking to the SMU chip in newer G5 PowerMacs | 5 | * Definitions for talking to the SMU chip in newer G5 PowerMacs |
| 6 | */ | 6 | */ |
| 7 | #ifdef __KERNEL__ | 7 | #ifdef __KERNEL__ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/list.h> | 8 | #include <linux/list.h> |
| 10 | #endif | 9 | #endif |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index 7cfcff3ef027..95713f397357 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #define _SPU_H | 24 | #define _SPU_H |
| 25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kref.h> | 27 | #include <linux/kref.h> |
| 29 | #include <linux/workqueue.h> | 28 | #include <linux/workqueue.h> |
| 30 | 29 | ||
diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h index 88b553c6b26c..d339e2e88b11 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #define THREAD_SIZE (1 << THREAD_SHIFT) | 21 | #define THREAD_SIZE (1 << THREAD_SHIFT) |
| 22 | 22 | ||
| 23 | #ifndef __ASSEMBLY__ | 23 | #ifndef __ASSEMBLY__ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/cache.h> | 24 | #include <linux/cache.h> |
| 26 | #include <asm/processor.h> | 25 | #include <asm/processor.h> |
| 27 | #include <asm/page.h> | 26 | #include <asm/page.h> |
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index 912118db13ae..4463148c659f 100644 --- a/include/asm-powerpc/time.h +++ b/include/asm-powerpc/time.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #define __POWERPC_TIME_H | 14 | #define __POWERPC_TIME_H |
| 15 | 15 | ||
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/percpu.h> | 18 | #include <linux/percpu.h> |
| 20 | 19 | ||
diff --git a/include/asm-powerpc/timex.h b/include/asm-powerpc/timex.h index c02d15aced91..3b9a8e786806 100644 --- a/include/asm-powerpc/timex.h +++ b/include/asm-powerpc/timex.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * PowerPC architecture timex specifications | 7 | * PowerPC architecture timex specifications |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/cputable.h> | 10 | #include <asm/cputable.h> |
| 12 | 11 | ||
| 13 | #define CLOCK_TICK_RATE 1024000 /* Underlying HZ */ | 12 | #define CLOCK_TICK_RATE 1024000 /* Underlying HZ */ |
diff --git a/include/asm-powerpc/tlb.h b/include/asm-powerpc/tlb.h index 601a53cf96d5..4e2a834683fb 100644 --- a/include/asm-powerpc/tlb.h +++ b/include/asm-powerpc/tlb.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define _ASM_POWERPC_TLB_H | 13 | #define _ASM_POWERPC_TLB_H |
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #ifndef __powerpc64__ | 16 | #ifndef __powerpc64__ |
| 18 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
| 19 | #endif | 18 | #endif |
diff --git a/include/asm-powerpc/tlbflush.h b/include/asm-powerpc/tlbflush.h index a2998eee37bb..93c7d0c7230f 100644 --- a/include/asm-powerpc/tlbflush.h +++ b/include/asm-powerpc/tlbflush.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | struct mm_struct; | 21 | struct mm_struct; |
| 23 | 22 | ||
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h index 87362a05542b..19c575f39164 100644 --- a/include/asm-powerpc/topology.h +++ b/include/asm-powerpc/topology.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASM_POWERPC_TOPOLOGY_H | 2 | #define _ASM_POWERPC_TOPOLOGY_H |
| 3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | struct sys_device; | 6 | struct sys_device; |
| 8 | struct device_node; | 7 | struct device_node; |
diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h index baabba96e313..d6fb56b80453 100644 --- a/include/asm-powerpc/types.h +++ b/include/asm-powerpc/types.h | |||
| @@ -64,7 +64,6 @@ typedef struct { | |||
| 64 | 64 | ||
| 65 | #ifndef __ASSEMBLY__ | 65 | #ifndef __ASSEMBLY__ |
| 66 | 66 | ||
| 67 | #include <linux/config.h> | ||
| 68 | 67 | ||
| 69 | typedef signed char s8; | 68 | typedef signed char s8; |
| 70 | typedef unsigned char u8; | 69 | typedef unsigned char u8; |
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index edde2462bf52..eb66eae6616f 100644 --- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h | |||
| @@ -324,12 +324,12 @@ | |||
| 324 | #define __NR_get_robust_list 299 | 324 | #define __NR_get_robust_list 299 |
| 325 | #define __NR_set_robust_list 300 | 325 | #define __NR_set_robust_list 300 |
| 326 | 326 | ||
| 327 | #ifdef __KERNEL__ | ||
| 328 | |||
| 327 | #define __NR_syscalls 301 | 329 | #define __NR_syscalls 301 |
| 328 | 330 | ||
| 329 | #ifdef __KERNEL__ | ||
| 330 | #define __NR__exit __NR_exit | 331 | #define __NR__exit __NR_exit |
| 331 | #define NR_syscalls __NR_syscalls | 332 | #define NR_syscalls __NR_syscalls |
| 332 | #endif | ||
| 333 | 333 | ||
| 334 | #ifndef __ASSEMBLY__ | 334 | #ifndef __ASSEMBLY__ |
| 335 | 335 | ||
| @@ -441,9 +441,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6 | |||
| 441 | __syscall_nr(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6); \ | 441 | __syscall_nr(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6); \ |
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | #ifdef __KERNEL__ | ||
| 445 | 444 | ||
| 446 | #include <linux/config.h> | ||
| 447 | #include <linux/types.h> | 445 | #include <linux/types.h> |
| 448 | #include <linux/compiler.h> | 446 | #include <linux/compiler.h> |
| 449 | #include <linux/linkage.h> | 447 | #include <linux/linkage.h> |
| @@ -499,8 +497,8 @@ extern int execve(const char *file, char **argv, char **envp); | |||
| 499 | #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall") | 497 | #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall") |
| 500 | #endif | 498 | #endif |
| 501 | 499 | ||
| 502 | #endif /* __KERNEL__ */ | ||
| 503 | 500 | ||
| 504 | #endif /* __ASSEMBLY__ */ | 501 | #endif /* __ASSEMBLY__ */ |
| 502 | #endif /* __KERNEL__ */ | ||
| 505 | 503 | ||
| 506 | #endif /* _ASM_PPC_UNISTD_H_ */ | 504 | #endif /* _ASM_PPC_UNISTD_H_ */ |
diff --git a/include/asm-powerpc/vga.h b/include/asm-powerpc/vga.h index f8d350aabf1a..eadaf2f3d032 100644 --- a/include/asm-powerpc/vga.h +++ b/include/asm-powerpc/vga.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) | 16 | #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) |
| 18 | 17 | ||
diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h index 0544ece51761..be14c59846f9 100644 --- a/include/asm-powerpc/vio.h +++ b/include/asm-powerpc/vio.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #define _ASM_POWERPC_VIO_H | 15 | #define _ASM_POWERPC_VIO_H |
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 21 | #include <linux/device.h> | 20 | #include <linux/device.h> |
diff --git a/include/asm-ppc/amigahw.h b/include/asm-ppc/amigahw.h index 8c98945e7dc1..90fd1274d727 100644 --- a/include/asm-ppc/amigahw.h +++ b/include/asm-ppc/amigahw.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef __ASMPPC_AMIGAHW_H | 2 | #ifndef __ASMPPC_AMIGAHW_H |
| 3 | #define __ASMPPC_AMIGAHW_H | 3 | #define __ASMPPC_AMIGAHW_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm-m68k/amigahw.h> | 5 | #include <asm-m68k/amigahw.h> |
| 7 | 6 | ||
| 8 | #undef CHIP_PHYSADDR | 7 | #undef CHIP_PHYSADDR |
diff --git a/include/asm-ppc/bootinfo.h b/include/asm-ppc/bootinfo.h index 93d955c70d65..2ace4a74f263 100644 --- a/include/asm-ppc/bootinfo.h +++ b/include/asm-ppc/bootinfo.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _PPC_BOOTINFO_H | 9 | #ifndef _PPC_BOOTINFO_H |
| 10 | #define _PPC_BOOTINFO_H | 10 | #define _PPC_BOOTINFO_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 14 | 13 | ||
| 15 | #if defined(CONFIG_APUS) && !defined(__BOOTER__) | 14 | #if defined(CONFIG_APUS) && !defined(__BOOTER__) |
diff --git a/include/asm-ppc/commproc.h b/include/asm-ppc/commproc.h index 31f362966a58..3247bea5fc2b 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __CPM_8XX__ | 17 | #ifndef __CPM_8XX__ |
| 18 | #define __CPM_8XX__ | 18 | #define __CPM_8XX__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/8xx_immap.h> | 20 | #include <asm/8xx_immap.h> |
| 22 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
| 23 | 22 | ||
diff --git a/include/asm-ppc/ibm403.h b/include/asm-ppc/ibm403.h index bf6efa0417ab..c9c5d539cfdb 100644 --- a/include/asm-ppc/ibm403.h +++ b/include/asm-ppc/ibm403.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_IBM403_H__ | 12 | #ifndef __ASM_IBM403_H__ |
| 13 | #define __ASM_IBM403_H__ | 13 | #define __ASM_IBM403_H__ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #if defined(CONFIG_403GCX) | 16 | #if defined(CONFIG_403GCX) |
| 18 | 17 | ||
diff --git a/include/asm-ppc/ibm44x.h b/include/asm-ppc/ibm44x.h index 3acc382cc83f..7818b54b6e37 100644 --- a/include/asm-ppc/ibm44x.h +++ b/include/asm-ppc/ibm44x.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __ASM_IBM44x_H__ | 17 | #ifndef __ASM_IBM44x_H__ |
| 18 | #define __ASM_IBM44x_H__ | 18 | #define __ASM_IBM44x_H__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #ifndef NR_BOARD_IRQS | 21 | #ifndef NR_BOARD_IRQS |
| 23 | #define NR_BOARD_IRQS 0 | 22 | #define NR_BOARD_IRQS 0 |
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h index 38f99710752b..cf62b69cb69a 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __ASM_IBM4XX_H__ | 14 | #ifndef __ASM_IBM4XX_H__ |
| 15 | #define __ASM_IBM4XX_H__ | 15 | #define __ASM_IBM4XX_H__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/types.h> | 17 | #include <asm/types.h> |
| 19 | 18 | ||
| 20 | #ifdef CONFIG_40x | 19 | #ifdef CONFIG_40x |
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index b919d8fb7d98..89c6f1bc3aab 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _PPC_IO_H | 2 | #ifndef _PPC_IO_H |
| 3 | #define _PPC_IO_H | 3 | #define _PPC_IO_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 8 | 7 | ||
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index e1a0a7b213d7..da7746738aee 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _PPC_MACHDEP_H | 2 | #ifndef _PPC_MACHDEP_H |
| 3 | #define _PPC_MACHDEP_H | 3 | #define _PPC_MACHDEP_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 7 | #include <linux/kexec.h> | 6 | #include <linux/kexec.h> |
| 8 | 7 | ||
diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index 9205db404c7a..0a70b05b3afb 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _PPC_MMU_H_ | 6 | #ifndef _PPC_MMU_H_ |
| 7 | #define _PPC_MMU_H_ | 7 | #define _PPC_MMU_H_ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #ifndef __ASSEMBLY__ | 10 | #ifndef __ASSEMBLY__ |
| 12 | 11 | ||
diff --git a/include/asm-ppc/mmu_context.h b/include/asm-ppc/mmu_context.h index 4f152cca13c1..94f2bf71310d 100644 --- a/include/asm-ppc/mmu_context.h +++ b/include/asm-ppc/mmu_context.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef __PPC_MMU_CONTEXT_H | 2 | #ifndef __PPC_MMU_CONTEXT_H |
| 3 | #define __PPC_MMU_CONTEXT_H | 3 | #define __PPC_MMU_CONTEXT_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/atomic.h> | 5 | #include <asm/atomic.h> |
| 7 | #include <asm/bitops.h> | 6 | #include <asm/bitops.h> |
| 8 | #include <asm/mmu.h> | 7 | #include <asm/mmu.h> |
diff --git a/include/asm-ppc/mpc8260.h b/include/asm-ppc/mpc8260.h index 6ba69a86b9dd..4b93481e7679 100644 --- a/include/asm-ppc/mpc8260.h +++ b/include/asm-ppc/mpc8260.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __ASM_PPC_MPC8260_H__ | 8 | #ifndef __ASM_PPC_MPC8260_H__ |
| 9 | #define __ASM_PPC_MPC8260_H__ | 9 | #define __ASM_PPC_MPC8260_H__ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #ifdef CONFIG_8260 | 12 | #ifdef CONFIG_8260 |
| 14 | 13 | ||
diff --git a/include/asm-ppc/mpc83xx.h b/include/asm-ppc/mpc83xx.h index 3c23fc43bfbc..02ed2c325714 100644 --- a/include/asm-ppc/mpc83xx.h +++ b/include/asm-ppc/mpc83xx.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __ASM_MPC83xx_H__ | 17 | #ifndef __ASM_MPC83xx_H__ |
| 18 | #define __ASM_MPC83xx_H__ | 18 | #define __ASM_MPC83xx_H__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/mmu.h> | 20 | #include <asm/mmu.h> |
| 22 | 21 | ||
| 23 | #ifdef CONFIG_83xx | 22 | #ifdef CONFIG_83xx |
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h index f47002a60edf..c25bdd9debf8 100644 --- a/include/asm-ppc/mpc85xx.h +++ b/include/asm-ppc/mpc85xx.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __ASM_MPC85xx_H__ | 17 | #ifndef __ASM_MPC85xx_H__ |
| 18 | #define __ASM_MPC85xx_H__ | 18 | #define __ASM_MPC85xx_H__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/mmu.h> | 20 | #include <asm/mmu.h> |
| 22 | 21 | ||
| 23 | #ifdef CONFIG_85xx | 22 | #ifdef CONFIG_85xx |
diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index 3515a7fa6c89..adcce33f20ae 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __CONFIG_8xx_DEFS | 8 | #ifndef __CONFIG_8xx_DEFS |
| 9 | #define __CONFIG_8xx_DEFS | 9 | #define __CONFIG_8xx_DEFS |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #ifdef CONFIG_8xx | 12 | #ifdef CONFIG_8xx |
| 14 | 13 | ||
diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h index 4f2405b83612..663edbee3e91 100644 --- a/include/asm-ppc/mv64x60.h +++ b/include/asm-ppc/mv64x60.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 983116f59d90..3be5d760ffcd 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/list.h> | 28 | #include <linux/list.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/devfs_fs_kernel.h> | 29 | #include <linux/devfs_fs_kernel.h> |
| 31 | #include <linux/device.h> | 30 | #include <linux/device.h> |
| 32 | 31 | ||
diff --git a/include/asm-ppc/open_pic.h b/include/asm-ppc/open_pic.h index ec2f46629ca2..a4fe962d9f73 100644 --- a/include/asm-ppc/open_pic.h +++ b/include/asm-ppc/open_pic.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _PPC_KERNEL_OPEN_PIC_H | 12 | #ifndef _PPC_KERNEL_OPEN_PIC_H |
| 13 | #define _PPC_KERNEL_OPEN_PIC_H | 13 | #define _PPC_KERNEL_OPEN_PIC_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 17 | 16 | ||
| 18 | #define OPENPIC_SIZE 0x40000 | 17 | #define OPENPIC_SIZE 0x40000 |
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index 0fb68a0b0181..0b19af82507f 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _PPC_PAGE_H | 1 | #ifndef _PPC_PAGE_H |
| 2 | #define _PPC_PAGE_H | 2 | #define _PPC_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/asm-compat.h> | 4 | #include <asm/asm-compat.h> |
| 6 | 5 | ||
| 7 | /* PAGE_SHIFT determines the page size */ | 6 | /* PAGE_SHIFT determines the page size */ |
| @@ -15,7 +14,6 @@ | |||
| 15 | #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) | 14 | #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) |
| 16 | 15 | ||
| 17 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 18 | #include <linux/config.h> | ||
| 19 | 17 | ||
| 20 | /* This must match what is in arch/ppc/Makefile */ | 18 | /* This must match what is in arch/ppc/Makefile */ |
| 21 | #define PAGE_OFFSET CONFIG_KERNEL_START | 19 | #define PAGE_OFFSET CONFIG_KERNEL_START |
diff --git a/include/asm-ppc/pc_serial.h b/include/asm-ppc/pc_serial.h index 8f994f9f8857..81a2d0fdaf00 100644 --- a/include/asm-ppc/pc_serial.h +++ b/include/asm-ppc/pc_serial.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * anyone using any of those on a PPC platform. -- paulus | 9 | * anyone using any of those on a PPC platform. -- paulus |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * This assumes you have a 1.8432 MHz clock for your UART. | 14 | * This assumes you have a 1.8432 MHz clock for your UART. |
diff --git a/include/asm-ppc/pgalloc.h b/include/asm-ppc/pgalloc.h index bdefd1c4a558..44d88a98e87c 100644 --- a/include/asm-ppc/pgalloc.h +++ b/include/asm-ppc/pgalloc.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _PPC_PGALLOC_H | 2 | #ifndef _PPC_PGALLOC_H |
| 3 | #define _PPC_PGALLOC_H | 3 | #define _PPC_PGALLOC_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | 6 | ||
| 8 | extern void __bad_pte(pmd_t *pmd); | 7 | extern void __bad_pte(pmd_t *pmd); |
diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h index 570b355162fa..9cb83679836c 100644 --- a/include/asm-ppc/pgtable.h +++ b/include/asm-ppc/pgtable.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | #include <asm-generic/4level-fixup.h> | 5 | #include <asm-generic/4level-fixup.h> |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h index 46a086fff816..935d1e05366b 100644 --- a/include/asm-ppc/ppc4xx_dma.h +++ b/include/asm-ppc/ppc4xx_dma.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef __ASMPPC_PPC4xx_DMA_H | 24 | #ifndef __ASMPPC_PPC4xx_DMA_H |
| 25 | #define __ASMPPC_PPC4xx_DMA_H | 25 | #define __ASMPPC_PPC4xx_DMA_H |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <asm/mmu.h> | 28 | #include <asm/mmu.h> |
| 30 | #include <asm/ibm4xx.h> | 29 | #include <asm/ibm4xx.h> |
diff --git a/include/asm-ppc/ppc4xx_pic.h b/include/asm-ppc/ppc4xx_pic.h index c16c7f81cfd8..e44261206f8b 100644 --- a/include/asm-ppc/ppc4xx_pic.h +++ b/include/asm-ppc/ppc4xx_pic.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __PPC4XX_PIC_H__ | 17 | #ifndef __PPC4XX_PIC_H__ |
| 18 | #define __PPC4XX_PIC_H__ | 18 | #define __PPC4XX_PIC_H__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
| 23 | 22 | ||
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h index b74af5461564..8a59f8871f32 100644 --- a/include/asm-ppc/serial.h +++ b/include/asm-ppc/serial.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef __ASM_SERIAL_H__ | 6 | #ifndef __ASM_SERIAL_H__ |
| 7 | #define __ASM_SERIAL_H__ | 7 | #define __ASM_SERIAL_H__ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #if defined(CONFIG_EV64260) | 10 | #if defined(CONFIG_EV64260) |
| 12 | #include <platforms/ev64260.h> | 11 | #include <platforms/ev64260.h> |
diff --git a/include/asm-ppc/smp.h b/include/asm-ppc/smp.h index 30e9268a888c..0b7fa89589df 100644 --- a/include/asm-ppc/smp.h +++ b/include/asm-ppc/smp.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _PPC_SMP_H | 10 | #ifndef _PPC_SMP_H |
| 11 | #define _PPC_SMP_H | 11 | #define _PPC_SMP_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/bitops.h> | 14 | #include <linux/bitops.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
diff --git a/include/asm-ppc/time.h b/include/asm-ppc/time.h index c86112323c9f..f7eadf6ac806 100644 --- a/include/asm-ppc/time.h +++ b/include/asm-ppc/time.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __ASM_TIME_H__ | 9 | #ifndef __ASM_TIME_H__ |
| 10 | #define __ASM_TIME_H__ | 10 | #define __ASM_TIME_H__ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/rtc.h> | 13 | #include <linux/rtc.h> |
| 15 | #include <linux/threads.h> | 14 | #include <linux/threads.h> |
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h index ca092ffb7a95..4d2b126ba159 100644 --- a/include/asm-s390/bitops.h +++ b/include/asm-s390/bitops.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 1992, Linus Torvalds | 12 | * Copyright (C) 1992, Linus Torvalds |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/compiler.h> | 15 | #include <linux/compiler.h> |
| 17 | 16 | ||
| 18 | /* | 17 | /* |
diff --git a/include/asm-s390/cmb.h b/include/asm-s390/cmb.h index dae1dd4fb937..2d09950a9c11 100644 --- a/include/asm-s390/cmb.h +++ b/include/asm-s390/cmb.h | |||
| @@ -47,7 +47,7 @@ struct cmbdata { | |||
| 47 | /* reset channel measurement block */ | 47 | /* reset channel measurement block */ |
| 48 | #define BIODASDRESETCMB _IO(DASD_IOCTL_LETTER,34) | 48 | #define BIODASDRESETCMB _IO(DASD_IOCTL_LETTER,34) |
| 49 | /* read channel measurement data */ | 49 | /* read channel measurement data */ |
| 50 | #define BIODASDREADCMB _IOWR(DASD_IOCTL_LETTER,32,u64) | 50 | #define BIODASDREADCMB _IOWR(DASD_IOCTL_LETTER,32,__u64) |
| 51 | /* read channel measurement data */ | 51 | /* read channel measurement data */ |
| 52 | #define BIODASDREADALLCMB _IOWR(DASD_IOCTL_LETTER,33,struct cmbdata) | 52 | #define BIODASDREADALLCMB _IOWR(DASD_IOCTL_LETTER,33,struct cmbdata) |
| 53 | 53 | ||
diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h index 23450ed4b571..7f1ef99fd1e1 100644 --- a/include/asm-s390/debug.h +++ b/include/asm-s390/debug.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef DEBUG_H | 9 | #ifndef DEBUG_H |
| 10 | #define DEBUG_H | 10 | #define DEBUG_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 15 | 14 | ||
diff --git a/include/asm-s390/hardirq.h b/include/asm-s390/hardirq.h index 6792c559a124..e84b7ef54aac 100644 --- a/include/asm-s390/hardirq.h +++ b/include/asm-s390/hardirq.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_HARDIRQ_H | 12 | #ifndef __ASM_HARDIRQ_H |
| 13 | #define __ASM_HARDIRQ_H | 13 | #define __ASM_HARDIRQ_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 18 | #include <linux/cache.h> | 17 | #include <linux/cache.h> |
diff --git a/include/asm-s390/idals.h b/include/asm-s390/idals.h index 8038858b86bb..e82c10efe65a 100644 --- a/include/asm-s390/idals.h +++ b/include/asm-s390/idals.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _S390_IDALS_H | 13 | #ifndef _S390_IDALS_H |
| 14 | #define _S390_IDALS_H | 14 | #define _S390_IDALS_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 18 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
diff --git a/include/asm-s390/local.h b/include/asm-s390/local.h index cf8189009c30..86745a1b29bb 100644 --- a/include/asm-s390/local.h +++ b/include/asm-s390/local.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_LOCAL_H | 1 | #ifndef _ASM_LOCAL_H |
| 2 | #define _ASM_LOCAL_H | 2 | #define _ASM_LOCAL_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/percpu.h> | 4 | #include <linux/percpu.h> |
| 6 | #include <asm/atomic.h> | 5 | #include <asm/atomic.h> |
| 7 | 6 | ||
diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h index bea727904287..596c8b172104 100644 --- a/include/asm-s390/lowcore.h +++ b/include/asm-s390/lowcore.h | |||
| @@ -124,7 +124,6 @@ | |||
| 124 | 124 | ||
| 125 | #ifndef __ASSEMBLY__ | 125 | #ifndef __ASSEMBLY__ |
| 126 | 126 | ||
| 127 | #include <linux/config.h> | ||
| 128 | #include <asm/processor.h> | 127 | #include <asm/processor.h> |
| 129 | #include <linux/types.h> | 128 | #include <linux/types.h> |
| 130 | #include <asm/sigp.h> | 129 | #include <asm/sigp.h> |
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h index 3b1138ac7e79..b2628dc5c490 100644 --- a/include/asm-s390/page.h +++ b/include/asm-s390/page.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _S390_PAGE_H | 9 | #ifndef _S390_PAGE_H |
| 10 | #define _S390_PAGE_H | 10 | #define _S390_PAGE_H |
| 11 | 11 | ||
| 12 | #include <asm/setup.h> | ||
| 13 | #include <asm/types.h> | 12 | #include <asm/types.h> |
| 14 | 13 | ||
| 15 | /* PAGE_SHIFT determines the page size */ | 14 | /* PAGE_SHIFT determines the page size */ |
| @@ -20,6 +19,7 @@ | |||
| 20 | #define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4) | 19 | #define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4) |
| 21 | 20 | ||
| 22 | #ifdef __KERNEL__ | 21 | #ifdef __KERNEL__ |
| 22 | #include <asm/setup.h> | ||
| 23 | #ifndef __ASSEMBLY__ | 23 | #ifndef __ASSEMBLY__ |
| 24 | 24 | ||
| 25 | #ifndef __s390x__ | 25 | #ifndef __s390x__ |
| @@ -189,9 +189,9 @@ page_get_storage_key(unsigned long addr) | |||
| 189 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 189 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
| 190 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 190 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 191 | 191 | ||
| 192 | #endif /* __KERNEL__ */ | ||
| 193 | |||
| 194 | #include <asm-generic/memory_model.h> | 192 | #include <asm-generic/memory_model.h> |
| 195 | #include <asm-generic/page.h> | 193 | #include <asm-generic/page.h> |
| 196 | 194 | ||
| 195 | #endif /* __KERNEL__ */ | ||
| 196 | |||
| 197 | #endif /* _S390_PAGE_H */ | 197 | #endif /* _S390_PAGE_H */ |
diff --git a/include/asm-s390/pgalloc.h b/include/asm-s390/pgalloc.h index e28aaf28e4a8..3002fda89d33 100644 --- a/include/asm-s390/pgalloc.h +++ b/include/asm-s390/pgalloc.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _S390_PGALLOC_H | 13 | #ifndef _S390_PGALLOC_H |
| 14 | #define _S390_PGALLOC_H | 14 | #define _S390_PGALLOC_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
| 18 | #include <linux/gfp.h> | 17 | #include <linux/gfp.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
diff --git a/include/asm-s390/posix_types.h b/include/asm-s390/posix_types.h index 61788de3c0c3..b94c98856e12 100644 --- a/include/asm-s390/posix_types.h +++ b/include/asm-s390/posix_types.h | |||
| @@ -76,24 +76,36 @@ typedef struct { | |||
| 76 | } __kernel_fsid_t; | 76 | } __kernel_fsid_t; |
| 77 | 77 | ||
| 78 | 78 | ||
| 79 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 79 | #ifdef __KERNEL__ |
| 80 | 80 | ||
| 81 | #ifndef _S390_BITOPS_H | 81 | #undef __FD_SET |
| 82 | #include <asm/bitops.h> | 82 | static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) |
| 83 | #endif | 83 | { |
| 84 | 84 | unsigned long _tmp = fd / __NFDBITS; | |
| 85 | #undef __FD_SET | 85 | unsigned long _rem = fd % __NFDBITS; |
| 86 | #define __FD_SET(fd,fdsetp) set_bit((fd),(fdsetp)->fds_bits) | 86 | fdsetp->fds_bits[_tmp] |= (1UL<<_rem); |
| 87 | 87 | } | |
| 88 | #undef __FD_CLR | 88 | |
| 89 | #define __FD_CLR(fd,fdsetp) clear_bit((fd),(fdsetp)->fds_bits) | 89 | #undef __FD_CLR |
| 90 | 90 | static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp) | |
| 91 | #undef __FD_ISSET | 91 | { |
| 92 | #define __FD_ISSET(fd,fdsetp) test_bit((fd),(fdsetp)->fds_bits) | 92 | unsigned long _tmp = fd / __NFDBITS; |
| 93 | unsigned long _rem = fd % __NFDBITS; | ||
| 94 | fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem); | ||
| 95 | } | ||
| 96 | |||
| 97 | #undef __FD_ISSET | ||
| 98 | static inline int __FD_ISSET(unsigned long fd, const __kernel_fd_set *fdsetp) | ||
| 99 | { | ||
| 100 | unsigned long _tmp = fd / __NFDBITS; | ||
| 101 | unsigned long _rem = fd % __NFDBITS; | ||
| 102 | return (fdsetp->fds_bits[_tmp] & (1UL<<_rem)) != 0; | ||
| 103 | } | ||
| 93 | 104 | ||
| 94 | #undef __FD_ZERO | 105 | #undef __FD_ZERO |
| 95 | #define __FD_ZERO(fdsetp) (memset ((fdsetp), 0, sizeof(*(fd_set *)(fdsetp)))) | 106 | #define __FD_ZERO(fdsetp) \ |
| 107 | ((void) memset ((__ptr_t) (fdsetp), 0, sizeof (__kernel_fd_set))) | ||
| 96 | 108 | ||
| 97 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)*/ | 109 | #endif /* __KERNEL__ */ |
| 98 | 110 | ||
| 99 | #endif | 111 | #endif |
diff --git a/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h index a949cc077cc7..4d75d77b0f99 100644 --- a/include/asm-s390/ptrace.h +++ b/include/asm-s390/ptrace.h | |||
| @@ -181,11 +181,8 @@ | |||
| 181 | #define PTRACE_OLDSETOPTIONS 21 | 181 | #define PTRACE_OLDSETOPTIONS 21 |
| 182 | 182 | ||
| 183 | #ifndef __ASSEMBLY__ | 183 | #ifndef __ASSEMBLY__ |
| 184 | #include <linux/config.h> | ||
| 185 | #include <linux/stddef.h> | 184 | #include <linux/stddef.h> |
| 186 | #include <linux/types.h> | 185 | #include <linux/types.h> |
| 187 | #include <asm/setup.h> | ||
| 188 | #include <asm/page.h> | ||
| 189 | 186 | ||
| 190 | typedef union | 187 | typedef union |
| 191 | { | 188 | { |
| @@ -301,6 +298,9 @@ typedef struct | |||
| 301 | } s390_regs; | 298 | } s390_regs; |
| 302 | 299 | ||
| 303 | #ifdef __KERNEL__ | 300 | #ifdef __KERNEL__ |
| 301 | #include <asm/setup.h> | ||
| 302 | #include <asm/page.h> | ||
| 303 | |||
| 304 | /* | 304 | /* |
| 305 | * The pt_regs struct defines the way the registers are stored on | 305 | * The pt_regs struct defines the way the registers are stored on |
| 306 | * the stack during a system call. | 306 | * the stack during a system call. |
diff --git a/include/asm-s390/sfp-machine.h b/include/asm-s390/sfp-machine.h index 3c79b5384f44..de69dfa46fbb 100644 --- a/include/asm-s390/sfp-machine.h +++ b/include/asm-s390/sfp-machine.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #ifndef _SFP_MACHINE_H | 25 | #ifndef _SFP_MACHINE_H |
| 26 | #define _SFP_MACHINE_H | 26 | #define _SFP_MACHINE_H |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #define _FP_W_TYPE_SIZE 32 | 29 | #define _FP_W_TYPE_SIZE 32 |
| 31 | #define _FP_W_TYPE unsigned long | 30 | #define _FP_W_TYPE unsigned long |
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h index 444dae5912e6..657646054c5e 100644 --- a/include/asm-s390/smp.h +++ b/include/asm-s390/smp.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_SMP_H | 10 | #ifndef __ASM_SMP_H |
| 11 | #define __ASM_SMP_H | 11 | #define __ASM_SMP_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/threads.h> | 13 | #include <linux/threads.h> |
| 15 | #include <linux/cpumask.h> | 14 | #include <linux/cpumask.h> |
| 16 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h index 6a89dbb03c1e..71a0732cd518 100644 --- a/include/asm-s390/system.h +++ b/include/asm-s390/system.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_SYSTEM_H | 11 | #ifndef __ASM_SYSTEM_H |
| 12 | #define __ASM_SYSTEM_H | 12 | #define __ASM_SYSTEM_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <asm/types.h> | 15 | #include <asm/types.h> |
| 17 | #include <asm/ptrace.h> | 16 | #include <asm/ptrace.h> |
diff --git a/include/asm-s390/tlbflush.h b/include/asm-s390/tlbflush.h index 1bb73b0e61fa..73cd85bebfb2 100644 --- a/include/asm-s390/tlbflush.h +++ b/include/asm-s390/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _S390_TLBFLUSH_H | 1 | #ifndef _S390_TLBFLUSH_H |
| 2 | #define _S390_TLBFLUSH_H | 2 | #define _S390_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
| 7 | 6 | ||
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h index 5738ad63537c..ae2951cc83ac 100644 --- a/include/asm-s390/types.h +++ b/include/asm-s390/types.h | |||
| @@ -58,7 +58,6 @@ typedef __signed__ long saddr_t; | |||
| 58 | 58 | ||
| 59 | #ifndef __ASSEMBLY__ | 59 | #ifndef __ASSEMBLY__ |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | 61 | ||
| 63 | typedef signed char s8; | 62 | typedef signed char s8; |
| 64 | typedef unsigned char u8; | 63 | typedef unsigned char u8; |
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h index 41c2792ff6b0..e21443d3ea1d 100644 --- a/include/asm-s390/unistd.h +++ b/include/asm-s390/unistd.h | |||
| @@ -392,6 +392,8 @@ | |||
| 392 | 392 | ||
| 393 | #endif | 393 | #endif |
| 394 | 394 | ||
| 395 | #ifdef __KERNEL__ | ||
| 396 | |||
| 395 | /* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */ | 397 | /* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */ |
| 396 | 398 | ||
| 397 | #define __syscall_return(type, res) \ | 399 | #define __syscall_return(type, res) \ |
| @@ -546,7 +548,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \ | |||
| 546 | __syscall_return(type,__res); \ | 548 | __syscall_return(type,__res); \ |
| 547 | } | 549 | } |
| 548 | 550 | ||
| 549 | #ifdef __KERNEL__ | ||
| 550 | #define __ARCH_WANT_IPC_PARSE_VERSION | 551 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 551 | #define __ARCH_WANT_OLD_READDIR | 552 | #define __ARCH_WANT_OLD_READDIR |
| 552 | #define __ARCH_WANT_SYS_ALARM | 553 | #define __ARCH_WANT_SYS_ALARM |
| @@ -573,11 +574,9 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \ | |||
| 573 | # define __ARCH_WANT_COMPAT_SYS_TIME | 574 | # define __ARCH_WANT_COMPAT_SYS_TIME |
| 574 | # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND | 575 | # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND |
| 575 | # endif | 576 | # endif |
| 576 | #endif | ||
| 577 | 577 | ||
| 578 | #ifdef __KERNEL_SYSCALLS__ | 578 | #ifdef __KERNEL_SYSCALLS__ |
| 579 | 579 | ||
| 580 | #include <linux/config.h> | ||
| 581 | #include <linux/compiler.h> | 580 | #include <linux/compiler.h> |
| 582 | #include <linux/types.h> | 581 | #include <linux/types.h> |
| 583 | #include <asm/ptrace.h> | 582 | #include <asm/ptrace.h> |
| @@ -625,7 +624,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 625 | struct sigaction __user *oact, | 624 | struct sigaction __user *oact, |
| 626 | size_t sigsetsize); | 625 | size_t sigsetsize); |
| 627 | 626 | ||
| 628 | #endif | 627 | #endif /* __KERNEL_SYSCALLS__ */ |
| 629 | 628 | ||
| 630 | /* | 629 | /* |
| 631 | * "Conditional" syscalls | 630 | * "Conditional" syscalls |
| @@ -635,4 +634,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 635 | */ | 634 | */ |
| 636 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 635 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 637 | 636 | ||
| 637 | #endif /* __KERNEL__ */ | ||
| 638 | #endif /* _ASM_S390_UNISTD_H_ */ | 638 | #endif /* _ASM_S390_UNISTD_H_ */ |
diff --git a/include/asm-s390/vtoc.h b/include/asm-s390/vtoc.h index d1de5b7ebb0b..3a5267d90d29 100644 --- a/include/asm-s390/vtoc.h +++ b/include/asm-s390/vtoc.h | |||
| @@ -177,27 +177,27 @@ struct vtoc_format7_label | |||
| 177 | } __attribute__ ((packed)); | 177 | } __attribute__ ((packed)); |
| 178 | 178 | ||
| 179 | struct vtoc_cms_label { | 179 | struct vtoc_cms_label { |
| 180 | u8 label_id[4]; /* Label identifier */ | 180 | __u8 label_id[4]; /* Label identifier */ |
| 181 | u8 vol_id[6]; /* Volid */ | 181 | __u8 vol_id[6]; /* Volid */ |
| 182 | u16 version_id; /* Version identifier */ | 182 | __u16 version_id; /* Version identifier */ |
| 183 | u32 block_size; /* Disk block size */ | 183 | __u32 block_size; /* Disk block size */ |
| 184 | u32 origin_ptr; /* Disk origin pointer */ | 184 | __u32 origin_ptr; /* Disk origin pointer */ |
| 185 | u32 usable_count; /* Number of usable cylinders/blocks */ | 185 | __u32 usable_count; /* Number of usable cylinders/blocks */ |
| 186 | u32 formatted_count; /* Maximum number of formatted cylinders/ | 186 | __u32 formatted_count; /* Maximum number of formatted cylinders/ |
| 187 | * blocks */ | 187 | * blocks */ |
| 188 | u32 block_count; /* Disk size in CMS blocks */ | 188 | __u32 block_count; /* Disk size in CMS blocks */ |
| 189 | u32 used_count; /* Number of CMS blocks in use */ | 189 | __u32 used_count; /* Number of CMS blocks in use */ |
| 190 | u32 fst_size; /* File Status Table (FST) size */ | 190 | __u32 fst_size; /* File Status Table (FST) size */ |
| 191 | u32 fst_count; /* Number of FSTs per CMS block */ | 191 | __u32 fst_count; /* Number of FSTs per CMS block */ |
| 192 | u8 format_date[6]; /* Disk FORMAT date */ | 192 | __u8 format_date[6]; /* Disk FORMAT date */ |
| 193 | u8 reserved1[2]; | 193 | __u8 reserved1[2]; |
| 194 | u32 disk_offset; /* Disk offset when reserved*/ | 194 | __u32 disk_offset; /* Disk offset when reserved*/ |
| 195 | u32 map_block; /* Allocation Map Block with next hole */ | 195 | __u32 map_block; /* Allocation Map Block with next hole */ |
| 196 | u32 hblk_disp; /* Displacement into HBLK data of next hole */ | 196 | __u32 hblk_disp; /* Displacement into HBLK data of next hole */ |
| 197 | u32 user_disp; /* Displacement into user part of Allocation | 197 | __u32 user_disp; /* Displacement into user part of Allocation |
| 198 | * map */ | 198 | * map */ |
| 199 | u8 reserved2[4]; | 199 | __u8 reserved2[4]; |
| 200 | u8 segment_name[8]; /* Name of shared segment */ | 200 | __u8 segment_name[8]; /* Name of shared segment */ |
| 201 | } __attribute__ ((packed)); | 201 | } __attribute__ ((packed)); |
| 202 | 202 | ||
| 203 | #endif /* _ASM_S390_VTOC_H */ | 203 | #endif /* _ASM_S390_VTOC_H */ |
diff --git a/include/asm-s390/z90crypt.h b/include/asm-s390/z90crypt.h new file mode 100644 index 000000000000..31a2439b07bd --- /dev/null +++ b/include/asm-s390/z90crypt.h | |||
| @@ -0,0 +1,212 @@ | |||
| 1 | /* | ||
| 2 | * include/asm-s390/z90crypt.h | ||
| 3 | * | ||
| 4 | * z90crypt 1.3.3 (user-visible header) | ||
| 5 | * | ||
| 6 | * Copyright (C) 2001, 2005 IBM Corporation | ||
| 7 | * Author(s): Robert Burroughs | ||
| 8 | * Eric Rossman (edrossma@us.ibm.com) | ||
| 9 | * | ||
| 10 | * Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com) | ||
| 11 | * | ||
| 12 | * This program is free software; you can redistribute it and/or modify | ||
| 13 | * it under the terms of the GNU General Public License as published by | ||
| 14 | * the Free Software Foundation; either version 2, or (at your option) | ||
| 15 | * any later version. | ||
| 16 | * | ||
| 17 | * This program is distributed in the hope that it will be useful, | ||
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 20 | * GNU General Public License for more details. | ||
| 21 | * | ||
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with this program; if not, write to the Free Software | ||
| 24 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 25 | */ | ||
| 26 | |||
| 27 | #ifndef __ASM_S390_Z90CRYPT_H | ||
| 28 | #define __ASM_S390_Z90CRYPT_H | ||
| 29 | #include <linux/ioctl.h> | ||
| 30 | |||
| 31 | #define z90crypt_VERSION 1 | ||
| 32 | #define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards | ||
| 33 | #define z90crypt_VARIANT 3 // 3 = CEX2A support | ||
| 34 | |||
| 35 | /** | ||
| 36 | * struct ica_rsa_modexpo | ||
| 37 | * | ||
| 38 | * Requirements: | ||
| 39 | * - outputdatalength is at least as large as inputdatalength. | ||
| 40 | * - All key parts are right justified in their fields, padded on | ||
| 41 | * the left with zeroes. | ||
| 42 | * - length(b_key) = inputdatalength | ||
| 43 | * - length(n_modulus) = inputdatalength | ||
| 44 | */ | ||
| 45 | struct ica_rsa_modexpo { | ||
| 46 | char __user * inputdata; | ||
| 47 | unsigned int inputdatalength; | ||
| 48 | char __user * outputdata; | ||
| 49 | unsigned int outputdatalength; | ||
| 50 | char __user * b_key; | ||
| 51 | char __user * n_modulus; | ||
| 52 | }; | ||
| 53 | |||
| 54 | /** | ||
| 55 | * struct ica_rsa_modexpo_crt | ||
| 56 | * | ||
| 57 | * Requirements: | ||
| 58 | * - inputdatalength is even. | ||
| 59 | * - outputdatalength is at least as large as inputdatalength. | ||
| 60 | * - All key parts are right justified in their fields, padded on | ||
| 61 | * the left with zeroes. | ||
| 62 | * - length(bp_key) = inputdatalength/2 + 8 | ||
| 63 | * - length(bq_key) = inputdatalength/2 | ||
| 64 | * - length(np_key) = inputdatalength/2 + 8 | ||
| 65 | * - length(nq_key) = inputdatalength/2 | ||
| 66 | * - length(u_mult_inv) = inputdatalength/2 + 8 | ||
| 67 | */ | ||
| 68 | struct ica_rsa_modexpo_crt { | ||
| 69 | char __user * inputdata; | ||
| 70 | unsigned int inputdatalength; | ||
| 71 | char __user * outputdata; | ||
| 72 | unsigned int outputdatalength; | ||
| 73 | char __user * bp_key; | ||
| 74 | char __user * bq_key; | ||
| 75 | char __user * np_prime; | ||
| 76 | char __user * nq_prime; | ||
| 77 | char __user * u_mult_inv; | ||
| 78 | }; | ||
| 79 | |||
| 80 | #define Z90_IOCTL_MAGIC 'z' // NOTE: Need to allocate from linux folks | ||
| 81 | |||
| 82 | /** | ||
| 83 | * Interface notes: | ||
| 84 | * | ||
| 85 | * The ioctl()s which are implemented (along with relevant details) | ||
| 86 | * are: | ||
| 87 | * | ||
| 88 | * ICARSAMODEXPO | ||
| 89 | * Perform an RSA operation using a Modulus-Exponent pair | ||
| 90 | * This takes an ica_rsa_modexpo struct as its arg. | ||
| 91 | * | ||
| 92 | * NOTE: please refer to the comments preceding this structure | ||
| 93 | * for the implementation details for the contents of the | ||
| 94 | * block | ||
| 95 | * | ||
| 96 | * ICARSACRT | ||
| 97 | * Perform an RSA operation using a Chinese-Remainder Theorem key | ||
| 98 | * This takes an ica_rsa_modexpo_crt struct as its arg. | ||
| 99 | * | ||
| 100 | * NOTE: please refer to the comments preceding this structure | ||
| 101 | * for the implementation details for the contents of the | ||
| 102 | * block | ||
| 103 | * | ||
| 104 | * Z90STAT_TOTALCOUNT | ||
| 105 | * Return an integer count of all device types together. | ||
| 106 | * | ||
| 107 | * Z90STAT_PCICACOUNT | ||
| 108 | * Return an integer count of all PCICAs. | ||
| 109 | * | ||
| 110 | * Z90STAT_PCICCCOUNT | ||
| 111 | * Return an integer count of all PCICCs. | ||
| 112 | * | ||
| 113 | * Z90STAT_PCIXCCMCL2COUNT | ||
| 114 | * Return an integer count of all MCL2 PCIXCCs. | ||
| 115 | * | ||
| 116 | * Z90STAT_PCIXCCMCL3COUNT | ||
| 117 | * Return an integer count of all MCL3 PCIXCCs. | ||
| 118 | * | ||
| 119 | * Z90STAT_CEX2CCOUNT | ||
| 120 | * Return an integer count of all CEX2Cs. | ||
| 121 | * | ||
| 122 | * Z90STAT_CEX2ACOUNT | ||
| 123 | * Return an integer count of all CEX2As. | ||
| 124 | * | ||
| 125 | * Z90STAT_REQUESTQ_COUNT | ||
| 126 | * Return an integer count of the number of entries waiting to be | ||
| 127 | * sent to a device. | ||
| 128 | * | ||
| 129 | * Z90STAT_PENDINGQ_COUNT | ||
| 130 | * Return an integer count of the number of entries sent to a | ||
| 131 | * device awaiting the reply. | ||
| 132 | * | ||
| 133 | * Z90STAT_TOTALOPEN_COUNT | ||
| 134 | * Return an integer count of the number of open file handles. | ||
| 135 | * | ||
| 136 | * Z90STAT_DOMAIN_INDEX | ||
| 137 | * Return the integer value of the Cryptographic Domain. | ||
| 138 | * | ||
| 139 | * Z90STAT_STATUS_MASK | ||
| 140 | * Return an 64 element array of unsigned chars for the status of | ||
| 141 | * all devices. | ||
| 142 | * 0x01: PCICA | ||
| 143 | * 0x02: PCICC | ||
| 144 | * 0x03: PCIXCC_MCL2 | ||
| 145 | * 0x04: PCIXCC_MCL3 | ||
| 146 | * 0x05: CEX2C | ||
| 147 | * 0x06: CEX2A | ||
| 148 | * 0x0d: device is disabled via the proc filesystem | ||
| 149 | * | ||
| 150 | * Z90STAT_QDEPTH_MASK | ||
| 151 | * Return an 64 element array of unsigned chars for the queue | ||
| 152 | * depth of all devices. | ||
| 153 | * | ||
| 154 | * Z90STAT_PERDEV_REQCNT | ||
| 155 | * Return an 64 element array of unsigned integers for the number | ||
| 156 | * of successfully completed requests per device since the device | ||
| 157 | * was detected and made available. | ||
| 158 | * | ||
| 159 | * ICAZ90STATUS (deprecated) | ||
| 160 | * Return some device driver status in a ica_z90_status struct | ||
| 161 | * This takes an ica_z90_status struct as its arg. | ||
| 162 | * | ||
| 163 | * NOTE: this ioctl() is deprecated, and has been replaced with | ||
| 164 | * single ioctl()s for each type of status being requested | ||
| 165 | * | ||
| 166 | * Z90STAT_PCIXCCCOUNT (deprecated) | ||
| 167 | * Return an integer count of all PCIXCCs (MCL2 + MCL3). | ||
| 168 | * This is DEPRECATED now that MCL3 PCIXCCs are treated differently from | ||
| 169 | * MCL2 PCIXCCs. | ||
| 170 | * | ||
| 171 | * Z90QUIESCE (not recommended) | ||
| 172 | * Quiesce the driver. This is intended to stop all new | ||
| 173 | * requests from being processed. Its use is NOT recommended, | ||
| 174 | * except in circumstances where there is no other way to stop | ||
| 175 | * callers from accessing the driver. Its original use was to | ||
| 176 | * allow the driver to be "drained" of work in preparation for | ||
| 177 | * a system shutdown. | ||
| 178 | * | ||
| 179 | * NOTE: once issued, this ban on new work cannot be undone | ||
| 180 | * except by unloading and reloading the driver. | ||
| 181 | */ | ||
| 182 | |||
| 183 | /** | ||
| 184 | * Supported ioctl calls | ||
| 185 | */ | ||
| 186 | #define ICARSAMODEXPO _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0) | ||
| 187 | #define ICARSACRT _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0) | ||
| 188 | |||
| 189 | /* DEPRECATED status calls (bound for removal at some point) */ | ||
| 190 | #define ICAZ90STATUS _IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status) | ||
| 191 | #define Z90STAT_PCIXCCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x43, int) | ||
| 192 | |||
| 193 | /* unrelated to ICA callers */ | ||
| 194 | #define Z90QUIESCE _IO(Z90_IOCTL_MAGIC, 0x11) | ||
| 195 | |||
| 196 | /* New status calls */ | ||
| 197 | #define Z90STAT_TOTALCOUNT _IOR(Z90_IOCTL_MAGIC, 0x40, int) | ||
| 198 | #define Z90STAT_PCICACOUNT _IOR(Z90_IOCTL_MAGIC, 0x41, int) | ||
| 199 | #define Z90STAT_PCICCCOUNT _IOR(Z90_IOCTL_MAGIC, 0x42, int) | ||
| 200 | #define Z90STAT_PCIXCCMCL2COUNT _IOR(Z90_IOCTL_MAGIC, 0x4b, int) | ||
| 201 | #define Z90STAT_PCIXCCMCL3COUNT _IOR(Z90_IOCTL_MAGIC, 0x4c, int) | ||
| 202 | #define Z90STAT_CEX2CCOUNT _IOR(Z90_IOCTL_MAGIC, 0x4d, int) | ||
| 203 | #define Z90STAT_CEX2ACOUNT _IOR(Z90_IOCTL_MAGIC, 0x4e, int) | ||
| 204 | #define Z90STAT_REQUESTQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x44, int) | ||
| 205 | #define Z90STAT_PENDINGQ_COUNT _IOR(Z90_IOCTL_MAGIC, 0x45, int) | ||
| 206 | #define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int) | ||
| 207 | #define Z90STAT_DOMAIN_INDEX _IOR(Z90_IOCTL_MAGIC, 0x47, int) | ||
| 208 | #define Z90STAT_STATUS_MASK _IOR(Z90_IOCTL_MAGIC, 0x48, char[64]) | ||
| 209 | #define Z90STAT_QDEPTH_MASK _IOR(Z90_IOCTL_MAGIC, 0x49, char[64]) | ||
| 210 | #define Z90STAT_PERDEV_REQCNT _IOR(Z90_IOCTL_MAGIC, 0x4a, int[64]) | ||
| 211 | |||
| 212 | #endif /* __ASM_S390_Z90CRYPT_H */ | ||
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h index 70508a360cd6..1b4fc52a59e8 100644 --- a/include/asm-sh/bug.h +++ b/include/asm-sh/bug.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH_BUG_H | 1 | #ifndef __ASM_SH_BUG_H |
| 2 | #define __ASM_SH_BUG_H | 2 | #define __ASM_SH_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_BUG | 5 | #ifdef CONFIG_BUG |
| 7 | /* | 6 | /* |
diff --git a/include/asm-sh/checksum.h b/include/asm-sh/checksum.h index 5ebd0f24299e..fa03b30c4269 100644 --- a/include/asm-sh/checksum.h +++ b/include/asm-sh/checksum.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1999 by Kaz Kojima & Niibe Yutaka | 9 | * Copyright (C) 1999 by Kaz Kojima & Niibe Yutaka |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/in6.h> | 12 | #include <linux/in6.h> |
| 14 | 13 | ||
| 15 | /* | 14 | /* |
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h index 48f1f42c5d14..124968f9866e 100644 --- a/include/asm-sh/dma-mapping.h +++ b/include/asm-sh/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH_DMA_MAPPING_H | 1 | #ifndef __ASM_SH_DMA_MAPPING_H |
| 2 | #define __ASM_SH_DMA_MAPPING_H | 2 | #define __ASM_SH_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/scatterlist.h> | 5 | #include <asm/scatterlist.h> |
| 7 | #include <asm/cacheflush.h> | 6 | #include <asm/cacheflush.h> |
diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h index a118a0d43053..e62a6d0ed932 100644 --- a/include/asm-sh/dma.h +++ b/include/asm-sh/dma.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define __ASM_SH_DMA_H | 11 | #define __ASM_SH_DMA_H |
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/spinlock.h> | 14 | #include <linux/spinlock.h> |
| 16 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
| 17 | #include <linux/sysdev.h> | 16 | #include <linux/sysdev.h> |
diff --git a/include/asm-sh/fixmap.h b/include/asm-sh/fixmap.h index 509224bdba28..412bccaa07e6 100644 --- a/include/asm-sh/fixmap.h +++ b/include/asm-sh/fixmap.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ASM_FIXMAP_H | 13 | #ifndef _ASM_FIXMAP_H |
| 14 | #define _ASM_FIXMAP_H | 14 | #define _ASM_FIXMAP_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <asm/page.h> | 17 | #include <asm/page.h> |
| 19 | #ifdef CONFIG_HIGHMEM | 18 | #ifdef CONFIG_HIGHMEM |
diff --git a/include/asm-sh/hardirq.h b/include/asm-sh/hardirq.h index f2fdf0f760e5..715ee237fc77 100644 --- a/include/asm-sh/hardirq.h +++ b/include/asm-sh/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH_HARDIRQ_H | 1 | #ifndef __ASM_SH_HARDIRQ_H |
| 2 | #define __ASM_SH_HARDIRQ_H | 2 | #define __ASM_SH_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
| 7 | 6 | ||
diff --git a/include/asm-sh/hd64461/hd64461.h b/include/asm-sh/hd64461/hd64461.h index c457ca277a42..87f13d24c630 100644 --- a/include/asm-sh/hd64461/hd64461.h +++ b/include/asm-sh/hd64461/hd64461.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2000 YAEGASHI Takeshi | 5 | * Copyright (C) 2000 YAEGASHI Takeshi |
| 6 | * Hitachi HD64461 companion chip support | 6 | * Hitachi HD64461 companion chip support |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | /* Constants for PCMCIA mappings */ | 9 | /* Constants for PCMCIA mappings */ |
| 11 | #define HD64461_PCC_WINDOW 0x01000000 | 10 | #define HD64461_PCC_WINDOW 0x01000000 |
diff --git a/include/asm-sh/hd64465/hd64465.h b/include/asm-sh/hd64465/hd64465.h index c672032b72c9..cfd0e803d2a2 100644 --- a/include/asm-sh/hd64465/hd64465.h +++ b/include/asm-sh/hd64465/hd64465.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Derived from <asm/hd64461.h> which bore the message: | 11 | * Derived from <asm/hd64461.h> which bore the message: |
| 12 | * Copyright (C) 2000 YAEGASHI Takeshi | 12 | * Copyright (C) 2000 YAEGASHI Takeshi |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
| 16 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
| 17 | 16 | ||
diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h index 711dad4cb48b..9f8e9142dc33 100644 --- a/include/asm-sh/ide.h +++ b/include/asm-sh/ide.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #define ide_default_io_ctl(base) (0) | 18 | #define ide_default_io_ctl(base) (0) |
| 20 | 19 | ||
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h index 2c3afe71323d..894e64b2d5f0 100644 --- a/include/asm-sh/io.h +++ b/include/asm-sh/io.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * inb by default expands to _inb, but the machine specific code may | 23 | * inb by default expands to _inb, but the machine specific code may |
| 24 | * define it to __inb if it chooses. | 24 | * define it to __inb if it chooses. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <asm/cache.h> | 26 | #include <asm/cache.h> |
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 29 | #include <asm/addrspace.h> | 28 | #include <asm/addrspace.h> |
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h index 42b8394c04ed..611e67cd0627 100644 --- a/include/asm-sh/irq.h +++ b/include/asm-sh/irq.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/machvec.h> | 14 | #include <asm/machvec.h> |
| 16 | #include <asm/ptrace.h> /* for pt_regs */ | 15 | #include <asm/ptrace.h> /* for pt_regs */ |
| 17 | 16 | ||
diff --git a/include/asm-sh/keyboard.h b/include/asm-sh/keyboard.h index 1103df003243..31dcc4fa5f28 100644 --- a/include/asm-sh/keyboard.h +++ b/include/asm-sh/keyboard.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/kd.h> | 7 | #include <linux/kd.h> |
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/machvec.h> | 8 | #include <asm/machvec.h> |
| 10 | 9 | ||
| 11 | #ifdef CONFIG_SH_MPC1211 | 10 | #ifdef CONFIG_SH_MPC1211 |
diff --git a/include/asm-sh/kmap_types.h b/include/asm-sh/kmap_types.h index 2492ba07148f..84d565c696be 100644 --- a/include/asm-sh/kmap_types.h +++ b/include/asm-sh/kmap_types.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | /* Dummy header just to define km_type. */ | 4 | /* Dummy header just to define km_type. */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifdef CONFIG_DEBUG_HIGHMEM | 7 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 9 | # define D(n) __KM_FENCE_##n , | 8 | # define D(n) __KM_FENCE_##n , |
diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h index 550c50a7359e..550501fa4fed 100644 --- a/include/asm-sh/machvec.h +++ b/include/asm-sh/machvec.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _ASM_SH_MACHVEC_H | 10 | #ifndef _ASM_SH_MACHVEC_H |
| 11 | #define _ASM_SH_MACHVEC_H 1 | 11 | #define _ASM_SH_MACHVEC_H 1 |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/time.h> | 14 | #include <linux/time.h> |
| 16 | 15 | ||
diff --git a/include/asm-sh/machvec_init.h b/include/asm-sh/machvec_init.h index 9e7de808f7f8..e397798ebd94 100644 --- a/include/asm-sh/machvec_init.h +++ b/include/asm-sh/machvec_init.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __SH_MACHVEC_INIT_H | 12 | #ifndef __SH_MACHVEC_INIT_H |
| 13 | #define __SH_MACHVEC_INIT_H | 13 | #define __SH_MACHVEC_INIT_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * In a GENERIC kernel, we have lots of these vectors floating about, | 17 | * In a GENERIC kernel, we have lots of these vectors floating about, |
diff --git a/include/asm-sh/mpc1211/dma.h b/include/asm-sh/mpc1211/dma.h index 0a2fdab3e454..e506d1aaa0d0 100644 --- a/include/asm-sh/mpc1211/dma.h +++ b/include/asm-sh/mpc1211/dma.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_MPC1211_DMA_H | 8 | #ifndef _ASM_MPC1211_DMA_H |
| 9 | #define _ASM_MPC1211_DMA_H | 9 | #define _ASM_MPC1211_DMA_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/spinlock.h> /* And spinlocks */ | 11 | #include <linux/spinlock.h> /* And spinlocks */ |
| 13 | #include <asm/io.h> /* need byte IO */ | 12 | #include <asm/io.h> /* need byte IO */ |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
diff --git a/include/asm-sh/overdrive/overdrive.h b/include/asm-sh/overdrive/overdrive.h index aa62ae68c55c..fc746c244f83 100644 --- a/include/asm-sh/overdrive/overdrive.h +++ b/include/asm-sh/overdrive/overdrive.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #ifndef __OVERDRIVE_H__ | 10 | #ifndef __OVERDRIVE_H__ |
| 12 | #define __OVERDRIVE_H__ | 11 | #define __OVERDRIVE_H__ |
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index 9c89287c3e56..a5559e38744e 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | [ P4 control ] 0xE0000000 | 13 | [ P4 control ] 0xE0000000 |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | /* PAGE_SHIFT determines the page size */ | 17 | /* PAGE_SHIFT determines the page size */ |
| 19 | #define PAGE_SHIFT 12 | 18 | #define PAGE_SHIFT 12 |
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h index bb0efb31a8cb..dcd23a03683d 100644 --- a/include/asm-sh/pgtable.h +++ b/include/asm-sh/pgtable.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2002, 2003, 2004 Paul Mundt | 8 | * Copyright (C) 2002, 2003, 2004 Paul Mundt |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm/pgtable-2level.h> | 11 | #include <asm/pgtable-2level.h> |
| 13 | 12 | ||
| 14 | /* | 13 | /* |
diff --git a/include/asm-sh/serial.h b/include/asm-sh/serial.h index f51e232d5cd9..8734590d27e8 100644 --- a/include/asm-sh/serial.h +++ b/include/asm-sh/serial.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _ASM_SERIAL_H | 7 | #ifndef _ASM_SERIAL_H |
| 8 | #define _ASM_SERIAL_H | 8 | #define _ASM_SERIAL_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | 11 | ||
| 13 | #ifdef CONFIG_SH_EC3104 | 12 | #ifdef CONFIG_SH_EC3104 |
diff --git a/include/asm-sh/smp.h b/include/asm-sh/smp.h index f19a8b3b69a6..f57c4fe9692a 100644 --- a/include/asm-sh/smp.h +++ b/include/asm-sh/smp.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_SH_SMP_H | 10 | #ifndef __ASM_SH_SMP_H |
| 11 | #define __ASM_SH_SMP_H | 11 | #define __ASM_SH_SMP_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
| 15 | #include <linux/cpumask.h> | 14 | #include <linux/cpumask.h> |
| 16 | 15 | ||
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h index bb0330499bdf..b752e5cbb830 100644 --- a/include/asm-sh/system.h +++ b/include/asm-sh/system.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 2002 Paul Mundt | 6 | * Copyright (C) 2002 Paul Mundt |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | /* | 10 | /* |
| 12 | * switch_to() should switch tasks to task nr n, first | 11 | * switch_to() should switch tasks to task nr n, first |
diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h index 488552f43b2a..3c09dd4ca31c 100644 --- a/include/asm-sh/types.h +++ b/include/asm-sh/types.h | |||
| @@ -35,7 +35,6 @@ typedef unsigned long long __u64; | |||
| 35 | 35 | ||
| 36 | #ifndef __ASSEMBLY__ | 36 | #ifndef __ASSEMBLY__ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | 38 | ||
| 40 | typedef __signed__ char s8; | 39 | typedef __signed__ char s8; |
| 41 | typedef unsigned char u8; | 40 | typedef unsigned char u8; |
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index 05520cebda12..76b5430cb458 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h | |||
| @@ -304,6 +304,8 @@ | |||
| 304 | 304 | ||
| 305 | #define NR_syscalls 293 | 305 | #define NR_syscalls 293 |
| 306 | 306 | ||
| 307 | #ifdef __KERNEL__ | ||
| 308 | |||
| 307 | /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */ | 309 | /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */ |
| 308 | 310 | ||
| 309 | #define __syscall_return(type, res) \ | 311 | #define __syscall_return(type, res) \ |
| @@ -420,7 +422,6 @@ __asm__ __volatile__ ("trapa #0x16" \ | |||
| 420 | __syscall_return(type,__sc0); \ | 422 | __syscall_return(type,__sc0); \ |
| 421 | } | 423 | } |
| 422 | 424 | ||
| 423 | #ifdef __KERNEL__ | ||
| 424 | #define __ARCH_WANT_IPC_PARSE_VERSION | 425 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 425 | #define __ARCH_WANT_OLD_READDIR | 426 | #define __ARCH_WANT_OLD_READDIR |
| 426 | #define __ARCH_WANT_OLD_STAT | 427 | #define __ARCH_WANT_OLD_STAT |
| @@ -443,7 +444,6 @@ __syscall_return(type,__sc0); \ | |||
| 443 | #define __ARCH_WANT_SYS_SIGPENDING | 444 | #define __ARCH_WANT_SYS_SIGPENDING |
| 444 | #define __ARCH_WANT_SYS_SIGPROCMASK | 445 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 445 | #define __ARCH_WANT_SYS_RT_SIGACTION | 446 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 446 | #endif | ||
| 447 | 447 | ||
| 448 | #ifdef __KERNEL_SYSCALLS__ | 448 | #ifdef __KERNEL_SYSCALLS__ |
| 449 | 449 | ||
| @@ -513,7 +513,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 513 | struct sigaction __user *oact, | 513 | struct sigaction __user *oact, |
| 514 | size_t sigsetsize); | 514 | size_t sigsetsize); |
| 515 | 515 | ||
| 516 | #endif | 516 | #endif /* __KERNEL_SYSCALLS__ */ |
| 517 | 517 | ||
| 518 | /* | 518 | /* |
| 519 | * "Conditional" syscalls | 519 | * "Conditional" syscalls |
| @@ -525,4 +525,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 525 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 525 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 526 | #endif | 526 | #endif |
| 527 | 527 | ||
| 528 | #endif /* __KERNEL__ */ | ||
| 528 | #endif /* __ASM_SH_UNISTD_H */ | 529 | #endif /* __ASM_SH_UNISTD_H */ |
diff --git a/include/asm-sh/watchdog.h b/include/asm-sh/watchdog.h index f0cf4be21655..09ca41972a11 100644 --- a/include/asm-sh/watchdog.h +++ b/include/asm-sh/watchdog.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifdef __KERNEL__ | 13 | #ifdef __KERNEL__ |
| 14 | 14 | ||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/cpu/watchdog.h> | 16 | #include <asm/cpu/watchdog.h> |
| 18 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 19 | 18 | ||
diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h index 5d659ec28e10..81f722efeb63 100644 --- a/include/asm-sh64/bug.h +++ b/include/asm-sh64/bug.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH64_BUG_H | 1 | #ifndef __ASM_SH64_BUG_H |
| 2 | #define __ASM_SH64_BUG_H | 2 | #define __ASM_SH64_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Tell the user there is some problem, then force a segfault (in process | 6 | * Tell the user there is some problem, then force a segfault (in process |
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h index cc9a2e86f5b4..a74a49e47922 100644 --- a/include/asm-sh64/dma-mapping.h +++ b/include/asm-sh64/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH_DMA_MAPPING_H | 1 | #ifndef __ASM_SH_DMA_MAPPING_H |
| 2 | #define __ASM_SH_DMA_MAPPING_H | 2 | #define __ASM_SH_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/scatterlist.h> | 5 | #include <asm/scatterlist.h> |
| 7 | #include <asm/io.h> | 6 | #include <asm/io.h> |
diff --git a/include/asm-sh64/hardirq.h b/include/asm-sh64/hardirq.h index ad2330e41fd5..555fd7a35108 100644 --- a/include/asm-sh64/hardirq.h +++ b/include/asm-sh64/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH64_HARDIRQ_H | 1 | #ifndef __ASM_SH64_HARDIRQ_H |
| 2 | #define __ASM_SH64_HARDIRQ_H | 2 | #define __ASM_SH64_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
| 7 | 6 | ||
diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h index 852f50afe39c..c9d84d5f772e 100644 --- a/include/asm-sh64/ide.h +++ b/include/asm-sh64/ide.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | /* Without this, the initialisation of PCI IDE cards end up calling | 19 | /* Without this, the initialisation of PCI IDE cards end up calling |
| 21 | * ide_init_hwif_ports, which won't work. */ | 20 | * ide_init_hwif_ports, which won't work. */ |
diff --git a/include/asm-sh64/irq.h b/include/asm-sh64/irq.h index f815b43df845..1ca49e29288a 100644 --- a/include/asm-sh64/irq.h +++ b/include/asm-sh64/irq.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Encoded IRQs are not considered worth to be supported. | 17 | * Encoded IRQs are not considered worth to be supported. |
diff --git a/include/asm-sh64/mmu_context.h b/include/asm-sh64/mmu_context.h index 991cfda4cdf6..8c860dab2d0e 100644 --- a/include/asm-sh64/mmu_context.h +++ b/include/asm-sh64/mmu_context.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | */ | 26 | */ |
| 27 | extern unsigned long mmu_context_cache; | 27 | extern unsigned long mmu_context_cache; |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <asm/page.h> | 29 | #include <asm/page.h> |
| 31 | 30 | ||
| 32 | 31 | ||
diff --git a/include/asm-sh64/page.h b/include/asm-sh64/page.h index e4937cdabebd..34fb34754ae6 100644 --- a/include/asm-sh64/page.h +++ b/include/asm-sh64/page.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | /* PAGE_SHIFT determines the page size */ | 21 | /* PAGE_SHIFT determines the page size */ |
| 23 | #define PAGE_SHIFT 12 | 22 | #define PAGE_SHIFT 12 |
diff --git a/include/asm-sh64/param.h b/include/asm-sh64/param.h index d18cc87c1a80..f409adb41540 100644 --- a/include/asm-sh64/param.h +++ b/include/asm-sh64/param.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef __ASM_SH64_PARAM_H | 12 | #ifndef __ASM_SH64_PARAM_H |
| 13 | #define __ASM_SH64_PARAM_H | 13 | #define __ASM_SH64_PARAM_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 18 | # ifdef CONFIG_SH_WDT | 17 | # ifdef CONFIG_SH_WDT |
diff --git a/include/asm-sh64/pgtable.h b/include/asm-sh64/pgtable.h index 57af6b3eb271..54c7821893f5 100644 --- a/include/asm-sh64/pgtable.h +++ b/include/asm-sh64/pgtable.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
| 23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 24 | #include <linux/threads.h> | 24 | #include <linux/threads.h> |
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | struct vm_area_struct; | 26 | struct vm_area_struct; |
| 28 | 27 | ||
diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h index 3002e988180c..7606f6e1f01e 100644 --- a/include/asm-sh64/system.h +++ b/include/asm-sh64/system.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/registers.h> | 17 | #include <asm/registers.h> |
| 19 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
| 20 | 19 | ||
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h index 1f8f394ae371..9a1590fffc15 100644 --- a/include/asm-sh64/unistd.h +++ b/include/asm-sh64/unistd.h | |||
| @@ -344,6 +344,8 @@ | |||
| 344 | #define __NR_inotify_add_watch 319 | 344 | #define __NR_inotify_add_watch 319 |
| 345 | #define __NR_inotify_rm_watch 320 | 345 | #define __NR_inotify_rm_watch 320 |
| 346 | 346 | ||
| 347 | #ifdef __KERNEL__ | ||
| 348 | |||
| 347 | #define NR_syscalls 321 | 349 | #define NR_syscalls 321 |
| 348 | 350 | ||
| 349 | /* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */ | 351 | /* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */ |
| @@ -486,7 +488,6 @@ __asm__ __volatile__ ("!dummy %0 %1 %2 %3 %4 %5 %6" \ | |||
| 486 | __syscall_return(type,__sc0); \ | 488 | __syscall_return(type,__sc0); \ |
| 487 | } | 489 | } |
| 488 | 490 | ||
| 489 | #ifdef __KERNEL__ | ||
| 490 | #define __ARCH_WANT_IPC_PARSE_VERSION | 491 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 491 | #define __ARCH_WANT_OLD_READDIR | 492 | #define __ARCH_WANT_OLD_READDIR |
| 492 | #define __ARCH_WANT_OLD_STAT | 493 | #define __ARCH_WANT_OLD_STAT |
| @@ -509,7 +510,6 @@ __syscall_return(type,__sc0); \ | |||
| 509 | #define __ARCH_WANT_SYS_SIGPENDING | 510 | #define __ARCH_WANT_SYS_SIGPENDING |
| 510 | #define __ARCH_WANT_SYS_SIGPROCMASK | 511 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 511 | #define __ARCH_WANT_SYS_RT_SIGACTION | 512 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 512 | #endif | ||
| 513 | 513 | ||
| 514 | #ifdef __KERNEL_SYSCALLS__ | 514 | #ifdef __KERNEL_SYSCALLS__ |
| 515 | 515 | ||
| @@ -550,7 +550,7 @@ static inline pid_t wait(int * wait_stat) | |||
| 550 | { | 550 | { |
| 551 | return waitpid(-1,wait_stat,0); | 551 | return waitpid(-1,wait_stat,0); |
| 552 | } | 552 | } |
| 553 | #endif | 553 | #endif /* __KERNEL_SYSCALLS__ */ |
| 554 | 554 | ||
| 555 | /* | 555 | /* |
| 556 | * "Conditional" syscalls | 556 | * "Conditional" syscalls |
| @@ -562,4 +562,5 @@ static inline pid_t wait(int * wait_stat) | |||
| 562 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 562 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 563 | #endif | 563 | #endif |
| 564 | 564 | ||
| 565 | #endif /* __KERNEL__ */ | ||
| 565 | #endif /* __ASM_SH64_UNISTD_H */ | 566 | #endif /* __ASM_SH64_UNISTD_H */ |
diff --git a/include/asm-sparc/asmmacro.h b/include/asm-sparc/asmmacro.h index 0d4b65bd252b..a619a4d97aae 100644 --- a/include/asm-sparc/asmmacro.h +++ b/include/asm-sparc/asmmacro.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _SPARC_ASMMACRO_H | 6 | #ifndef _SPARC_ASMMACRO_H |
| 7 | #define _SPARC_ASMMACRO_H | 7 | #define _SPARC_ASMMACRO_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/btfixup.h> | 9 | #include <asm/btfixup.h> |
| 11 | #include <asm/asi.h> | 10 | #include <asm/asi.h> |
| 12 | 11 | ||
diff --git a/include/asm-sparc/atomic.h b/include/asm-sparc/atomic.h index e1033170bd3a..731fa56e0c37 100644 --- a/include/asm-sparc/atomic.h +++ b/include/asm-sparc/atomic.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ARCH_SPARC_ATOMIC__ | 10 | #ifndef __ARCH_SPARC_ATOMIC__ |
| 11 | #define __ARCH_SPARC_ATOMIC__ | 11 | #define __ARCH_SPARC_ATOMIC__ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | typedef struct { volatile int counter; } atomic_t; | 14 | typedef struct { volatile int counter; } atomic_t; |
| 16 | 15 | ||
diff --git a/include/asm-sparc/bugs.h b/include/asm-sparc/bugs.h index e652f89e0eff..a0f939beeea1 100644 --- a/include/asm-sparc/bugs.h +++ b/include/asm-sparc/bugs.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <asm/cpudata.h> | 7 | #include <asm/cpudata.h> |
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | extern unsigned long loops_per_jiffy; | 9 | extern unsigned long loops_per_jiffy; |
| 11 | 10 | ||
diff --git a/include/asm-sparc/cacheflush.h b/include/asm-sparc/cacheflush.h index 4901217008c0..fc632f811cd8 100644 --- a/include/asm-sparc/cacheflush.h +++ b/include/asm-sparc/cacheflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SPARC_CACHEFLUSH_H | 1 | #ifndef _SPARC_CACHEFLUSH_H |
| 2 | #define _SPARC_CACHEFLUSH_H | 2 | #define _SPARC_CACHEFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> /* Common for other includes */ | 4 | #include <linux/mm.h> /* Common for other includes */ |
| 6 | // #include <linux/kernel.h> from pgalloc.h | 5 | // #include <linux/kernel.h> from pgalloc.h |
| 7 | // #include <linux/sched.h> from pgalloc.h | 6 | // #include <linux/sched.h> from pgalloc.h |
diff --git a/include/asm-sparc/delay.h b/include/asm-sparc/delay.h index 7ec8e9f7ad4f..48aa70eef997 100644 --- a/include/asm-sparc/delay.h +++ b/include/asm-sparc/delay.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __SPARC_DELAY_H | 7 | #ifndef __SPARC_DELAY_H |
| 8 | #define __SPARC_DELAY_H | 8 | #define __SPARC_DELAY_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/cpudata.h> | 10 | #include <asm/cpudata.h> |
| 12 | 11 | ||
| 13 | static inline void __delay(unsigned long loops) | 12 | static inline void __delay(unsigned long loops) |
diff --git a/include/asm-sparc/dma-mapping.h b/include/asm-sparc/dma-mapping.h index d7c3b0f0a901..6db83dc93cb7 100644 --- a/include/asm-sparc/dma-mapping.h +++ b/include/asm-sparc/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_SPARC_DMA_MAPPING_H | 1 | #ifndef _ASM_SPARC_DMA_MAPPING_H |
| 2 | #define _ASM_SPARC_DMA_MAPPING_H | 2 | #define _ASM_SPARC_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PCI | 5 | #ifdef CONFIG_PCI |
| 7 | #include <asm-generic/dma-mapping.h> | 6 | #include <asm-generic/dma-mapping.h> |
diff --git a/include/asm-sparc/dma.h b/include/asm-sparc/dma.h index 8ec206aa5f2e..407b3614468a 100644 --- a/include/asm-sparc/dma.h +++ b/include/asm-sparc/dma.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _ASM_SPARC_DMA_H | 7 | #ifndef _ASM_SPARC_DMA_H |
| 8 | #define _ASM_SPARC_DMA_H | 8 | #define _ASM_SPARC_DMA_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | 12 | ||
diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h index 4a71d7c1eace..83a3dd15a6ed 100644 --- a/include/asm-sparc/elf.h +++ b/include/asm-sparc/elf.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * ELF register definitions.. | 6 | * ELF register definitions.. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
| 11 | 10 | ||
| 12 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
diff --git a/include/asm-sparc/fixmap.h b/include/asm-sparc/fixmap.h index 9de52b4d2cfb..f18fc0755adf 100644 --- a/include/asm-sparc/fixmap.h +++ b/include/asm-sparc/fixmap.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ASM_FIXMAP_H | 13 | #ifndef _ASM_FIXMAP_H |
| 14 | #define _ASM_FIXMAP_H | 14 | #define _ASM_FIXMAP_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <asm/page.h> | 17 | #include <asm/page.h> |
| 19 | #ifdef CONFIG_HIGHMEM | 18 | #ifdef CONFIG_HIGHMEM |
diff --git a/include/asm-sparc/hardirq.h b/include/asm-sparc/hardirq.h index 2a668c479f68..4f63ed8df551 100644 --- a/include/asm-sparc/hardirq.h +++ b/include/asm-sparc/hardirq.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __SPARC_HARDIRQ_H | 7 | #ifndef __SPARC_HARDIRQ_H |
| 8 | #define __SPARC_HARDIRQ_H | 8 | #define __SPARC_HARDIRQ_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/threads.h> | 10 | #include <linux/threads.h> |
| 12 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 13 | #include <linux/cache.h> | 12 | #include <linux/cache.h> |
diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h index 64d810385ea4..a6d735a1310e 100644 --- a/include/asm-sparc/ide.h +++ b/include/asm-sparc/ide.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
| 16 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 17 | #include <asm/psr.h> | 16 | #include <asm/psr.h> |
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h index cee356b0dae3..dbc687403208 100644 --- a/include/asm-sparc/irq.h +++ b/include/asm-sparc/irq.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _SPARC_IRQ_H | 7 | #ifndef _SPARC_IRQ_H |
| 8 | #define _SPARC_IRQ_H | 8 | #define _SPARC_IRQ_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | #include <linux/threads.h> /* For NR_CPUS */ | 11 | #include <linux/threads.h> /* For NR_CPUS */ |
| 13 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
diff --git a/include/asm-sparc/mostek.h b/include/asm-sparc/mostek.h index 59b86bc793bf..bd92a78f4937 100644 --- a/include/asm-sparc/mostek.h +++ b/include/asm-sparc/mostek.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _SPARC_MOSTEK_H | 9 | #ifndef _SPARC_MOSTEK_H |
| 10 | #define _SPARC_MOSTEK_H | 10 | #define _SPARC_MOSTEK_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/idprom.h> | 12 | #include <asm/idprom.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | 14 | ||
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h index ec3274b7ddf4..5bab8a7c25ce 100644 --- a/include/asm-sparc/page.h +++ b/include/asm-sparc/page.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _SPARC_PAGE_H | 8 | #ifndef _SPARC_PAGE_H |
| 9 | #define _SPARC_PAGE_H | 9 | #define _SPARC_PAGE_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #ifdef CONFIG_SUN4 | 11 | #ifdef CONFIG_SUN4 |
| 13 | #define PAGE_SHIFT 13 | 12 | #define PAGE_SHIFT 13 |
| 14 | #else | 13 | #else |
diff --git a/include/asm-sparc/pgalloc.h b/include/asm-sparc/pgalloc.h index 126800acd10d..a449cd4912d1 100644 --- a/include/asm-sparc/pgalloc.h +++ b/include/asm-sparc/pgalloc.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _SPARC_PGALLOC_H | 2 | #ifndef _SPARC_PGALLOC_H |
| 3 | #define _SPARC_PGALLOC_H | 3 | #define _SPARC_PGALLOC_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | 7 | ||
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h index 9eea8f4d41f0..226c6475c9a2 100644 --- a/include/asm-sparc/pgtable.h +++ b/include/asm-sparc/pgtable.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #include <asm-generic/4level-fixup.h> | 12 | #include <asm-generic/4level-fixup.h> |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/spinlock.h> | 14 | #include <linux/spinlock.h> |
| 16 | #include <linux/swap.h> | 15 | #include <linux/swap.h> |
| 17 | #include <asm/types.h> | 16 | #include <asm/types.h> |
diff --git a/include/asm-sparc/sfp-machine.h b/include/asm-sparc/sfp-machine.h index b4ca2d94bf08..ecfc86a4a725 100644 --- a/include/asm-sparc/sfp-machine.h +++ b/include/asm-sparc/sfp-machine.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #ifndef _SFP_MACHINE_H | 25 | #ifndef _SFP_MACHINE_H |
| 26 | #define _SFP_MACHINE_H | 26 | #define _SFP_MACHINE_H |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #define _FP_W_TYPE_SIZE 32 | 29 | #define _FP_W_TYPE_SIZE 32 |
| 31 | #define _FP_W_TYPE unsigned long | 30 | #define _FP_W_TYPE unsigned long |
diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h index 98c46e3fbe8a..5a1b7e4e7cc9 100644 --- a/include/asm-sparc/smp.h +++ b/include/asm-sparc/smp.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _SPARC_SMP_H | 6 | #ifndef _SPARC_SMP_H |
| 7 | #define _SPARC_SMP_H | 7 | #define _SPARC_SMP_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/threads.h> | 9 | #include <linux/threads.h> |
| 11 | #include <asm/head.h> | 10 | #include <asm/head.h> |
| 12 | #include <asm/btfixup.h> | 11 | #include <asm/btfixup.h> |
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 58dd162927bb..cb7dda1e5e91 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h | |||
| @@ -1,10 +1,8 @@ | |||
| 1 | /* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */ | 1 | /* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */ |
| 2 | #include <linux/config.h> | ||
| 3 | 2 | ||
| 4 | #ifndef __SPARC_SYSTEM_H | 3 | #ifndef __SPARC_SYSTEM_H |
| 5 | #define __SPARC_SYSTEM_H | 4 | #define __SPARC_SYSTEM_H |
| 6 | 5 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 9 | #include <linux/threads.h> /* NR_CPUS */ | 7 | #include <linux/threads.h> /* NR_CPUS */ |
| 10 | #include <linux/thread_info.h> | 8 | #include <linux/thread_info.h> |
diff --git a/include/asm-sparc/timer.h b/include/asm-sparc/timer.h index b16eb739dddb..cb1fa1d1f184 100644 --- a/include/asm-sparc/timer.h +++ b/include/asm-sparc/timer.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifndef _SPARC_TIMER_H | 8 | #ifndef _SPARC_TIMER_H |
| 10 | #define _SPARC_TIMER_H | 9 | #define _SPARC_TIMER_H |
diff --git a/include/asm-sparc/tlbflush.h b/include/asm-sparc/tlbflush.h index 5643ca31ead9..4a3b66618e75 100644 --- a/include/asm-sparc/tlbflush.h +++ b/include/asm-sparc/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SPARC_TLBFLUSH_H | 1 | #ifndef _SPARC_TLBFLUSH_H |
| 2 | #define _SPARC_TLBFLUSH_H | 2 | #define _SPARC_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | // #include <asm/processor.h> | 5 | // #include <asm/processor.h> |
| 7 | 6 | ||
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 45a576507785..2553762465ca 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -319,6 +319,7 @@ | |||
| 319 | #define __NR_set_robust_list 300 | 319 | #define __NR_set_robust_list 300 |
| 320 | #define __NR_get_robust_list 301 | 320 | #define __NR_get_robust_list 301 |
| 321 | 321 | ||
| 322 | #ifdef __KERNEL__ | ||
| 322 | /* WARNING: You MAY NOT add syscall numbers larger than 301, since | 323 | /* WARNING: You MAY NOT add syscall numbers larger than 301, since |
| 323 | * all of the syscall tables in the Sparc kernel are | 324 | * all of the syscall tables in the Sparc kernel are |
| 324 | * sized to have 301 entries (starting at zero). Therefore | 325 | * sized to have 301 entries (starting at zero). Therefore |
| @@ -455,7 +456,6 @@ errno = -__res; \ | |||
| 455 | return -1; \ | 456 | return -1; \ |
| 456 | } | 457 | } |
| 457 | 458 | ||
| 458 | #ifdef __KERNEL__ | ||
| 459 | #define __ARCH_WANT_IPC_PARSE_VERSION | 459 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 460 | #define __ARCH_WANT_OLD_READDIR | 460 | #define __ARCH_WANT_OLD_READDIR |
| 461 | #define __ARCH_WANT_STAT64 | 461 | #define __ARCH_WANT_STAT64 |
| @@ -477,7 +477,6 @@ return -1; \ | |||
| 477 | #define __ARCH_WANT_SYS_SIGPENDING | 477 | #define __ARCH_WANT_SYS_SIGPENDING |
| 478 | #define __ARCH_WANT_SYS_SIGPROCMASK | 478 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 479 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 479 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
| 480 | #endif | ||
| 481 | 480 | ||
| 482 | #ifdef __KERNEL_SYSCALLS__ | 481 | #ifdef __KERNEL_SYSCALLS__ |
| 483 | 482 | ||
| @@ -534,4 +533,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 534 | */ | 533 | */ |
| 535 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 534 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 536 | 535 | ||
| 536 | #endif /* __KERNEL__ */ | ||
| 537 | #endif /* _SPARC_UNISTD_H */ | 537 | #endif /* _SPARC_UNISTD_H */ |
diff --git a/include/asm-sparc/vac-ops.h b/include/asm-sparc/vac-ops.h index 9e0172323042..ab6f53b913ea 100644 --- a/include/asm-sparc/vac-ops.h +++ b/include/asm-sparc/vac-ops.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1994, David S. Miller (davem@caip.rutgers.edu) | 8 | * Copyright (C) 1994, David S. Miller (davem@caip.rutgers.edu) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm/sysen.h> | 11 | #include <asm/sysen.h> |
| 13 | #include <asm/contregs.h> | 12 | #include <asm/contregs.h> |
| 14 | #include <asm/asi.h> | 13 | #include <asm/asi.h> |
diff --git a/include/asm-sparc/winmacro.h b/include/asm-sparc/winmacro.h index 557257eef3f9..096f3d3d90c3 100644 --- a/include/asm-sparc/winmacro.h +++ b/include/asm-sparc/winmacro.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _SPARC_WINMACRO_H | 7 | #ifndef _SPARC_WINMACRO_H |
| 8 | #define _SPARC_WINMACRO_H | 8 | #define _SPARC_WINMACRO_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
| 12 | 11 | ||
| 13 | /* Store the register window onto the 8-byte aligned area starting | 12 | /* Store the register window onto the 8-byte aligned area starting |
diff --git a/include/asm-sparc64/atomic.h b/include/asm-sparc64/atomic.h index 468eb48d8142..2f0bec26a695 100644 --- a/include/asm-sparc64/atomic.h +++ b/include/asm-sparc64/atomic.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __ARCH_SPARC64_ATOMIC__ | 8 | #ifndef __ARCH_SPARC64_ATOMIC__ |
| 9 | #define __ARCH_SPARC64_ATOMIC__ | 9 | #define __ARCH_SPARC64_ATOMIC__ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | 12 | ||
| 14 | typedef struct { volatile int counter; } atomic_t; | 13 | typedef struct { volatile int counter; } atomic_t; |
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h index 71944b0f09de..3d5e1af84723 100644 --- a/include/asm-sparc64/bitops.h +++ b/include/asm-sparc64/bitops.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _SPARC64_BITOPS_H | 7 | #ifndef _SPARC64_BITOPS_H |
| 8 | #define _SPARC64_BITOPS_H | 8 | #define _SPARC64_BITOPS_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/compiler.h> | 10 | #include <linux/compiler.h> |
| 12 | #include <asm/byteorder.h> | 11 | #include <asm/byteorder.h> |
| 13 | 12 | ||
diff --git a/include/asm-sparc64/bugs.h b/include/asm-sparc64/bugs.h index 360dd04ed8e4..120422fdb02f 100644 --- a/include/asm-sparc64/bugs.h +++ b/include/asm-sparc64/bugs.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | extern unsigned long loops_per_jiffy; | 8 | extern unsigned long loops_per_jiffy; |
| 10 | 9 | ||
diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h index b3f61659ba81..745d1ab60371 100644 --- a/include/asm-sparc64/cacheflush.h +++ b/include/asm-sparc64/cacheflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SPARC64_CACHEFLUSH_H | 1 | #ifndef _SPARC64_CACHEFLUSH_H |
| 2 | #define _SPARC64_CACHEFLUSH_H | 2 | #define _SPARC64_CACHEFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/page.h> | 4 | #include <asm/page.h> |
| 6 | 5 | ||
| 7 | #ifndef __ASSEMBLY__ | 6 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-sparc64/delay.h b/include/asm-sparc64/delay.h index 2901ea0c342d..a4aae6f80627 100644 --- a/include/asm-sparc64/delay.h +++ b/include/asm-sparc64/delay.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __SPARC64_DELAY_H | 11 | #ifndef __SPARC64_DELAY_H |
| 12 | #define __SPARC64_DELAY_H | 12 | #define __SPARC64_DELAY_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/param.h> | 14 | #include <linux/param.h> |
| 16 | #include <asm/cpudata.h> | 15 | #include <asm/cpudata.h> |
| 17 | 16 | ||
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h index a8d39f23d43b..3c2b5bc8650b 100644 --- a/include/asm-sparc64/dma-mapping.h +++ b/include/asm-sparc64/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_SPARC64_DMA_MAPPING_H | 1 | #ifndef _ASM_SPARC64_DMA_MAPPING_H |
| 2 | #define _ASM_SPARC64_DMA_MAPPING_H | 2 | #define _ASM_SPARC64_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PCI | 5 | #ifdef CONFIG_PCI |
| 7 | 6 | ||
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h index 1aab3c8dce2b..27f65972b3bb 100644 --- a/include/asm-sparc64/dma.h +++ b/include/asm-sparc64/dma.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _ASM_SPARC64_DMA_H | 7 | #ifndef _ASM_SPARC64_DMA_H |
| 8 | #define _ASM_SPARC64_DMA_H | 8 | #define _ASM_SPARC64_DMA_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/spinlock.h> | 12 | #include <linux/spinlock.h> |
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h index 6a95d5d0c576..07ccd6f04b52 100644 --- a/include/asm-sparc64/floppy.h +++ b/include/asm-sparc64/floppy.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef __ASM_SPARC64_FLOPPY_H | 10 | #ifndef __ASM_SPARC64_FLOPPY_H |
| 11 | #define __ASM_SPARC64_FLOPPY_H | 11 | #define __ASM_SPARC64_FLOPPY_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
| 16 | #include <asm/page.h> | 15 | #include <asm/page.h> |
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h index c393f815b0be..55149cf933c2 100644 --- a/include/asm-sparc64/ide.h +++ b/include/asm-sparc64/ide.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/pgalloc.h> | 13 | #include <asm/pgalloc.h> |
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
| 16 | #include <asm/spitfire.h> | 15 | #include <asm/spitfire.h> |
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h index de33d6e1afb5..fa164d37ee3f 100644 --- a/include/asm-sparc64/irq.h +++ b/include/asm-sparc64/irq.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _SPARC64_IRQ_H | 8 | #ifndef _SPARC64_IRQ_H |
| 9 | #define _SPARC64_IRQ_H | 9 | #define _SPARC64_IRQ_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h index e4efe652b54b..e9bb26f770ed 100644 --- a/include/asm-sparc64/kprobes.h +++ b/include/asm-sparc64/kprobes.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SPARC64_KPROBES_H | 1 | #ifndef _SPARC64_KPROBES_H |
| 2 | #define _SPARC64_KPROBES_H | 2 | #define _SPARC64_KPROBES_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | #include <linux/percpu.h> | 5 | #include <linux/percpu.h> |
| 7 | 6 | ||
diff --git a/include/asm-sparc64/mc146818rtc.h b/include/asm-sparc64/mc146818rtc.h index 75bd572b35fe..e9c0fcc25c6f 100644 --- a/include/asm-sparc64/mc146818rtc.h +++ b/include/asm-sparc64/mc146818rtc.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifndef __ASM_SPARC64_MC146818RTC_H | 4 | #ifndef __ASM_SPARC64_MC146818RTC_H |
| 5 | #define __ASM_SPARC64_MC146818RTC_H | 5 | #define __ASM_SPARC64_MC146818RTC_H |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/io.h> | 7 | #include <asm/io.h> |
| 9 | 8 | ||
| 10 | #ifndef RTC_PORT | 9 | #ifndef RTC_PORT |
diff --git a/include/asm-sparc64/mmu.h b/include/asm-sparc64/mmu.h index 2d4f2ea9568a..70af4b6ce136 100644 --- a/include/asm-sparc64/mmu.h +++ b/include/asm-sparc64/mmu.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __MMU_H | 1 | #ifndef __MMU_H |
| 2 | #define __MMU_H | 2 | #define __MMU_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/page.h> | 4 | #include <asm/page.h> |
| 6 | #include <asm/const.h> | 5 | #include <asm/const.h> |
| 7 | #include <asm/hypervisor.h> | 6 | #include <asm/hypervisor.h> |
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h index c754676e13ef..dea3e73f0955 100644 --- a/include/asm-sparc64/oplib.h +++ b/include/asm-sparc64/oplib.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __SPARC64_OPLIB_H | 9 | #ifndef __SPARC64_OPLIB_H |
| 10 | #define __SPARC64_OPLIB_H | 10 | #define __SPARC64_OPLIB_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/openprom.h> | 12 | #include <asm/openprom.h> |
| 14 | 13 | ||
| 15 | /* OBP version string. */ | 14 | /* OBP version string. */ |
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index aabb21906724..fdf0ceb76028 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | #ifndef _SPARC64_PAGE_H | 3 | #ifndef _SPARC64_PAGE_H |
| 4 | #define _SPARC64_PAGE_H | 4 | #define _SPARC64_PAGE_H |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/const.h> | 6 | #include <asm/const.h> |
| 8 | 7 | ||
| 9 | #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB) | 8 | #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB) |
diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h index a1cd4974630b..f0125cf5a9df 100644 --- a/include/asm-sparc64/param.h +++ b/include/asm-sparc64/param.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASMSPARC64_PARAM_H | 1 | #ifndef _ASMSPARC64_PARAM_H |
| 2 | #define _ASMSPARC64_PARAM_H | 2 | #define _ASMSPARC64_PARAM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 7 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | 6 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h index 12e4a273bd43..010f9cd0a672 100644 --- a/include/asm-sparc64/pgalloc.h +++ b/include/asm-sparc64/pgalloc.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _SPARC64_PGALLOC_H | 2 | #ifndef _SPARC64_PGALLOC_H |
| 3 | #define _SPARC64_PGALLOC_H | 3 | #define _SPARC64_PGALLOC_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index cd464f469a2c..4e218814bb3c 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #include <asm-generic/pgtable-nopud.h> | 15 | #include <asm-generic/pgtable-nopud.h> |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/compiler.h> | 17 | #include <linux/compiler.h> |
| 19 | #include <asm/types.h> | 18 | #include <asm/types.h> |
| 20 | #include <asm/spitfire.h> | 19 | #include <asm/spitfire.h> |
diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h index c6896b88283e..66dd2fa0e319 100644 --- a/include/asm-sparc64/processor.h +++ b/include/asm-sparc64/processor.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #define current_text_addr() ({ void *pc; __asm__("rd %%pc, %0" : "=r" (pc)); pc; }) | 14 | #define current_text_addr() ({ void *pc; __asm__("rd %%pc, %0" : "=r" (pc)); pc; }) |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/asi.h> | 16 | #include <asm/asi.h> |
| 18 | #include <asm/a.out.h> | 17 | #include <asm/a.out.h> |
| 19 | #include <asm/pstate.h> | 18 | #include <asm/pstate.h> |
diff --git a/include/asm-sparc64/siginfo.h b/include/asm-sparc64/siginfo.h index df17e47abc1c..c96e6c30f8b0 100644 --- a/include/asm-sparc64/siginfo.h +++ b/include/asm-sparc64/siginfo.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/compat.h> | 14 | #include <linux/compat.h> |
| 16 | 15 | ||
| 17 | #ifdef CONFIG_COMPAT | 16 | #ifdef CONFIG_COMPAT |
diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h index e3059bb4a465..fdc42a14d4e6 100644 --- a/include/asm-sparc64/signal.h +++ b/include/asm-sparc64/signal.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #ifdef __KERNEL__ | 7 | #ifdef __KERNEL__ |
| 8 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/personality.h> | 9 | #include <linux/personality.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/compat.h> | 11 | #include <linux/compat.h> |
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h index 89d86ecaab24..388249b751c3 100644 --- a/include/asm-sparc64/smp.h +++ b/include/asm-sparc64/smp.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _SPARC64_SMP_H | 6 | #ifndef _SPARC64_SMP_H |
| 7 | #define _SPARC64_SMP_H | 7 | #define _SPARC64_SMP_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/threads.h> | 9 | #include <linux/threads.h> |
| 11 | #include <asm/asi.h> | 10 | #include <asm/asi.h> |
| 12 | #include <asm/starfire.h> | 11 | #include <asm/starfire.h> |
diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h index 508c416e9d6a..bd5ffc76bc7e 100644 --- a/include/asm-sparc64/spinlock.h +++ b/include/asm-sparc64/spinlock.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef __SPARC64_SPINLOCK_H | 6 | #ifndef __SPARC64_SPINLOCK_H |
| 7 | #define __SPARC64_SPINLOCK_H | 7 | #define __SPARC64_SPINLOCK_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/threads.h> /* For NR_CPUS */ | 9 | #include <linux/threads.h> /* For NR_CPUS */ |
| 11 | 10 | ||
| 12 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h index a18ec87a52c1..4ca68600c670 100644 --- a/include/asm-sparc64/system.h +++ b/include/asm-sparc64/system.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef __SPARC64_SYSTEM_H | 2 | #ifndef __SPARC64_SYSTEM_H |
| 3 | #define __SPARC64_SYSTEM_H | 3 | #define __SPARC64_SYSTEM_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/ptrace.h> | 5 | #include <asm/ptrace.h> |
| 7 | #include <asm/processor.h> | 6 | #include <asm/processor.h> |
| 8 | #include <asm/visasm.h> | 7 | #include <asm/visasm.h> |
diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h index edc8e08c3a39..d435594df786 100644 --- a/include/asm-sparc64/timer.h +++ b/include/asm-sparc64/timer.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | struct sparc64_tick_ops { | 13 | struct sparc64_tick_ops { |
| 15 | void (*init_tick)(unsigned long); | 14 | void (*init_tick)(unsigned long); |
diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h index 61c01882b562..7af1e1109c49 100644 --- a/include/asm-sparc64/tlb.h +++ b/include/asm-sparc64/tlb.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SPARC64_TLB_H | 1 | #ifndef _SPARC64_TLB_H |
| 2 | #define _SPARC64_TLB_H | 2 | #define _SPARC64_TLB_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/swap.h> | 4 | #include <linux/swap.h> |
| 6 | #include <asm/pgalloc.h> | 5 | #include <asm/pgalloc.h> |
| 7 | #include <asm/tlbflush.h> | 6 | #include <asm/tlbflush.h> |
diff --git a/include/asm-sparc64/tlbflush.h b/include/asm-sparc64/tlbflush.h index e3a7c453b500..3487328570ed 100644 --- a/include/asm-sparc64/tlbflush.h +++ b/include/asm-sparc64/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SPARC64_TLBFLUSH_H | 1 | #ifndef _SPARC64_TLBFLUSH_H |
| 2 | #define _SPARC64_TLBFLUSH_H | 2 | #define _SPARC64_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/mmu_context.h> | 5 | #include <asm/mmu_context.h> |
| 7 | 6 | ||
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h index 2d5e3c464df5..f2352606a79f 100644 --- a/include/asm-sparc64/ttable.h +++ b/include/asm-sparc64/ttable.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _SPARC64_TTABLE_H | 2 | #ifndef _SPARC64_TTABLE_H |
| 3 | #define _SPARC64_TTABLE_H | 3 | #define _SPARC64_TTABLE_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/utrap.h> | 5 | #include <asm/utrap.h> |
| 7 | 6 | ||
| 8 | #ifdef __ASSEMBLY__ | 7 | #ifdef __ASSEMBLY__ |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 998ef4ab0e06..badc73fdcb97 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
| @@ -321,6 +321,7 @@ | |||
| 321 | #define __NR_set_robust_list 300 | 321 | #define __NR_set_robust_list 300 |
| 322 | #define __NR_get_robust_list 301 | 322 | #define __NR_get_robust_list 301 |
| 323 | 323 | ||
| 324 | #ifdef __KERNEL__ | ||
| 324 | /* WARNING: You MAY NOT add syscall numbers larger than 301, since | 325 | /* WARNING: You MAY NOT add syscall numbers larger than 301, since |
| 325 | * all of the syscall tables in the Sparc kernel are | 326 | * all of the syscall tables in the Sparc kernel are |
| 326 | * sized to have 301 entries (starting at zero). Therefore | 327 | * sized to have 301 entries (starting at zero). Therefore |
| @@ -487,7 +488,6 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 487 | 488 | ||
| 488 | #endif /* __KERNEL_SYSCALLS__ */ | 489 | #endif /* __KERNEL_SYSCALLS__ */ |
| 489 | 490 | ||
| 490 | #ifdef __KERNEL__ | ||
| 491 | /* sysconf options, for SunOS compatibility */ | 491 | /* sysconf options, for SunOS compatibility */ |
| 492 | #define _SC_ARG_MAX 1 | 492 | #define _SC_ARG_MAX 1 |
| 493 | #define _SC_CHILD_MAX 2 | 493 | #define _SC_CHILD_MAX 2 |
| @@ -521,7 +521,6 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 521 | #define __ARCH_WANT_SYS_SIGPROCMASK | 521 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 522 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 522 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
| 523 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND | 523 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND |
| 524 | #endif | ||
| 525 | 524 | ||
| 526 | /* | 525 | /* |
| 527 | * "Conditional" syscalls | 526 | * "Conditional" syscalls |
| @@ -531,4 +530,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 531 | */ | 530 | */ |
| 532 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 531 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 533 | 532 | ||
| 533 | #endif /* __KERNEL__ */ | ||
| 534 | #endif /* _SPARC64_UNISTD_H */ | 534 | #endif /* _SPARC64_UNISTD_H */ |
diff --git a/include/asm-um/a.out.h b/include/asm-um/a.out.h index 7c26265e1d7a..50cee7b296f4 100644 --- a/include/asm-um/a.out.h +++ b/include/asm-um/a.out.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __UM_A_OUT_H | 1 | #ifndef __UM_A_OUT_H |
| 2 | #define __UM_A_OUT_H | 2 | #define __UM_A_OUT_H |
| 3 | 3 | ||
| 4 | #include "linux/config.h" | ||
| 5 | #include "asm/arch/a.out.h" | 4 | #include "asm/arch/a.out.h" |
| 6 | #include "choose-mode.h" | 5 | #include "choose-mode.h" |
| 7 | 6 | ||
diff --git a/include/asm-um/cache.h b/include/asm-um/cache.h index 3d0587075521..19e1bdd67416 100644 --- a/include/asm-um/cache.h +++ b/include/asm-um/cache.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __UM_CACHE_H | 1 | #ifndef __UM_CACHE_H |
| 2 | #define __UM_CACHE_H | 2 | #define __UM_CACHE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT) | 5 | #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT) |
| 7 | # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) | 6 | # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) |
diff --git a/include/asm-um/elf-ppc.h b/include/asm-um/elf-ppc.h index 2998cf925042..99711134e477 100644 --- a/include/asm-um/elf-ppc.h +++ b/include/asm-um/elf-ppc.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __UM_ELF_PPC_H | 1 | #ifndef __UM_ELF_PPC_H |
| 2 | #define __UM_ELF_PPC_H | 2 | #define __UM_ELF_PPC_H |
| 3 | 3 | ||
| 4 | #include "linux/config.h" | ||
| 5 | 4 | ||
| 6 | extern long elf_aux_hwcap; | 5 | extern long elf_aux_hwcap; |
| 7 | #define ELF_HWCAP (elf_aux_hwcap) | 6 | #define ELF_HWCAP (elf_aux_hwcap) |
diff --git a/include/asm-um/fixmap.h b/include/asm-um/fixmap.h index ae0ca3932d50..d352a35cfafb 100644 --- a/include/asm-um/fixmap.h +++ b/include/asm-um/fixmap.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __UM_FIXMAP_H | 1 | #ifndef __UM_FIXMAP_H |
| 2 | #define __UM_FIXMAP_H | 2 | #define __UM_FIXMAP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/kmap_types.h> | 4 | #include <asm/kmap_types.h> |
| 6 | #include <asm/archparam.h> | 5 | #include <asm/archparam.h> |
| 7 | #include <asm/elf.h> | 6 | #include <asm/elf.h> |
diff --git a/include/asm-um/hardirq.h b/include/asm-um/hardirq.h index 1224b2690a23..313ebb8a2566 100644 --- a/include/asm-um/hardirq.h +++ b/include/asm-um/hardirq.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | #ifndef __ASM_UM_HARDIRQ_H | 3 | #ifndef __ASM_UM_HARDIRQ_H |
| 4 | #define __ASM_UM_HARDIRQ_H | 4 | #define __ASM_UM_HARDIRQ_H |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/threads.h> | 6 | #include <linux/threads.h> |
| 8 | #include <linux/irq.h> | 7 | #include <linux/irq.h> |
| 9 | 8 | ||
diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h index e3d62dcbd356..78b862472b36 100644 --- a/include/asm-um/linkage.h +++ b/include/asm-um/linkage.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include "asm/arch/linkage.h" | 4 | #include "asm/arch/linkage.h" |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | /* <linux/linkage.h> will pick sane defaults */ | 7 | /* <linux/linkage.h> will pick sane defaults */ |
| 9 | #ifdef CONFIG_GPROF | 8 | #ifdef CONFIG_GPROF |
diff --git a/include/asm-um/mmu_context.h b/include/asm-um/mmu_context.h index 9a0e48eb542e..f709c784bf12 100644 --- a/include/asm-um/mmu_context.h +++ b/include/asm-um/mmu_context.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #define __UM_MMU_CONTEXT_H | 7 | #define __UM_MMU_CONTEXT_H |
| 8 | 8 | ||
| 9 | #include "linux/sched.h" | 9 | #include "linux/sched.h" |
| 10 | #include "linux/config.h" | ||
| 11 | #include "choose-mode.h" | 10 | #include "choose-mode.h" |
| 12 | #include "um_mmu.h" | 11 | #include "um_mmu.h" |
| 13 | 12 | ||
diff --git a/include/asm-um/page.h b/include/asm-um/page.h index 41364330aff1..4296d3135aa9 100644 --- a/include/asm-um/page.h +++ b/include/asm-um/page.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | struct page; | 10 | struct page; |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/vm-flags.h> | 12 | #include <asm/vm-flags.h> |
| 14 | 13 | ||
| 15 | /* PAGE_SHIFT determines the page size */ | 14 | /* PAGE_SHIFT determines the page size */ |
diff --git a/include/asm-um/pgalloc.h b/include/asm-um/pgalloc.h index ea49411236dc..34ab268ef40e 100644 --- a/include/asm-um/pgalloc.h +++ b/include/asm-um/pgalloc.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __UM_PGALLOC_H | 8 | #ifndef __UM_PGALLOC_H |
| 9 | #define __UM_PGALLOC_H | 9 | #define __UM_PGALLOC_H |
| 10 | 10 | ||
| 11 | #include "linux/config.h" | ||
| 12 | #include "linux/mm.h" | 11 | #include "linux/mm.h" |
| 13 | #include "asm/fixmap.h" | 12 | #include "asm/fixmap.h" |
| 14 | 13 | ||
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h index da07a69ce82a..824c28896382 100644 --- a/include/asm-um/processor-generic.h +++ b/include/asm-um/processor-generic.h | |||
| @@ -10,7 +10,6 @@ struct pt_regs; | |||
| 10 | 10 | ||
| 11 | struct task_struct; | 11 | struct task_struct; |
| 12 | 12 | ||
| 13 | #include "linux/config.h" | ||
| 14 | #include "asm/ptrace.h" | 13 | #include "asm/ptrace.h" |
| 15 | #include "choose-mode.h" | 14 | #include "choose-mode.h" |
| 16 | #include "registers.h" | 15 | #include "registers.h" |
diff --git a/include/asm-um/ptrace-generic.h b/include/asm-um/ptrace-generic.h index 503484305e67..a36f5371b36b 100644 --- a/include/asm-um/ptrace-generic.h +++ b/include/asm-um/ptrace-generic.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #ifndef __ASSEMBLY__ | 9 | #ifndef __ASSEMBLY__ |
| 10 | 10 | ||
| 11 | #include "linux/config.h" | ||
| 12 | 11 | ||
| 13 | #define pt_regs pt_regs_subarch | 12 | #define pt_regs pt_regs_subarch |
| 14 | #define show_regs show_regs_subarch | 13 | #define show_regs show_regs_subarch |
diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h index aeda6657f366..ca552261ed1f 100644 --- a/include/asm-um/smp.h +++ b/include/asm-um/smp.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef CONFIG_SMP | 4 | #ifdef CONFIG_SMP |
| 5 | 5 | ||
| 6 | #include "linux/config.h" | ||
| 7 | #include "linux/bitops.h" | 6 | #include "linux/bitops.h" |
| 8 | #include "asm/current.h" | 7 | #include "asm/current.h" |
| 9 | #include "linux/cpumask.h" | 8 | #include "linux/cpumask.h" |
diff --git a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h index f166b9837c6a..261e2f4528f6 100644 --- a/include/asm-um/thread_info.h +++ b/include/asm-um/thread_info.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #ifndef __ASSEMBLY__ | 9 | #ifndef __ASSEMBLY__ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 13 | #include <asm/types.h> | 12 | #include <asm/types.h> |
| 14 | 13 | ||
diff --git a/include/asm-v850/atomic.h b/include/asm-v850/atomic.h index 166df00457ea..e4e57de08f73 100644 --- a/include/asm-v850/atomic.h +++ b/include/asm-v850/atomic.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __V850_ATOMIC_H__ | 14 | #ifndef __V850_ATOMIC_H__ |
| 15 | #define __V850_ATOMIC_H__ | 15 | #define __V850_ATOMIC_H__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #include <asm/system.h> | 18 | #include <asm/system.h> |
| 20 | 19 | ||
diff --git a/include/asm-v850/bitops.h b/include/asm-v850/bitops.h index 1f6fd5ab4177..1fa99baf4e25 100644 --- a/include/asm-v850/bitops.h +++ b/include/asm-v850/bitops.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #define __V850_BITOPS_H__ | 14 | #define __V850_BITOPS_H__ |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/compiler.h> /* unlikely */ | 17 | #include <linux/compiler.h> /* unlikely */ |
| 19 | #include <asm/byteorder.h> /* swab32 */ | 18 | #include <asm/byteorder.h> /* swab32 */ |
| 20 | #include <asm/system.h> /* interrupt enable/disable */ | 19 | #include <asm/system.h> /* interrupt enable/disable */ |
diff --git a/include/asm-v850/dma-mapping.h b/include/asm-v850/dma-mapping.h index c63fb50ec9ef..1cc42c603a1b 100644 --- a/include/asm-v850/dma-mapping.h +++ b/include/asm-v850/dma-mapping.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __V850_DMA_MAPPING_H__ | 1 | #ifndef __V850_DMA_MAPPING_H__ |
| 2 | #define __V850_DMA_MAPPING_H__ | 2 | #define __V850_DMA_MAPPING_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PCI | 5 | #ifdef CONFIG_PCI |
| 7 | #include <asm-generic/dma-mapping.h> | 6 | #include <asm-generic/dma-mapping.h> |
diff --git a/include/asm-v850/hardirq.h b/include/asm-v850/hardirq.h index d98488cd5af1..04e20127c5af 100644 --- a/include/asm-v850/hardirq.h +++ b/include/asm-v850/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __V850_HARDIRQ_H__ | 1 | #ifndef __V850_HARDIRQ_H__ |
| 2 | #define __V850_HARDIRQ_H__ | 2 | #define __V850_HARDIRQ_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/cache.h> | 5 | #include <linux/cache.h> |
| 7 | 6 | ||
diff --git a/include/asm-v850/machdep.h b/include/asm-v850/machdep.h index 98d8bf63970e..f1e3b8b91508 100644 --- a/include/asm-v850/machdep.h +++ b/include/asm-v850/machdep.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __V850_MACHDEP_H__ | 14 | #ifndef __V850_MACHDEP_H__ |
| 15 | #define __V850_MACHDEP_H__ | 15 | #define __V850_MACHDEP_H__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | /* chips */ | 18 | /* chips */ |
| 20 | #ifdef CONFIG_V850E_MA1 | 19 | #ifdef CONFIG_V850E_MA1 |
diff --git a/include/asm-v850/pgtable.h b/include/asm-v850/pgtable.h index 3cf8775ce85f..1ea2a900f0f8 100644 --- a/include/asm-v850/pgtable.h +++ b/include/asm-v850/pgtable.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm-generic/4level-fixup.h> | 4 | #include <asm-generic/4level-fixup.h> |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/page.h> | 6 | #include <asm/page.h> |
| 8 | 7 | ||
| 9 | 8 | ||
diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h index 2d31308935a0..6965b66ccaed 100644 --- a/include/asm-v850/processor.h +++ b/include/asm-v850/processor.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __V850_PROCESSOR_H__ | 14 | #ifndef __V850_PROCESSOR_H__ |
| 15 | #define __V850_PROCESSOR_H__ | 15 | #define __V850_PROCESSOR_H__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #ifndef __ASSEMBLY__ /* <linux/thread_info.h> is not asm-safe. */ | 17 | #ifndef __ASSEMBLY__ /* <linux/thread_info.h> is not asm-safe. */ |
| 19 | #include <linux/thread_info.h> | 18 | #include <linux/thread_info.h> |
| 20 | #endif | 19 | #endif |
diff --git a/include/asm-v850/serial.h b/include/asm-v850/serial.h index 8c2a609ba2b0..36d8f4cbbf39 100644 --- a/include/asm-v850/serial.h +++ b/include/asm-v850/serial.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1999 by Ralf Baechle | 6 | * Copyright (C) 1999 by Ralf Baechle |
| 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #ifdef CONFIG_RTE_CB_ME2 | 10 | #ifdef CONFIG_RTE_CB_ME2 |
| 12 | 11 | ||
diff --git a/include/asm-v850/unistd.h b/include/asm-v850/unistd.h index 82460a7bb233..bcb44bfe577a 100644 --- a/include/asm-v850/unistd.h +++ b/include/asm-v850/unistd.h | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | #ifndef __V850_UNISTD_H__ | 14 | #ifndef __V850_UNISTD_H__ |
| 15 | #define __V850_UNISTD_H__ | 15 | #define __V850_UNISTD_H__ |
| 16 | 16 | ||
| 17 | #include <asm/clinkage.h> | ||
| 18 | |||
| 19 | #define __NR_restart_syscall 0 | 17 | #define __NR_restart_syscall 0 |
| 20 | #define __NR_exit 1 | 18 | #define __NR_exit 1 |
| 21 | #define __NR_fork 2 | 19 | #define __NR_fork 2 |
| @@ -237,10 +235,9 @@ | |||
| 237 | except the syscall number (r12). */ | 235 | except the syscall number (r12). */ |
| 238 | #define SYSCALL_SHORT_CLOBBERS SYSCALL_CLOBBERS, "r13", "r14" | 236 | #define SYSCALL_SHORT_CLOBBERS SYSCALL_CLOBBERS, "r13", "r14" |
| 239 | 237 | ||
| 238 | #ifdef __KERNEL__ | ||
| 240 | 239 | ||
| 241 | /* User programs sometimes end up including this header file | 240 | #include <asm/clinkage.h> |
| 242 | (indirectly, via uClibc header files), so I'm a bit nervous just | ||
| 243 | including <linux/compiler.h>. */ | ||
| 244 | 241 | ||
| 245 | #define __syscall_return(type, res) \ | 242 | #define __syscall_return(type, res) \ |
| 246 | do { \ | 243 | do { \ |
| @@ -368,7 +365,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \ | |||
| 368 | } | 365 | } |
| 369 | 366 | ||
| 370 | 367 | ||
| 371 | #ifdef __KERNEL__ | ||
| 372 | #define __ARCH_WANT_IPC_PARSE_VERSION | 368 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 373 | #define __ARCH_WANT_OLD_READDIR | 369 | #define __ARCH_WANT_OLD_READDIR |
| 374 | #define __ARCH_WANT_STAT64 | 370 | #define __ARCH_WANT_STAT64 |
| @@ -389,7 +385,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \ | |||
| 389 | #define __ARCH_WANT_SYS_SIGPENDING | 385 | #define __ARCH_WANT_SYS_SIGPENDING |
| 390 | #define __ARCH_WANT_SYS_SIGPROCMASK | 386 | #define __ARCH_WANT_SYS_SIGPROCMASK |
| 391 | #define __ARCH_WANT_SYS_RT_SIGACTION | 387 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 392 | #endif | ||
| 393 | 388 | ||
| 394 | #ifdef __KERNEL_SYSCALLS__ | 389 | #ifdef __KERNEL_SYSCALLS__ |
| 395 | 390 | ||
| @@ -440,7 +435,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 440 | struct sigaction __user *oact, | 435 | struct sigaction __user *oact, |
| 441 | size_t sigsetsize); | 436 | size_t sigsetsize); |
| 442 | 437 | ||
| 443 | #endif | 438 | #endif /* __KERNEL_SYSCALLS__ */ |
| 444 | 439 | ||
| 445 | /* | 440 | /* |
| 446 | * "Conditional" syscalls | 441 | * "Conditional" syscalls |
| @@ -455,4 +450,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 455 | void name (void) __attribute__ ((weak, alias ("sys_ni_syscall"))); | 450 | void name (void) __attribute__ ((weak, alias ("sys_ni_syscall"))); |
| 456 | #endif | 451 | #endif |
| 457 | 452 | ||
| 453 | #endif /* __KERNEL__ */ | ||
| 458 | #endif /* __V850_UNISTD_H__ */ | 454 | #endif /* __V850_UNISTD_H__ */ |
diff --git a/include/asm-v850/v850e_uart.h b/include/asm-v850/v850e_uart.h index 5930d5990b19..5182fb4cc989 100644 --- a/include/asm-v850/v850e_uart.h +++ b/include/asm-v850/v850e_uart.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef __V850_V850E_UART_H__ | 19 | #ifndef __V850_V850E_UART_H__ |
| 20 | #define __V850_V850E_UART_H__ | 20 | #define __V850_V850E_UART_H__ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/termios.h> | 22 | #include <linux/termios.h> |
| 24 | 23 | ||
| 25 | #include <asm/v850e_utils.h> | 24 | #include <asm/v850e_utils.h> |
diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h index bdbd8935612a..a731be2204d2 100644 --- a/include/asm-x86_64/apic.h +++ b/include/asm-x86_64/apic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_APIC_H | 1 | #ifndef __ASM_APIC_H |
| 2 | #define __ASM_APIC_H | 2 | #define __ASM_APIC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/pm.h> | 4 | #include <linux/pm.h> |
| 6 | #include <asm/fixmap.h> | 5 | #include <asm/fixmap.h> |
| 7 | #include <asm/apicdef.h> | 6 | #include <asm/apicdef.h> |
diff --git a/include/asm-x86_64/atomic.h b/include/asm-x86_64/atomic.h index cecbf7baa6aa..bd3fa67ed835 100644 --- a/include/asm-x86_64/atomic.h +++ b/include/asm-x86_64/atomic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ARCH_X86_64_ATOMIC__ | 1 | #ifndef __ARCH_X86_64_ATOMIC__ |
| 2 | #define __ARCH_X86_64_ATOMIC__ | 2 | #define __ARCH_X86_64_ATOMIC__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| 6 | 5 | ||
| 7 | /* atomic_t should be 32 bit signed type */ | 6 | /* atomic_t should be 32 bit signed type */ |
diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h index 79212128d0f7..e9bf933d25d0 100644 --- a/include/asm-x86_64/bitops.h +++ b/include/asm-x86_64/bitops.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright 1992, Linus Torvalds. | 5 | * Copyright 1992, Linus Torvalds. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #ifdef CONFIG_SMP | 9 | #ifdef CONFIG_SMP |
| 11 | #define LOCK_PREFIX "lock ; " | 10 | #define LOCK_PREFIX "lock ; " |
diff --git a/include/asm-x86_64/bugs.h b/include/asm-x86_64/bugs.h index 59bc68925d0f..d86c5dd689fa 100644 --- a/include/asm-x86_64/bugs.h +++ b/include/asm-x86_64/bugs.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * void check_bugs(void); | 10 | * void check_bugs(void); |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
| 15 | #include <asm/i387.h> | 14 | #include <asm/i387.h> |
| 16 | #include <asm/msr.h> | 15 | #include <asm/msr.h> |
diff --git a/include/asm-x86_64/cache.h b/include/asm-x86_64/cache.h index f8dff1c67538..ed8a9d25272d 100644 --- a/include/asm-x86_64/cache.h +++ b/include/asm-x86_64/cache.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifndef __ARCH_X8664_CACHE_H | 4 | #ifndef __ARCH_X8664_CACHE_H |
| 5 | #define __ARCH_X8664_CACHE_H | 5 | #define __ARCH_X8664_CACHE_H |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | /* L1 cache line size */ | 8 | /* L1 cache line size */ |
| 10 | #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) | 9 | #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) |
diff --git a/include/asm-x86_64/calling.h b/include/asm-x86_64/calling.h index fc2c5a6c262a..6f4f63af96e1 100644 --- a/include/asm-x86_64/calling.h +++ b/include/asm-x86_64/calling.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Some macros to handle stack frames in assembly. | 2 | * Some macros to handle stack frames in assembly. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | #define R15 0 | 6 | #define R15 0 |
| 8 | #define R14 8 | 7 | #define R14 8 |
diff --git a/include/asm-x86_64/dma-mapping.h b/include/asm-x86_64/dma-mapping.h index 49a81a66516e..498f66df36b9 100644 --- a/include/asm-x86_64/dma-mapping.h +++ b/include/asm-x86_64/dma-mapping.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * documentation. | 6 | * documentation. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #include <asm/scatterlist.h> | 10 | #include <asm/scatterlist.h> |
| 12 | #include <asm/io.h> | 11 | #include <asm/io.h> |
diff --git a/include/asm-x86_64/dma.h b/include/asm-x86_64/dma.h index 6f2a817b6a7c..c556208d3dd7 100644 --- a/include/asm-x86_64/dma.h +++ b/include/asm-x86_64/dma.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_DMA_H | 8 | #ifndef _ASM_DMA_H |
| 9 | #define _ASM_DMA_H | 9 | #define _ASM_DMA_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/spinlock.h> /* And spinlocks */ | 11 | #include <linux/spinlock.h> /* And spinlocks */ |
| 13 | #include <asm/io.h> /* need byte IO */ | 12 | #include <asm/io.h> /* need byte IO */ |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
diff --git a/include/asm-x86_64/dwarf2.h b/include/asm-x86_64/dwarf2.h index 07654bd155bf..0744db777676 100644 --- a/include/asm-x86_64/dwarf2.h +++ b/include/asm-x86_64/dwarf2.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _DWARF2_H | 1 | #ifndef _DWARF2_H |
| 2 | #define _DWARF2_H 1 | 2 | #define _DWARF2_H 1 |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifndef __ASSEMBLY__ | 5 | #ifndef __ASSEMBLY__ |
| 7 | #warning "asm/dwarf2.h should be only included in pure assembly files" | 6 | #warning "asm/dwarf2.h should be only included in pure assembly files" |
diff --git a/include/asm-x86_64/fixmap.h b/include/asm-x86_64/fixmap.h index 7b286bd21d1d..0b4ffbd1a125 100644 --- a/include/asm-x86_64/fixmap.h +++ b/include/asm-x86_64/fixmap.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _ASM_FIXMAP_H | 11 | #ifndef _ASM_FIXMAP_H |
| 12 | #define _ASM_FIXMAP_H | 12 | #define _ASM_FIXMAP_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <asm/apicdef.h> | 15 | #include <asm/apicdef.h> |
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
diff --git a/include/asm-x86_64/hardirq.h b/include/asm-x86_64/hardirq.h index 8689951e3503..64a65ce2f41f 100644 --- a/include/asm-x86_64/hardirq.h +++ b/include/asm-x86_64/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_HARDIRQ_H | 1 | #ifndef __ASM_HARDIRQ_H |
| 2 | #define __ASM_HARDIRQ_H | 2 | #define __ASM_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
| 7 | #include <asm/pda.h> | 6 | #include <asm/pda.h> |
diff --git a/include/asm-x86_64/hw_irq.h b/include/asm-x86_64/hw_irq.h index 0df1715dee71..3de96fd86a70 100644 --- a/include/asm-x86_64/hw_irq.h +++ b/include/asm-x86_64/hw_irq.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/atomic.h> | 20 | #include <asm/atomic.h> |
| 22 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
| 23 | #include <linux/profile.h> | 22 | #include <linux/profile.h> |
diff --git a/include/asm-x86_64/ia32.h b/include/asm-x86_64/ia32.h index e6b7f2234e43..0190b7c4e319 100644 --- a/include/asm-x86_64/ia32.h +++ b/include/asm-x86_64/ia32.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_X86_64_IA32_H | 1 | #ifndef _ASM_X86_64_IA32_H |
| 2 | #define _ASM_X86_64_IA32_H | 2 | #define _ASM_X86_64_IA32_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_IA32_EMULATION | 5 | #ifdef CONFIG_IA32_EMULATION |
| 7 | 6 | ||
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h index a05da8a50bfd..70e91fe76344 100644 --- a/include/asm-x86_64/io.h +++ b/include/asm-x86_64/io.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_IO_H | 1 | #ifndef _ASM_IO_H |
| 2 | #define _ASM_IO_H | 2 | #define _ASM_IO_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * This file contains the definitions for the x86 IO instructions | 6 | * This file contains the definitions for the x86 IO instructions |
diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h index 52484e82c641..fb7a0909a174 100644 --- a/include/asm-x86_64/io_apic.h +++ b/include/asm-x86_64/io_apic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_IO_APIC_H | 1 | #ifndef __ASM_IO_APIC_H |
| 2 | #define __ASM_IO_APIC_H | 2 | #define __ASM_IO_APIC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| 6 | #include <asm/mpspec.h> | 5 | #include <asm/mpspec.h> |
| 7 | 6 | ||
diff --git a/include/asm-x86_64/mmu_context.h b/include/asm-x86_64/mmu_context.h index 19f0c83d0792..af03b9f852d6 100644 --- a/include/asm-x86_64/mmu_context.h +++ b/include/asm-x86_64/mmu_context.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __X86_64_MMU_CONTEXT_H | 1 | #ifndef __X86_64_MMU_CONTEXT_H |
| 2 | #define __X86_64_MMU_CONTEXT_H | 2 | #define __X86_64_MMU_CONTEXT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/desc.h> | 4 | #include <asm/desc.h> |
| 6 | #include <asm/atomic.h> | 5 | #include <asm/atomic.h> |
| 7 | #include <asm/pgalloc.h> | 6 | #include <asm/pgalloc.h> |
diff --git a/include/asm-x86_64/mmzone.h b/include/asm-x86_64/mmzone.h index 6944e7122df5..70bb9969766e 100644 --- a/include/asm-x86_64/mmzone.h +++ b/include/asm-x86_64/mmzone.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifndef _ASM_X86_64_MMZONE_H | 4 | #ifndef _ASM_X86_64_MMZONE_H |
| 5 | #define _ASM_X86_64_MMZONE_H 1 | 5 | #define _ASM_X86_64_MMZONE_H 1 |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifdef CONFIG_NUMA | 8 | #ifdef CONFIG_NUMA |
| 10 | 9 | ||
diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86_64/mtrr.h index 66ac1c0f27e1..d6135b2549bf 100644 --- a/include/asm-x86_64/mtrr.h +++ b/include/asm-x86_64/mtrr.h | |||
| @@ -23,9 +23,7 @@ | |||
| 23 | #ifndef _LINUX_MTRR_H | 23 | #ifndef _LINUX_MTRR_H |
| 24 | #define _LINUX_MTRR_H | 24 | #define _LINUX_MTRR_H |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
| 28 | #include <linux/compat.h> | ||
| 29 | 27 | ||
| 30 | #define MTRR_IOCTL_BASE 'M' | 28 | #define MTRR_IOCTL_BASE 'M' |
| 31 | 29 | ||
| @@ -102,11 +100,10 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base, | |||
| 102 | return -ENODEV; | 100 | return -ENODEV; |
| 103 | } | 101 | } |
| 104 | 102 | ||
| 105 | # endif | 103 | #endif /* CONFIG_MTRR */ |
| 106 | |||
| 107 | #endif | ||
| 108 | 104 | ||
| 109 | #ifdef CONFIG_COMPAT | 105 | #ifdef CONFIG_COMPAT |
| 106 | #include <linux/compat.h> | ||
| 110 | 107 | ||
| 111 | struct mtrr_sentry32 | 108 | struct mtrr_sentry32 |
| 112 | { | 109 | { |
| @@ -138,4 +135,6 @@ struct mtrr_gentry32 | |||
| 138 | 135 | ||
| 139 | #endif /* CONFIG_COMPAT */ | 136 | #endif /* CONFIG_COMPAT */ |
| 140 | 137 | ||
| 138 | #endif /* __KERNEL__ */ | ||
| 139 | |||
| 141 | #endif /* _LINUX_MTRR_H */ | 140 | #endif /* _LINUX_MTRR_H */ |
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h index 408185bac351..f7bf875aae40 100644 --- a/include/asm-x86_64/page.h +++ b/include/asm-x86_64/page.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _X86_64_PAGE_H | 1 | #ifndef _X86_64_PAGE_H |
| 2 | #define _X86_64_PAGE_H | 2 | #define _X86_64_PAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* PAGE_SHIFT determines the page size */ | 5 | /* PAGE_SHIFT determines the page size */ |
| 7 | #define PAGE_SHIFT 12 | 6 | #define PAGE_SHIFT 12 |
| @@ -136,9 +135,9 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 136 | 135 | ||
| 137 | #define __HAVE_ARCH_GATE_AREA 1 | 136 | #define __HAVE_ARCH_GATE_AREA 1 |
| 138 | 137 | ||
| 139 | #endif /* __KERNEL__ */ | ||
| 140 | |||
| 141 | #include <asm-generic/memory_model.h> | 138 | #include <asm-generic/memory_model.h> |
| 142 | #include <asm-generic/page.h> | 139 | #include <asm-generic/page.h> |
| 143 | 140 | ||
| 141 | #endif /* __KERNEL__ */ | ||
| 142 | |||
| 144 | #endif /* _X86_64_PAGE_H */ | 143 | #endif /* _X86_64_PAGE_H */ |
diff --git a/include/asm-x86_64/param.h b/include/asm-x86_64/param.h index 5956b23b57c2..a728786c3c7c 100644 --- a/include/asm-x86_64/param.h +++ b/include/asm-x86_64/param.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASMx86_64_PARAM_H | 2 | #define _ASMx86_64_PARAM_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | # include <linux/config.h> | ||
| 6 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | 5 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
| 7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks */ | 6 | # define USER_HZ 100 /* .. some user interfaces are in "ticks */ |
| 8 | #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | 7 | #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index 8a05af264d18..2db0620d5449 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __x8664_PCI_H | 1 | #ifndef __x8664_PCI_H |
| 2 | #define __x8664_PCI_H | 2 | #define __x8664_PCI_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/io.h> | 4 | #include <asm/io.h> |
| 6 | 5 | ||
| 7 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
diff --git a/include/asm-x86_64/processor.h b/include/asm-x86_64/processor.h index 37a3ec433ee5..3061a38a3b1d 100644 --- a/include/asm-x86_64/processor.h +++ b/include/asm-x86_64/processor.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/types.h> | 12 | #include <asm/types.h> |
| 13 | #include <asm/sigcontext.h> | 13 | #include <asm/sigcontext.h> |
| 14 | #include <asm/cpufeature.h> | 14 | #include <asm/cpufeature.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
| 17 | #include <asm/msr.h> | 16 | #include <asm/msr.h> |
| 18 | #include <asm/current.h> | 17 | #include <asm/current.h> |
diff --git a/include/asm-x86_64/serial.h b/include/asm-x86_64/serial.h index dc752eafa681..b0496e0d72a6 100644 --- a/include/asm-x86_64/serial.h +++ b/include/asm-x86_64/serial.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * include/asm-x86_64/serial.h | 2 | * include/asm-x86_64/serial.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | /* | 6 | /* |
| 8 | * This assumes you have a 1.8432 MHz clock for your UART. | 7 | * This assumes you have a 1.8432 MHz clock for your UART. |
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h index a4fdaeb5c397..7686b9b25aef 100644 --- a/include/asm-x86_64/smp.h +++ b/include/asm-x86_64/smp.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * We need the APIC definitions automatically as part of 'smp.h' | 5 | * We need the APIC definitions automatically as part of 'smp.h' |
| 6 | */ | 6 | */ |
| 7 | #ifndef __ASSEMBLY__ | 7 | #ifndef __ASSEMBLY__ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/threads.h> | 8 | #include <linux/threads.h> |
| 10 | #include <linux/cpumask.h> | 9 | #include <linux/cpumask.h> |
| 11 | #include <linux/bitops.h> | 10 | #include <linux/bitops.h> |
diff --git a/include/asm-x86_64/spinlock.h b/include/asm-x86_64/spinlock.h index fe484a699cc3..5d8a5e3589ff 100644 --- a/include/asm-x86_64/spinlock.h +++ b/include/asm-x86_64/spinlock.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <asm/atomic.h> | 4 | #include <asm/atomic.h> |
| 5 | #include <asm/rwlock.h> | 5 | #include <asm/rwlock.h> |
| 6 | #include <asm/page.h> | 6 | #include <asm/page.h> |
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | /* | 8 | /* |
| 10 | * Your basic SMP spinlocks, allowing only a single CPU anywhere | 9 | * Your basic SMP spinlocks, allowing only a single CPU anywhere |
diff --git a/include/asm-x86_64/swiotlb.h b/include/asm-x86_64/swiotlb.h index 60757efd1353..5f9a01805821 100644 --- a/include/asm-x86_64/swiotlb.h +++ b/include/asm-x86_64/swiotlb.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_SWIOTLB_H | 1 | #ifndef _ASM_SWIOTLB_H |
| 2 | #define _ASM_SWTIOLB_H 1 | 2 | #define _ASM_SWTIOLB_H 1 |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include <asm/dma-mapping.h> | 5 | #include <asm/dma-mapping.h> |
| 7 | 6 | ||
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h index 397598980228..f48e0dad8b3d 100644 --- a/include/asm-x86_64/system.h +++ b/include/asm-x86_64/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SYSTEM_H | 1 | #ifndef __ASM_SYSTEM_H |
| 2 | #define __ASM_SYSTEM_H | 2 | #define __ASM_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 6 | #include <asm/segment.h> | 5 | #include <asm/segment.h> |
| 7 | 6 | ||
diff --git a/include/asm-x86_64/tlbflush.h b/include/asm-x86_64/tlbflush.h index 4a9c20ea9b10..d16d5b60f419 100644 --- a/include/asm-x86_64/tlbflush.h +++ b/include/asm-x86_64/tlbflush.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _X8664_TLBFLUSH_H | 1 | #ifndef _X8664_TLBFLUSH_H |
| 2 | #define _X8664_TLBFLUSH_H | 2 | #define _X8664_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <asm/processor.h> | 5 | #include <asm/processor.h> |
| 7 | 6 | ||
diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h index 9db54e9d17bb..80c4e44d011c 100644 --- a/include/asm-x86_64/topology.h +++ b/include/asm-x86_64/topology.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_X86_64_TOPOLOGY_H | 1 | #ifndef _ASM_X86_64_TOPOLOGY_H |
| 2 | #define _ASM_X86_64_TOPOLOGY_H | 2 | #define _ASM_X86_64_TOPOLOGY_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_NUMA | 5 | #ifdef CONFIG_NUMA |
| 7 | 6 | ||
diff --git a/include/asm-x86_64/uaccess.h b/include/asm-x86_64/uaccess.h index bddffcb591b8..1e1fa003daa3 100644 --- a/include/asm-x86_64/uaccess.h +++ b/include/asm-x86_64/uaccess.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | /* | 4 | /* |
| 5 | * User space memory access functions | 5 | * User space memory access functions |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/compiler.h> | 7 | #include <linux/compiler.h> |
| 9 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index feb77cb8c044..0aff22bdbb21 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h | |||
| @@ -618,6 +618,8 @@ __SYSCALL(__NR_sync_file_range, sys_sync_file_range) | |||
| 618 | #define __NR_vmsplice 278 | 618 | #define __NR_vmsplice 278 |
| 619 | __SYSCALL(__NR_vmsplice, sys_vmsplice) | 619 | __SYSCALL(__NR_vmsplice, sys_vmsplice) |
| 620 | 620 | ||
| 621 | #ifdef __KERNEL__ | ||
| 622 | |||
| 621 | #define __NR_syscall_max __NR_vmsplice | 623 | #define __NR_syscall_max __NR_vmsplice |
| 622 | 624 | ||
| 623 | #ifndef __NO_STUBS | 625 | #ifndef __NO_STUBS |
| @@ -635,7 +637,6 @@ do { \ | |||
| 635 | return (type) (res); \ | 637 | return (type) (res); \ |
| 636 | } while (0) | 638 | } while (0) |
| 637 | 639 | ||
| 638 | #ifdef __KERNEL__ | ||
| 639 | #define __ARCH_WANT_OLD_READDIR | 640 | #define __ARCH_WANT_OLD_READDIR |
| 640 | #define __ARCH_WANT_OLD_STAT | 641 | #define __ARCH_WANT_OLD_STAT |
| 641 | #define __ARCH_WANT_SYS_ALARM | 642 | #define __ARCH_WANT_SYS_ALARM |
| @@ -657,7 +658,6 @@ do { \ | |||
| 657 | #define __ARCH_WANT_SYS_RT_SIGACTION | 658 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 658 | #define __ARCH_WANT_SYS_TIME | 659 | #define __ARCH_WANT_SYS_TIME |
| 659 | #define __ARCH_WANT_COMPAT_SYS_TIME | 660 | #define __ARCH_WANT_COMPAT_SYS_TIME |
| 660 | #endif | ||
| 661 | 661 | ||
| 662 | #ifndef __KERNEL_SYSCALLS__ | 662 | #ifndef __KERNEL_SYSCALLS__ |
| 663 | 663 | ||
| @@ -821,7 +821,7 @@ asmlinkage long sys_pipe(int *fildes); | |||
| 821 | 821 | ||
| 822 | #endif /* __KERNEL_SYSCALLS__ */ | 822 | #endif /* __KERNEL_SYSCALLS__ */ |
| 823 | 823 | ||
| 824 | #if !defined(__ASSEMBLY__) && defined(__KERNEL__) | 824 | #ifndef __ASSEMBLY__ |
| 825 | 825 | ||
| 826 | #include <linux/linkage.h> | 826 | #include <linux/linkage.h> |
| 827 | #include <linux/compiler.h> | 827 | #include <linux/compiler.h> |
| @@ -848,4 +848,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
| 848 | */ | 848 | */ |
| 849 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 849 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
| 850 | 850 | ||
| 851 | #endif /* __KERNEL__ */ | ||
| 851 | #endif | 852 | #endif |
diff --git a/include/asm-xtensa/atomic.h b/include/asm-xtensa/atomic.h index fe105a123924..5c2672021068 100644 --- a/include/asm-xtensa/atomic.h +++ b/include/asm-xtensa/atomic.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _XTENSA_ATOMIC_H | 13 | #ifndef _XTENSA_ATOMIC_H |
| 14 | #define _XTENSA_ATOMIC_H | 14 | #define _XTENSA_ATOMIC_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/stringify.h> | 16 | #include <linux/stringify.h> |
| 18 | 17 | ||
| 19 | typedef struct { volatile int counter; } atomic_t; | 18 | typedef struct { volatile int counter; } atomic_t; |
diff --git a/include/asm-xtensa/checksum.h b/include/asm-xtensa/checksum.h index 81a797ae3abe..bdc00ae9be48 100644 --- a/include/asm-xtensa/checksum.h +++ b/include/asm-xtensa/checksum.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_CHECKSUM_H | 11 | #ifndef _XTENSA_CHECKSUM_H |
| 12 | #define _XTENSA_CHECKSUM_H | 12 | #define _XTENSA_CHECKSUM_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/in6.h> | 14 | #include <linux/in6.h> |
| 16 | #include <xtensa/config/core.h> | 15 | #include <xtensa/config/core.h> |
| 17 | 16 | ||
diff --git a/include/asm-xtensa/delay.h b/include/asm-xtensa/delay.h index 1bc601ec3621..e1d8c9e010c1 100644 --- a/include/asm-xtensa/delay.h +++ b/include/asm-xtensa/delay.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _XTENSA_DELAY_H | 12 | #ifndef _XTENSA_DELAY_H |
| 13 | #define _XTENSA_DELAY_H | 13 | #define _XTENSA_DELAY_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/processor.h> | 15 | #include <asm/processor.h> |
| 17 | #include <asm/param.h> | 16 | #include <asm/param.h> |
| 18 | 17 | ||
diff --git a/include/asm-xtensa/dma.h b/include/asm-xtensa/dma.h index 1c22b0234586..db2633f67789 100644 --- a/include/asm-xtensa/dma.h +++ b/include/asm-xtensa/dma.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_DMA_H | 11 | #ifndef _XTENSA_DMA_H |
| 12 | #define _XTENSA_DMA_H | 12 | #define _XTENSA_DMA_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/io.h> /* need byte IO */ | 14 | #include <asm/io.h> /* need byte IO */ |
| 16 | #include <xtensa/config/core.h> | 15 | #include <xtensa/config/core.h> |
| 17 | 16 | ||
diff --git a/include/asm-xtensa/hardirq.h b/include/asm-xtensa/hardirq.h index aa9c1adf68d7..87cb19d1b10c 100644 --- a/include/asm-xtensa/hardirq.h +++ b/include/asm-xtensa/hardirq.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_HARDIRQ_H | 11 | #ifndef _XTENSA_HARDIRQ_H |
| 12 | #define _XTENSA_HARDIRQ_H | 12 | #define _XTENSA_HARDIRQ_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/cache.h> | 14 | #include <linux/cache.h> |
| 16 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
| 17 | 16 | ||
diff --git a/include/asm-xtensa/ide.h b/include/asm-xtensa/ide.h index b523cd4a486e..6b912742a42d 100644 --- a/include/asm-xtensa/ide.h +++ b/include/asm-xtensa/ide.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #ifndef MAX_HWIFS | 18 | #ifndef MAX_HWIFS |
| 20 | # define MAX_HWIFS 1 | 19 | # define MAX_HWIFS 1 |
diff --git a/include/asm-xtensa/io.h b/include/asm-xtensa/io.h index c5c13985bbe1..556e5eed34f5 100644 --- a/include/asm-xtensa/io.h +++ b/include/asm-xtensa/io.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define _XTENSA_IO_H | 12 | #define _XTENSA_IO_H |
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/byteorder.h> | 15 | #include <asm/byteorder.h> |
| 17 | 16 | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/include/asm-xtensa/irq.h b/include/asm-xtensa/irq.h index d984e955938f..049fde7e752d 100644 --- a/include/asm-xtensa/irq.h +++ b/include/asm-xtensa/irq.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_IRQ_H | 11 | #ifndef _XTENSA_IRQ_H |
| 12 | #define _XTENSA_IRQ_H | 12 | #define _XTENSA_IRQ_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/platform/hardware.h> | 14 | #include <asm/platform/hardware.h> |
| 16 | 15 | ||
| 17 | #include <xtensa/config/core.h> | 16 | #include <xtensa/config/core.h> |
diff --git a/include/asm-xtensa/mmu_context.h b/include/asm-xtensa/mmu_context.h index 364a7b057bfa..af683a74a4ec 100644 --- a/include/asm-xtensa/mmu_context.h +++ b/include/asm-xtensa/mmu_context.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _XTENSA_MMU_CONTEXT_H | 13 | #ifndef _XTENSA_MMU_CONTEXT_H |
| 14 | #define _XTENSA_MMU_CONTEXT_H | 14 | #define _XTENSA_MMU_CONTEXT_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/stringify.h> | 16 | #include <linux/stringify.h> |
| 18 | 17 | ||
| 19 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h index 992bac5c1258..40f4c6c3f580 100644 --- a/include/asm-xtensa/page.h +++ b/include/asm-xtensa/page.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | /* | 18 | /* |
| 20 | * PAGE_SHIFT determines the page size | 19 | * PAGE_SHIFT determines the page size |
diff --git a/include/asm-xtensa/pgalloc.h b/include/asm-xtensa/pgalloc.h index 734a8d060395..d56ddf2055e1 100644 --- a/include/asm-xtensa/pgalloc.h +++ b/include/asm-xtensa/pgalloc.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
| 18 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
| 19 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
diff --git a/include/asm-xtensa/platform.h b/include/asm-xtensa/platform.h index 36163894bc20..48135a9718b0 100644 --- a/include/asm-xtensa/platform.h +++ b/include/asm-xtensa/platform.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _XTENSA_PLATFORM_H | 13 | #ifndef _XTENSA_PLATFORM_H |
| 14 | #define _XTENSA_PLATFORM_H | 14 | #define _XTENSA_PLATFORM_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 19 | 18 | ||
diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h index b29f7ae6a08a..f986170bd2a1 100644 --- a/include/asm-xtensa/system.h +++ b/include/asm-xtensa/system.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_SYSTEM_H | 11 | #ifndef _XTENSA_SYSTEM_H |
| 12 | #define _XTENSA_SYSTEM_H | 12 | #define _XTENSA_SYSTEM_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stringify.h> | 14 | #include <linux/stringify.h> |
| 16 | 15 | ||
| 17 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h index 6b39d6609d9c..5e1b99dc4ab3 100644 --- a/include/asm-xtensa/unistd.h +++ b/include/asm-xtensa/unistd.h | |||
| @@ -11,8 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_UNISTD_H | 11 | #ifndef _XTENSA_UNISTD_H |
| 12 | #define _XTENSA_UNISTD_H | 12 | #define _XTENSA_UNISTD_H |
| 13 | 13 | ||
| 14 | #include <linux/linkage.h> | ||
| 15 | |||
| 16 | #define __NR_spill 0 | 14 | #define __NR_spill 0 |
| 17 | #define __NR_exit 1 | 15 | #define __NR_exit 1 |
| 18 | #define __NR_read 3 | 16 | #define __NR_read 3 |
| @@ -221,21 +219,9 @@ | |||
| 221 | #define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/ | 219 | #define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/ |
| 222 | 220 | ||
| 223 | #ifdef __KERNEL__ | 221 | #ifdef __KERNEL__ |
| 224 | #define __syscall_return(type, res) return ((type)(res)) | 222 | #include <linux/linkage.h> |
| 225 | #else | ||
| 226 | #define __syscall_return(type, res) \ | ||
| 227 | do { \ | ||
| 228 | if ((unsigned long)(res) >= (unsigned long)(-125)) { \ | ||
| 229 | /* Avoid using "res" which is declared to be in register r2; \ | ||
| 230 | * errno might expand to a function call and clobber it. */ \ | ||
| 231 | int __err = -(res); \ | ||
| 232 | errno = __err; \ | ||
| 233 | res = -1; \ | ||
| 234 | } \ | ||
| 235 | return (type) (res); \ | ||
| 236 | } while (0) | ||
| 237 | #endif | ||
| 238 | 223 | ||
| 224 | #define __syscall_return(type, res) return ((type)(res)) | ||
| 239 | 225 | ||
| 240 | /* Tensilica's xt-xcc compiler is much more agressive at code | 226 | /* Tensilica's xt-xcc compiler is much more agressive at code |
| 241 | * optimization than gcc. Multiple __asm__ statements are | 227 | * optimization than gcc. Multiple __asm__ statements are |
| @@ -429,11 +415,10 @@ static __inline__ _syscall3(int,execve,const char*,file,char**,argv,char**,envp) | |||
| 429 | */ | 415 | */ |
| 430 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall"); | 416 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall"); |
| 431 | 417 | ||
| 432 | #ifdef __KERNEL__ | ||
| 433 | #define __ARCH_WANT_STAT64 | 418 | #define __ARCH_WANT_STAT64 |
| 434 | #define __ARCH_WANT_SYS_UTIME | 419 | #define __ARCH_WANT_SYS_UTIME |
| 435 | #define __ARCH_WANT_SYS_LLSEEK | 420 | #define __ARCH_WANT_SYS_LLSEEK |
| 436 | #define __ARCH_WANT_SYS_RT_SIGACTION | 421 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 437 | #endif | 422 | #endif /* __KERNEL__ */ |
| 438 | 423 | ||
| 439 | #endif /* _XTENSA_UNISTD_H */ | 424 | #endif /* _XTENSA_UNISTD_H */ |
diff --git a/include/linux/acct.h b/include/linux/acct.h index 9a66401073fc..3d54fbcf969e 100644 --- a/include/linux/acct.h +++ b/include/linux/acct.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #define _LINUX_ACCT_H | 16 | #define _LINUX_ACCT_H |
| 17 | 17 | ||
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | #include <linux/jiffies.h> | ||
| 20 | 19 | ||
| 21 | #include <asm/param.h> | 20 | #include <asm/param.h> |
| 22 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| @@ -116,7 +115,6 @@ struct acct_v3 | |||
| 116 | 115 | ||
| 117 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
| 118 | 117 | ||
| 119 | #include <linux/config.h> | ||
| 120 | 118 | ||
| 121 | #ifdef CONFIG_BSD_PROCESS_ACCT | 119 | #ifdef CONFIG_BSD_PROCESS_ACCT |
| 122 | struct vfsmount; | 120 | struct vfsmount; |
| @@ -165,6 +163,7 @@ typedef struct acct acct_t; | |||
| 165 | #endif /* __KERNEL */ | 163 | #endif /* __KERNEL */ |
| 166 | 164 | ||
| 167 | #ifdef __KERNEL__ | 165 | #ifdef __KERNEL__ |
| 166 | #include <linux/jiffies.h> | ||
| 168 | /* | 167 | /* |
| 169 | * Yet another set of HZ to *HZ helper functions. | 168 | * Yet another set of HZ to *HZ helper functions. |
| 170 | * See <linux/jiffies.h> for the original. | 169 | * See <linux/jiffies.h> for the original. |
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d3bc25e6d27d..1cf0b91d05bd 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #ifndef _LINUX_ACPI_H | 25 | #ifndef _LINUX_ACPI_H |
| 26 | #define _LINUX_ACPI_H | 26 | #define _LINUX_ACPI_H |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #ifdef CONFIG_ACPI | 29 | #ifdef CONFIG_ACPI |
| 31 | 30 | ||
diff --git a/include/linux/affs_hardblocks.h b/include/linux/affs_hardblocks.h index 3fb869939d82..f1b948c1f592 100644 --- a/include/linux/affs_hardblocks.h +++ b/include/linux/affs_hardblocks.h | |||
| @@ -1,45 +1,47 @@ | |||
| 1 | #ifndef AFFS_HARDBLOCKS_H | 1 | #ifndef AFFS_HARDBLOCKS_H |
| 2 | #define AFFS_HARDBLOCKS_H | 2 | #define AFFS_HARDBLOCKS_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 4 | /* Just the needed definitions for the RDB of an Amiga HD. */ | 6 | /* Just the needed definitions for the RDB of an Amiga HD. */ |
| 5 | 7 | ||
| 6 | struct RigidDiskBlock { | 8 | struct RigidDiskBlock { |
| 7 | u32 rdb_ID; | 9 | __u32 rdb_ID; |
| 8 | __be32 rdb_SummedLongs; | 10 | __be32 rdb_SummedLongs; |
| 9 | s32 rdb_ChkSum; | 11 | __s32 rdb_ChkSum; |
| 10 | u32 rdb_HostID; | 12 | __u32 rdb_HostID; |
| 11 | __be32 rdb_BlockBytes; | 13 | __be32 rdb_BlockBytes; |
| 12 | u32 rdb_Flags; | 14 | __u32 rdb_Flags; |
| 13 | u32 rdb_BadBlockList; | 15 | __u32 rdb_BadBlockList; |
| 14 | __be32 rdb_PartitionList; | 16 | __be32 rdb_PartitionList; |
| 15 | u32 rdb_FileSysHeaderList; | 17 | __u32 rdb_FileSysHeaderList; |
| 16 | u32 rdb_DriveInit; | 18 | __u32 rdb_DriveInit; |
| 17 | u32 rdb_Reserved1[6]; | 19 | __u32 rdb_Reserved1[6]; |
| 18 | u32 rdb_Cylinders; | 20 | __u32 rdb_Cylinders; |
| 19 | u32 rdb_Sectors; | 21 | __u32 rdb_Sectors; |
| 20 | u32 rdb_Heads; | 22 | __u32 rdb_Heads; |
| 21 | u32 rdb_Interleave; | 23 | __u32 rdb_Interleave; |
| 22 | u32 rdb_Park; | 24 | __u32 rdb_Park; |
| 23 | u32 rdb_Reserved2[3]; | 25 | __u32 rdb_Reserved2[3]; |
| 24 | u32 rdb_WritePreComp; | 26 | __u32 rdb_WritePreComp; |
| 25 | u32 rdb_ReducedWrite; | 27 | __u32 rdb_ReducedWrite; |
| 26 | u32 rdb_StepRate; | 28 | __u32 rdb_StepRate; |
| 27 | u32 rdb_Reserved3[5]; | 29 | __u32 rdb_Reserved3[5]; |
| 28 | u32 rdb_RDBBlocksLo; | 30 | __u32 rdb_RDBBlocksLo; |
| 29 | u32 rdb_RDBBlocksHi; | 31 | __u32 rdb_RDBBlocksHi; |
| 30 | u32 rdb_LoCylinder; | 32 | __u32 rdb_LoCylinder; |
| 31 | u32 rdb_HiCylinder; | 33 | __u32 rdb_HiCylinder; |
| 32 | u32 rdb_CylBlocks; | 34 | __u32 rdb_CylBlocks; |
| 33 | u32 rdb_AutoParkSeconds; | 35 | __u32 rdb_AutoParkSeconds; |
| 34 | u32 rdb_HighRDSKBlock; | 36 | __u32 rdb_HighRDSKBlock; |
| 35 | u32 rdb_Reserved4; | 37 | __u32 rdb_Reserved4; |
| 36 | char rdb_DiskVendor[8]; | 38 | char rdb_DiskVendor[8]; |
| 37 | char rdb_DiskProduct[16]; | 39 | char rdb_DiskProduct[16]; |
| 38 | char rdb_DiskRevision[4]; | 40 | char rdb_DiskRevision[4]; |
| 39 | char rdb_ControllerVendor[8]; | 41 | char rdb_ControllerVendor[8]; |
| 40 | char rdb_ControllerProduct[16]; | 42 | char rdb_ControllerProduct[16]; |
| 41 | char rdb_ControllerRevision[4]; | 43 | char rdb_ControllerRevision[4]; |
| 42 | u32 rdb_Reserved5[10]; | 44 | __u32 rdb_Reserved5[10]; |
| 43 | }; | 45 | }; |
| 44 | 46 | ||
| 45 | #define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */ | 47 | #define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */ |
| @@ -47,16 +49,16 @@ struct RigidDiskBlock { | |||
| 47 | struct PartitionBlock { | 49 | struct PartitionBlock { |
| 48 | __be32 pb_ID; | 50 | __be32 pb_ID; |
| 49 | __be32 pb_SummedLongs; | 51 | __be32 pb_SummedLongs; |
| 50 | s32 pb_ChkSum; | 52 | __s32 pb_ChkSum; |
| 51 | u32 pb_HostID; | 53 | __u32 pb_HostID; |
| 52 | __be32 pb_Next; | 54 | __be32 pb_Next; |
| 53 | u32 pb_Flags; | 55 | __u32 pb_Flags; |
| 54 | u32 pb_Reserved1[2]; | 56 | __u32 pb_Reserved1[2]; |
| 55 | u32 pb_DevFlags; | 57 | __u32 pb_DevFlags; |
| 56 | u8 pb_DriveName[32]; | 58 | __u8 pb_DriveName[32]; |
| 57 | u32 pb_Reserved2[15]; | 59 | __u32 pb_Reserved2[15]; |
| 58 | __be32 pb_Environment[17]; | 60 | __be32 pb_Environment[17]; |
| 59 | u32 pb_EReserved[15]; | 61 | __u32 pb_EReserved[15]; |
| 60 | }; | 62 | }; |
| 61 | 63 | ||
| 62 | #define IDNAME_PARTITION 0x50415254 /* "PART" */ | 64 | #define IDNAME_PARTITION 0x50415254 /* "PART" */ |
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index 6d59c8efe3be..bfb8ec791b7b 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
| @@ -27,8 +27,6 @@ | |||
| 27 | #ifndef _AGP_H | 27 | #ifndef _AGP_H |
| 28 | #define _AGP_H 1 | 28 | #define _AGP_H 1 |
| 29 | 29 | ||
| 30 | #include <linux/agp_backend.h> | ||
| 31 | |||
| 32 | #define AGPIOC_BASE 'A' | 30 | #define AGPIOC_BASE 'A' |
| 33 | #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) | 31 | #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) |
| 34 | #define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1) | 32 | #define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1) |
| @@ -112,6 +110,7 @@ typedef struct _agp_unbind { | |||
| 112 | 110 | ||
| 113 | #else /* __KERNEL__ */ | 111 | #else /* __KERNEL__ */ |
| 114 | #include <linux/mutex.h> | 112 | #include <linux/mutex.h> |
| 113 | #include <linux/agp_backend.h> | ||
| 115 | 114 | ||
| 116 | #define AGPGART_MINOR 175 | 115 | #define AGPGART_MINOR 175 |
| 117 | 116 | ||
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h index 9cf64b1b688b..29c0448265cf 100644 --- a/include/linux/amba/clcd.h +++ b/include/linux/amba/clcd.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * License. See the file COPYING in the main directory of this archive | 9 | * License. See the file COPYING in the main directory of this archive |
| 10 | * for more details. | 10 | * for more details. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/fb.h> | 12 | #include <linux/fb.h> |
| 14 | 13 | ||
| 15 | /* | 14 | /* |
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index b203ea82a0a8..1eb238affb12 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h | |||
| @@ -209,7 +209,6 @@ struct atm_cirange { | |||
| 209 | 209 | ||
| 210 | #ifdef __KERNEL__ | 210 | #ifdef __KERNEL__ |
| 211 | 211 | ||
| 212 | #include <linux/config.h> | ||
| 213 | #include <linux/wait.h> /* wait_queue_head_t */ | 212 | #include <linux/wait.h> /* wait_queue_head_t */ |
| 214 | #include <linux/time.h> /* struct timeval */ | 213 | #include <linux/time.h> /* struct timeval */ |
| 215 | #include <linux/net.h> | 214 | #include <linux/net.h> |
diff --git a/include/linux/audit.h b/include/linux/audit.h index b74c148f14e3..14259f6db5bc 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -24,8 +24,7 @@ | |||
| 24 | #ifndef _LINUX_AUDIT_H_ | 24 | #ifndef _LINUX_AUDIT_H_ |
| 25 | #define _LINUX_AUDIT_H_ | 25 | #define _LINUX_AUDIT_H_ |
| 26 | 26 | ||
| 27 | #include <linux/sched.h> | 27 | #include <linux/elf-em.h> |
| 28 | #include <linux/elf.h> | ||
| 29 | 28 | ||
| 30 | /* The netlink messages for the audit system is divided into blocks: | 29 | /* The netlink messages for the audit system is divided into blocks: |
| 31 | * 1000 - 1099 are for commanding the audit system | 30 | * 1000 - 1099 are for commanding the audit system |
| @@ -273,6 +272,7 @@ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ | |||
| 273 | }; | 272 | }; |
| 274 | 273 | ||
| 275 | #ifdef __KERNEL__ | 274 | #ifdef __KERNEL__ |
| 275 | #include <linux/sched.h> | ||
| 276 | 276 | ||
| 277 | struct audit_sig_info { | 277 | struct audit_sig_info { |
| 278 | uid_t uid; | 278 | uid_t uid; |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 59e1259b1c40..5d327313a9f7 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_BLKDEV_H | 1 | #ifndef _LINUX_BLKDEV_H |
| 2 | #define _LINUX_BLKDEV_H | 2 | #define _LINUX_BLKDEV_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/major.h> | 4 | #include <linux/major.h> |
| 6 | #include <linux/genhd.h> | 5 | #include <linux/genhd.h> |
| 7 | #include <linux/list.h> | 6 | #include <linux/list.h> |
diff --git a/include/linux/blkpg.h b/include/linux/blkpg.h index be5d0f4ad24c..faf8a45af210 100644 --- a/include/linux/blkpg.h +++ b/include/linux/blkpg.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | * | 24 | * |
| 25 | * For today, only the partition stuff - aeb, 990515 | 25 | * For today, only the partition stuff - aeb, 990515 |
| 26 | */ | 26 | */ |
| 27 | #include <linux/compiler.h> | ||
| 27 | #include <linux/ioctl.h> | 28 | #include <linux/ioctl.h> |
| 28 | 29 | ||
| 29 | #define BLKPG _IO(0x12,105) | 30 | #define BLKPG _IO(0x12,105) |
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index b34d3e73d5ea..eb1a867ed245 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef BLKTRACE_H | 1 | #ifndef BLKTRACE_H |
| 2 | #define BLKTRACE_H | 2 | #define BLKTRACE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
| 6 | #include <linux/relay.h> | 5 | #include <linux/relay.h> |
| 7 | 6 | ||
diff --git a/include/linux/blockgroup_lock.h b/include/linux/blockgroup_lock.h index 0137ee5dd43c..8607312983bd 100644 --- a/include/linux/blockgroup_lock.h +++ b/include/linux/blockgroup_lock.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Simple hashed spinlocking. | 6 | * Simple hashed spinlocking. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
| 11 | #include <linux/cache.h> | 10 | #include <linux/cache.h> |
| 12 | 11 | ||
diff --git a/include/linux/cache.h b/include/linux/cache.h index cc4b3aafad9a..4552504c0228 100644 --- a/include/linux/cache.h +++ b/include/linux/cache.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __LINUX_CACHE_H | 2 | #define __LINUX_CACHE_H |
| 3 | 3 | ||
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/cache.h> | 5 | #include <asm/cache.h> |
| 7 | 6 | ||
| 8 | #ifndef L1_CACHE_ALIGN | 7 | #ifndef L1_CACHE_ALIGN |
diff --git a/include/linux/coda.h b/include/linux/coda.h index bbc5afcd7db6..b5cf0780c51a 100644 --- a/include/linux/coda.h +++ b/include/linux/coda.h | |||
| @@ -59,7 +59,6 @@ Mellon the rights to redistribute these changes without encumbrance. | |||
| 59 | #ifndef _CODA_HEADER_ | 59 | #ifndef _CODA_HEADER_ |
| 60 | #define _CODA_HEADER_ | 60 | #define _CODA_HEADER_ |
| 61 | 61 | ||
| 62 | #include <linux/config.h> | ||
| 63 | 62 | ||
| 64 | /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ | 63 | /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ |
| 65 | #if defined(__NetBSD__) || \ | 64 | #if defined(__NetBSD__) || \ |
diff --git a/include/linux/compat.h b/include/linux/compat.h index 6d3a654be1ae..dda1697ec753 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * These are the type definitions for the architecture specific | 4 | * These are the type definitions for the architecture specific |
| 5 | * syscall compatibility layer. | 5 | * syscall compatibility layer. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifdef CONFIG_COMPAT | 8 | #ifdef CONFIG_COMPAT |
| 10 | 9 | ||
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index f23d3c6fc2c0..9b4f11094937 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h | |||
| @@ -78,6 +78,7 @@ extern void __chk_io_ptr(void __iomem *); | |||
| 78 | 78 | ||
| 79 | #endif /* __ASSEMBLY__ */ | 79 | #endif /* __ASSEMBLY__ */ |
| 80 | 80 | ||
| 81 | #ifdef __KERNEL__ | ||
| 81 | /* | 82 | /* |
| 82 | * Allow us to mark functions as 'deprecated' and have gcc emit a nice | 83 | * Allow us to mark functions as 'deprecated' and have gcc emit a nice |
| 83 | * warning for each use, in hopes of speeding the functions removal. | 84 | * warning for each use, in hopes of speeding the functions removal. |
| @@ -127,6 +128,16 @@ extern void __chk_io_ptr(void __iomem *); | |||
| 127 | # define __attribute_pure__ /* unimplemented */ | 128 | # define __attribute_pure__ /* unimplemented */ |
| 128 | #endif | 129 | #endif |
| 129 | 130 | ||
| 131 | #ifndef noinline | ||
| 132 | #define noinline | ||
| 133 | #endif | ||
| 134 | |||
| 135 | #ifndef __always_inline | ||
| 136 | #define __always_inline inline | ||
| 137 | #endif | ||
| 138 | |||
| 139 | #endif /* __KERNEL__ */ | ||
| 140 | |||
| 130 | /* | 141 | /* |
| 131 | * From the GCC manual: | 142 | * From the GCC manual: |
| 132 | * | 143 | * |
| @@ -145,12 +156,4 @@ extern void __chk_io_ptr(void __iomem *); | |||
| 145 | # define __attribute_const__ /* unimplemented */ | 156 | # define __attribute_const__ /* unimplemented */ |
| 146 | #endif | 157 | #endif |
| 147 | 158 | ||
| 148 | #ifndef noinline | ||
| 149 | #define noinline | ||
| 150 | #endif | ||
| 151 | |||
| 152 | #ifndef __always_inline | ||
| 153 | #define __always_inline inline | ||
| 154 | #endif | ||
| 155 | |||
| 156 | #endif /* __LINUX_COMPILER_H */ | 159 | #endif /* __LINUX_COMPILER_H */ |
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 17866d7e2b71..5aa95011f7e6 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #define _LINUX_CPUFREQ_H | 15 | #define _LINUX_CPUFREQ_H |
| 16 | 16 | ||
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/notifier.h> | 18 | #include <linux/notifier.h> |
| 20 | #include <linux/threads.h> | 19 | #include <linux/threads.h> |
| 21 | #include <linux/device.h> | 20 | #include <linux/device.h> |
diff --git a/include/linux/cramfs_fs.h b/include/linux/cramfs_fs.h index a8948f34b776..a41f38428c37 100644 --- a/include/linux/cramfs_fs.h +++ b/include/linux/cramfs_fs.h | |||
| @@ -1,13 +1,7 @@ | |||
| 1 | #ifndef __CRAMFS_H | 1 | #ifndef __CRAMFS_H |
| 2 | #define __CRAMFS_H | 2 | #define __CRAMFS_H |
| 3 | 3 | ||
| 4 | #ifndef __KERNEL__ | 4 | #include <linux/types.h> |
| 5 | |||
| 6 | typedef unsigned char u8; | ||
| 7 | typedef unsigned short u16; | ||
| 8 | typedef unsigned int u32; | ||
| 9 | |||
| 10 | #endif | ||
| 11 | 5 | ||
| 12 | #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ | 6 | #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ |
| 13 | #define CRAMFS_SIGNATURE "Compressed ROMFS" | 7 | #define CRAMFS_SIGNATURE "Compressed ROMFS" |
| @@ -33,9 +27,9 @@ typedef unsigned int u32; | |||
| 33 | * Reasonably terse representation of the inode data. | 27 | * Reasonably terse representation of the inode data. |
| 34 | */ | 28 | */ |
| 35 | struct cramfs_inode { | 29 | struct cramfs_inode { |
| 36 | u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; | 30 | __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; |
| 37 | /* SIZE for device files is i_rdev */ | 31 | /* SIZE for device files is i_rdev */ |
| 38 | u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; | 32 | __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; |
| 39 | /* NAMELEN is the length of the file name, divided by 4 and | 33 | /* NAMELEN is the length of the file name, divided by 4 and |
| 40 | rounded up. (cramfs doesn't support hard links.) */ | 34 | rounded up. (cramfs doesn't support hard links.) */ |
| 41 | /* OFFSET: For symlinks and non-empty regular files, this | 35 | /* OFFSET: For symlinks and non-empty regular files, this |
| @@ -44,27 +38,27 @@ struct cramfs_inode { | |||
| 44 | see README). For non-empty directories it is the offset | 38 | see README). For non-empty directories it is the offset |
| 45 | (divided by 4) of the inode of the first file in that | 39 | (divided by 4) of the inode of the first file in that |
| 46 | directory. For anything else, offset is zero. */ | 40 | directory. For anything else, offset is zero. */ |
| 47 | u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; | 41 | __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; |
| 48 | }; | 42 | }; |
| 49 | 43 | ||
| 50 | struct cramfs_info { | 44 | struct cramfs_info { |
| 51 | u32 crc; | 45 | __u32 crc; |
| 52 | u32 edition; | 46 | __u32 edition; |
| 53 | u32 blocks; | 47 | __u32 blocks; |
| 54 | u32 files; | 48 | __u32 files; |
| 55 | }; | 49 | }; |
| 56 | 50 | ||
| 57 | /* | 51 | /* |
| 58 | * Superblock information at the beginning of the FS. | 52 | * Superblock information at the beginning of the FS. |
| 59 | */ | 53 | */ |
| 60 | struct cramfs_super { | 54 | struct cramfs_super { |
| 61 | u32 magic; /* 0x28cd3d45 - random number */ | 55 | __u32 magic; /* 0x28cd3d45 - random number */ |
| 62 | u32 size; /* length in bytes */ | 56 | __u32 size; /* length in bytes */ |
| 63 | u32 flags; /* feature flags */ | 57 | __u32 flags; /* feature flags */ |
| 64 | u32 future; /* reserved for future use */ | 58 | __u32 future; /* reserved for future use */ |
| 65 | u8 signature[16]; /* "Compressed ROMFS" */ | 59 | __u8 signature[16]; /* "Compressed ROMFS" */ |
| 66 | struct cramfs_info fsid; /* unique filesystem info */ | 60 | struct cramfs_info fsid; /* unique filesystem info */ |
| 67 | u8 name[16]; /* user-defined name */ | 61 | __u8 name[16]; /* user-defined name */ |
| 68 | struct cramfs_inode root; /* root inode data */ | 62 | struct cramfs_inode root; /* root inode data */ |
| 69 | }; | 63 | }; |
| 70 | 64 | ||
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 0ab1bc1152ca..5a0470e36111 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef _LINUX_CRYPTO_H | 17 | #ifndef _LINUX_CRYPTO_H |
| 18 | #define _LINUX_CRYPTO_H | 18 | #define _LINUX_CRYPTO_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index 300d704bdb9a..b88f7f428e58 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * 1998/08/08 acme Version 0.0.1 | 24 | * 1998/08/08 acme Version 0.0.1 |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/wanrouter.h> | 27 | #include <linux/wanrouter.h> |
| 29 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
| 30 | 29 | ||
diff --git a/include/linux/dcookies.h b/include/linux/dcookies.h index 1d68428c925d..0fe7cdf326f7 100644 --- a/include/linux/dcookies.h +++ b/include/linux/dcookies.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef DCOOKIES_H | 9 | #ifndef DCOOKIES_H |
| 10 | #define DCOOKIES_H | 10 | #define DCOOKIES_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #ifdef CONFIG_PROFILING | 13 | #ifdef CONFIG_PROFILING |
| 15 | 14 | ||
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h index 89810e73d256..0d74a6f22abc 100644 --- a/include/linux/devfs_fs_kernel.h +++ b/include/linux/devfs_fs_kernel.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _LINUX_DEVFS_FS_KERNEL_H | 2 | #define _LINUX_DEVFS_FS_KERNEL_H |
| 3 | 3 | ||
| 4 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 8 | 7 | ||
diff --git a/include/linux/device.h b/include/linux/device.h index e8e53b9accc6..b2e5da2b637b 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _DEVICE_H_ | 11 | #ifndef _DEVICE_H_ |
| 12 | #define _DEVICE_H_ | 12 | #define _DEVICE_H_ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
| 16 | #include <linux/kobject.h> | 15 | #include <linux/kobject.h> |
| 17 | #include <linux/klist.h> | 16 | #include <linux/klist.h> |
diff --git a/include/linux/divert.h b/include/linux/divert.h index 6919b09133d4..8fb4e9de6843 100644 --- a/include/linux/divert.h +++ b/include/linux/divert.h | |||
| @@ -27,10 +27,10 @@ struct divert_blk | |||
| 27 | { | 27 | { |
| 28 | int divert; /* are we active */ | 28 | int divert; /* are we active */ |
| 29 | unsigned int protos; /* protocols */ | 29 | unsigned int protos; /* protocols */ |
| 30 | u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */ | 30 | __u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */ |
| 31 | u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */ | 31 | __u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */ |
| 32 | u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */ | 32 | __u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */ |
| 33 | u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */ | 33 | __u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */ |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | /* | 36 | /* |
| @@ -40,12 +40,12 @@ struct divert_blk | |||
| 40 | 40 | ||
| 41 | typedef union _divert_cf_arg | 41 | typedef union _divert_cf_arg |
| 42 | { | 42 | { |
| 43 | s16 int16; | 43 | __s16 int16; |
| 44 | u16 uint16; | 44 | __u16 uint16; |
| 45 | s32 int32; | 45 | __s32 int32; |
| 46 | u32 uint32; | 46 | __u32 uint32; |
| 47 | s64 int64; | 47 | __s64 int64; |
| 48 | u64 uint64; | 48 | __u64 uint64; |
| 49 | void __user *ptr; | 49 | void __user *ptr; |
| 50 | } divert_cf_arg; | 50 | } divert_cf_arg; |
| 51 | 51 | ||
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 64fd6c366604..b2cd2071d432 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __DMI_H__ | 2 | #define __DMI_H__ |
| 3 | 3 | ||
| 4 | #include <linux/list.h> | 4 | #include <linux/list.h> |
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | enum dmi_field { | 6 | enum dmi_field { |
| 8 | DMI_NONE, | 7 | DMI_NONE, |
diff --git a/include/linux/dnotify.h b/include/linux/dnotify.h index f134a01975c7..102a902b4396 100644 --- a/include/linux/dnotify.h +++ b/include/linux/dnotify.h | |||
| @@ -18,7 +18,6 @@ struct dnotify_struct { | |||
| 18 | 18 | ||
| 19 | #ifdef __KERNEL__ | 19 | #ifdef __KERNEL__ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | #ifdef CONFIG_DNOTIFY | 22 | #ifdef CONFIG_DNOTIFY |
| 24 | 23 | ||
diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h new file mode 100644 index 000000000000..114a96d25652 --- /dev/null +++ b/include/linux/elf-em.h | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | #ifndef _LINUX_ELF_EM_H | ||
| 2 | #define _LINUX_ELF_EM_H | ||
| 3 | |||
| 4 | /* These constants define the various ELF target machines */ | ||
| 5 | #define EM_NONE 0 | ||
| 6 | #define EM_M32 1 | ||
| 7 | #define EM_SPARC 2 | ||
| 8 | #define EM_386 3 | ||
| 9 | #define EM_68K 4 | ||
| 10 | #define EM_88K 5 | ||
| 11 | #define EM_486 6 /* Perhaps disused */ | ||
| 12 | #define EM_860 7 | ||
| 13 | #define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ | ||
| 14 | #define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ | ||
| 15 | #define EM_PARISC 15 /* HPPA */ | ||
| 16 | #define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ | ||
| 17 | #define EM_PPC 20 /* PowerPC */ | ||
| 18 | #define EM_PPC64 21 /* PowerPC64 */ | ||
| 19 | #define EM_SH 42 /* SuperH */ | ||
| 20 | #define EM_SPARCV9 43 /* SPARC v9 64-bit */ | ||
| 21 | #define EM_IA_64 50 /* HP/Intel IA-64 */ | ||
| 22 | #define EM_X86_64 62 /* AMD x86-64 */ | ||
| 23 | #define EM_S390 22 /* IBM S/390 */ | ||
| 24 | #define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ | ||
| 25 | #define EM_V850 87 /* NEC v850 */ | ||
| 26 | #define EM_M32R 88 /* Renesas M32R */ | ||
| 27 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ | ||
| 28 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ | ||
| 29 | |||
| 30 | /* | ||
| 31 | * This is an interim value that we will use until the committee comes | ||
| 32 | * up with a final number. | ||
| 33 | */ | ||
| 34 | #define EM_ALPHA 0x9026 | ||
| 35 | |||
| 36 | /* Bogus old v850 magic number, used by old tools. */ | ||
| 37 | #define EM_CYGNUS_V850 0x9080 | ||
| 38 | /* Bogus old m32r magic number, used by old tools. */ | ||
| 39 | #define EM_CYGNUS_M32R 0x9041 | ||
| 40 | /* This is the old interim value for S/390 architecture */ | ||
| 41 | #define EM_S390_OLD 0xA390 | ||
| 42 | |||
| 43 | |||
| 44 | #endif /* _LINUX_ELF_EM_H */ | ||
diff --git a/include/linux/elf.h b/include/linux/elf.h index d3bfacb24496..b70d1d2c8d28 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/auxvec.h> | 5 | #include <linux/auxvec.h> |
| 6 | #include <linux/elf-em.h> | ||
| 6 | #include <asm/elf.h> | 7 | #include <asm/elf.h> |
| 7 | 8 | ||
| 8 | #ifndef elf_read_implies_exec | 9 | #ifndef elf_read_implies_exec |
| @@ -55,64 +56,6 @@ typedef __s64 Elf64_Sxword; | |||
| 55 | #define ET_LOPROC 0xff00 | 56 | #define ET_LOPROC 0xff00 |
| 56 | #define ET_HIPROC 0xffff | 57 | #define ET_HIPROC 0xffff |
| 57 | 58 | ||
| 58 | /* These constants define the various ELF target machines */ | ||
| 59 | #define EM_NONE 0 | ||
| 60 | #define EM_M32 1 | ||
| 61 | #define EM_SPARC 2 | ||
| 62 | #define EM_386 3 | ||
| 63 | #define EM_68K 4 | ||
| 64 | #define EM_88K 5 | ||
| 65 | #define EM_486 6 /* Perhaps disused */ | ||
| 66 | #define EM_860 7 | ||
| 67 | |||
| 68 | #define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ | ||
| 69 | |||
| 70 | #define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ | ||
| 71 | |||
| 72 | #define EM_PARISC 15 /* HPPA */ | ||
| 73 | |||
| 74 | #define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ | ||
| 75 | |||
| 76 | #define EM_PPC 20 /* PowerPC */ | ||
| 77 | #define EM_PPC64 21 /* PowerPC64 */ | ||
| 78 | |||
| 79 | #define EM_SH 42 /* SuperH */ | ||
| 80 | |||
| 81 | #define EM_SPARCV9 43 /* SPARC v9 64-bit */ | ||
| 82 | |||
| 83 | #define EM_IA_64 50 /* HP/Intel IA-64 */ | ||
| 84 | |||
| 85 | #define EM_X86_64 62 /* AMD x86-64 */ | ||
| 86 | |||
| 87 | #define EM_S390 22 /* IBM S/390 */ | ||
| 88 | |||
| 89 | #define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ | ||
| 90 | |||
| 91 | #define EM_V850 87 /* NEC v850 */ | ||
| 92 | |||
| 93 | #define EM_M32R 88 /* Renesas M32R */ | ||
| 94 | |||
| 95 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ | ||
| 96 | |||
| 97 | /* | ||
| 98 | * This is an interim value that we will use until the committee comes | ||
| 99 | * up with a final number. | ||
| 100 | */ | ||
| 101 | #define EM_ALPHA 0x9026 | ||
| 102 | |||
| 103 | /* Bogus old v850 magic number, used by old tools. */ | ||
| 104 | #define EM_CYGNUS_V850 0x9080 | ||
| 105 | |||
| 106 | /* Bogus old m32r magic number, used by old tools. */ | ||
| 107 | #define EM_CYGNUS_M32R 0x9041 | ||
| 108 | |||
| 109 | /* | ||
| 110 | * This is the old interim value for S/390 architecture | ||
| 111 | */ | ||
| 112 | #define EM_S390_OLD 0xA390 | ||
| 113 | |||
| 114 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ | ||
| 115 | |||
| 116 | /* This is the info that is needed to parse the dynamic section of the file */ | 59 | /* This is the info that is needed to parse the dynamic section of the file */ |
| 117 | #define DT_NULL 0 | 60 | #define DT_NULL 0 |
| 118 | #define DT_NEEDED 1 | 61 | #define DT_NEEDED 1 |
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index 174582fedb8b..408118a07763 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h | |||
| @@ -21,7 +21,6 @@ struct sock_extended_err | |||
| 21 | 21 | ||
| 22 | #ifdef __KERNEL__ | 22 | #ifdef __KERNEL__ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <net/ip.h> | 24 | #include <net/ip.h> |
| 26 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 25 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |
| 27 | #include <linux/ipv6.h> | 26 | #include <linux/ipv6.h> |
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 93535f093216..cf2abeca92a0 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
| @@ -15,24 +15,24 @@ | |||
| 15 | 15 | ||
| 16 | /* This should work for both 32 and 64 bit userland. */ | 16 | /* This should work for both 32 and 64 bit userland. */ |
| 17 | struct ethtool_cmd { | 17 | struct ethtool_cmd { |
| 18 | u32 cmd; | 18 | __u32 cmd; |
| 19 | u32 supported; /* Features this interface supports */ | 19 | __u32 supported; /* Features this interface supports */ |
| 20 | u32 advertising; /* Features this interface advertises */ | 20 | __u32 advertising; /* Features this interface advertises */ |
| 21 | u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ | 21 | __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ |
| 22 | u8 duplex; /* Duplex, half or full */ | 22 | __u8 duplex; /* Duplex, half or full */ |
| 23 | u8 port; /* Which connector port */ | 23 | __u8 port; /* Which connector port */ |
| 24 | u8 phy_address; | 24 | __u8 phy_address; |
| 25 | u8 transceiver; /* Which transceiver to use */ | 25 | __u8 transceiver; /* Which transceiver to use */ |
| 26 | u8 autoneg; /* Enable or disable autonegotiation */ | 26 | __u8 autoneg; /* Enable or disable autonegotiation */ |
| 27 | u32 maxtxpkt; /* Tx pkts before generating tx int */ | 27 | __u32 maxtxpkt; /* Tx pkts before generating tx int */ |
| 28 | u32 maxrxpkt; /* Rx pkts before generating rx int */ | 28 | __u32 maxrxpkt; /* Rx pkts before generating rx int */ |
| 29 | u32 reserved[4]; | 29 | __u32 reserved[4]; |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | #define ETHTOOL_BUSINFO_LEN 32 | 32 | #define ETHTOOL_BUSINFO_LEN 32 |
| 33 | /* these strings are set to whatever the driver author decides... */ | 33 | /* these strings are set to whatever the driver author decides... */ |
| 34 | struct ethtool_drvinfo { | 34 | struct ethtool_drvinfo { |
| 35 | u32 cmd; | 35 | __u32 cmd; |
| 36 | char driver[32]; /* driver short name, "tulip", "eepro100" */ | 36 | char driver[32]; /* driver short name, "tulip", "eepro100" */ |
| 37 | char version[32]; /* driver version string */ | 37 | char version[32]; /* driver version string */ |
| 38 | char fw_version[32]; /* firmware version string, if applicable */ | 38 | char fw_version[32]; /* firmware version string, if applicable */ |
| @@ -40,53 +40,53 @@ struct ethtool_drvinfo { | |||
| 40 | /* For PCI devices, use pci_name(pci_dev). */ | 40 | /* For PCI devices, use pci_name(pci_dev). */ |
| 41 | char reserved1[32]; | 41 | char reserved1[32]; |
| 42 | char reserved2[16]; | 42 | char reserved2[16]; |
| 43 | u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ | 43 | __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ |
| 44 | u32 testinfo_len; | 44 | __u32 testinfo_len; |
| 45 | u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ | 45 | __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ |
| 46 | u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ | 46 | __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ |
| 47 | }; | 47 | }; |
| 48 | 48 | ||
| 49 | #define SOPASS_MAX 6 | 49 | #define SOPASS_MAX 6 |
| 50 | /* wake-on-lan settings */ | 50 | /* wake-on-lan settings */ |
| 51 | struct ethtool_wolinfo { | 51 | struct ethtool_wolinfo { |
| 52 | u32 cmd; | 52 | __u32 cmd; |
| 53 | u32 supported; | 53 | __u32 supported; |
| 54 | u32 wolopts; | 54 | __u32 wolopts; |
| 55 | u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ | 55 | __u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | /* for passing single values */ | 58 | /* for passing single values */ |
| 59 | struct ethtool_value { | 59 | struct ethtool_value { |
| 60 | u32 cmd; | 60 | __u32 cmd; |
| 61 | u32 data; | 61 | __u32 data; |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | /* for passing big chunks of data */ | 64 | /* for passing big chunks of data */ |
| 65 | struct ethtool_regs { | 65 | struct ethtool_regs { |
| 66 | u32 cmd; | 66 | __u32 cmd; |
| 67 | u32 version; /* driver-specific, indicates different chips/revs */ | 67 | __u32 version; /* driver-specific, indicates different chips/revs */ |
| 68 | u32 len; /* bytes */ | 68 | __u32 len; /* bytes */ |
| 69 | u8 data[0]; | 69 | __u8 data[0]; |
| 70 | }; | 70 | }; |
| 71 | 71 | ||
| 72 | /* for passing EEPROM chunks */ | 72 | /* for passing EEPROM chunks */ |
| 73 | struct ethtool_eeprom { | 73 | struct ethtool_eeprom { |
| 74 | u32 cmd; | 74 | __u32 cmd; |
| 75 | u32 magic; | 75 | __u32 magic; |
| 76 | u32 offset; /* in bytes */ | 76 | __u32 offset; /* in bytes */ |
| 77 | u32 len; /* in bytes */ | 77 | __u32 len; /* in bytes */ |
| 78 | u8 data[0]; | 78 | __u8 data[0]; |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | /* for configuring coalescing parameters of chip */ | 81 | /* for configuring coalescing parameters of chip */ |
| 82 | struct ethtool_coalesce { | 82 | struct ethtool_coalesce { |
| 83 | u32 cmd; /* ETHTOOL_{G,S}COALESCE */ | 83 | __u32 cmd; /* ETHTOOL_{G,S}COALESCE */ |
| 84 | 84 | ||
| 85 | /* How many usecs to delay an RX interrupt after | 85 | /* How many usecs to delay an RX interrupt after |
| 86 | * a packet arrives. If 0, only rx_max_coalesced_frames | 86 | * a packet arrives. If 0, only rx_max_coalesced_frames |
| 87 | * is used. | 87 | * is used. |
| 88 | */ | 88 | */ |
| 89 | u32 rx_coalesce_usecs; | 89 | __u32 rx_coalesce_usecs; |
| 90 | 90 | ||
| 91 | /* How many packets to delay an RX interrupt after | 91 | /* How many packets to delay an RX interrupt after |
| 92 | * a packet arrives. If 0, only rx_coalesce_usecs is | 92 | * a packet arrives. If 0, only rx_coalesce_usecs is |
| @@ -94,21 +94,21 @@ struct ethtool_coalesce { | |||
| 94 | * to zero as this would cause RX interrupts to never be | 94 | * to zero as this would cause RX interrupts to never be |
| 95 | * generated. | 95 | * generated. |
| 96 | */ | 96 | */ |
| 97 | u32 rx_max_coalesced_frames; | 97 | __u32 rx_max_coalesced_frames; |
| 98 | 98 | ||
| 99 | /* Same as above two parameters, except that these values | 99 | /* Same as above two parameters, except that these values |
| 100 | * apply while an IRQ is being serviced by the host. Not | 100 | * apply while an IRQ is being serviced by the host. Not |
| 101 | * all cards support this feature and the values are ignored | 101 | * all cards support this feature and the values are ignored |
| 102 | * in that case. | 102 | * in that case. |
| 103 | */ | 103 | */ |
| 104 | u32 rx_coalesce_usecs_irq; | 104 | __u32 rx_coalesce_usecs_irq; |
| 105 | u32 rx_max_coalesced_frames_irq; | 105 | __u32 rx_max_coalesced_frames_irq; |
| 106 | 106 | ||
| 107 | /* How many usecs to delay a TX interrupt after | 107 | /* How many usecs to delay a TX interrupt after |
| 108 | * a packet is sent. If 0, only tx_max_coalesced_frames | 108 | * a packet is sent. If 0, only tx_max_coalesced_frames |
| 109 | * is used. | 109 | * is used. |
| 110 | */ | 110 | */ |
| 111 | u32 tx_coalesce_usecs; | 111 | __u32 tx_coalesce_usecs; |
| 112 | 112 | ||
| 113 | /* How many packets to delay a TX interrupt after | 113 | /* How many packets to delay a TX interrupt after |
| 114 | * a packet is sent. If 0, only tx_coalesce_usecs is | 114 | * a packet is sent. If 0, only tx_coalesce_usecs is |
| @@ -116,22 +116,22 @@ struct ethtool_coalesce { | |||
| 116 | * to zero as this would cause TX interrupts to never be | 116 | * to zero as this would cause TX interrupts to never be |
| 117 | * generated. | 117 | * generated. |
| 118 | */ | 118 | */ |
| 119 | u32 tx_max_coalesced_frames; | 119 | __u32 tx_max_coalesced_frames; |
| 120 | 120 | ||
| 121 | /* Same as above two parameters, except that these values | 121 | /* Same as above two parameters, except that these values |
| 122 | * apply while an IRQ is being serviced by the host. Not | 122 | * apply while an IRQ is being serviced by the host. Not |
| 123 | * all cards support this feature and the values are ignored | 123 | * all cards support this feature and the values are ignored |
| 124 | * in that case. | 124 | * in that case. |
| 125 | */ | 125 | */ |
| 126 | u32 tx_coalesce_usecs_irq; | 126 | __u32 tx_coalesce_usecs_irq; |
| 127 | u32 tx_max_coalesced_frames_irq; | 127 | __u32 tx_max_coalesced_frames_irq; |
| 128 | 128 | ||
| 129 | /* How many usecs to delay in-memory statistics | 129 | /* How many usecs to delay in-memory statistics |
| 130 | * block updates. Some drivers do not have an in-memory | 130 | * block updates. Some drivers do not have an in-memory |
| 131 | * statistic block, and in such cases this value is ignored. | 131 | * statistic block, and in such cases this value is ignored. |
| 132 | * This value must not be zero. | 132 | * This value must not be zero. |
| 133 | */ | 133 | */ |
| 134 | u32 stats_block_coalesce_usecs; | 134 | __u32 stats_block_coalesce_usecs; |
| 135 | 135 | ||
| 136 | /* Adaptive RX/TX coalescing is an algorithm implemented by | 136 | /* Adaptive RX/TX coalescing is an algorithm implemented by |
| 137 | * some drivers to improve latency under low packet rates and | 137 | * some drivers to improve latency under low packet rates and |
| @@ -140,18 +140,18 @@ struct ethtool_coalesce { | |||
| 140 | * not implemented by the driver causes these values to be | 140 | * not implemented by the driver causes these values to be |
| 141 | * silently ignored. | 141 | * silently ignored. |
| 142 | */ | 142 | */ |
| 143 | u32 use_adaptive_rx_coalesce; | 143 | __u32 use_adaptive_rx_coalesce; |
| 144 | u32 use_adaptive_tx_coalesce; | 144 | __u32 use_adaptive_tx_coalesce; |
| 145 | 145 | ||
| 146 | /* When the packet rate (measured in packets per second) | 146 | /* When the packet rate (measured in packets per second) |
| 147 | * is below pkt_rate_low, the {rx,tx}_*_low parameters are | 147 | * is below pkt_rate_low, the {rx,tx}_*_low parameters are |
| 148 | * used. | 148 | * used. |
| 149 | */ | 149 | */ |
| 150 | u32 pkt_rate_low; | 150 | __u32 pkt_rate_low; |
| 151 | u32 rx_coalesce_usecs_low; | 151 | __u32 rx_coalesce_usecs_low; |
| 152 | u32 rx_max_coalesced_frames_low; | 152 | __u32 rx_max_coalesced_frames_low; |
| 153 | u32 tx_coalesce_usecs_low; | 153 | __u32 tx_coalesce_usecs_low; |
| 154 | u32 tx_max_coalesced_frames_low; | 154 | __u32 tx_max_coalesced_frames_low; |
| 155 | 155 | ||
| 156 | /* When the packet rate is below pkt_rate_high but above | 156 | /* When the packet rate is below pkt_rate_high but above |
| 157 | * pkt_rate_low (both measured in packets per second) the | 157 | * pkt_rate_low (both measured in packets per second) the |
| @@ -162,43 +162,43 @@ struct ethtool_coalesce { | |||
| 162 | * is above pkt_rate_high, the {rx,tx}_*_high parameters are | 162 | * is above pkt_rate_high, the {rx,tx}_*_high parameters are |
| 163 | * used. | 163 | * used. |
| 164 | */ | 164 | */ |
| 165 | u32 pkt_rate_high; | 165 | __u32 pkt_rate_high; |
| 166 | u32 rx_coalesce_usecs_high; | 166 | __u32 rx_coalesce_usecs_high; |
| 167 | u32 rx_max_coalesced_frames_high; | 167 | __u32 rx_max_coalesced_frames_high; |
| 168 | u32 tx_coalesce_usecs_high; | 168 | __u32 tx_coalesce_usecs_high; |
| 169 | u32 tx_max_coalesced_frames_high; | 169 | __u32 tx_max_coalesced_frames_high; |
| 170 | 170 | ||
| 171 | /* How often to do adaptive coalescing packet rate sampling, | 171 | /* How often to do adaptive coalescing packet rate sampling, |
| 172 | * measured in seconds. Must not be zero. | 172 | * measured in seconds. Must not be zero. |
| 173 | */ | 173 | */ |
| 174 | u32 rate_sample_interval; | 174 | __u32 rate_sample_interval; |
| 175 | }; | 175 | }; |
| 176 | 176 | ||
| 177 | /* for configuring RX/TX ring parameters */ | 177 | /* for configuring RX/TX ring parameters */ |
| 178 | struct ethtool_ringparam { | 178 | struct ethtool_ringparam { |
| 179 | u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ | 179 | __u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ |
| 180 | 180 | ||
| 181 | /* Read only attributes. These indicate the maximum number | 181 | /* Read only attributes. These indicate the maximum number |
| 182 | * of pending RX/TX ring entries the driver will allow the | 182 | * of pending RX/TX ring entries the driver will allow the |
| 183 | * user to set. | 183 | * user to set. |
| 184 | */ | 184 | */ |
| 185 | u32 rx_max_pending; | 185 | __u32 rx_max_pending; |
| 186 | u32 rx_mini_max_pending; | 186 | __u32 rx_mini_max_pending; |
| 187 | u32 rx_jumbo_max_pending; | 187 | __u32 rx_jumbo_max_pending; |
| 188 | u32 tx_max_pending; | 188 | __u32 tx_max_pending; |
| 189 | 189 | ||
| 190 | /* Values changeable by the user. The valid values are | 190 | /* Values changeable by the user. The valid values are |
| 191 | * in the range 1 to the "*_max_pending" counterpart above. | 191 | * in the range 1 to the "*_max_pending" counterpart above. |
| 192 | */ | 192 | */ |
| 193 | u32 rx_pending; | 193 | __u32 rx_pending; |
| 194 | u32 rx_mini_pending; | 194 | __u32 rx_mini_pending; |
| 195 | u32 rx_jumbo_pending; | 195 | __u32 rx_jumbo_pending; |
| 196 | u32 tx_pending; | 196 | __u32 tx_pending; |
| 197 | }; | 197 | }; |
| 198 | 198 | ||
| 199 | /* for configuring link flow control parameters */ | 199 | /* for configuring link flow control parameters */ |
| 200 | struct ethtool_pauseparam { | 200 | struct ethtool_pauseparam { |
| 201 | u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ | 201 | __u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ |
| 202 | 202 | ||
| 203 | /* If the link is being auto-negotiated (via ethtool_cmd.autoneg | 203 | /* If the link is being auto-negotiated (via ethtool_cmd.autoneg |
| 204 | * being true) the user may set 'autonet' here non-zero to have the | 204 | * being true) the user may set 'autonet' here non-zero to have the |
| @@ -210,9 +210,9 @@ struct ethtool_pauseparam { | |||
| 210 | * then {rx,tx}_pause force the driver to use/not-use pause | 210 | * then {rx,tx}_pause force the driver to use/not-use pause |
| 211 | * flow control. | 211 | * flow control. |
| 212 | */ | 212 | */ |
| 213 | u32 autoneg; | 213 | __u32 autoneg; |
| 214 | u32 rx_pause; | 214 | __u32 rx_pause; |
| 215 | u32 tx_pause; | 215 | __u32 tx_pause; |
| 216 | }; | 216 | }; |
| 217 | 217 | ||
| 218 | #define ETH_GSTRING_LEN 32 | 218 | #define ETH_GSTRING_LEN 32 |
| @@ -223,10 +223,10 @@ enum ethtool_stringset { | |||
| 223 | 223 | ||
| 224 | /* for passing string sets for data tagging */ | 224 | /* for passing string sets for data tagging */ |
| 225 | struct ethtool_gstrings { | 225 | struct ethtool_gstrings { |
| 226 | u32 cmd; /* ETHTOOL_GSTRINGS */ | 226 | __u32 cmd; /* ETHTOOL_GSTRINGS */ |
| 227 | u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ | 227 | __u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ |
| 228 | u32 len; /* number of strings in the string set */ | 228 | __u32 len; /* number of strings in the string set */ |
| 229 | u8 data[0]; | 229 | __u8 data[0]; |
| 230 | }; | 230 | }; |
| 231 | 231 | ||
| 232 | enum ethtool_test_flags { | 232 | enum ethtool_test_flags { |
| @@ -236,26 +236,28 @@ enum ethtool_test_flags { | |||
| 236 | 236 | ||
| 237 | /* for requesting NIC test and getting results*/ | 237 | /* for requesting NIC test and getting results*/ |
| 238 | struct ethtool_test { | 238 | struct ethtool_test { |
| 239 | u32 cmd; /* ETHTOOL_TEST */ | 239 | __u32 cmd; /* ETHTOOL_TEST */ |
| 240 | u32 flags; /* ETH_TEST_FL_xxx */ | 240 | __u32 flags; /* ETH_TEST_FL_xxx */ |
| 241 | u32 reserved; | 241 | __u32 reserved; |
| 242 | u32 len; /* result length, in number of u64 elements */ | 242 | __u32 len; /* result length, in number of u64 elements */ |
| 243 | u64 data[0]; | 243 | __u64 data[0]; |
| 244 | }; | 244 | }; |
| 245 | 245 | ||
| 246 | /* for dumping NIC-specific statistics */ | 246 | /* for dumping NIC-specific statistics */ |
| 247 | struct ethtool_stats { | 247 | struct ethtool_stats { |
| 248 | u32 cmd; /* ETHTOOL_GSTATS */ | 248 | __u32 cmd; /* ETHTOOL_GSTATS */ |
| 249 | u32 n_stats; /* number of u64's being returned */ | 249 | __u32 n_stats; /* number of u64's being returned */ |
| 250 | u64 data[0]; | 250 | __u64 data[0]; |
| 251 | }; | 251 | }; |
| 252 | 252 | ||
| 253 | struct ethtool_perm_addr { | 253 | struct ethtool_perm_addr { |
| 254 | u32 cmd; /* ETHTOOL_GPERMADDR */ | 254 | __u32 cmd; /* ETHTOOL_GPERMADDR */ |
| 255 | u32 size; | 255 | __u32 size; |
| 256 | u8 data[0]; | 256 | __u8 data[0]; |
| 257 | }; | 257 | }; |
| 258 | 258 | ||
| 259 | #ifdef __KERNEL__ | ||
| 260 | |||
| 259 | struct net_device; | 261 | struct net_device; |
| 260 | 262 | ||
| 261 | /* Some generic methods drivers may use in their ethtool_ops */ | 263 | /* Some generic methods drivers may use in their ethtool_ops */ |
| @@ -371,6 +373,7 @@ struct ethtool_ops { | |||
| 371 | u32 (*get_ufo)(struct net_device *); | 373 | u32 (*get_ufo)(struct net_device *); |
| 372 | int (*set_ufo)(struct net_device *, u32); | 374 | int (*set_ufo)(struct net_device *, u32); |
| 373 | }; | 375 | }; |
| 376 | #endif /* __KERNEL__ */ | ||
| 374 | 377 | ||
| 375 | /* CMDs currently supported */ | 378 | /* CMDs currently supported */ |
| 376 | #define ETHTOOL_GSET 0x00000001 /* Get settings. */ | 379 | #define ETHTOOL_GSET 0x00000001 /* Get settings. */ |
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index f7bd1c7ebefb..facf34e98954 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #define _LINUX_EXT2_FS_H | 17 | #define _LINUX_EXT2_FS_H |
| 18 | 18 | ||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/ext2_fs_sb.h> | ||
| 21 | 20 | ||
| 22 | /* | 21 | /* |
| 23 | * The second extended filesystem constants/structures | 22 | * The second extended filesystem constants/structures |
| @@ -70,6 +69,7 @@ | |||
| 70 | #define EXT2_SUPER_MAGIC 0xEF53 | 69 | #define EXT2_SUPER_MAGIC 0xEF53 |
| 71 | 70 | ||
| 72 | #ifdef __KERNEL__ | 71 | #ifdef __KERNEL__ |
| 72 | #include <linux/ext2_fs_sb.h> | ||
| 73 | static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) | 73 | static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) |
| 74 | { | 74 | { |
| 75 | return sb->s_fs_info; | 75 | return sb->s_fs_info; |
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index 3ade6a4e3bdd..757d54d8f1a5 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h | |||
| @@ -17,11 +17,6 @@ | |||
| 17 | #define _LINUX_EXT3_FS_H | 17 | #define _LINUX_EXT3_FS_H |
| 18 | 18 | ||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/ext3_fs_i.h> | ||
| 21 | #include <linux/ext3_fs_sb.h> | ||
| 22 | |||
| 23 | |||
| 24 | struct statfs; | ||
| 25 | 20 | ||
| 26 | /* | 21 | /* |
| 27 | * The second extended filesystem constants/structures | 22 | * The second extended filesystem constants/structures |
| @@ -487,6 +482,8 @@ struct ext3_super_block { | |||
| 487 | }; | 482 | }; |
| 488 | 483 | ||
| 489 | #ifdef __KERNEL__ | 484 | #ifdef __KERNEL__ |
| 485 | #include <linux/ext3_fs_i.h> | ||
| 486 | #include <linux/ext3_fs_sb.h> | ||
| 490 | static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb) | 487 | static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb) |
| 491 | { | 488 | { |
| 492 | return sb->s_fs_info; | 489 | return sb->s_fs_info; |
| @@ -664,6 +661,8 @@ struct ext3_dir_entry_2 { | |||
| 664 | #define DX_HASH_HALF_MD4 1 | 661 | #define DX_HASH_HALF_MD4 1 |
| 665 | #define DX_HASH_TEA 2 | 662 | #define DX_HASH_TEA 2 |
| 666 | 663 | ||
| 664 | #ifdef __KERNEL__ | ||
| 665 | |||
| 667 | /* hash info structure used by the directory hash */ | 666 | /* hash info structure used by the directory hash */ |
| 668 | struct dx_hash_info | 667 | struct dx_hash_info |
| 669 | { | 668 | { |
| @@ -675,7 +674,6 @@ struct dx_hash_info | |||
| 675 | 674 | ||
| 676 | #define EXT3_HTREE_EOF 0x7fffffff | 675 | #define EXT3_HTREE_EOF 0x7fffffff |
| 677 | 676 | ||
| 678 | #ifdef __KERNEL__ | ||
| 679 | /* | 677 | /* |
| 680 | * Control parameters used by ext3_htree_next_block | 678 | * Control parameters used by ext3_htree_next_block |
| 681 | */ | 679 | */ |
diff --git a/include/linux/fs.h b/include/linux/fs.h index f813bc8266aa..ecc8c2c3d8ca 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * structures etc. | 6 | * structures etc. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/limits.h> | 9 | #include <linux/limits.h> |
| 11 | #include <linux/ioctl.h> | 10 | #include <linux/ioctl.h> |
| 12 | 11 | ||
diff --git a/include/linux/ftape.h b/include/linux/ftape.h index 72faeec9f6e1..7e7038cba86a 100644 --- a/include/linux/ftape.h +++ b/include/linux/ftape.h | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
| 36 | #endif | 36 | #endif |
| 37 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/mtio.h> | 38 | #include <linux/mtio.h> |
| 40 | 39 | ||
| 41 | #define FT_SECTOR(x) (x+1) /* sector offset into real sector */ | 40 | #define FT_SECTOR(x) (x+1) /* sector offset into real sector */ |
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 71e7b2847cb3..2cdba0c23957 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * the Free Software Foundation. | 9 | * the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | ||
| 12 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 13 | #include <linux/list.h> | 14 | #include <linux/list.h> |
| 14 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
| @@ -154,6 +155,8 @@ static inline void gameport_register_driver(struct gameport_driver *drv) | |||
| 154 | 155 | ||
| 155 | void gameport_unregister_driver(struct gameport_driver *drv); | 156 | void gameport_unregister_driver(struct gameport_driver *drv); |
| 156 | 157 | ||
| 158 | #endif /* __KERNEL__ */ | ||
| 159 | |||
| 157 | #define GAMEPORT_MODE_DISABLED 0 | 160 | #define GAMEPORT_MODE_DISABLED 0 |
| 158 | #define GAMEPORT_MODE_RAW 1 | 161 | #define GAMEPORT_MODE_RAW 1 |
| 159 | #define GAMEPORT_MODE_COOKED 2 | 162 | #define GAMEPORT_MODE_COOKED 2 |
| @@ -169,6 +172,8 @@ void gameport_unregister_driver(struct gameport_driver *drv); | |||
| 169 | #define GAMEPORT_ID_VENDOR_GRAVIS 0x0009 | 172 | #define GAMEPORT_ID_VENDOR_GRAVIS 0x0009 |
| 170 | #define GAMEPORT_ID_VENDOR_GUILLEMOT 0x000a | 173 | #define GAMEPORT_ID_VENDOR_GUILLEMOT 0x000a |
| 171 | 174 | ||
| 175 | #ifdef __KERNEL__ | ||
| 176 | |||
| 172 | static inline void gameport_trigger(struct gameport *gameport) | 177 | static inline void gameport_trigger(struct gameport *gameport) |
| 173 | { | 178 | { |
| 174 | if (gameport->trigger) | 179 | if (gameport->trigger) |
| @@ -219,4 +224,5 @@ static inline void gameport_set_poll_interval(struct gameport *gameport, unsigne | |||
| 219 | void gameport_start_polling(struct gameport *gameport); | 224 | void gameport_start_polling(struct gameport *gameport); |
| 220 | void gameport_stop_polling(struct gameport *gameport); | 225 | void gameport_stop_polling(struct gameport *gameport); |
| 221 | 226 | ||
| 227 | #endif /* __KERNEL__ */ | ||
| 222 | #endif | 228 | #endif |
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h index 652611a4bdcd..e25384561955 100644 --- a/include/linux/generic_serial.h +++ b/include/linux/generic_serial.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #ifndef GENERIC_SERIAL_H | 12 | #ifndef GENERIC_SERIAL_H |
| 13 | #define GENERIC_SERIAL_H | 13 | #define GENERIC_SERIAL_H |
| 14 | 14 | ||
| 15 | #ifdef __KERNEL__ | ||
| 15 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
| 16 | 17 | ||
| 17 | struct real_driver { | 18 | struct real_driver { |
| @@ -54,6 +55,7 @@ struct gs_port { | |||
| 54 | spinlock_t driver_lock; | 55 | spinlock_t driver_lock; |
| 55 | }; | 56 | }; |
| 56 | 57 | ||
| 58 | #endif /* __KERNEL__ */ | ||
| 57 | 59 | ||
| 58 | /* Flags */ | 60 | /* Flags */ |
| 59 | /* Warning: serial.h defines some ASYNC_ flags, they say they are "only" | 61 | /* Warning: serial.h defines some ASYNC_ flags, they say they are "only" |
| @@ -75,7 +77,7 @@ struct gs_port { | |||
| 75 | #define GS_DEBUG_FLOW 0x00000020 | 77 | #define GS_DEBUG_FLOW 0x00000020 |
| 76 | #define GS_DEBUG_WRITE 0x00000040 | 78 | #define GS_DEBUG_WRITE 0x00000040 |
| 77 | 79 | ||
| 78 | 80 | #ifdef __KERNEL__ | |
| 79 | void gs_put_char(struct tty_struct *tty, unsigned char ch); | 81 | void gs_put_char(struct tty_struct *tty, unsigned char ch); |
| 80 | int gs_write(struct tty_struct *tty, | 82 | int gs_write(struct tty_struct *tty, |
| 81 | const unsigned char *buf, int count); | 83 | const unsigned char *buf, int count); |
| @@ -94,5 +96,5 @@ int gs_init_port(struct gs_port *port); | |||
| 94 | int gs_setserial(struct gs_port *port, struct serial_struct __user *sp); | 96 | int gs_setserial(struct gs_port *port, struct serial_struct __user *sp); |
| 95 | int gs_getserial(struct gs_port *port, struct serial_struct __user *sp); | 97 | int gs_getserial(struct gs_port *port, struct serial_struct __user *sp); |
| 96 | void gs_got_break(struct gs_port *port); | 98 | void gs_got_break(struct gs_port *port); |
| 97 | 99 | #endif /* __KERNEL__ */ | |
| 98 | #endif | 100 | #endif |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 2ef845b35175..3498a0c68184 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -9,13 +9,7 @@ | |||
| 9 | * <drew@colorado.edu> | 9 | * <drew@colorado.edu> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/major.h> | ||
| 15 | #include <linux/device.h> | ||
| 16 | #include <linux/smp.h> | ||
| 17 | #include <linux/string.h> | ||
| 18 | #include <linux/fs.h> | ||
| 19 | 13 | ||
| 20 | enum { | 14 | enum { |
| 21 | /* These three have identical behaviour; use the second one if DOS FDISK gets | 15 | /* These three have identical behaviour; use the second one if DOS FDISK gets |
| @@ -61,6 +55,12 @@ struct partition { | |||
| 61 | #endif | 55 | #endif |
| 62 | 56 | ||
| 63 | #ifdef __KERNEL__ | 57 | #ifdef __KERNEL__ |
| 58 | #include <linux/major.h> | ||
| 59 | #include <linux/device.h> | ||
| 60 | #include <linux/smp.h> | ||
| 61 | #include <linux/string.h> | ||
| 62 | #include <linux/fs.h> | ||
| 63 | |||
| 64 | struct partition { | 64 | struct partition { |
| 65 | unsigned char boot_ind; /* 0x80 - active */ | 65 | unsigned char boot_ind; /* 0x80 - active */ |
| 66 | unsigned char head; /* starting head */ | 66 | unsigned char head; /* starting head */ |
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3ac452945a7d..cc9e60844484 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <linux/mmzone.h> | 4 | #include <linux/mmzone.h> |
| 5 | #include <linux/stddef.h> | 5 | #include <linux/stddef.h> |
| 6 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | struct vm_area_struct; | 8 | struct vm_area_struct; |
| 10 | 9 | ||
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index eab537091f2a..114ae583cca9 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef LINUX_HARDIRQ_H | 1 | #ifndef LINUX_HARDIRQ_H |
| 2 | #define LINUX_HARDIRQ_H | 2 | #define LINUX_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/preempt.h> | 4 | #include <linux/preempt.h> |
| 6 | #include <linux/smp_lock.h> | 5 | #include <linux/smp_lock.h> |
| 7 | #include <asm/hardirq.h> | 6 | #include <asm/hardirq.h> |
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 892c4ea1b425..85ce7ef9a512 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_HIGHMEM_H | 1 | #ifndef _LINUX_HIGHMEM_H |
| 2 | #define _LINUX_HIGHMEM_H | 2 | #define _LINUX_HIGHMEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
| 6 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 7 | 6 | ||
diff --git a/include/linux/highuid.h b/include/linux/highuid.h index 53ecac3905e8..434e56246f67 100644 --- a/include/linux/highuid.h +++ b/include/linux/highuid.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_HIGHUID_H | 1 | #ifndef _LINUX_HIGHUID_H |
| 2 | #define _LINUX_HIGHUID_H | 2 | #define _LINUX_HIGHUID_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | 5 | ||
| 7 | /* | 6 | /* |
diff --git a/include/linux/i2c-algo-ite.h b/include/linux/i2c-algo-ite.h index 26a8b89855f1..0073fe96c76e 100644 --- a/include/linux/i2c-algo-ite.h +++ b/include/linux/i2c-algo-ite.h | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #ifndef I2C_ALGO_ITE_H | 29 | #ifndef I2C_ALGO_ITE_H |
| 30 | #define I2C_ALGO_ITE_H 1 | 30 | #define I2C_ALGO_ITE_H 1 |
| 31 | 31 | ||
| 32 | #include <linux/i2c.h> | 32 | #include <linux/types.h> |
| 33 | 33 | ||
| 34 | /* Example of a sequential read request: | 34 | /* Example of a sequential read request: |
| 35 | struct i2c_iic_msg s_msg; | 35 | struct i2c_iic_msg s_msg; |
| @@ -49,6 +49,9 @@ struct i2c_iic_msg { | |||
| 49 | char *buf; /* pointer to msg data */ | 49 | char *buf; /* pointer to msg data */ |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | #ifdef __KERNEL__ | ||
| 53 | struct i2c_adapter; | ||
| 54 | |||
| 52 | struct i2c_algo_iic_data { | 55 | struct i2c_algo_iic_data { |
| 53 | void *data; /* private data for lolevel routines */ | 56 | void *data; /* private data for lolevel routines */ |
| 54 | void (*setiic) (void *data, int ctl, int val); | 57 | void (*setiic) (void *data, int ctl, int val); |
| @@ -65,5 +68,5 @@ struct i2c_algo_iic_data { | |||
| 65 | 68 | ||
| 66 | int i2c_iic_add_bus(struct i2c_adapter *); | 69 | int i2c_iic_add_bus(struct i2c_adapter *); |
| 67 | int i2c_iic_del_bus(struct i2c_adapter *); | 70 | int i2c_iic_del_bus(struct i2c_adapter *); |
| 68 | 71 | #endif /* __KERNEL__ */ | |
| 69 | #endif /* I2C_ALGO_ITE_H */ | 72 | #endif /* I2C_ALGO_ITE_H */ |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 1635ee25918f..0510430e00db 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -20,14 +20,15 @@ | |||
| 20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
| 21 | /* ------------------------------------------------------------------------- */ | 21 | /* ------------------------------------------------------------------------- */ |
| 22 | 22 | ||
| 23 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and | 23 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and |
| 24 | Frodo Looijaard <frodol@dds.nl> */ | 24 | Frodo Looijaard <frodol@dds.nl> */ |
| 25 | 25 | ||
| 26 | #ifndef _LINUX_I2C_H | 26 | #ifndef _LINUX_I2C_H |
| 27 | #define _LINUX_I2C_H | 27 | #define _LINUX_I2C_H |
| 28 | 28 | ||
| 29 | #include <linux/module.h> | ||
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 30 | #ifdef __KERNEL__ | ||
| 31 | #include <linux/module.h> | ||
| 31 | #include <linux/i2c-id.h> | 32 | #include <linux/i2c-id.h> |
| 32 | #include <linux/mod_devicetable.h> | 33 | #include <linux/mod_devicetable.h> |
| 33 | #include <linux/device.h> /* for struct device */ | 34 | #include <linux/device.h> /* for struct device */ |
| @@ -354,6 +355,7 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap) | |||
| 354 | { | 355 | { |
| 355 | return adap->nr; | 356 | return adap->nr; |
| 356 | } | 357 | } |
| 358 | #endif /* __KERNEL__ */ | ||
| 357 | 359 | ||
| 358 | /* | 360 | /* |
| 359 | * I2C Message - used for pure i2c transaction, also from /dev interface | 361 | * I2C Message - used for pure i2c transaction, also from /dev interface |
| @@ -469,6 +471,7 @@ union i2c_smbus_data { | |||
| 469 | #define I2C_SMBUS 0x0720 /* SMBus-level access */ | 471 | #define I2C_SMBUS 0x0720 /* SMBus-level access */ |
| 470 | 472 | ||
| 471 | /* ----- I2C-DEV: char device interface stuff ------------------------- */ | 473 | /* ----- I2C-DEV: char device interface stuff ------------------------- */ |
| 474 | #ifdef __KERNEL__ | ||
| 472 | 475 | ||
| 473 | #define I2C_MAJOR 89 /* Device major number */ | 476 | #define I2C_MAJOR 89 /* Device major number */ |
| 474 | 477 | ||
| @@ -646,5 +649,5 @@ static unsigned short *forces[] = { force, force_##chip1, \ | |||
| 646 | force_##chip6, force_##chip7, \ | 649 | force_##chip6, force_##chip7, \ |
| 647 | force_##chip8, NULL }; \ | 650 | force_##chip8, NULL }; \ |
| 648 | I2C_CLIENT_INSMOD_COMMON | 651 | I2C_CLIENT_INSMOD_COMMON |
| 649 | 652 | #endif /* __KERNEL__ */ | |
| 650 | #endif /* _LINUX_I2C_H */ | 653 | #endif /* _LINUX_I2C_H */ |
diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h index 36fd18cdad28..c2519df1b6dc 100644 --- a/include/linux/i2o-dev.h +++ b/include/linux/i2o-dev.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * This header file defines the I2O APIs that are available to both | 13 | * This header file defines the I2O APIs that are available to both |
| 14 | * the kernel and user level applications. Kernel specific structures | 14 | * the kernel and user level applications. Kernel specific structures |
| 15 | * are defined in i2o_osm. OSMs should include _only_ i2o_osm.h which | 15 | * are defined in i2o_osm. OSMs should include _only_ i2o_osm.h which |
| 16 | * automatically includs this file. | 16 | * automatically includes this file. |
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| @@ -23,14 +23,7 @@ | |||
| 23 | /* How many controllers are we allowing */ | 23 | /* How many controllers are we allowing */ |
| 24 | #define MAX_I2O_CONTROLLERS 32 | 24 | #define MAX_I2O_CONTROLLERS 32 |
| 25 | 25 | ||
| 26 | //#include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
| 27 | #ifndef __KERNEL__ | ||
| 28 | |||
| 29 | typedef unsigned char u8; | ||
| 30 | typedef unsigned short u16; | ||
| 31 | typedef unsigned int u32; | ||
| 32 | |||
| 33 | #endif /* __KERNEL__ */ | ||
| 34 | 27 | ||
| 35 | /* | 28 | /* |
| 36 | * I2O Control IOCTLs and structures | 29 | * I2O Control IOCTLs and structures |
| @@ -53,7 +46,7 @@ typedef unsigned int u32; | |||
| 53 | 46 | ||
| 54 | struct i2o_cmd_passthru32 { | 47 | struct i2o_cmd_passthru32 { |
| 55 | unsigned int iop; /* IOP unit number */ | 48 | unsigned int iop; /* IOP unit number */ |
| 56 | u32 msg; /* message */ | 49 | __u32 msg; /* message */ |
| 57 | }; | 50 | }; |
| 58 | 51 | ||
| 59 | struct i2o_cmd_passthru { | 52 | struct i2o_cmd_passthru { |
| @@ -138,53 +131,53 @@ typedef struct i2o_sg_io_hdr { | |||
| 138 | #define I2O_BUS_UNKNOWN 0x80 | 131 | #define I2O_BUS_UNKNOWN 0x80 |
| 139 | 132 | ||
| 140 | typedef struct _i2o_pci_bus { | 133 | typedef struct _i2o_pci_bus { |
| 141 | u8 PciFunctionNumber; | 134 | __u8 PciFunctionNumber; |
| 142 | u8 PciDeviceNumber; | 135 | __u8 PciDeviceNumber; |
| 143 | u8 PciBusNumber; | 136 | __u8 PciBusNumber; |
| 144 | u8 reserved; | 137 | __u8 reserved; |
| 145 | u16 PciVendorID; | 138 | __u16 PciVendorID; |
| 146 | u16 PciDeviceID; | 139 | __u16 PciDeviceID; |
| 147 | } i2o_pci_bus; | 140 | } i2o_pci_bus; |
| 148 | 141 | ||
| 149 | typedef struct _i2o_local_bus { | 142 | typedef struct _i2o_local_bus { |
| 150 | u16 LbBaseIOPort; | 143 | __u16 LbBaseIOPort; |
| 151 | u16 reserved; | 144 | __u16 reserved; |
| 152 | u32 LbBaseMemoryAddress; | 145 | __u32 LbBaseMemoryAddress; |
| 153 | } i2o_local_bus; | 146 | } i2o_local_bus; |
| 154 | 147 | ||
| 155 | typedef struct _i2o_isa_bus { | 148 | typedef struct _i2o_isa_bus { |
| 156 | u16 IsaBaseIOPort; | 149 | __u16 IsaBaseIOPort; |
| 157 | u8 CSN; | 150 | __u8 CSN; |
| 158 | u8 reserved; | 151 | __u8 reserved; |
| 159 | u32 IsaBaseMemoryAddress; | 152 | __u32 IsaBaseMemoryAddress; |
| 160 | } i2o_isa_bus; | 153 | } i2o_isa_bus; |
| 161 | 154 | ||
| 162 | typedef struct _i2o_eisa_bus_info { | 155 | typedef struct _i2o_eisa_bus_info { |
| 163 | u16 EisaBaseIOPort; | 156 | __u16 EisaBaseIOPort; |
| 164 | u8 reserved; | 157 | __u8 reserved; |
| 165 | u8 EisaSlotNumber; | 158 | __u8 EisaSlotNumber; |
| 166 | u32 EisaBaseMemoryAddress; | 159 | __u32 EisaBaseMemoryAddress; |
| 167 | } i2o_eisa_bus; | 160 | } i2o_eisa_bus; |
| 168 | 161 | ||
| 169 | typedef struct _i2o_mca_bus { | 162 | typedef struct _i2o_mca_bus { |
| 170 | u16 McaBaseIOPort; | 163 | __u16 McaBaseIOPort; |
| 171 | u8 reserved; | 164 | __u8 reserved; |
| 172 | u8 McaSlotNumber; | 165 | __u8 McaSlotNumber; |
| 173 | u32 McaBaseMemoryAddress; | 166 | __u32 McaBaseMemoryAddress; |
| 174 | } i2o_mca_bus; | 167 | } i2o_mca_bus; |
| 175 | 168 | ||
| 176 | typedef struct _i2o_other_bus { | 169 | typedef struct _i2o_other_bus { |
| 177 | u16 BaseIOPort; | 170 | __u16 BaseIOPort; |
| 178 | u16 reserved; | 171 | __u16 reserved; |
| 179 | u32 BaseMemoryAddress; | 172 | __u32 BaseMemoryAddress; |
| 180 | } i2o_other_bus; | 173 | } i2o_other_bus; |
| 181 | 174 | ||
| 182 | typedef struct _i2o_hrt_entry { | 175 | typedef struct _i2o_hrt_entry { |
| 183 | u32 adapter_id; | 176 | __u32 adapter_id; |
| 184 | u32 parent_tid:12; | 177 | __u32 parent_tid:12; |
| 185 | u32 state:4; | 178 | __u32 state:4; |
| 186 | u32 bus_num:8; | 179 | __u32 bus_num:8; |
| 187 | u32 bus_type:8; | 180 | __u32 bus_type:8; |
| 188 | union { | 181 | union { |
| 189 | i2o_pci_bus pci_bus; | 182 | i2o_pci_bus pci_bus; |
| 190 | i2o_local_bus local_bus; | 183 | i2o_local_bus local_bus; |
| @@ -196,66 +189,66 @@ typedef struct _i2o_hrt_entry { | |||
| 196 | } i2o_hrt_entry; | 189 | } i2o_hrt_entry; |
| 197 | 190 | ||
| 198 | typedef struct _i2o_hrt { | 191 | typedef struct _i2o_hrt { |
| 199 | u16 num_entries; | 192 | __u16 num_entries; |
| 200 | u8 entry_len; | 193 | __u8 entry_len; |
| 201 | u8 hrt_version; | 194 | __u8 hrt_version; |
| 202 | u32 change_ind; | 195 | __u32 change_ind; |
| 203 | i2o_hrt_entry hrt_entry[1]; | 196 | i2o_hrt_entry hrt_entry[1]; |
| 204 | } i2o_hrt; | 197 | } i2o_hrt; |
| 205 | 198 | ||
| 206 | typedef struct _i2o_lct_entry { | 199 | typedef struct _i2o_lct_entry { |
| 207 | u32 entry_size:16; | 200 | __u32 entry_size:16; |
| 208 | u32 tid:12; | 201 | __u32 tid:12; |
| 209 | u32 reserved:4; | 202 | __u32 reserved:4; |
| 210 | u32 change_ind; | 203 | __u32 change_ind; |
| 211 | u32 device_flags; | 204 | __u32 device_flags; |
| 212 | u32 class_id:12; | 205 | __u32 class_id:12; |
| 213 | u32 version:4; | 206 | __u32 version:4; |
| 214 | u32 vendor_id:16; | 207 | __u32 vendor_id:16; |
| 215 | u32 sub_class; | 208 | __u32 sub_class; |
| 216 | u32 user_tid:12; | 209 | __u32 user_tid:12; |
| 217 | u32 parent_tid:12; | 210 | __u32 parent_tid:12; |
| 218 | u32 bios_info:8; | 211 | __u32 bios_info:8; |
| 219 | u8 identity_tag[8]; | 212 | __u8 identity_tag[8]; |
| 220 | u32 event_capabilities; | 213 | __u32 event_capabilities; |
| 221 | } i2o_lct_entry; | 214 | } i2o_lct_entry; |
| 222 | 215 | ||
| 223 | typedef struct _i2o_lct { | 216 | typedef struct _i2o_lct { |
| 224 | u32 table_size:16; | 217 | __u32 table_size:16; |
| 225 | u32 boot_tid:12; | 218 | __u32 boot_tid:12; |
| 226 | u32 lct_ver:4; | 219 | __u32 lct_ver:4; |
| 227 | u32 iop_flags; | 220 | __u32 iop_flags; |
| 228 | u32 change_ind; | 221 | __u32 change_ind; |
| 229 | i2o_lct_entry lct_entry[1]; | 222 | i2o_lct_entry lct_entry[1]; |
| 230 | } i2o_lct; | 223 | } i2o_lct; |
| 231 | 224 | ||
| 232 | typedef struct _i2o_status_block { | 225 | typedef struct _i2o_status_block { |
| 233 | u16 org_id; | 226 | __u16 org_id; |
| 234 | u16 reserved; | 227 | __u16 reserved; |
| 235 | u16 iop_id:12; | 228 | __u16 iop_id:12; |
| 236 | u16 reserved1:4; | 229 | __u16 reserved1:4; |
| 237 | u16 host_unit_id; | 230 | __u16 host_unit_id; |
| 238 | u16 segment_number:12; | 231 | __u16 segment_number:12; |
| 239 | u16 i2o_version:4; | 232 | __u16 i2o_version:4; |
| 240 | u8 iop_state; | 233 | __u8 iop_state; |
| 241 | u8 msg_type; | 234 | __u8 msg_type; |
| 242 | u16 inbound_frame_size; | 235 | __u16 inbound_frame_size; |
| 243 | u8 init_code; | 236 | __u8 init_code; |
| 244 | u8 reserved2; | 237 | __u8 reserved2; |
| 245 | u32 max_inbound_frames; | 238 | __u32 max_inbound_frames; |
| 246 | u32 cur_inbound_frames; | 239 | __u32 cur_inbound_frames; |
| 247 | u32 max_outbound_frames; | 240 | __u32 max_outbound_frames; |
| 248 | char product_id[24]; | 241 | char product_id[24]; |
| 249 | u32 expected_lct_size; | 242 | __u32 expected_lct_size; |
| 250 | u32 iop_capabilities; | 243 | __u32 iop_capabilities; |
| 251 | u32 desired_mem_size; | 244 | __u32 desired_mem_size; |
| 252 | u32 current_mem_size; | 245 | __u32 current_mem_size; |
| 253 | u32 current_mem_base; | 246 | __u32 current_mem_base; |
| 254 | u32 desired_io_size; | 247 | __u32 desired_io_size; |
| 255 | u32 current_io_size; | 248 | __u32 current_io_size; |
| 256 | u32 current_io_base; | 249 | __u32 current_io_base; |
| 257 | u32 reserved3:24; | 250 | __u32 reserved3:24; |
| 258 | u32 cmd_status:8; | 251 | __u32 cmd_status:8; |
| 259 | } i2o_status_block; | 252 | } i2o_status_block; |
| 260 | 253 | ||
| 261 | /* Event indicator mask flags */ | 254 | /* Event indicator mask flags */ |
diff --git a/include/linux/ide.h b/include/linux/ide.h index a8bef1d1371c..77e66d055f5b 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1994-2002 Linus Torvalds & authors | 6 | * Copyright (C) 1994-2002 Linus Torvalds & authors |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/ioport.h> | 10 | #include <linux/ioport.h> |
| 12 | #include <linux/hdreg.h> | 11 | #include <linux/hdreg.h> |
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h index 1288a161bc0b..e0a150046208 100644 --- a/include/linux/if_fddi.h +++ b/include/linux/if_fddi.h | |||
| @@ -102,6 +102,7 @@ struct fddihdr | |||
| 102 | } hdr; | 102 | } hdr; |
| 103 | } __attribute__ ((packed)); | 103 | } __attribute__ ((packed)); |
| 104 | 104 | ||
| 105 | #ifdef __KERNEL__ | ||
| 105 | /* Define FDDI statistics structure */ | 106 | /* Define FDDI statistics structure */ |
| 106 | struct fddi_statistics { | 107 | struct fddi_statistics { |
| 107 | 108 | ||
| @@ -193,5 +194,6 @@ struct fddi_statistics { | |||
| 193 | __u32 port_ler_flag[2]; | 194 | __u32 port_ler_flag[2]; |
| 194 | __u32 port_hardware_present[2]; | 195 | __u32 port_hardware_present[2]; |
| 195 | }; | 196 | }; |
| 197 | #endif /* __KERNEL__ */ | ||
| 196 | 198 | ||
| 197 | #endif /* _LINUX_IF_FDDI_H */ | 199 | #endif /* _LINUX_IF_FDDI_H */ |
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 395f0aad9cbf..f272a80caa3e 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef _FRAD_H_ | 24 | #ifndef _FRAD_H_ |
| 25 | #define _FRAD_H_ | 25 | #define _FRAD_H_ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/if.h> | 27 | #include <linux/if.h> |
| 29 | 28 | ||
| 30 | #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) | 29 | #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) |
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h index 5502f597cf0e..2f94cf2c7abb 100644 --- a/include/linux/if_tr.h +++ b/include/linux/if_tr.h | |||
| @@ -43,7 +43,6 @@ struct trh_hdr { | |||
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | #ifdef __KERNEL__ | 45 | #ifdef __KERNEL__ |
| 46 | #include <linux/config.h> | ||
| 47 | #include <linux/skbuff.h> | 46 | #include <linux/skbuff.h> |
| 48 | 47 | ||
| 49 | static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb) | 48 | static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb) |
diff --git a/include/linux/init.h b/include/linux/init.h index 93dcbe1abb4c..6667785dd1ff 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_INIT_H | 1 | #ifndef _LINUX_INIT_H |
| 2 | #define _LINUX_INIT_H | 2 | #define _LINUX_INIT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 6 | 5 | ||
| 7 | /* These macros are used to mark some functions or | 6 | /* These macros are used to mark some functions or |
diff --git a/include/linux/inotify.h b/include/linux/inotify.h index 09e00433c78e..71aa1553ef38 100644 --- a/include/linux/inotify.h +++ b/include/linux/inotify.h | |||
| @@ -67,7 +67,6 @@ struct inotify_event { | |||
| 67 | 67 | ||
| 68 | #include <linux/dcache.h> | 68 | #include <linux/dcache.h> |
| 69 | #include <linux/fs.h> | 69 | #include <linux/fs.h> |
| 70 | #include <linux/config.h> | ||
| 71 | 70 | ||
| 72 | #ifdef CONFIG_INOTIFY | 71 | #ifdef CONFIG_INOTIFY |
| 73 | 72 | ||
diff --git a/include/linux/input.h b/include/linux/input.h index ce1a756c4c30..b32c2b6e53f6 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #else | 15 | #else |
| 16 | #include <sys/time.h> | 16 | #include <sys/time.h> |
| 17 | #include <sys/ioctl.h> | 17 | #include <sys/ioctl.h> |
| 18 | #include <sys/types.h> | ||
| 18 | #include <asm/types.h> | 19 | #include <asm/types.h> |
| 19 | #endif | 20 | #endif |
| 20 | 21 | ||
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 2c08fdc2bdf7..9e0fefd7884a 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef _LINUX_INTERRUPT_H | 2 | #ifndef _LINUX_INTERRUPT_H |
| 3 | #define _LINUX_INTERRUPT_H | 3 | #define _LINUX_INTERRUPT_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
| 8 | #include <linux/bitops.h> | 7 | #include <linux/bitops.h> |
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index 0a84b56935c2..5653b2f23b6a 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | #include <linux/ipmi_msgdefs.h> | 37 | #include <linux/ipmi_msgdefs.h> |
| 38 | #include <linux/compiler.h> | 38 | #include <linux/compiler.h> |
| 39 | #include <linux/device.h> | ||
| 40 | 39 | ||
| 41 | /* | 40 | /* |
| 42 | * This file describes an interface to an IPMI driver. You have to | 41 | * This file describes an interface to an IPMI driver. You have to |
| @@ -210,6 +209,7 @@ struct kernel_ipmi_msg | |||
| 210 | */ | 209 | */ |
| 211 | #include <linux/list.h> | 210 | #include <linux/list.h> |
| 212 | #include <linux/module.h> | 211 | #include <linux/module.h> |
| 212 | #include <linux/device.h> | ||
| 213 | 213 | ||
| 214 | #ifdef CONFIG_PROC_FS | 214 | #ifdef CONFIG_PROC_FS |
| 215 | #include <linux/proc_fs.h> | 215 | #include <linux/proc_fs.h> |
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 1263d8cb3c18..297853c841b4 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _IPV6_H | 1 | #ifndef _IPV6_H |
| 2 | #define _IPV6_H | 2 | #define _IPV6_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/in6.h> | 4 | #include <linux/in6.h> |
| 6 | #include <asm/byteorder.h> | 5 | #include <asm/byteorder.h> |
| 7 | 6 | ||
diff --git a/include/linux/irq.h b/include/linux/irq.h index ee2a82a572f7..42c9cd562860 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Thanks. --rmk | 9 | * Thanks. --rmk |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/smp.h> | 12 | #include <linux/smp.h> |
| 14 | 13 | ||
| 15 | #if !defined(CONFIG_S390) | 14 | #if !defined(CONFIG_S390) |
diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h index af93505ec2ec..77e4bac29287 100644 --- a/include/linux/irq_cpustat.h +++ b/include/linux/irq_cpustat.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Keith Owens <kaos@ocs.com.au> July 2000. | 9 | * Keith Owens <kaos@ocs.com.au> July 2000. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * Simple wrappers reducing source bloat. Define all irq_stat fields | 14 | * Simple wrappers reducing source bloat. Define all irq_stat fields |
diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h index 26c64c286f42..1e8728a9ee8a 100644 --- a/include/linux/isapnp.h +++ b/include/linux/isapnp.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef LINUX_ISAPNP_H | 22 | #ifndef LINUX_ISAPNP_H |
| 23 | #define LINUX_ISAPNP_H | 23 | #define LINUX_ISAPNP_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/pnp.h> | 26 | #include <linux/pnp.h> |
| 28 | 27 | ||
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 53eaee96065b..62991148d5a5 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h | |||
| @@ -146,7 +146,6 @@ typedef struct { | |||
| 146 | 146 | ||
| 147 | #ifdef __KERNEL__ | 147 | #ifdef __KERNEL__ |
| 148 | 148 | ||
| 149 | #include <linux/config.h> | ||
| 150 | #include <linux/errno.h> | 149 | #include <linux/errno.h> |
| 151 | #include <linux/fs.h> | 150 | #include <linux/fs.h> |
| 152 | #include <linux/major.h> | 151 | #include <linux/major.h> |
diff --git a/include/linux/isdn/tpam.h b/include/linux/isdn/tpam.h index 9f65bea49d11..d18dd0dc570d 100644 --- a/include/linux/isdn/tpam.h +++ b/include/linux/isdn/tpam.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #define _TPAM_H_ | 26 | #define _TPAM_H_ |
| 27 | 27 | ||
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/pci.h> | ||
| 30 | 29 | ||
| 31 | /* IOCTL commands */ | 30 | /* IOCTL commands */ |
| 32 | #define TPAM_CMD_DSPLOAD 0x0001 | 31 | #define TPAM_CMD_DSPLOAD 0x0001 |
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h index 26b00a76e135..8687a7dc0632 100644 --- a/include/linux/isdn_ppp.h +++ b/include/linux/isdn_ppp.h | |||
| @@ -67,7 +67,6 @@ struct isdn_ppp_comp_data { | |||
| 67 | #ifdef __KERNEL__ | 67 | #ifdef __KERNEL__ |
| 68 | 68 | ||
| 69 | 69 | ||
| 70 | #include <linux/config.h> | ||
| 71 | 70 | ||
| 72 | #ifdef CONFIG_IPPP_FILTER | 71 | #ifdef CONFIG_IPPP_FILTER |
| 73 | #include <linux/filter.h> | 72 | #include <linux/filter.h> |
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h index 04e10f9f14f8..b9b5a684ed69 100644 --- a/include/linux/isdnif.h +++ b/include/linux/isdnif.h | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | 54 | ||
| 55 | #ifdef __KERNEL__ | 55 | #ifdef __KERNEL__ |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/skbuff.h> | 57 | #include <linux/skbuff.h> |
| 59 | 58 | ||
| 60 | /***************************************************************************/ | 59 | /***************************************************************************/ |
diff --git a/include/linux/joystick.h b/include/linux/joystick.h index 5fd20ddd7ae3..e2d3a18af456 100644 --- a/include/linux/joystick.h +++ b/include/linux/joystick.h | |||
| @@ -111,25 +111,25 @@ struct js_corr { | |||
| 111 | #define JS_SET_ALL 8 | 111 | #define JS_SET_ALL 8 |
| 112 | 112 | ||
| 113 | struct JS_DATA_TYPE { | 113 | struct JS_DATA_TYPE { |
| 114 | int32_t buttons; | 114 | __s32 buttons; |
| 115 | int32_t x; | 115 | __s32 x; |
| 116 | int32_t y; | 116 | __s32 y; |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | struct JS_DATA_SAVE_TYPE_32 { | 119 | struct JS_DATA_SAVE_TYPE_32 { |
| 120 | int32_t JS_TIMEOUT; | 120 | __s32 JS_TIMEOUT; |
| 121 | int32_t BUSY; | 121 | __s32 BUSY; |
| 122 | int32_t JS_EXPIRETIME; | 122 | __s32 JS_EXPIRETIME; |
| 123 | int32_t JS_TIMELIMIT; | 123 | __s32 JS_TIMELIMIT; |
| 124 | struct JS_DATA_TYPE JS_SAVE; | 124 | struct JS_DATA_TYPE JS_SAVE; |
| 125 | struct JS_DATA_TYPE JS_CORR; | 125 | struct JS_DATA_TYPE JS_CORR; |
| 126 | }; | 126 | }; |
| 127 | 127 | ||
| 128 | struct JS_DATA_SAVE_TYPE_64 { | 128 | struct JS_DATA_SAVE_TYPE_64 { |
| 129 | int32_t JS_TIMEOUT; | 129 | __s32 JS_TIMEOUT; |
| 130 | int32_t BUSY; | 130 | __s32 BUSY; |
| 131 | int64_t JS_EXPIRETIME; | 131 | __s64 JS_EXPIRETIME; |
| 132 | int64_t JS_TIMELIMIT; | 132 | __s64 JS_TIMELIMIT; |
| 133 | struct JS_DATA_TYPE JS_SAVE; | 133 | struct JS_DATA_TYPE JS_SAVE; |
| 134 | struct JS_DATA_TYPE JS_CORR; | 134 | struct JS_DATA_TYPE JS_CORR; |
| 135 | }; | 135 | }; |
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 9bbd04092365..54e2549f96ba 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #ifndef _LINUX_KALLSYMS_H | 5 | #ifndef _LINUX_KALLSYMS_H |
| 6 | #define _LINUX_KALLSYMS_H | 6 | #define _LINUX_KALLSYMS_H |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #define KSYM_NAME_LEN 127 | 9 | #define KSYM_NAME_LEN 127 |
| 11 | 10 | ||
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index b46249082cca..43e895f1cabe 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_KERNEL_STAT_H | 1 | #ifndef _LINUX_KERNEL_STAT_H |
| 2 | #define _LINUX_KERNEL_STAT_H | 2 | #define _LINUX_KERNEL_STAT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/irq.h> | 4 | #include <asm/irq.h> |
| 6 | #include <linux/smp.h> | 5 | #include <linux/smp.h> |
| 7 | #include <linux/threads.h> | 6 | #include <linux/threads.h> |
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index e4a231549407..0db22a1ab474 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/stddef.h> | 22 | #include <linux/stddef.h> |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 25 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
| 26 | 25 | ||
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 778adc0fa640..8bf6702da2a0 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi | 29 | * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi |
| 30 | * <prasanna@in.ibm.com> added function-return probes. | 30 | * <prasanna@in.ibm.com> added function-return probes. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/list.h> | 32 | #include <linux/list.h> |
| 34 | #include <linux/notifier.h> | 33 | #include <linux/notifier.h> |
| 35 | #include <linux/smp.h> | 34 | #include <linux/smp.h> |
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index c08c9983e840..932021f872d5 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_LINKAGE_H | 1 | #ifndef _LINUX_LINKAGE_H |
| 2 | #define _LINUX_LINKAGE_H | 2 | #define _LINUX_LINKAGE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/linkage.h> | 4 | #include <asm/linkage.h> |
| 6 | 5 | ||
| 7 | #ifdef __cplusplus | 6 | #ifdef __cplusplus |
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 995f89dc8c04..a8876bc6513b 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/in.h> | 14 | #include <linux/in.h> |
| 16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 17 | #include <linux/kref.h> | 16 | #include <linux/kref.h> |
diff --git a/include/linux/lockd/nlm.h b/include/linux/lockd/nlm.h index 869b630cba24..d9d46e442538 100644 --- a/include/linux/lockd/nlm.h +++ b/include/linux/lockd/nlm.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef LINUX_LOCKD_NLM_H | 9 | #ifndef LINUX_LOCKD_NLM_H |
| 10 | #define LINUX_LOCKD_NLM_H | 10 | #define LINUX_LOCKD_NLM_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* Maximum file offset in file_lock.fl_end */ | 13 | /* Maximum file offset in file_lock.fl_end */ |
| 15 | # define NLM_OFFSET_MAX ((s32) 0x7fffffff) | 14 | # define NLM_OFFSET_MAX ((s32) 0x7fffffff) |
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index f5fdca1d67e6..72440f0a443d 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #ifdef __KERNEL__ | 29 | #ifdef __KERNEL__ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/mmzone.h> | 31 | #include <linux/mmzone.h> |
| 33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 34 | #include <linux/rbtree.h> | 33 | #include <linux/rbtree.h> |
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index ff0a64073ebc..6789c4940c9c 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_MIGRATE_H | 1 | #ifndef _LINUX_MIGRATE_H |
| 2 | #define _LINUX_MIGRATE_H | 2 | #define _LINUX_MIGRATE_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | 5 | ||
| 7 | #ifdef CONFIG_MIGRATION | 6 | #ifdef CONFIG_MIGRATION |
diff --git a/include/linux/mii.h b/include/linux/mii.h index 68f5a0f392dd..beddc6d3b0f6 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #define __LINUX_MII_H__ | 9 | #define __LINUX_MII_H__ |
| 10 | 10 | ||
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/if.h> | ||
| 13 | 12 | ||
| 14 | /* Generic MII registers. */ | 13 | /* Generic MII registers. */ |
| 15 | 14 | ||
| @@ -136,6 +135,20 @@ | |||
| 136 | #define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */ | 135 | #define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */ |
| 137 | #define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */ | 136 | #define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */ |
| 138 | 137 | ||
| 138 | /* This structure is used in all SIOCxMIIxxx ioctl calls */ | ||
| 139 | struct mii_ioctl_data { | ||
| 140 | __u16 phy_id; | ||
| 141 | __u16 reg_num; | ||
| 142 | __u16 val_in; | ||
| 143 | __u16 val_out; | ||
| 144 | }; | ||
| 145 | |||
| 146 | #ifdef __KERNEL__ | ||
| 147 | |||
| 148 | #include <linux/if.h> | ||
| 149 | |||
| 150 | struct ethtool_cmd; | ||
| 151 | |||
| 139 | struct mii_if_info { | 152 | struct mii_if_info { |
| 140 | int phy_id; | 153 | int phy_id; |
| 141 | int advertising; | 154 | int advertising; |
| @@ -151,9 +164,6 @@ struct mii_if_info { | |||
| 151 | void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); | 164 | void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); |
| 152 | }; | 165 | }; |
| 153 | 166 | ||
| 154 | struct ethtool_cmd; | ||
| 155 | struct mii_ioctl_data; | ||
| 156 | |||
| 157 | extern int mii_link_ok (struct mii_if_info *mii); | 167 | extern int mii_link_ok (struct mii_if_info *mii); |
| 158 | extern int mii_nway_restart (struct mii_if_info *mii); | 168 | extern int mii_nway_restart (struct mii_if_info *mii); |
| 159 | extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); | 169 | 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_if_info *mii_if, | |||
| 168 | unsigned int *duplex_changed); | 178 | unsigned int *duplex_changed); |
| 169 | 179 | ||
| 170 | 180 | ||
| 171 | |||
| 172 | /* This structure is used in all SIOCxMIIxxx ioctl calls */ | ||
| 173 | struct mii_ioctl_data { | ||
| 174 | u16 phy_id; | ||
| 175 | u16 reg_num; | ||
| 176 | u16 val_in; | ||
| 177 | u16 val_out; | ||
| 178 | }; | ||
| 179 | |||
| 180 | |||
| 181 | static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) | 181 | static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) |
| 182 | { | 182 | { |
| 183 | return (struct mii_ioctl_data *) &rq->ifr_ifru; | 183 | return (struct mii_ioctl_data *) &rq->ifr_ifru; |
| @@ -235,5 +235,5 @@ static inline unsigned int mii_duplex (unsigned int duplex_lock, | |||
| 235 | return 0; | 235 | return 0; |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | 238 | #endif /* __KERNEL__ */ | |
| 239 | #endif /* __LINUX_MII_H__ */ | 239 | #endif /* __LINUX_MII_H__ */ |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 1154684209a4..e2fa375e478e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/gfp.h> | 10 | #include <linux/gfp.h> |
| 12 | #include <linux/list.h> | 11 | #include <linux/list.h> |
| 13 | #include <linux/mmzone.h> | 12 | #include <linux/mmzone.h> |
diff --git a/include/linux/mman.h b/include/linux/mman.h index 18a5689ef748..87920a0852a3 100644 --- a/include/linux/mman.h +++ b/include/linux/mman.h | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | #ifndef _LINUX_MMAN_H | 1 | #ifndef _LINUX_MMAN_H |
| 2 | #define _LINUX_MMAN_H | 2 | #define _LINUX_MMAN_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | ||
| 6 | |||
| 7 | #include <asm/atomic.h> | ||
| 8 | #include <asm/mman.h> | 4 | #include <asm/mman.h> |
| 9 | 5 | ||
| 10 | #define MREMAP_MAYMOVE 1 | 6 | #define MREMAP_MAYMOVE 1 |
| @@ -13,6 +9,12 @@ | |||
| 13 | #define OVERCOMMIT_GUESS 0 | 9 | #define OVERCOMMIT_GUESS 0 |
| 14 | #define OVERCOMMIT_ALWAYS 1 | 10 | #define OVERCOMMIT_ALWAYS 1 |
| 15 | #define OVERCOMMIT_NEVER 2 | 11 | #define OVERCOMMIT_NEVER 2 |
| 12 | |||
| 13 | #ifdef __KERNEL__ | ||
| 14 | #include <linux/mm.h> | ||
| 15 | |||
| 16 | #include <asm/atomic.h> | ||
| 17 | |||
| 16 | extern int sysctl_overcommit_memory; | 18 | extern int sysctl_overcommit_memory; |
| 17 | extern int sysctl_overcommit_ratio; | 19 | extern int sysctl_overcommit_ratio; |
| 18 | extern atomic_t vm_committed_space; | 20 | extern atomic_t vm_committed_space; |
| @@ -63,5 +65,5 @@ calc_vm_flag_bits(unsigned long flags) | |||
| 63 | _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) | | 65 | _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) | |
| 64 | _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ); | 66 | _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ); |
| 65 | } | 67 | } |
| 66 | 68 | #endif /* __KERNEL__ */ | |
| 67 | #endif /* _LINUX_MMAN_H */ | 69 | #endif /* _LINUX_MMAN_H */ |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 2d8337150493..9742e3c16222 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | #ifndef __ASSEMBLY__ | 5 | #ifndef __ASSEMBLY__ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/spinlock.h> | 7 | #include <linux/spinlock.h> |
| 9 | #include <linux/list.h> | 8 | #include <linux/list.h> |
| 10 | #include <linux/wait.h> | 9 | #include <linux/wait.h> |
diff --git a/include/linux/module.h b/include/linux/module.h index b0d44134f3c4..c2d89e037af0 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996 | 6 | * Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996 |
| 7 | * Rewritten again by Rusty Russell, 2002 | 7 | * Rewritten again by Rusty Russell, 2002 |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
| 12 | #include <linux/list.h> | 11 | #include <linux/list.h> |
diff --git a/include/linux/msg.h b/include/linux/msg.h index 903e0ab8101f..acc7c174ff00 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _LINUX_MSG_H | 2 | #define _LINUX_MSG_H |
| 3 | 3 | ||
| 4 | #include <linux/ipc.h> | 4 | #include <linux/ipc.h> |
| 5 | #include <linux/list.h> | ||
| 6 | 5 | ||
| 7 | /* ipcs ctl commands */ | 6 | /* ipcs ctl commands */ |
| 8 | #define MSG_STAT 11 | 7 | #define MSG_STAT 11 |
| @@ -63,6 +62,7 @@ struct msginfo { | |||
| 63 | #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) | 62 | #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) |
| 64 | 63 | ||
| 65 | #ifdef __KERNEL__ | 64 | #ifdef __KERNEL__ |
| 65 | #include <linux/list.h> | ||
| 66 | 66 | ||
| 67 | /* one msg_msg structure for each message */ | 67 | /* one msg_msg structure for each message */ |
| 68 | struct msg_msg { | 68 | struct msg_msg { |
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index 23a568910341..09bfae6938b3 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __MTD_CFI_H__ | 7 | #ifndef __MTD_CFI_H__ |
| 8 | #define __MTD_CFI_H__ | 8 | #define __MTD_CFI_H__ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index 7dfd6e1fcde7..28d461d862bd 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #ifndef __LINUX_MTD_MAP_H__ | 5 | #ifndef __LINUX_MTD_MAP_H__ |
| 6 | #define __LINUX_MTD_MAP_H__ | 6 | #define __LINUX_MTD_MAP_H__ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/list.h> | 9 | #include <linux/list.h> |
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index e1d2a3d56546..9b7a2b525d63 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #error This is a kernel header. Perhaps include mtd-user.h instead? | 13 | #error This is a kernel header. Perhaps include mtd-user.h instead? |
| 14 | #endif | 14 | #endif |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/uio.h> | 18 | #include <linux/uio.h> |
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index a30969eb9afe..66559272ebcb 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __LINUX_MTD_NAND_H | 20 | #ifndef __LINUX_MTD_NAND_H |
| 21 | #define __LINUX_MTD_NAND_H | 21 | #define __LINUX_MTD_NAND_H |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/wait.h> | 23 | #include <linux/wait.h> |
| 25 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 26 | #include <linux/mtd/mtd.h> | 25 | #include <linux/mtd/mtd.h> |
diff --git a/include/linux/mtd/xip.h b/include/linux/mtd/xip.h index 220d50bb71cd..e9d40bdde48c 100644 --- a/include/linux/mtd/xip.h +++ b/include/linux/mtd/xip.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __LINUX_MTD_XIP_H__ | 18 | #ifndef __LINUX_MTD_XIP_H__ |
| 19 | #define __LINUX_MTD_XIP_H__ | 19 | #define __LINUX_MTD_XIP_H__ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | #ifdef CONFIG_MTD_XIP | 22 | #ifdef CONFIG_MTD_XIP |
| 24 | 23 | ||
diff --git a/include/linux/nbd.h b/include/linux/nbd.h index a6ce409ec6fc..1d7cdd20b553 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h | |||
| @@ -77,11 +77,11 @@ struct nbd_device { | |||
| 77 | * server. All data are in network byte order. | 77 | * server. All data are in network byte order. |
| 78 | */ | 78 | */ |
| 79 | struct nbd_request { | 79 | struct nbd_request { |
| 80 | u32 magic; | 80 | __u32 magic; |
| 81 | u32 type; /* == READ || == WRITE */ | 81 | __u32 type; /* == READ || == WRITE */ |
| 82 | char handle[8]; | 82 | char handle[8]; |
| 83 | u64 from; | 83 | __u64 from; |
| 84 | u32 len; | 84 | __u32 len; |
| 85 | } | 85 | } |
| 86 | #ifdef __GNUC__ | 86 | #ifdef __GNUC__ |
| 87 | __attribute__ ((packed)) | 87 | __attribute__ ((packed)) |
| @@ -93,8 +93,8 @@ struct nbd_request { | |||
| 93 | * it has completed an I/O request (or an error occurs). | 93 | * it has completed an I/O request (or an error occurs). |
| 94 | */ | 94 | */ |
| 95 | struct nbd_reply { | 95 | struct nbd_reply { |
| 96 | u32 magic; | 96 | __u32 magic; |
| 97 | u32 error; /* 0 = ok, else error */ | 97 | __u32 error; /* 0 = ok, else error */ |
| 98 | char handle[8]; /* handle you got from request */ | 98 | char handle[8]; /* handle you got from request */ |
| 99 | }; | 99 | }; |
| 100 | #endif | 100 | #endif |
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 96dc237b8f03..b208f0cd556b 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #include <linux/in.h> | 12 | #include <linux/in.h> |
| 13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 14 | 14 | ||
| 15 | #include <linux/ncp_fs_i.h> | ||
| 16 | #include <linux/ncp_fs_sb.h> | ||
| 17 | #include <linux/ipx.h> | 15 | #include <linux/ipx.h> |
| 18 | #include <linux/ncp_no.h> | 16 | #include <linux/ncp_no.h> |
| 19 | 17 | ||
| @@ -146,7 +144,8 @@ struct ncp_nls_ioctl | |||
| 146 | 144 | ||
| 147 | #ifdef __KERNEL__ | 145 | #ifdef __KERNEL__ |
| 148 | 146 | ||
| 149 | #include <linux/config.h> | 147 | #include <linux/ncp_fs_i.h> |
| 148 | #include <linux/ncp_fs_sb.h> | ||
| 150 | 149 | ||
| 151 | /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */ | 150 | /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */ |
| 152 | #undef PRINTK | 151 | #undef PRINTK |
diff --git a/include/linux/net.h b/include/linux/net.h index 84a490e5f0a1..385e68f5bd93 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -18,9 +18,7 @@ | |||
| 18 | #ifndef _LINUX_NET_H | 18 | #ifndef _LINUX_NET_H |
| 19 | #define _LINUX_NET_H | 19 | #define _LINUX_NET_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
| 23 | #include <linux/stringify.h> | ||
| 24 | #include <asm/socket.h> | 22 | #include <asm/socket.h> |
| 25 | 23 | ||
| 26 | struct poll_table_struct; | 24 | struct poll_table_struct; |
| @@ -57,6 +55,7 @@ typedef enum { | |||
| 57 | #define __SO_ACCEPTCON (1 << 16) /* performed a listen */ | 55 | #define __SO_ACCEPTCON (1 << 16) /* performed a listen */ |
| 58 | 56 | ||
| 59 | #ifdef __KERNEL__ | 57 | #ifdef __KERNEL__ |
| 58 | #include <linux/stringify.h> | ||
| 60 | 59 | ||
| 61 | #define SOCK_ASYNC_NOSPACE 0 | 60 | #define SOCK_ASYNC_NOSPACE 0 |
| 62 | #define SOCK_ASYNC_WAITDATA 1 | 61 | #define SOCK_ASYNC_WAITDATA 1 |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e432b743dda2..5e8e2d50429a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <asm/cache.h> | 34 | #include <asm/cache.h> |
| 35 | #include <asm/byteorder.h> | 35 | #include <asm/byteorder.h> |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/device.h> | 37 | #include <linux/device.h> |
| 39 | #include <linux/percpu.h> | 38 | #include <linux/percpu.h> |
| 40 | #include <linux/dmaengine.h> | 39 | #include <linux/dmaengine.h> |
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index b31a9bca9361..10168e26a846 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | #ifdef __KERNEL__ | 42 | #ifdef __KERNEL__ |
| 43 | #include <linux/config.h> | ||
| 44 | #ifdef CONFIG_NETFILTER | 43 | #ifdef CONFIG_NETFILTER |
| 45 | 44 | ||
| 46 | extern void netfilter_init(void); | 45 | extern void netfilter_init(void); |
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h index 34f63cf2e293..4c2d9945ca54 100644 --- a/include/linux/netfilter/xt_conntrack.h +++ b/include/linux/netfilter/xt_conntrack.h | |||
| @@ -42,7 +42,7 @@ struct ip_conntrack_old_tuple | |||
| 42 | } u; | 42 | } u; |
| 43 | 43 | ||
| 44 | /* The protocol. */ | 44 | /* The protocol. */ |
| 45 | u16 protonum; | 45 | __u16 protonum; |
| 46 | } dst; | 46 | } dst; |
| 47 | }; | 47 | }; |
| 48 | 48 | ||
diff --git a/include/linux/netfilter_arp.h b/include/linux/netfilter_arp.h index a3f8977f7f12..92bc6ddcbf73 100644 --- a/include/linux/netfilter_arp.h +++ b/include/linux/netfilter_arp.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * (C)2002 Rusty Russell IBM -- This code is GPL. | 5 | * (C)2002 Rusty Russell IBM -- This code is GPL. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/netfilter.h> | 8 | #include <linux/netfilter.h> |
| 10 | 9 | ||
| 11 | /* There is no PF_ARP. */ | 10 | /* There is no PF_ARP. */ |
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index a75b84bb9a88..87764022cc67 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | /* bridge-specific defines for netfilter. | 4 | /* bridge-specific defines for netfilter. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/netfilter.h> | 7 | #include <linux/netfilter.h> |
| 9 | #if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER) | 8 | #if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER) |
| 10 | #include <asm/atomic.h> | 9 | #include <asm/atomic.h> |
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h index 85301c5e8d24..ce02c984f3ba 100644 --- a/include/linux/netfilter_ipv4.h +++ b/include/linux/netfilter_ipv4.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * (C)1998 Rusty Russell -- This code is GPL. | 5 | * (C)1998 Rusty Russell -- This code is GPL. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/netfilter.h> | 8 | #include <linux/netfilter.h> |
| 10 | 9 | ||
| 11 | /* only for userspace compatibility */ | 10 | /* only for userspace compatibility */ |
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h index e0e9951eb8c3..51dbec1892c8 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <linux/netfilter/nf_conntrack_common.h> | 4 | #include <linux/netfilter/nf_conntrack_common.h> |
| 5 | 5 | ||
| 6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/netfilter_ipv4/ip_conntrack_tuple.h> | 7 | #include <linux/netfilter_ipv4/ip_conntrack_tuple.h> |
| 9 | #include <linux/bitops.h> | 8 | #include <linux/bitops.h> |
| 10 | #include <linux/compiler.h> | 9 | #include <linux/compiler.h> |
diff --git a/include/linux/netfilter_ipv4/listhelp.h b/include/linux/netfilter_ipv4/listhelp.h index 360429f48737..5d92cf044d91 100644 --- a/include/linux/netfilter_ipv4/listhelp.h +++ b/include/linux/netfilter_ipv4/listhelp.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #ifndef _LISTHELP_H | 1 | #ifndef _LISTHELP_H |
| 2 | #define _LISTHELP_H | 2 | #define _LISTHELP_H |
| 3 | #include <linux/config.h> | ||
| 4 | #include <linux/list.h> | 3 | #include <linux/list.h> |
| 5 | 4 | ||
| 6 | /* Header to do more comprehensive job than linux/list.h; assume list | 5 | /* Header to do more comprehensive job than linux/list.h; assume list |
diff --git a/include/linux/nfs.h b/include/linux/nfs.h index ca2ffa6ae1d5..54af92c1c70b 100644 --- a/include/linux/nfs.h +++ b/include/linux/nfs.h | |||
| @@ -7,9 +7,6 @@ | |||
| 7 | #ifndef _LINUX_NFS_H | 7 | #ifndef _LINUX_NFS_H |
| 8 | #define _LINUX_NFS_H | 8 | #define _LINUX_NFS_H |
| 9 | 9 | ||
| 10 | #include <linux/sunrpc/msg_prot.h> | ||
| 11 | #include <linux/string.h> | ||
| 12 | |||
| 13 | #define NFS_PROGRAM 100003 | 10 | #define NFS_PROGRAM 100003 |
| 14 | #define NFS_PORT 2049 | 11 | #define NFS_PORT 2049 |
| 15 | #define NFS_MAXDATA 8192 | 12 | #define NFS_MAXDATA 8192 |
| @@ -129,7 +126,10 @@ enum nfs_ftype { | |||
| 129 | NFFIFO = 8 | 126 | NFFIFO = 8 |
| 130 | }; | 127 | }; |
| 131 | 128 | ||
| 132 | #if defined(__KERNEL__) | 129 | #ifdef __KERNEL__ |
| 130 | #include <linux/sunrpc/msg_prot.h> | ||
| 131 | #include <linux/string.h> | ||
| 132 | |||
| 133 | /* | 133 | /* |
| 134 | * This is the kernel NFS client file handle representation | 134 | * This is the kernel NFS client file handle representation |
| 135 | */ | 135 | */ |
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 0c1c306cdaec..1059e6d69d3b 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #define _LINUX_NFS4_H | 14 | #define _LINUX_NFS4_H |
| 15 | 15 | ||
| 16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 17 | #include <linux/list.h> | ||
| 18 | 17 | ||
| 19 | #define NFS4_VERIFIER_SIZE 8 | 18 | #define NFS4_VERIFIER_SIZE 8 |
| 20 | #define NFS4_FHSIZE 128 | 19 | #define NFS4_FHSIZE 128 |
| @@ -97,6 +96,9 @@ enum nfs4_acl_whotype { | |||
| 97 | NFS4_ACL_WHO_EVERYONE, | 96 | NFS4_ACL_WHO_EVERYONE, |
| 98 | }; | 97 | }; |
| 99 | 98 | ||
| 99 | #ifdef __KERNEL__ | ||
| 100 | #include <linux/list.h> | ||
| 101 | |||
| 100 | struct nfs4_ace { | 102 | struct nfs4_ace { |
| 101 | uint32_t type; | 103 | uint32_t type; |
| 102 | uint32_t flag; | 104 | uint32_t flag; |
| @@ -345,8 +347,6 @@ enum lock_type4 { | |||
| 345 | #define NFS4_MINOR_VERSION 0 | 347 | #define NFS4_MINOR_VERSION 0 |
| 346 | #define NFS4_DEBUG 1 | 348 | #define NFS4_DEBUG 1 |
| 347 | 349 | ||
| 348 | #ifdef __KERNEL__ | ||
| 349 | |||
| 350 | /* Index of predefined Linux client operations */ | 350 | /* Index of predefined Linux client operations */ |
| 351 | 351 | ||
| 352 | enum { | 352 | enum { |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index c71227dd4389..7e079f8ce18b 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
| @@ -9,26 +9,6 @@ | |||
| 9 | #ifndef _LINUX_NFS_FS_H | 9 | #ifndef _LINUX_NFS_FS_H |
| 10 | #define _LINUX_NFS_FS_H | 10 | #define _LINUX_NFS_FS_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/in.h> | ||
| 14 | #include <linux/mm.h> | ||
| 15 | #include <linux/pagemap.h> | ||
| 16 | #include <linux/rwsem.h> | ||
| 17 | #include <linux/wait.h> | ||
| 18 | |||
| 19 | #include <linux/nfs_fs_sb.h> | ||
| 20 | |||
| 21 | #include <linux/sunrpc/debug.h> | ||
| 22 | #include <linux/sunrpc/auth.h> | ||
| 23 | #include <linux/sunrpc/clnt.h> | ||
| 24 | |||
| 25 | #include <linux/nfs.h> | ||
| 26 | #include <linux/nfs2.h> | ||
| 27 | #include <linux/nfs3.h> | ||
| 28 | #include <linux/nfs4.h> | ||
| 29 | #include <linux/nfs_xdr.h> | ||
| 30 | #include <linux/rwsem.h> | ||
| 31 | #include <linux/mempool.h> | ||
| 32 | 12 | ||
| 33 | /* | 13 | /* |
| 34 | * Enable debugging support for nfs client. | 14 | * Enable debugging support for nfs client. |
| @@ -63,6 +43,25 @@ | |||
| 63 | #define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ | 43 | #define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ |
| 64 | 44 | ||
| 65 | #ifdef __KERNEL__ | 45 | #ifdef __KERNEL__ |
| 46 | #include <linux/in.h> | ||
| 47 | #include <linux/mm.h> | ||
| 48 | #include <linux/pagemap.h> | ||
| 49 | #include <linux/rwsem.h> | ||
| 50 | #include <linux/wait.h> | ||
| 51 | |||
| 52 | #include <linux/nfs_fs_sb.h> | ||
| 53 | |||
| 54 | #include <linux/sunrpc/debug.h> | ||
| 55 | #include <linux/sunrpc/auth.h> | ||
| 56 | #include <linux/sunrpc/clnt.h> | ||
| 57 | |||
| 58 | #include <linux/nfs.h> | ||
| 59 | #include <linux/nfs2.h> | ||
| 60 | #include <linux/nfs3.h> | ||
| 61 | #include <linux/nfs4.h> | ||
| 62 | #include <linux/nfs_xdr.h> | ||
| 63 | #include <linux/rwsem.h> | ||
| 64 | #include <linux/mempool.h> | ||
| 66 | 65 | ||
| 67 | /* | 66 | /* |
| 68 | * NFSv3/v4 Access mode cache entry | 67 | * NFSv3/v4 Access mode cache entry |
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index ec7c2e872d72..2dcad295fece 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef LINUX_NFSD_NFSD_H | 10 | #ifndef LINUX_NFSD_NFSD_H |
| 11 | #define LINUX_NFSD_NFSD_H | 11 | #define LINUX_NFSD_NFSD_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/unistd.h> | 14 | #include <linux/unistd.h> |
| 16 | #include <linux/dirent.h> | 15 | #include <linux/dirent.h> |
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index 0798b7781a6e..f9edcd2ff3c8 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include <asm/types.h> | 17 | #include <asm/types.h> |
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | # include <linux/config.h> | ||
| 20 | # include <linux/types.h> | 19 | # include <linux/types.h> |
| 21 | # include <linux/string.h> | 20 | # include <linux/string.h> |
| 22 | # include <linux/fs.h> | 21 | # include <linux/fs.h> |
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index 781efbf94ed3..dae0faea2807 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #include <asm/types.h> | 12 | #include <asm/types.h> |
| 13 | #ifdef __KERNEL__ | 13 | #ifdef __KERNEL__ |
| 14 | # include <linux/config.h> | ||
| 15 | # include <linux/types.h> | 14 | # include <linux/types.h> |
| 16 | # include <linux/in.h> | 15 | # include <linux/in.h> |
| 17 | #endif | 16 | #endif |
diff --git a/include/linux/numa.h b/include/linux/numa.h index e481feb1bfd8..a31a7301b159 100644 --- a/include/linux/numa.h +++ b/include/linux/numa.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_NUMA_H | 1 | #ifndef _LINUX_NUMA_H |
| 2 | #define _LINUX_NUMA_H | 2 | #define _LINUX_NUMA_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_NODES_SHIFT | 5 | #ifdef CONFIG_NODES_SHIFT |
| 7 | #define NODES_SHIFT CONFIG_NODES_SHIFT | 6 | #define NODES_SHIFT CONFIG_NODES_SHIFT |
diff --git a/include/linux/parport.h b/include/linux/parport.h index 008d736a6c9a..d42737eeee06 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h | |||
| @@ -96,7 +96,6 @@ typedef enum { | |||
| 96 | /* The rest is for the kernel only */ | 96 | /* The rest is for the kernel only */ |
| 97 | #ifdef __KERNEL__ | 97 | #ifdef __KERNEL__ |
| 98 | 98 | ||
| 99 | #include <linux/config.h> | ||
| 100 | #include <linux/jiffies.h> | 99 | #include <linux/jiffies.h> |
| 101 | #include <linux/proc_fs.h> | 100 | #include <linux/proc_fs.h> |
| 102 | #include <linux/spinlock.h> | 101 | #include <linux/spinlock.h> |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 6fd36cb09160..6c4bc773f7b7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | #ifndef LINUX_PCI_H | 17 | #ifndef LINUX_PCI_H |
| 18 | #define LINUX_PCI_H | 18 | #define LINUX_PCI_H |
| 19 | 19 | ||
| 20 | #include <linux/mod_devicetable.h> | ||
| 21 | |||
| 22 | /* Include the pci register defines */ | 20 | /* Include the pci register defines */ |
| 23 | #include <linux/pci_regs.h> | 21 | #include <linux/pci_regs.h> |
| 24 | 22 | ||
| @@ -46,8 +44,9 @@ | |||
| 46 | 44 | ||
| 47 | #ifdef __KERNEL__ | 45 | #ifdef __KERNEL__ |
| 48 | 46 | ||
| 47 | #include <linux/mod_devicetable.h> | ||
| 48 | |||
| 49 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| 50 | #include <linux/config.h> | ||
| 51 | #include <linux/ioport.h> | 50 | #include <linux/ioport.h> |
| 52 | #include <linux/list.h> | 51 | #include <linux/list.h> |
| 53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h index 682525511c9e..66b5de404f22 100644 --- a/include/linux/percpu_counter.h +++ b/include/linux/percpu_counter.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * WARNING: these things are HUGE. 4 kbytes per counter on 32-way P4. | 6 | * WARNING: these things are HUGE. 4 kbytes per counter on 32-way P4. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
| 11 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
| 12 | #include <linux/threads.h> | 11 | #include <linux/threads.h> |
diff --git a/include/linux/pm.h b/include/linux/pm.h index 66be58902b17..658c1b93d5bb 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | #ifdef __KERNEL__ | 24 | #ifdef __KERNEL__ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/list.h> | 26 | #include <linux/list.h> |
| 28 | #include <asm/atomic.h> | 27 | #include <asm/atomic.h> |
| 29 | 28 | ||
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h index 008932d73c35..78027c533b94 100644 --- a/include/linux/pm_legacy.h +++ b/include/linux/pm_legacy.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __LINUX_PM_LEGACY_H__ | 1 | #ifndef __LINUX_PM_LEGACY_H__ |
| 2 | #define __LINUX_PM_LEGACY_H__ | 2 | #define __LINUX_PM_LEGACY_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_PM_LEGACY | 5 | #ifdef CONFIG_PM_LEGACY |
| 7 | 6 | ||
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 217d3daf7336..ecce5912f4d6 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1998 Paul Mackerras. | 6 | * Copyright (C) 1998 Paul Mackerras. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #define PMU_DRIVER_VERSION 2 | 10 | #define PMU_DRIVER_VERSION 2 |
| 12 | 11 | ||
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 402056cd049d..c6b13ff85028 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h | |||
| @@ -42,8 +42,6 @@ | |||
| 42 | #ifndef _PPP_DEFS_H_ | 42 | #ifndef _PPP_DEFS_H_ |
| 43 | #define _PPP_DEFS_H_ | 43 | #define _PPP_DEFS_H_ |
| 44 | 44 | ||
| 45 | #include <linux/crc-ccitt.h> | ||
| 46 | |||
| 47 | /* | 45 | /* |
| 48 | * The basic PPP frame. | 46 | * The basic PPP frame. |
| 49 | */ | 47 | */ |
| @@ -97,7 +95,11 @@ | |||
| 97 | 95 | ||
| 98 | #define PPP_INITFCS 0xffff /* Initial FCS value */ | 96 | #define PPP_INITFCS 0xffff /* Initial FCS value */ |
| 99 | #define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ | 97 | #define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ |
| 98 | |||
| 99 | #ifdef __KERNEL__ | ||
| 100 | #include <linux/crc-ccitt.h> | ||
| 100 | #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c) | 101 | #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c) |
| 102 | #endif | ||
| 101 | 103 | ||
| 102 | /* | 104 | /* |
| 103 | * Extended asyncmap - allows any character to be escaped. | 105 | * Extended asyncmap - allows any character to be escaped. |
| @@ -179,12 +181,4 @@ struct ppp_idle { | |||
| 179 | time_t recv_idle; /* time since last NP packet received */ | 181 | time_t recv_idle; /* time since last NP packet received */ |
| 180 | }; | 182 | }; |
| 181 | 183 | ||
| 182 | #ifndef __P | ||
| 183 | #ifdef __STDC__ | ||
| 184 | #define __P(x) x | ||
| 185 | #else | ||
| 186 | #define __P(x) () | ||
| 187 | #endif | ||
| 188 | #endif | ||
| 189 | |||
| 190 | #endif /* _PPP_DEFS_H_ */ | 184 | #endif /* _PPP_DEFS_H_ */ |
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 5769d14d1e6a..d0926d63406c 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * preempt_count (used for kernel preemption, interrupt count, etc.) | 6 | * preempt_count (used for kernel preemption, interrupt count, etc.) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/thread_info.h> | 9 | #include <linux/thread_info.h> |
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | 11 | ||
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 4b47a0253425..5810d28fbed9 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_PROC_FS_H | 1 | #ifndef _LINUX_PROC_FS_H |
| 2 | #define _LINUX_PROC_FS_H | 2 | #define _LINUX_PROC_FS_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
| 6 | #include <linux/fs.h> | 5 | #include <linux/fs.h> |
| 7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
diff --git a/include/linux/profile.h b/include/linux/profile.h index 1f2fea6640a4..e633004ae052 100644 --- a/include/linux/profile.h +++ b/include/linux/profile.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/cpumask.h> | 8 | #include <linux/cpumask.h> |
| 10 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
diff --git a/include/linux/quota.h b/include/linux/quota.h index 2dab71e1c3d1..b8fbf26eb885 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h | |||
| @@ -37,8 +37,6 @@ | |||
| 37 | 37 | ||
| 38 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 40 | #include <linux/spinlock.h> | ||
| 41 | #include <linux/mutex.h> | ||
| 42 | 40 | ||
| 43 | #define __DQUOT_VERSION__ "dquot_6.5.1" | 41 | #define __DQUOT_VERSION__ "dquot_6.5.1" |
| 44 | #define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 | 42 | #define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 |
| @@ -133,6 +131,8 @@ struct if_dqinfo { | |||
| 133 | }; | 131 | }; |
| 134 | 132 | ||
| 135 | #ifdef __KERNEL__ | 133 | #ifdef __KERNEL__ |
| 134 | #include <linux/spinlock.h> | ||
| 135 | #include <linux/mutex.h> | ||
| 136 | 136 | ||
| 137 | #include <linux/dqblk_xfs.h> | 137 | #include <linux/dqblk_xfs.h> |
| 138 | #include <linux/dqblk_v1.h> | 138 | #include <linux/dqblk_v1.h> |
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index 21e5a9124856..5110201a4159 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _LINUX_QUOTAOPS_ | 10 | #ifndef _LINUX_QUOTAOPS_ |
| 11 | #define _LINUX_QUOTAOPS_ | 11 | #define _LINUX_QUOTAOPS_ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
| 15 | 14 | ||
| 16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h index 5353afb11db3..5e961035c725 100644 --- a/include/linux/reiserfs_xattr.h +++ b/include/linux/reiserfs_xattr.h | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | File: linux/reiserfs_xattr.h | 2 | File: linux/reiserfs_xattr.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/init.h> | ||
| 7 | #include <linux/xattr.h> | 5 | #include <linux/xattr.h> |
| 8 | 6 | ||
| 9 | /* Magic value in header */ | 7 | /* Magic value in header */ |
| @@ -15,6 +13,7 @@ struct reiserfs_xattr_header { | |||
| 15 | }; | 13 | }; |
| 16 | 14 | ||
| 17 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
| 16 | #include <linux/init.h> | ||
| 18 | 17 | ||
| 19 | struct reiserfs_xattr_handler { | 18 | struct reiserfs_xattr_handler { |
| 20 | char *prefix; | 19 | char *prefix; |
diff --git a/include/linux/relay.h b/include/linux/relay.h index 4bcc1531d6a9..24accb483849 100644 --- a/include/linux/relay.h +++ b/include/linux/relay.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _LINUX_RELAY_H | 10 | #ifndef _LINUX_RELAY_H |
| 11 | #define _LINUX_RELAY_H | 11 | #define _LINUX_RELAY_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
diff --git a/include/linux/rio.h b/include/linux/rio.h index c7e907faae9c..d93857056cb9 100644 --- a/include/linux/rio.h +++ b/include/linux/rio.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
| 18 | 18 | ||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
| 22 | #include <linux/list.h> | 21 | #include <linux/list.h> |
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h index f54772d0e7f8..7adb2a1aac92 100644 --- a/include/linux/rio_drv.h +++ b/include/linux/rio_drv.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | 17 | ||
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 21 | #include <linux/list.h> | 20 | #include <linux/list.h> |
| 22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index d6b9bcd1384c..2d4c81a220db 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Declarations for Reverse Mapping functions in mm/rmap.c | 4 | * Declarations for Reverse Mapping functions in mm/rmap.c |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/list.h> | 7 | #include <linux/list.h> |
| 9 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index df0cdd41085c..facd9ee37b76 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -909,7 +909,6 @@ struct tcamsg | |||
| 909 | 909 | ||
| 910 | #ifdef __KERNEL__ | 910 | #ifdef __KERNEL__ |
| 911 | 911 | ||
| 912 | #include <linux/config.h> | ||
| 913 | #include <linux/mutex.h> | 912 | #include <linux/mutex.h> |
| 914 | 913 | ||
| 915 | extern size_t rtattr_strlcpy(char *dest, const struct rtattr *rta, size_t size); | 914 | extern size_t rtattr_strlcpy(char *dest, const struct rtattr *rta, size_t size); |
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index bfb988885002..f99fe90732ab 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <asm/system.h> | 18 | #include <asm/system.h> |
diff --git a/include/linux/scc.h b/include/linux/scc.h index 885a4a02b23c..3495bd953cc6 100644 --- a/include/linux/scc.h +++ b/include/linux/scc.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | #ifndef _SCC_H | 3 | #ifndef _SCC_H |
| 4 | #define _SCC_H | 4 | #define _SCC_H |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | /* selection of hardware types */ | 7 | /* selection of hardware types */ |
| 9 | 8 | ||
diff --git a/include/linux/sched.h b/include/linux/sched.h index 29b7d4f87d20..701b8cbceb05 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1,9 +1,46 @@ | |||
| 1 | #ifndef _LINUX_SCHED_H | 1 | #ifndef _LINUX_SCHED_H |
| 2 | #define _LINUX_SCHED_H | 2 | #define _LINUX_SCHED_H |
| 3 | 3 | ||
| 4 | #include <linux/auxvec.h> /* For AT_VECTOR_SIZE */ | ||
| 5 | |||
| 6 | /* | ||
| 7 | * cloning flags: | ||
| 8 | */ | ||
| 9 | #define CSIGNAL 0x000000ff /* signal mask to be sent at exit */ | ||
| 10 | #define CLONE_VM 0x00000100 /* set if VM shared between processes */ | ||
| 11 | #define CLONE_FS 0x00000200 /* set if fs info shared between processes */ | ||
| 12 | #define CLONE_FILES 0x00000400 /* set if open files shared between processes */ | ||
| 13 | #define CLONE_SIGHAND 0x00000800 /* set if signal handlers and blocked signals shared */ | ||
| 14 | #define CLONE_PTRACE 0x00002000 /* set if we want to let tracing continue on the child too */ | ||
| 15 | #define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ | ||
| 16 | #define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ | ||
| 17 | #define CLONE_THREAD 0x00010000 /* Same thread group? */ | ||
| 18 | #define CLONE_NEWNS 0x00020000 /* New namespace group? */ | ||
| 19 | #define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ | ||
| 20 | #define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ | ||
| 21 | #define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ | ||
| 22 | #define CLONE_CHILD_CLEARTID 0x00200000 /* clear the TID in the child */ | ||
| 23 | #define CLONE_DETACHED 0x00400000 /* Unused, ignored */ | ||
| 24 | #define CLONE_UNTRACED 0x00800000 /* set if the tracing process can't force CLONE_PTRACE on this clone */ | ||
| 25 | #define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ | ||
| 26 | #define CLONE_STOPPED 0x02000000 /* Start in stopped state */ | ||
| 27 | |||
| 28 | /* | ||
| 29 | * Scheduling policies | ||
| 30 | */ | ||
| 31 | #define SCHED_NORMAL 0 | ||
| 32 | #define SCHED_FIFO 1 | ||
| 33 | #define SCHED_RR 2 | ||
| 34 | #define SCHED_BATCH 3 | ||
| 35 | |||
| 36 | #ifdef __KERNEL__ | ||
| 37 | |||
| 38 | struct sched_param { | ||
| 39 | int sched_priority; | ||
| 40 | }; | ||
| 41 | |||
| 4 | #include <asm/param.h> /* for HZ */ | 42 | #include <asm/param.h> /* for HZ */ |
| 5 | 43 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/capability.h> | 44 | #include <linux/capability.h> |
| 8 | #include <linux/threads.h> | 45 | #include <linux/threads.h> |
| 9 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| @@ -37,31 +74,15 @@ | |||
| 37 | #include <linux/rcupdate.h> | 74 | #include <linux/rcupdate.h> |
| 38 | #include <linux/futex.h> | 75 | #include <linux/futex.h> |
| 39 | 76 | ||
| 40 | #include <linux/auxvec.h> /* For AT_VECTOR_SIZE */ | 77 | #include <linux/time.h> |
| 78 | #include <linux/param.h> | ||
| 79 | #include <linux/resource.h> | ||
| 80 | #include <linux/timer.h> | ||
| 81 | #include <linux/hrtimer.h> | ||
| 41 | 82 | ||
| 42 | struct exec_domain; | 83 | #include <asm/processor.h> |
| 43 | 84 | ||
| 44 | /* | 85 | struct exec_domain; |
| 45 | * cloning flags: | ||
| 46 | */ | ||
| 47 | #define CSIGNAL 0x000000ff /* signal mask to be sent at exit */ | ||
| 48 | #define CLONE_VM 0x00000100 /* set if VM shared between processes */ | ||
| 49 | #define CLONE_FS 0x00000200 /* set if fs info shared between processes */ | ||
| 50 | #define CLONE_FILES 0x00000400 /* set if open files shared between processes */ | ||
| 51 | #define CLONE_SIGHAND 0x00000800 /* set if signal handlers and blocked signals shared */ | ||
| 52 | #define CLONE_PTRACE 0x00002000 /* set if we want to let tracing continue on the child too */ | ||
| 53 | #define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ | ||
| 54 | #define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ | ||
| 55 | #define CLONE_THREAD 0x00010000 /* Same thread group? */ | ||
| 56 | #define CLONE_NEWNS 0x00020000 /* New namespace group? */ | ||
| 57 | #define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ | ||
| 58 | #define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ | ||
| 59 | #define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ | ||
| 60 | #define CLONE_CHILD_CLEARTID 0x00200000 /* clear the TID in the child */ | ||
| 61 | #define CLONE_DETACHED 0x00400000 /* Unused, ignored */ | ||
| 62 | #define CLONE_UNTRACED 0x00800000 /* set if the tracing process can't force CLONE_PTRACE on this clone */ | ||
| 63 | #define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ | ||
| 64 | #define CLONE_STOPPED 0x02000000 /* Start in stopped state */ | ||
| 65 | 86 | ||
| 66 | /* | 87 | /* |
| 67 | * List of flags we want to share for kernel threads, | 88 | * List of flags we want to share for kernel threads, |
| @@ -103,13 +124,6 @@ extern unsigned long nr_uninterruptible(void); | |||
| 103 | extern unsigned long nr_active(void); | 124 | extern unsigned long nr_active(void); |
| 104 | extern unsigned long nr_iowait(void); | 125 | extern unsigned long nr_iowait(void); |
| 105 | 126 | ||
| 106 | #include <linux/time.h> | ||
| 107 | #include <linux/param.h> | ||
| 108 | #include <linux/resource.h> | ||
| 109 | #include <linux/timer.h> | ||
| 110 | #include <linux/hrtimer.h> | ||
| 111 | |||
| 112 | #include <asm/processor.h> | ||
| 113 | 127 | ||
| 114 | /* | 128 | /* |
| 115 | * Task state bitmask. NOTE! These bits are also | 129 | * Task state bitmask. NOTE! These bits are also |
| @@ -156,20 +170,6 @@ extern unsigned long nr_iowait(void); | |||
| 156 | /* Task command name length */ | 170 | /* Task command name length */ |
| 157 | #define TASK_COMM_LEN 16 | 171 | #define TASK_COMM_LEN 16 |
| 158 | 172 | ||
| 159 | /* | ||
| 160 | * Scheduling policies | ||
| 161 | */ | ||
| 162 | #define SCHED_NORMAL 0 | ||
| 163 | #define SCHED_FIFO 1 | ||
| 164 | #define SCHED_RR 2 | ||
| 165 | #define SCHED_BATCH 3 | ||
| 166 | |||
| 167 | struct sched_param { | ||
| 168 | int sched_priority; | ||
| 169 | }; | ||
| 170 | |||
| 171 | #ifdef __KERNEL__ | ||
| 172 | |||
| 173 | #include <linux/spinlock.h> | 173 | #include <linux/spinlock.h> |
| 174 | 174 | ||
| 175 | /* | 175 | /* |
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index cd2773b29a64..3e8b1cf54303 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_SECCOMP_H | 1 | #ifndef _LINUX_SECCOMP_H |
| 2 | #define _LINUX_SECCOMP_H | 2 | #define _LINUX_SECCOMP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #ifdef CONFIG_SECCOMP | 5 | #ifdef CONFIG_SECCOMP |
| 7 | 6 | ||
diff --git a/include/linux/sem.h b/include/linux/sem.h index 3c1f1120fe88..9aaffb0b1d81 100644 --- a/include/linux/sem.h +++ b/include/linux/sem.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _LINUX_SEM_H | 2 | #define _LINUX_SEM_H |
| 3 | 3 | ||
| 4 | #include <linux/ipc.h> | 4 | #include <linux/ipc.h> |
| 5 | #include <asm/atomic.h> | ||
| 6 | 5 | ||
| 7 | /* semop flags */ | 6 | /* semop flags */ |
| 8 | #define SEM_UNDO 0x1000 /* undo the operation on exit */ | 7 | #define SEM_UNDO 0x1000 /* undo the operation on exit */ |
| @@ -78,6 +77,7 @@ struct seminfo { | |||
| 78 | #define SEMUSZ 20 /* sizeof struct sem_undo */ | 77 | #define SEMUSZ 20 /* sizeof struct sem_undo */ |
| 79 | 78 | ||
| 80 | #ifdef __KERNEL__ | 79 | #ifdef __KERNEL__ |
| 80 | #include <asm/atomic.h> | ||
| 81 | 81 | ||
| 82 | struct task_struct; | 82 | struct task_struct; |
| 83 | 83 | ||
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 5a095572881d..7bc5c7c12b54 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * by Keith Owens and Andrea Arcangeli | 26 | * by Keith Owens and Andrea Arcangeli |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 31 | #include <linux/preempt.h> | 30 | #include <linux/preempt.h> |
| 32 | 31 | ||
diff --git a/include/linux/serialP.h b/include/linux/serialP.h index 2b9e6b9554d5..e811a615f696 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * For definitions of the flags field, see tty.h | 19 | * For definitions of the flags field, see tty.h |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/termios.h> | 22 | #include <linux/termios.h> |
| 24 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index bd14858121ea..94b9286cf6bd 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -132,7 +132,6 @@ | |||
| 132 | 132 | ||
| 133 | #ifdef __KERNEL__ | 133 | #ifdef __KERNEL__ |
| 134 | 134 | ||
| 135 | #include <linux/config.h> | ||
| 136 | #include <linux/compiler.h> | 135 | #include <linux/compiler.h> |
| 137 | #include <linux/interrupt.h> | 136 | #include <linux/interrupt.h> |
| 138 | #include <linux/circ_buf.h> | 137 | #include <linux/circ_buf.h> |
diff --git a/include/linux/signal.h b/include/linux/signal.h index 70739f51a09f..1e4ce7225eee 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | #ifndef _LINUX_SIGNAL_H | 1 | #ifndef _LINUX_SIGNAL_H |
| 2 | #define _LINUX_SIGNAL_H | 2 | #define _LINUX_SIGNAL_H |
| 3 | 3 | ||
| 4 | #include <linux/list.h> | ||
| 5 | #include <linux/spinlock.h> | ||
| 6 | #include <asm/signal.h> | 4 | #include <asm/signal.h> |
| 7 | #include <asm/siginfo.h> | 5 | #include <asm/siginfo.h> |
| 8 | 6 | ||
| 9 | #ifdef __KERNEL__ | 7 | #ifdef __KERNEL__ |
| 8 | #include <linux/list.h> | ||
| 9 | #include <linux/spinlock.h> | ||
| 10 | 10 | ||
| 11 | /* | 11 | /* |
| 12 | * These values of sa_flags are used only by the kernel as part of the | 12 | * These values of sa_flags are used only by the kernel as part of the |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 93e4db221585..66f8819f9568 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _LINUX_SKBUFF_H | 14 | #ifndef _LINUX_SKBUFF_H |
| 15 | #define _LINUX_SKBUFF_H | 15 | #define _LINUX_SKBUFF_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/compiler.h> | 18 | #include <linux/compiler.h> |
| 20 | #include <linux/time.h> | 19 | #include <linux/time.h> |
diff --git a/include/linux/slab.h b/include/linux/slab.h index 2d985d59c7b8..9dc93163e065 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | typedef struct kmem_cache kmem_cache_t; | 12 | typedef struct kmem_cache kmem_cache_t; |
| 13 | 13 | ||
| 14 | #include <linux/config.h> /* kmalloc_sizes.h needs CONFIG_ options */ | ||
| 15 | #include <linux/gfp.h> | 14 | #include <linux/gfp.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
diff --git a/include/linux/smb_fs.h b/include/linux/smb_fs.h index 621a3d3662f3..367d6c3e8ed4 100644 --- a/include/linux/smb_fs.h +++ b/include/linux/smb_fs.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | #define _LINUX_SMB_FS_H | 10 | #define _LINUX_SMB_FS_H |
| 11 | 11 | ||
| 12 | #include <linux/smb.h> | 12 | #include <linux/smb.h> |
| 13 | #include <linux/smb_fs_i.h> | ||
| 14 | #include <linux/smb_fs_sb.h> | ||
| 15 | 13 | ||
| 16 | /* | 14 | /* |
| 17 | * ioctl commands | 15 | * ioctl commands |
| @@ -24,6 +22,8 @@ | |||
| 24 | 22 | ||
| 25 | 23 | ||
| 26 | #ifdef __KERNEL__ | 24 | #ifdef __KERNEL__ |
| 25 | #include <linux/smb_fs_i.h> | ||
| 26 | #include <linux/smb_fs_sb.h> | ||
| 27 | 27 | ||
| 28 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
| 29 | #include <linux/pagemap.h> | 29 | #include <linux/pagemap.h> |
diff --git a/include/linux/smp.h b/include/linux/smp.h index e2fa3ab4afc5..c93c3fe4308c 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Alan Cox. <alan@redhat.com> | 6 | * Alan Cox. <alan@redhat.com> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | extern void cpu_idle(void); | 10 | extern void cpu_idle(void); |
| 12 | 11 | ||
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h index fa1ff3b165fe..cf715a40d833 100644 --- a/include/linux/smp_lock.h +++ b/include/linux/smp_lock.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __LINUX_SMPLOCK_H | 1 | #ifndef __LINUX_SMPLOCK_H |
| 2 | #define __LINUX_SMPLOCK_H | 2 | #define __LINUX_SMPLOCK_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #ifdef CONFIG_LOCK_KERNEL | 4 | #ifdef CONFIG_LOCK_KERNEL |
| 6 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
| 7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
diff --git a/include/linux/socket.h b/include/linux/socket.h index 9ab2ddd80221..361409094649 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h | |||
| @@ -18,8 +18,6 @@ struct __kernel_sockaddr_storage { | |||
| 18 | 18 | ||
| 19 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 19 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) |
| 20 | 20 | ||
| 21 | #include <linux/config.h> /* for CONFIG_COMPAT */ | ||
| 22 | #include <linux/linkage.h> | ||
| 23 | #include <asm/socket.h> /* arch-dependent defines */ | 21 | #include <asm/socket.h> /* arch-dependent defines */ |
| 24 | #include <linux/sockios.h> /* the SIOCxxx I/O controls */ | 22 | #include <linux/sockios.h> /* the SIOCxxx I/O controls */ |
| 25 | #include <linux/uio.h> /* iovec support */ | 23 | #include <linux/uio.h> /* iovec support */ |
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 799be6747944..ae23beef9cc9 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * linux/spinlock.h: builds the final spin_*() APIs. | 46 | * linux/spinlock.h: builds the final spin_*() APIs. |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/preempt.h> | 49 | #include <linux/preempt.h> |
| 51 | #include <linux/linkage.h> | 50 | #include <linux/linkage.h> |
| 52 | #include <linux/compiler.h> | 51 | #include <linux/compiler.h> |
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h index 151a803ed0ed..5bfc553bdb21 100644 --- a/include/linux/stop_machine.h +++ b/include/linux/stop_machine.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | very heavy lock, which is equivalent to grabbing every spinlock | 4 | very heavy lock, which is equivalent to grabbing every spinlock |
| 5 | (and more). So the "read" side to such a lock is anything which | 5 | (and more). So the "read" side to such a lock is anything which |
| 6 | diables preeempt. */ | 6 | diables preeempt. */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/cpu.h> | 7 | #include <linux/cpu.h> |
| 9 | #include <asm/system.h> | 8 | #include <asm/system.h> |
| 10 | 9 | ||
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index be4772ed43c0..a6de332e57d4 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sunrpc/sched.h> | 14 | #include <linux/sunrpc/sched.h> |
| 16 | #include <linux/sunrpc/msg_prot.h> | 15 | #include <linux/sunrpc/msg_prot.h> |
| 17 | #include <linux/sunrpc/xdr.h> | 16 | #include <linux/sunrpc/xdr.h> |
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index 1a42d902bc11..e4729aa67654 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h | |||
| @@ -9,19 +9,6 @@ | |||
| 9 | #ifndef _LINUX_SUNRPC_DEBUG_H_ | 9 | #ifndef _LINUX_SUNRPC_DEBUG_H_ |
| 10 | #define _LINUX_SUNRPC_DEBUG_H_ | 10 | #define _LINUX_SUNRPC_DEBUG_H_ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | |||
| 14 | #include <linux/timer.h> | ||
| 15 | #include <linux/workqueue.h> | ||
| 16 | |||
| 17 | /* | ||
| 18 | * Enable RPC debugging/profiling. | ||
| 19 | */ | ||
| 20 | #ifdef CONFIG_SYSCTL | ||
| 21 | #define RPC_DEBUG | ||
| 22 | #endif | ||
| 23 | /* #define RPC_PROFILE */ | ||
| 24 | |||
| 25 | /* | 12 | /* |
| 26 | * RPC debug facilities | 13 | * RPC debug facilities |
| 27 | */ | 14 | */ |
| @@ -41,6 +28,17 @@ | |||
| 41 | 28 | ||
| 42 | #ifdef __KERNEL__ | 29 | #ifdef __KERNEL__ |
| 43 | 30 | ||
| 31 | #include <linux/timer.h> | ||
| 32 | #include <linux/workqueue.h> | ||
| 33 | |||
| 34 | /* | ||
| 35 | * Enable RPC debugging/profiling. | ||
| 36 | */ | ||
| 37 | #ifdef CONFIG_SYSCTL | ||
| 38 | #define RPC_DEBUG | ||
| 39 | #endif | ||
| 40 | /* #define RPC_PROFILE */ | ||
| 41 | |||
| 44 | /* | 42 | /* |
| 45 | * Debugging macros etc | 43 | * Debugging macros etc |
| 46 | */ | 44 | */ |
diff --git a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h index d93c24b47f3f..5fa0f2084307 100644 --- a/include/linux/sunrpc/stats.h +++ b/include/linux/sunrpc/stats.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _LINUX_SUNRPC_STATS_H | 9 | #ifndef _LINUX_SUNRPC_STATS_H |
| 10 | #define _LINUX_SUNRPC_STATS_H | 10 | #define _LINUX_SUNRPC_STATS_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
| 14 | 13 | ||
| 15 | struct rpc_stat { | 14 | struct rpc_stat { |
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 37c1c76fd547..96e31aa64cc7 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #endif | 6 | #endif |
| 7 | #include <linux/swap.h> | 7 | #include <linux/swap.h> |
| 8 | #include <linux/notifier.h> | 8 | #include <linux/notifier.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/pm.h> | 10 | #include <linux/pm.h> |
| 12 | 11 | ||
diff --git a/include/linux/swap.h b/include/linux/swap.h index f03c24719302..aca9bfae208f 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_SWAP_H | 1 | #ifndef _LINUX_SWAP_H |
| 2 | #define _LINUX_SWAP_H | 2 | #define _LINUX_SWAP_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/spinlock.h> | 4 | #include <linux/spinlock.h> |
| 6 | #include <linux/linkage.h> | 5 | #include <linux/linkage.h> |
| 7 | #include <linux/mmzone.h> | 6 | #include <linux/mmzone.h> |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 60d49e5456e7..bd67a4413df7 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -54,7 +54,6 @@ struct compat_stat; | |||
| 54 | struct compat_timeval; | 54 | struct compat_timeval; |
| 55 | struct robust_list_head; | 55 | struct robust_list_head; |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/types.h> | 57 | #include <linux/types.h> |
| 59 | #include <linux/aio_abi.h> | 58 | #include <linux/aio_abi.h> |
| 60 | #include <linux/capability.h> | 59 | #include <linux/capability.h> |
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h index ea819b89c235..4812ff60561c 100644 --- a/include/linux/sysrq.h +++ b/include/linux/sysrq.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * based upon discusions in irc://irc.openprojects.net/#kernelnewbies | 11 | * based upon discusions in irc://irc.openprojects.net/#kernelnewbies |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | struct pt_regs; | 15 | struct pt_regs; |
| 17 | struct tty_struct; | 16 | struct tty_struct; |
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index c90daa5da6c3..420a689c3fb4 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
| @@ -160,7 +160,6 @@ struct tcp_info | |||
| 160 | 160 | ||
| 161 | #ifdef __KERNEL__ | 161 | #ifdef __KERNEL__ |
| 162 | 162 | ||
| 163 | #include <linux/config.h> | ||
| 164 | #include <linux/skbuff.h> | 163 | #include <linux/skbuff.h> |
| 165 | #include <net/sock.h> | 164 | #include <net/sock.h> |
| 166 | #include <net/inet_connection_sock.h> | 165 | #include <net/inet_connection_sock.h> |
diff --git a/include/linux/threads.h b/include/linux/threads.h index e646bcdf2614..38d1a5d6568e 100644 --- a/include/linux/threads.h +++ b/include/linux/threads.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_THREADS_H | 1 | #ifndef _LINUX_THREADS_H |
| 2 | #define _LINUX_THREADS_H | 2 | #define _LINUX_THREADS_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * The default limit for the nr of threads is now in | 6 | * The default limit for the nr of threads is now in |
diff --git a/include/linux/timer.h b/include/linux/timer.h index 0a485beba9f5..c982304dbafd 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_TIMER_H | 1 | #ifndef _LINUX_TIMER_H |
| 2 | #define _LINUX_TIMER_H | 2 | #define _LINUX_TIMER_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/list.h> | 4 | #include <linux/list.h> |
| 6 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
| 7 | #include <linux/stddef.h> | 6 | #include <linux/stddef.h> |
diff --git a/include/linux/timex.h b/include/linux/timex.h index 03914b7e41b1..34d3ccff7bbb 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | #ifndef _LINUX_TIMEX_H | 53 | #ifndef _LINUX_TIMEX_H |
| 54 | #define _LINUX_TIMEX_H | 54 | #define _LINUX_TIMEX_H |
| 55 | 55 | ||
| 56 | #include <linux/config.h> | ||
| 57 | #include <linux/compiler.h> | 56 | #include <linux/compiler.h> |
| 58 | #include <linux/time.h> | 57 | #include <linux/time.h> |
| 59 | 58 | ||
diff --git a/include/linux/tty.h b/include/linux/tty.h index f13f49afe198..e898eeb94166 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | consoles 16 and higher (since it returns a short) */ | 16 | consoles 16 and higher (since it returns a short) */ |
| 17 | 17 | ||
| 18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 21 | #include <linux/major.h> | 20 | #include <linux/major.h> |
| 22 | #include <linux/termios.h> | 21 | #include <linux/termios.h> |
diff --git a/include/linux/types.h b/include/linux/types.h index 1046c7ad86d9..a5e46e783ffa 100644 --- a/include/linux/types.h +++ b/include/linux/types.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _LINUX_TYPES_H | 2 | #define _LINUX_TYPES_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | #include <linux/config.h> | ||
| 6 | 5 | ||
| 7 | #define BITS_TO_LONGS(bits) \ | 6 | #define BITS_TO_LONGS(bits) \ |
| 8 | (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) | 7 | (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) |
diff --git a/include/linux/udp.h b/include/linux/udp.h index 85a55658831c..bdd39be09406 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h | |||
| @@ -35,7 +35,6 @@ struct udphdr { | |||
| 35 | #define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */ | 35 | #define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */ |
| 36 | 36 | ||
| 37 | #ifdef __KERNEL__ | 37 | #ifdef __KERNEL__ |
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 40 | 39 | ||
| 41 | #include <net/inet_sock.h> | 40 | #include <net/inet_sock.h> |
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h index 843aeaaa79d4..86b5b4271b5a 100644 --- a/include/linux/ufs_fs.h +++ b/include/linux/ufs_fs.h | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 35 | #include <linux/time.h> | ||
| 36 | #include <linux/stat.h> | 35 | #include <linux/stat.h> |
| 37 | #include <linux/fs.h> | 36 | #include <linux/fs.h> |
| 38 | 37 | ||
diff --git a/include/linux/unistd.h b/include/linux/unistd.h index 10ed9834b822..c18c60f3254e 100644 --- a/include/linux/unistd.h +++ b/include/linux/unistd.h | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | #ifndef _LINUX_UNISTD_H_ | 1 | #ifndef _LINUX_UNISTD_H_ |
| 2 | #define _LINUX_UNISTD_H_ | 2 | #define _LINUX_UNISTD_H_ |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 4 | extern int errno; | 5 | extern int errno; |
| 6 | #endif | ||
| 5 | 7 | ||
| 6 | /* | 8 | /* |
| 7 | * Include machine specific syscallX macros | 9 | * Include machine specific syscallX macros |
diff --git a/include/linux/usb.h b/include/linux/usb.h index e34e5e3dce52..1f492c0c7047 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> /* for -ENODEV */ | 13 | #include <linux/errno.h> /* for -ENODEV */ |
| 15 | #include <linux/delay.h> /* for mdelay() */ | 14 | #include <linux/delay.h> /* for mdelay() */ |
| 16 | #include <linux/interrupt.h> /* for in_interrupt() */ | 15 | #include <linux/interrupt.h> /* for in_interrupt() */ |
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index b2d08984a9f7..608487a62c98 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __LINUX_USB_USUAL_H | 9 | #ifndef __LINUX_USB_USUAL_H |
| 10 | #define __LINUX_USB_USUAL_H | 10 | #define __LINUX_USB_USUAL_H |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* We should do this for cleanliness... But other usb_foo.h do not do this. */ | 13 | /* We should do this for cleanliness... But other usb_foo.h do not do this. */ |
| 15 | /* #include <linux/usb.h> */ | 14 | /* #include <linux/usb.h> */ |
diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h index 8859f0b41543..7b7aadb69092 100644 --- a/include/linux/usbdevice_fs.h +++ b/include/linux/usbdevice_fs.h | |||
| @@ -123,6 +123,7 @@ struct usbdevfs_hub_portinfo { | |||
| 123 | char port [127]; /* e.g. port 3 connects to device 27 */ | 123 | char port [127]; /* e.g. port 3 connects to device 27 */ |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | #ifdef __KERNEL__ | ||
| 126 | #ifdef CONFIG_COMPAT | 127 | #ifdef CONFIG_COMPAT |
| 127 | #include <linux/compat.h> | 128 | #include <linux/compat.h> |
| 128 | struct usbdevfs_urb32 { | 129 | struct usbdevfs_urb32 { |
| @@ -147,6 +148,7 @@ struct usbdevfs_ioctl32 { | |||
| 147 | compat_caddr_t data; | 148 | compat_caddr_t data; |
| 148 | }; | 149 | }; |
| 149 | #endif | 150 | #endif |
| 151 | #endif /* __KERNEL__ */ | ||
| 150 | 152 | ||
| 151 | #define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer) | 153 | #define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer) |
| 152 | #define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer) | 154 | #define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer) |
diff --git a/include/linux/vt_buffer.h b/include/linux/vt_buffer.h index 1f7ba3629053..057db7d2f448 100644 --- a/include/linux/vt_buffer.h +++ b/include/linux/vt_buffer.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _LINUX_VT_BUFFER_H_ | 13 | #ifndef _LINUX_VT_BUFFER_H_ |
| 14 | #define _LINUX_VT_BUFFER_H_ | 14 | #define _LINUX_VT_BUFFER_H_ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) | 17 | #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) |
| 19 | #include <asm/vga.h> | 18 | #include <asm/vga.h> |
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index fab5aed8ca31..940d0261a545 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * with information needed by the vt package | 6 | * with information needed by the vt package |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/vt.h> | 9 | #include <linux/vt.h> |
| 11 | #include <linux/kd.h> | 10 | #include <linux/kd.h> |
| 12 | #include <linux/tty.h> | 11 | #include <linux/tty.h> |
diff --git a/include/linux/wait.h b/include/linux/wait.h index d28518236b62..544e855c7c02 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/list.h> | 22 | #include <linux/list.h> |
| 24 | #include <linux/stddef.h> | 23 | #include <linux/stddef.h> |
| 25 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h index 1b6b76a4eb54..2cd05013edfc 100644 --- a/include/linux/wanrouter.h +++ b/include/linux/wanrouter.h | |||
| @@ -44,8 +44,6 @@ | |||
| 44 | * Jan 02, 1997 Gene Kozin Initial version (based on wanpipe.h). | 44 | * Jan 02, 1997 Gene Kozin Initial version (based on wanpipe.h). |
| 45 | *****************************************************************************/ | 45 | *****************************************************************************/ |
| 46 | 46 | ||
| 47 | #include <linux/spinlock.h> /* Support for SMP Locking */ | ||
| 48 | |||
| 49 | #ifndef _ROUTER_H | 47 | #ifndef _ROUTER_H |
| 50 | #define _ROUTER_H | 48 | #define _ROUTER_H |
| 51 | 49 | ||
| @@ -457,6 +455,8 @@ typedef struct wanif_conf | |||
| 457 | #include <linux/fs.h> /* support for device drivers */ | 455 | #include <linux/fs.h> /* support for device drivers */ |
| 458 | #include <linux/proc_fs.h> /* proc filesystem pragmatics */ | 456 | #include <linux/proc_fs.h> /* proc filesystem pragmatics */ |
| 459 | #include <linux/netdevice.h> /* support for network drivers */ | 457 | #include <linux/netdevice.h> /* support for network drivers */ |
| 458 | #include <linux/spinlock.h> /* Support for SMP Locking */ | ||
| 459 | |||
| 460 | /*---------------------------------------------------------------------------- | 460 | /*---------------------------------------------------------------------------- |
| 461 | * WAN device data space. | 461 | * WAN device data space. |
| 462 | */ | 462 | */ |
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h index ee2afbaefe1b..31329fce1ff5 100644 --- a/include/mtd/mtd-abi.h +++ b/include/mtd/mtd-abi.h | |||
| @@ -7,8 +7,9 @@ | |||
| 7 | #ifndef __MTD_ABI_H__ | 7 | #ifndef __MTD_ABI_H__ |
| 8 | #define __MTD_ABI_H__ | 8 | #define __MTD_ABI_H__ |
| 9 | 9 | ||
| 10 | #ifndef __KERNEL__ /* Urgh. The whole point of splitting this out into | 10 | #ifndef __KERNEL__ |
| 11 | separate files was to avoid #ifdef __KERNEL__ */ | 11 | /* Urgh. The whole point of splitting this out into |
| 12 | separate files was to avoid #ifdef __KERNEL__ */ | ||
| 12 | #define __user | 13 | #define __user |
| 13 | #endif | 14 | #endif |
| 14 | 15 | ||
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 750e2508dd90..3d71251b3eca 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
| @@ -45,7 +45,6 @@ struct prefix_info { | |||
| 45 | 45 | ||
| 46 | #ifdef __KERNEL__ | 46 | #ifdef __KERNEL__ |
| 47 | 47 | ||
| 48 | #include <linux/config.h> | ||
| 49 | #include <linux/netdevice.h> | 48 | #include <linux/netdevice.h> |
| 50 | #include <net/if_inet6.h> | 49 | #include <net/if_inet6.h> |
| 51 | #include <net/ipv6.h> | 50 | #include <net/ipv6.h> |
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 427dac94bc7e..795f81f9ec7f 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __LINUX_NET_AFUNIX_H | 1 | #ifndef __LINUX_NET_AFUNIX_H |
| 2 | #define __LINUX_NET_AFUNIX_H | 2 | #define __LINUX_NET_AFUNIX_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/socket.h> | 4 | #include <linux/socket.h> |
| 6 | #include <linux/un.h> | 5 | #include <linux/un.h> |
| 7 | #include <linux/mutex.h> | 6 | #include <linux/mutex.h> |
diff --git a/include/net/ax25.h b/include/net/ax25.h index 5bd997487054..7cd528e9d668 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _AX25_H | 6 | #ifndef _AX25_H |
| 7 | #define _AX25_H | 7 | #define _AX25_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/ax25.h> | 9 | #include <linux/ax25.h> |
| 11 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
| 12 | #include <linux/timer.h> | 11 | #include <linux/timer.h> |
diff --git a/include/net/compat.h b/include/net/compat.h index e65cbedb6abc..9859b60280d5 100644 --- a/include/net/compat.h +++ b/include/net/compat.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef NET_COMPAT_H | 1 | #ifndef NET_COMPAT_H |
| 2 | #define NET_COMPAT_H | 2 | #define NET_COMPAT_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | struct sock; | 5 | struct sock; |
| 7 | 6 | ||
diff --git a/include/net/dst.h b/include/net/dst.h index 5161e89017f9..36d54fc248b0 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _NET_DST_H | 8 | #ifndef _NET_DST_H |
| 9 | #define _NET_DST_H | 9 | #define _NET_DST_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/netdevice.h> | 11 | #include <linux/netdevice.h> |
| 13 | #include <linux/rtnetlink.h> | 12 | #include <linux/rtnetlink.h> |
| 14 | #include <linux/rcupdate.h> | 13 | #include <linux/rcupdate.h> |
diff --git a/include/net/icmp.h b/include/net/icmp.h index e7c3f20fbafc..05f8ff7d9316 100644 --- a/include/net/icmp.h +++ b/include/net/icmp.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef _ICMP_H | 18 | #ifndef _ICMP_H |
| 19 | #define _ICMP_H | 19 | #define _ICMP_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/icmp.h> | 21 | #include <linux/icmp.h> |
| 23 | 22 | ||
| 24 | #include <net/inet_sock.h> | 23 | #include <net/inet_sock.h> |
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h index 59f0c83d55a2..bc6a71dce984 100644 --- a/include/net/inet6_hashtables.h +++ b/include/net/inet6_hashtables.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _INET6_HASHTABLES_H | 14 | #ifndef _INET6_HASHTABLES_H |
| 15 | #define _INET6_HASHTABLES_H | 15 | #define _INET6_HASHTABLES_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 18 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |
| 20 | #include <linux/in6.h> | 19 | #include <linux/in6.h> |
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 135d80fd658e..98e0bb3014fe 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _INET_HASHTABLES_H | 14 | #ifndef _INET_HASHTABLES_H |
| 15 | #define _INET_HASHTABLES_H | 15 | #define _INET_HASHTABLES_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 20 | #include <linux/ipv6.h> | 19 | #include <linux/ipv6.h> |
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 883eb529ef8e..1f4a9a60d4cc 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef _INET_SOCK_H | 16 | #ifndef _INET_SOCK_H |
| 17 | #define _INET_SOCK_H | 17 | #define _INET_SOCK_H |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | 19 | ||
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index e837f98fdb50..600cb543550d 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _INET_TIMEWAIT_SOCK_ | 15 | #ifndef _INET_TIMEWAIT_SOCK_ |
| 16 | #define _INET_TIMEWAIT_SOCK_ | 16 | #define _INET_TIMEWAIT_SOCK_ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #include <linux/list.h> | 19 | #include <linux/list.h> |
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
diff --git a/include/net/ip.h b/include/net/ip.h index ead233c9540d..98f908400771 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef _IP_H | 22 | #ifndef _IP_H |
| 23 | #define _IP_H | 23 | #define _IP_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 27 | #include <linux/ip.h> | 26 | #include <linux/ip.h> |
| 28 | #include <linux/in.h> | 27 | #include <linux/in.h> |
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index e000fa2cd5f6..a095d1dec7a4 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef _NET_IP_FIB_H | 16 | #ifndef _NET_IP_FIB_H |
| 17 | #define _NET_IP_FIB_H | 17 | #define _NET_IP_FIB_H |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <net/flow.h> | 19 | #include <net/flow.h> |
| 21 | #include <linux/seq_file.h> | 20 | #include <linux/seq_file.h> |
| 22 | 21 | ||
diff --git a/include/net/ip_mp_alg.h b/include/net/ip_mp_alg.h index 77225735cbd4..ac747b64734c 100644 --- a/include/net/ip_mp_alg.h +++ b/include/net/ip_mp_alg.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _NET_IP_MP_ALG_H | 7 | #ifndef _NET_IP_MP_ALG_H |
| 8 | #define _NET_IP_MP_ALG_H | 8 | #define _NET_IP_MP_ALG_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/ip_mp_alg.h> | 10 | #include <linux/ip_mp_alg.h> |
| 12 | #include <net/flow.h> | 11 | #include <net/flow.h> |
| 13 | #include <net/route.h> | 12 | #include <net/route.h> |
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 7d2674fde19a..3b57b159b653 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -248,7 +248,6 @@ struct ip_vs_daemon_user { | |||
| 248 | 248 | ||
| 249 | #ifdef __KERNEL__ | 249 | #ifdef __KERNEL__ |
| 250 | 250 | ||
| 251 | #include <linux/config.h> | ||
| 252 | #include <linux/list.h> /* for struct list_head */ | 251 | #include <linux/list.h> /* for struct list_head */ |
| 253 | #include <linux/spinlock.h> /* for struct rwlock_t */ | 252 | #include <linux/spinlock.h> /* for struct rwlock_t */ |
| 254 | #include <asm/atomic.h> /* for struct atomic_t */ | 253 | #include <asm/atomic.h> /* for struct atomic_t */ |
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 4abedb8eaece..a8fdf7970b37 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -104,7 +104,6 @@ struct frag_hdr { | |||
| 104 | 104 | ||
| 105 | #ifdef __KERNEL__ | 105 | #ifdef __KERNEL__ |
| 106 | 106 | ||
| 107 | #include <linux/config.h> | ||
| 108 | #include <net/sock.h> | 107 | #include <net/sock.h> |
| 109 | 108 | ||
| 110 | /* sysctls */ | 109 | /* sysctls */ |
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h index 1880e46ecc9b..1cb0607fcbb9 100644 --- a/include/net/irda/irda.h +++ b/include/net/irda/irda.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #ifndef NET_IRDA_H | 26 | #ifndef NET_IRDA_H |
| 27 | #define NET_IRDA_H | 27 | #define NET_IRDA_H |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/skbuff.h> /* struct sk_buff */ | 29 | #include <linux/skbuff.h> /* struct sk_buff */ |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/if.h> /* sa_family_t in <linux/irda.h> */ | 31 | #include <linux/if.h> /* sa_family_t in <linux/irda.h> */ |
diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h index 92c828029cd8..0575c59a5c96 100644 --- a/include/net/irda/irda_device.h +++ b/include/net/irda/irda_device.h | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #ifndef IRDA_DEVICE_H | 39 | #ifndef IRDA_DEVICE_H |
| 40 | #define IRDA_DEVICE_H | 40 | #define IRDA_DEVICE_H |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/tty.h> | 42 | #include <linux/tty.h> |
| 44 | #include <linux/netdevice.h> | 43 | #include <linux/netdevice.h> |
| 45 | #include <linux/spinlock.h> | 44 | #include <linux/spinlock.h> |
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h index 2127cae1e0a6..e77eb88d9226 100644 --- a/include/net/irda/irlap.h +++ b/include/net/irda/irlap.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #ifndef IRLAP_H | 27 | #ifndef IRLAP_H |
| 28 | #define IRLAP_H | 28 | #define IRLAP_H |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/skbuff.h> | 31 | #include <linux/skbuff.h> |
| 33 | #include <linux/netdevice.h> | 32 | #include <linux/netdevice.h> |
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index c0c895d379ba..11ecfa58a648 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <asm/param.h> /* for HZ */ | 30 | #include <asm/param.h> /* for HZ */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | 33 | ||
| 35 | #include <net/irda/irda.h> | 34 | #include <net/irda/irda.h> |
diff --git a/include/net/irda/irlmp_frame.h b/include/net/irda/irlmp_frame.h index eb3ad158c023..c463f8bca856 100644 --- a/include/net/irda/irlmp_frame.h +++ b/include/net/irda/irlmp_frame.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #ifndef IRMLP_FRAME_H | 26 | #ifndef IRMLP_FRAME_H |
| 27 | #define IRMLP_FRAME_H | 27 | #define IRMLP_FRAME_H |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/skbuff.h> | 29 | #include <linux/skbuff.h> |
| 31 | 30 | ||
| 32 | #include <net/irda/discovery.h> | 31 | #include <net/irda/discovery.h> |
diff --git a/include/net/irda/qos.h b/include/net/irda/qos.h index 9ae3d6bc2423..cc577dc0a0ef 100644 --- a/include/net/irda/qos.h +++ b/include/net/irda/qos.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #ifndef IRDA_QOS_H | 31 | #ifndef IRDA_QOS_H |
| 32 | #define IRDA_QOS_H | 32 | #define IRDA_QOS_H |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/skbuff.h> | 34 | #include <linux/skbuff.h> |
| 36 | 35 | ||
| 37 | #include <net/irda/parameters.h> | 36 | #include <net/irda/parameters.h> |
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 91fa271a0064..d3915dabe6de 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h | |||
| @@ -37,7 +37,6 @@ enum { | |||
| 37 | 37 | ||
| 38 | #ifdef __KERNEL__ | 38 | #ifdef __KERNEL__ |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/compiler.h> | 40 | #include <linux/compiler.h> |
| 42 | #include <linux/icmpv6.h> | 41 | #include <linux/icmpv6.h> |
| 43 | #include <linux/in6.h> | 42 | #include <linux/in6.h> |
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 411117815807..1fbd8193d5f1 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/netfilter/nf_conntrack_common.h> | 15 | #include <linux/netfilter/nf_conntrack_common.h> |
| 16 | 16 | ||
| 17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/bitops.h> | 18 | #include <linux/bitops.h> |
| 20 | #include <linux/compiler.h> | 19 | #include <linux/compiler.h> |
| 21 | #include <asm/atomic.h> | 20 | #include <asm/atomic.h> |
diff --git a/include/net/pkt_act.h b/include/net/pkt_act.h index b225d8472b7e..cf5e4d2e4c21 100644 --- a/include/net/pkt_act.h +++ b/include/net/pkt_act.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <asm/uaccess.h> | 4 | #include <asm/uaccess.h> |
| 5 | #include <asm/system.h> | 5 | #include <asm/system.h> |
| 6 | #include <linux/bitops.h> | 6 | #include <linux/bitops.h> |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/include/net/protocol.h b/include/net/protocol.h index 6dc5970612d7..bcaee39bd2ff 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef _PROTOCOL_H | 24 | #ifndef _PROTOCOL_H |
| 25 | #define _PROTOCOL_H | 25 | #define _PROTOCOL_H |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/in6.h> | 27 | #include <linux/in6.h> |
| 29 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 28 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |
| 30 | #include <linux/ipv6.h> | 29 | #include <linux/ipv6.h> |
diff --git a/include/net/raw.h b/include/net/raw.h index d83571fe4c69..e4af59781949 100644 --- a/include/net/raw.h +++ b/include/net/raw.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef _RAW_H | 17 | #ifndef _RAW_H |
| 18 | #define _RAW_H | 18 | #define _RAW_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #include <net/protocol.h> | 21 | #include <net/protocol.h> |
| 23 | 22 | ||
diff --git a/include/net/red.h b/include/net/red.h index 2ed4358e3295..5ccdbb3d4722 100644 --- a/include/net/red.h +++ b/include/net/red.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __NET_SCHED_RED_H | 1 | #ifndef __NET_SCHED_RED_H |
| 2 | #define __NET_SCHED_RED_H | 2 | #define __NET_SCHED_RED_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | #include <net/pkt_sched.h> | 5 | #include <net/pkt_sched.h> |
| 7 | #include <net/inet_ecn.h> | 6 | #include <net/inet_ecn.h> |
diff --git a/include/net/route.h b/include/net/route.h index 98c915abdec8..c4a068692dcc 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef _ROUTE_H | 24 | #ifndef _ROUTE_H |
| 25 | #define _ROUTE_H | 25 | #define _ROUTE_H |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <net/dst.h> | 27 | #include <net/dst.h> |
| 29 | #include <net/inetpeer.h> | 28 | #include <net/inetpeer.h> |
| 30 | #include <net/flow.h> | 29 | #include <net/flow.h> |
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 7b6ec9986715..b0e9108a4e18 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __NET_SCHED_GENERIC_H | 1 | #ifndef __NET_SCHED_GENERIC_H |
| 2 | #define __NET_SCHED_GENERIC_H | 2 | #define __NET_SCHED_GENERIC_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/netdevice.h> | 4 | #include <linux/netdevice.h> |
| 6 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 7 | #include <linux/rcupdate.h> | 6 | #include <linux/rcupdate.h> |
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index b2b40f951ae6..237f82b05e40 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | */ | 63 | */ |
| 64 | 64 | ||
| 65 | 65 | ||
| 66 | #include <linux/config.h> | ||
| 67 | 66 | ||
| 68 | #ifdef TEST_FRAME | 67 | #ifdef TEST_FRAME |
| 69 | #undef CONFIG_PROC_FS | 68 | #undef CONFIG_PROC_FS |
diff --git a/include/net/sock.h b/include/net/sock.h index 96565ff0de6a..d10dfecb6cbd 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #ifndef _SOCK_H | 40 | #ifndef _SOCK_H |
| 41 | #define _SOCK_H | 41 | #define _SOCK_H |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/list.h> | 43 | #include <linux/list.h> |
| 45 | #include <linux/timer.h> | 44 | #include <linux/timer.h> |
| 46 | #include <linux/cache.h> | 45 | #include <linux/cache.h> |
diff --git a/include/net/tcp.h b/include/net/tcp.h index bfc71f954bbe..5f4eb5c79689 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #define TCP_DEBUG 1 | 21 | #define TCP_DEBUG 1 |
| 22 | #define FASTRETRANS_DEBUG 1 | 22 | #define FASTRETRANS_DEBUG 1 |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 26 | #include <linux/tcp.h> | 25 | #include <linux/tcp.h> |
| 27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 5e0a01ab2216..ede639812f8a 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _LINUX_SS_H | 15 | #ifndef _LINUX_SS_H |
| 16 | #define _LINUX_SS_H | 16 | #define _LINUX_SS_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/device.h> | 18 | #include <linux/device.h> |
| 20 | #include <linux/sched.h> /* task_struct, completion */ | 19 | #include <linux/sched.h> /* task_struct, completion */ |
| 21 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index 5626225bd3ae..6d28b0317657 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #ifndef SCSI_TRANSPORT_FC_H | 27 | #ifndef SCSI_TRANSPORT_FC_H |
| 28 | #define SCSI_TRANSPORT_FC_H | 28 | #define SCSI_TRANSPORT_FC_H |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 32 | #include <scsi/scsi.h> | 31 | #include <scsi/scsi.h> |
| 33 | 32 | ||
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h index 5e1d61913d4e..302680c0c0de 100644 --- a/include/scsi/scsi_transport_spi.h +++ b/include/scsi/scsi_transport_spi.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef SCSI_TRANSPORT_SPI_H | 20 | #ifndef SCSI_TRANSPORT_SPI_H |
| 21 | #define SCSI_TRANSPORT_SPI_H | 21 | #define SCSI_TRANSPORT_SPI_H |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/transport_class.h> | 23 | #include <linux/transport_class.h> |
| 25 | #include <linux/mutex.h> | 24 | #include <linux/mutex.h> |
| 26 | 25 | ||
diff --git a/include/sound/driver.h b/include/sound/driver.h index 89c6a73f3920..3c522e59a33c 100644 --- a/include/sound/driver.h +++ b/include/sound/driver.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include "config.h" | 26 | #include "config.h" |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | 29 | ||
| 31 | /* number of supported soundcards */ | 30 | /* number of supported soundcards */ |
| 32 | #ifdef CONFIG_SND_DYNAMIC_MINORS | 31 | #ifdef CONFIG_SND_DYNAMIC_MINORS |
diff --git a/include/sound/hdsp.h b/include/sound/hdsp.h index 25e1951a9955..dec6b1dc37ea 100644 --- a/include/sound/hdsp.h +++ b/include/sound/hdsp.h | |||
| @@ -30,13 +30,13 @@ enum HDSP_IO_Type { | |||
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | struct hdsp_peak_rms { | 32 | struct hdsp_peak_rms { |
| 33 | u32 input_peaks[26]; | 33 | __u32 input_peaks[26]; |
| 34 | u32 playback_peaks[26]; | 34 | __u32 playback_peaks[26]; |
| 35 | u32 output_peaks[28]; | 35 | __u32 output_peaks[28]; |
| 36 | u64 input_rms[26]; | 36 | __u64 input_rms[26]; |
| 37 | u64 playback_rms[26]; | 37 | __u64 playback_rms[26]; |
| 38 | /* These are only used for H96xx cards */ | 38 | /* These are only used for H96xx cards */ |
| 39 | u64 output_rms[26]; | 39 | __u64 output_rms[26]; |
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | #define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct hdsp_peak_rms) | 42 | #define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct hdsp_peak_rms) |
diff --git a/include/video/edid.h b/include/video/edid.h index b913f196131d..f6a42d6c2e2d 100644 --- a/include/video/edid.h +++ b/include/video/edid.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifdef CONFIG_X86 | 7 | #ifdef CONFIG_X86 |
| 9 | struct edid_info { | 8 | struct edid_info { |
diff --git a/include/video/vga.h b/include/video/vga.h index 700d6c8eb736..b49a5120ca2d 100644 --- a/include/video/vga.h +++ b/include/video/vga.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __linux_video_vga_h__ | 17 | #ifndef __linux_video_vga_h__ |
| 18 | #define __linux_video_vga_h__ | 18 | #define __linux_video_vga_h__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 23 | #ifndef CONFIG_AMIGA | 22 | #ifndef CONFIG_AMIGA |