diff options
3362 files changed, 12131 insertions, 12436 deletions
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl index 6e463d0db266..999afe1ca8cb 100644 --- a/Documentation/DocBook/mtdnand.tmpl +++ b/Documentation/DocBook/mtdnand.tmpl | |||
| @@ -189,9 +189,9 @@ static unsigned long baseaddr; | |||
| 189 | <sect1> | 189 | <sect1> |
| 190 | <title>Partition defines</title> | 190 | <title>Partition defines</title> |
| 191 | <para> | 191 | <para> |
| 192 | If you want to divide your device into parititions, then | 192 | If you want to divide your device into partitions, then |
| 193 | enable the configuration switch CONFIG_MTD_PARITIONS and define | 193 | enable the configuration switch CONFIG_MTD_PARTITIONS and define |
| 194 | a paritioning scheme suitable to your board. | 194 | a partitioning scheme suitable to your board. |
| 195 | </para> | 195 | </para> |
| 196 | <programlisting> | 196 | <programlisting> |
| 197 | #define NUM_PARTITIONS 2 | 197 | #define NUM_PARTITIONS 2 |
diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt index bf1cf98d2a27..0256805b548f 100644 --- a/Documentation/IPMI.txt +++ b/Documentation/IPMI.txt | |||
| @@ -10,7 +10,7 @@ standard for controlling intelligent devices that monitor a system. | |||
| 10 | It provides for dynamic discovery of sensors in the system and the | 10 | It provides for dynamic discovery of sensors in the system and the |
| 11 | ability to monitor the sensors and be informed when the sensor's | 11 | ability to monitor the sensors and be informed when the sensor's |
| 12 | values change or go outside certain boundaries. It also has a | 12 | values change or go outside certain boundaries. It also has a |
| 13 | standardized database for field-replacable units (FRUs) and a watchdog | 13 | standardized database for field-replaceable units (FRUs) and a watchdog |
| 14 | timer. | 14 | timer. |
| 15 | 15 | ||
| 16 | To use this, you need an interface to an IPMI controller in your | 16 | To use this, you need an interface to an IPMI controller in your |
| @@ -64,7 +64,7 @@ situation, you need to read the section below named 'The SI Driver' or | |||
| 64 | IPMI defines a standard watchdog timer. You can enable this with the | 64 | IPMI defines a standard watchdog timer. You can enable this with the |
| 65 | 'IPMI Watchdog Timer' config option. If you compile the driver into | 65 | 'IPMI Watchdog Timer' config option. If you compile the driver into |
| 66 | the kernel, then via a kernel command-line option you can have the | 66 | the kernel, then via a kernel command-line option you can have the |
| 67 | watchdog timer start as soon as it intitializes. It also have a lot | 67 | watchdog timer start as soon as it initializes. It also have a lot |
| 68 | of other options, see the 'Watchdog' section below for more details. | 68 | of other options, see the 'Watchdog' section below for more details. |
| 69 | Note that you can also have the watchdog continue to run if it is | 69 | Note that you can also have the watchdog continue to run if it is |
| 70 | closed (by default it is disabled on close). Go into the 'Watchdog | 70 | closed (by default it is disabled on close). Go into the 'Watchdog |
diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx index d4c6d3aa0c25..43edb4ecf27d 100644 --- a/Documentation/arm/IXP4xx +++ b/Documentation/arm/IXP4xx | |||
| @@ -85,7 +85,7 @@ IXP4xx provides two methods of accessing PCI memory space: | |||
| 85 | 2) If > 64MB of memory space is required, the IXP4xx can be | 85 | 2) If > 64MB of memory space is required, the IXP4xx can be |
| 86 | configured to use indirect registers to access PCI This allows | 86 | configured to use indirect registers to access PCI This allows |
| 87 | for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. | 87 | for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. |
| 88 | The disadvantadge of this is that every PCI access requires | 88 | The disadvantage of this is that every PCI access requires |
| 89 | three local register accesses plus a spinlock, but in some | 89 | three local register accesses plus a spinlock, but in some |
| 90 | cases the performance hit is acceptable. In addition, you cannot | 90 | cases the performance hit is acceptable. In addition, you cannot |
| 91 | mmap() PCI devices in this case due to the indirect nature | 91 | mmap() PCI devices in this case due to the indirect nature |
diff --git a/Documentation/digiepca.txt b/Documentation/digiepca.txt index 88820fe38dad..f2560e22f2c9 100644 --- a/Documentation/digiepca.txt +++ b/Documentation/digiepca.txt | |||
| @@ -2,7 +2,7 @@ NOTE: This driver is obsolete. Digi provides a 2.6 driver (dgdm) at | |||
| 2 | http://www.digi.com for PCI cards. They no longer maintain this driver, | 2 | http://www.digi.com for PCI cards. They no longer maintain this driver, |
| 3 | and have no 2.6 driver for ISA cards. | 3 | and have no 2.6 driver for ISA cards. |
| 4 | 4 | ||
| 5 | This driver requires a number of user-space tools. They can be aquired from | 5 | This driver requires a number of user-space tools. They can be acquired from |
| 6 | http://www.digi.com, but only works with 2.4 kernels. | 6 | http://www.digi.com, but only works with 2.4 kernels. |
| 7 | 7 | ||
| 8 | 8 | ||
diff --git a/Documentation/filesystems/configfs/configfs_example.c b/Documentation/filesystems/configfs/configfs_example.c index 3d4713a6c207..2d6a14a463e0 100644 --- a/Documentation/filesystems/configfs/configfs_example.c +++ b/Documentation/filesystems/configfs/configfs_example.c | |||
| @@ -264,6 +264,15 @@ static struct config_item_type simple_child_type = { | |||
| 264 | }; | 264 | }; |
| 265 | 265 | ||
| 266 | 266 | ||
| 267 | struct simple_children { | ||
| 268 | struct config_group group; | ||
| 269 | }; | ||
| 270 | |||
| 271 | static inline struct simple_children *to_simple_children(struct config_item *item) | ||
| 272 | { | ||
| 273 | return item ? container_of(to_config_group(item), struct simple_children, group) : NULL; | ||
| 274 | } | ||
| 275 | |||
| 267 | static struct config_item *simple_children_make_item(struct config_group *group, const char *name) | 276 | static struct config_item *simple_children_make_item(struct config_group *group, const char *name) |
| 268 | { | 277 | { |
| 269 | struct simple_child *simple_child; | 278 | struct simple_child *simple_child; |
| @@ -304,7 +313,13 @@ static ssize_t simple_children_attr_show(struct config_item *item, | |||
| 304 | "items have only one attribute that is readable and writeable.\n"); | 313 | "items have only one attribute that is readable and writeable.\n"); |
| 305 | } | 314 | } |
| 306 | 315 | ||
| 316 | static void simple_children_release(struct config_item *item) | ||
| 317 | { | ||
| 318 | kfree(to_simple_children(item)); | ||
| 319 | } | ||
| 320 | |||
| 307 | static struct configfs_item_operations simple_children_item_ops = { | 321 | static struct configfs_item_operations simple_children_item_ops = { |
| 322 | .release = simple_children_release, | ||
| 308 | .show_attribute = simple_children_attr_show, | 323 | .show_attribute = simple_children_attr_show, |
| 309 | }; | 324 | }; |
| 310 | 325 | ||
| @@ -345,10 +360,6 @@ static struct configfs_subsystem simple_children_subsys = { | |||
| 345 | * children of its own. | 360 | * children of its own. |
| 346 | */ | 361 | */ |
| 347 | 362 | ||
| 348 | struct simple_children { | ||
| 349 | struct config_group group; | ||
| 350 | }; | ||
| 351 | |||
| 352 | static struct config_group *group_children_make_group(struct config_group *group, const char *name) | 363 | static struct config_group *group_children_make_group(struct config_group *group, const char *name) |
| 353 | { | 364 | { |
| 354 | struct simple_children *simple_children; | 365 | struct simple_children *simple_children; |
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index cf0d5416a4c3..28d1bc3edb1c 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
| @@ -602,7 +602,7 @@ Consider the following sequence of events: | |||
| 602 | 602 | ||
| 603 | This sequence of events is committed to the memory coherence system in an order | 603 | This sequence of events is committed to the memory coherence system in an order |
| 604 | that the rest of the system might perceive as the unordered set of { STORE A, | 604 | that the rest of the system might perceive as the unordered set of { STORE A, |
| 605 | STORE B, STORE C } all occuring before the unordered set of { STORE D, STORE E | 605 | STORE B, STORE C } all occurring before the unordered set of { STORE D, STORE E |
| 606 | }: | 606 | }: |
| 607 | 607 | ||
| 608 | +-------+ : : | 608 | +-------+ : : |
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt index 278771c9ad99..44f2f769e865 100644 --- a/Documentation/networking/pktgen.txt +++ b/Documentation/networking/pktgen.txt | |||
| @@ -74,7 +74,7 @@ Examples: | |||
| 74 | pgset "pkt_size 9014" sets packet size to 9014 | 74 | pgset "pkt_size 9014" sets packet size to 9014 |
| 75 | pgset "frags 5" packet will consist of 5 fragments | 75 | pgset "frags 5" packet will consist of 5 fragments |
| 76 | pgset "count 200000" sets number of packets to send, set to zero | 76 | pgset "count 200000" sets number of packets to send, set to zero |
| 77 | for continious sends untill explicitl stopped. | 77 | for continuous sends until explicitly stopped. |
| 78 | 78 | ||
| 79 | pgset "delay 5000" adds delay to hard_start_xmit(). nanoseconds | 79 | pgset "delay 5000" adds delay to hard_start_xmit(). nanoseconds |
| 80 | 80 | ||
diff --git a/Documentation/pcmcia/crc32hash.c b/Documentation/pcmcia/crc32hash.c new file mode 100644 index 000000000000..cbc36d299af8 --- /dev/null +++ b/Documentation/pcmcia/crc32hash.c | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | /* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */ | ||
| 2 | /* Usage example: | ||
| 3 | $ ./crc32hash "Dual Speed" | ||
| 4 | */ | ||
| 5 | |||
| 6 | #include <string.h> | ||
| 7 | #include <stdio.h> | ||
| 8 | #include <ctype.h> | ||
| 9 | #include <stdlib.h> | ||
| 10 | |||
| 11 | unsigned int crc32(unsigned char const *p, unsigned int len) | ||
| 12 | { | ||
| 13 | int i; | ||
| 14 | unsigned int crc = 0; | ||
| 15 | while (len--) { | ||
| 16 | crc ^= *p++; | ||
| 17 | for (i = 0; i < 8; i++) | ||
| 18 | crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0); | ||
| 19 | } | ||
| 20 | return crc; | ||
| 21 | } | ||
| 22 | |||
| 23 | int main(int argc, char **argv) { | ||
| 24 | unsigned int result; | ||
| 25 | if (argc != 2) { | ||
| 26 | printf("no string passed as argument\n"); | ||
| 27 | return -1; | ||
| 28 | } | ||
| 29 | result = crc32(argv[1], strlen(argv[1])); | ||
| 30 | printf("0x%x\n", result); | ||
| 31 | return 0; | ||
| 32 | } | ||
diff --git a/Documentation/pcmcia/devicetable.txt b/Documentation/pcmcia/devicetable.txt index 3351c0355143..199afd100cf2 100644 --- a/Documentation/pcmcia/devicetable.txt +++ b/Documentation/pcmcia/devicetable.txt | |||
| @@ -27,37 +27,7 @@ pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000 | |||
| 27 | The hex value after "pa" is the hash of product ID string 1, after "pb" for | 27 | The hex value after "pa" is the hash of product ID string 1, after "pb" for |
| 28 | string 2 and so on. | 28 | string 2 and so on. |
| 29 | 29 | ||
| 30 | Alternatively, you can use this small tool to determine the crc32 hash. | 30 | Alternatively, you can use crc32hash (see Documentation/pcmcia/crc32hash.c) |
| 31 | simply pass the string you want to evaluate as argument to this program, | 31 | to determine the crc32 hash. Simply pass the string you want to evaluate |
| 32 | e.g. | 32 | as argument to this program, e.g.: |
| 33 | $ ./crc32hash "Dual Speed" | 33 | $ ./crc32hash "Dual Speed" |
| 34 | |||
| 35 | ------------------------------------------------------------------------- | ||
| 36 | /* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */ | ||
| 37 | #include <string.h> | ||
| 38 | #include <stdio.h> | ||
| 39 | #include <ctype.h> | ||
| 40 | #include <stdlib.h> | ||
| 41 | |||
| 42 | unsigned int crc32(unsigned char const *p, unsigned int len) | ||
| 43 | { | ||
| 44 | int i; | ||
| 45 | unsigned int crc = 0; | ||
| 46 | while (len--) { | ||
| 47 | crc ^= *p++; | ||
| 48 | for (i = 0; i < 8; i++) | ||
| 49 | crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0); | ||
| 50 | } | ||
| 51 | return crc; | ||
| 52 | } | ||
| 53 | |||
| 54 | int main(int argc, char **argv) { | ||
| 55 | unsigned int result; | ||
| 56 | if (argc != 2) { | ||
| 57 | printf("no string passed as argument\n"); | ||
| 58 | return -1; | ||
| 59 | } | ||
| 60 | result = crc32(argv[1], strlen(argv[1])); | ||
| 61 | printf("0x%x\n", result); | ||
| 62 | return 0; | ||
| 63 | } | ||
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index 635cbb94357c..bb18115d5170 100644 --- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | |||
| @@ -3048,7 +3048,7 @@ struct _snd_pcm_runtime { | |||
| 3048 | </para> | 3048 | </para> |
| 3049 | 3049 | ||
| 3050 | <para> | 3050 | <para> |
| 3051 | If you aquire a spinlock in the interrupt handler, and the | 3051 | If you acquire a spinlock in the interrupt handler, and the |
| 3052 | lock is used in other pcm callbacks, too, then you have to | 3052 | lock is used in other pcm callbacks, too, then you have to |
| 3053 | release the lock before calling | 3053 | release the lock before calling |
| 3054 | <function>snd_pcm_period_elapsed()</function>, because | 3054 | <function>snd_pcm_period_elapsed()</function>, because |
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index 2dc246af4885..86754eb390da 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
| @@ -28,7 +28,6 @@ Currently, these files are in /proc/sys/vm: | |||
| 28 | - block_dump | 28 | - block_dump |
| 29 | - drop-caches | 29 | - drop-caches |
| 30 | - zone_reclaim_mode | 30 | - zone_reclaim_mode |
| 31 | - zone_reclaim_interval | ||
| 32 | - panic_on_oom | 31 | - panic_on_oom |
| 33 | 32 | ||
| 34 | ============================================================== | 33 | ============================================================== |
| @@ -167,18 +166,6 @@ use of files and builds up large slab caches. However, the slab | |||
| 167 | shrink operation is global, may take a long time and free slabs | 166 | shrink operation is global, may take a long time and free slabs |
| 168 | in all nodes of the system. | 167 | in all nodes of the system. |
| 169 | 168 | ||
| 170 | ================================================================ | ||
| 171 | |||
| 172 | zone_reclaim_interval: | ||
| 173 | |||
| 174 | The time allowed for off node allocations after zone reclaim | ||
| 175 | has failed to reclaim enough pages to allow a local allocation. | ||
| 176 | |||
| 177 | Time is set in seconds and set by default to 30 seconds. | ||
| 178 | |||
| 179 | Reduce the interval if undesired off node allocations occur. However, too | ||
| 180 | frequent scans will have a negative impact onoff node allocation performance. | ||
| 181 | |||
| 182 | ============================================================= | 169 | ============================================================= |
| 183 | 170 | ||
| 184 | panic_on_oom | 171 | panic_on_oom |
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 6cb63ddf6163..00d9a1f2a54c 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
| @@ -50,3 +50,4 @@ | |||
| 50 | 49 -> PixelView PlayTV P7000 [1554:4813] | 50 | 49 -> PixelView PlayTV P7000 [1554:4813] |
| 51 | 50 -> NPG Tech Real TV FM Top 10 [14f1:0842] | 51 | 50 -> NPG Tech Real TV FM Top 10 [14f1:0842] |
| 52 | 51 -> WinFast DTV2000 H [107d:665e] | 52 | 51 -> WinFast DTV2000 H [107d:665e] |
| 53 | 52 -> Geniatech DVB-S [14f1:0084] | ||
diff --git a/MAINTAINERS b/MAINTAINERS index 31a13720f23c..42be131139c8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -925,23 +925,21 @@ S: Maintained | |||
| 925 | 925 | ||
| 926 | EDAC-CORE | 926 | EDAC-CORE |
| 927 | P: Doug Thompson | 927 | P: Doug Thompson |
| 928 | M: norsk5@xmission.com, dthompson@linuxnetworx.com | 928 | M: norsk5@xmission.com |
| 929 | P: Dave Peterson | ||
| 930 | M: dsp@llnl.gov, dave_peterson@pobox.com | ||
| 931 | L: bluesmoke-devel@lists.sourceforge.net | 929 | L: bluesmoke-devel@lists.sourceforge.net |
| 932 | W: bluesmoke.sourceforge.net | 930 | W: bluesmoke.sourceforge.net |
| 933 | S: Maintained | 931 | S: Supported |
| 934 | 932 | ||
| 935 | EDAC-E752X | 933 | EDAC-E752X |
| 936 | P: Dave Peterson | 934 | P: Mark Gross |
| 937 | M: dsp@llnl.gov, dave_peterson@pobox.com | 935 | M: mark.gross@intel.com |
| 938 | L: bluesmoke-devel@lists.sourceforge.net | 936 | L: bluesmoke-devel@lists.sourceforge.net |
| 939 | W: bluesmoke.sourceforge.net | 937 | W: bluesmoke.sourceforge.net |
| 940 | S: Maintained | 938 | S: Maintained |
| 941 | 939 | ||
| 942 | EDAC-E7XXX | 940 | EDAC-E7XXX |
| 943 | P: Dave Peterson | 941 | P: Doug Thompson |
| 944 | M: dsp@llnl.gov, dave_peterson@pobox.com | 942 | M: norsk5@xmission.com |
| 945 | L: bluesmoke-devel@lists.sourceforge.net | 943 | L: bluesmoke-devel@lists.sourceforge.net |
| 946 | W: bluesmoke.sourceforge.net | 944 | W: bluesmoke.sourceforge.net |
| 947 | S: Maintained | 945 | S: Maintained |
| @@ -2557,13 +2555,6 @@ M: thomas@winischhofer.net | |||
| 2557 | W: http://www.winischhofer.at/linuxsisusbvga.shtml | 2555 | W: http://www.winischhofer.at/linuxsisusbvga.shtml |
| 2558 | S: Maintained | 2556 | S: Maintained |
| 2559 | 2557 | ||
| 2560 | SMB FILESYSTEM | ||
| 2561 | P: Urban Widmark | ||
| 2562 | M: urban@teststation.com | ||
| 2563 | W: http://samba.org/ | ||
| 2564 | L: samba@samba.org | ||
| 2565 | S: Maintained | ||
| 2566 | |||
| 2567 | SMC91x ETHERNET DRIVER | 2558 | SMC91x ETHERNET DRIVER |
| 2568 | P: Nicolas Pitre | 2559 | P: Nicolas Pitre |
| 2569 | M: nico@cam.org | 2560 | M: nico@cam.org |
| @@ -41,8 +41,9 @@ ifndef KBUILD_VERBOSE | |||
| 41 | KBUILD_VERBOSE = 0 | 41 | KBUILD_VERBOSE = 0 |
| 42 | endif | 42 | endif |
| 43 | 43 | ||
| 44 | # Call sparse as part of compilation of C files | 44 | # Call checker as part of compilation of C files |
| 45 | # Use 'make C=1' to enable sparse checking | 45 | # Use 'make C=1' to enable checking (sparse, by default) |
| 46 | # Override with 'make C=1 CHECK=checker_executable CHECKFLAGS=....' | ||
| 46 | 47 | ||
| 47 | ifdef C | 48 | ifdef C |
| 48 | ifeq ("$(origin C)", "command line") | 49 | ifeq ("$(origin C)", "command line") |
| @@ -1060,8 +1061,8 @@ help: | |||
| 1060 | 1061 | ||
| 1061 | @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' | 1062 | @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' |
| 1062 | @echo ' make O=dir [targets] Locate all output files in "dir", including .config' | 1063 | @echo ' make O=dir [targets] Locate all output files in "dir", including .config' |
| 1063 | @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse)' | 1064 | @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)' |
| 1064 | @echo ' make C=2 [targets] Force check of all c source with $$CHECK (sparse)' | 1065 | @echo ' make C=2 [targets] Force check of all c source with $$CHECK' |
| 1065 | @echo '' | 1066 | @echo '' |
| 1066 | @echo 'Execute "make" or "make all" to build all targets marked with [*] ' | 1067 | @echo 'Execute "make" or "make all" to build all targets marked with [*] ' |
| 1067 | @echo 'For further info see the ./README file' | 1068 | @echo 'For further info see the ./README file' |
| @@ -1352,7 +1353,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) | |||
| 1352 | 1353 | ||
| 1353 | a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \ | 1354 | a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \ |
| 1354 | $(NOSTDINC_FLAGS) $(CPPFLAGS) \ | 1355 | $(NOSTDINC_FLAGS) $(CPPFLAGS) \ |
| 1355 | $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) | 1356 | $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o) |
| 1356 | 1357 | ||
| 1357 | quiet_cmd_as_o_S = AS $@ | 1358 | quiet_cmd_as_o_S = AS $@ |
| 1358 | cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< | 1359 | cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< |
diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c index d3848c5b0d2b..425643762bf5 100644 --- a/arch/alpha/kernel/alpha_ksyms.c +++ b/arch/alpha/kernel/alpha_ksyms.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * modules. | 5 | * modules. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
| 11 | #include <linux/user.h> | 10 | #include <linux/user.h> |
diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c index cb3e739fbad8..f313b34939bb 100644 --- a/arch/alpha/kernel/console.c +++ b/arch/alpha/kernel/console.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * non-0 I/O hose | 5 | * non-0 I/O hose |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/tty.h> | 10 | #include <linux/tty.h> |
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index 7af15bf7e5ab..01ecd09d4a64 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Kernel entry-points. | 4 | * Kernel entry-points. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/asm-offsets.h> | 7 | #include <asm/asm-offsets.h> |
| 9 | #include <asm/thread_info.h> | 8 | #include <asm/thread_info.h> |
| 10 | #include <asm/pal.h> | 9 | #include <asm/pal.h> |
diff --git a/arch/alpha/kernel/gct.c b/arch/alpha/kernel/gct.c index 8827687b9f89..c0c7155448e0 100644 --- a/arch/alpha/kernel/gct.c +++ b/arch/alpha/kernel/gct.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/alpha/kernel/gct.c | 2 | * linux/arch/alpha/kernel/gct.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 8 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S index 0905721fcbca..1e2a62a1f75f 100644 --- a/arch/alpha/kernel/head.S +++ b/arch/alpha/kernel/head.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * the kernel global pointer and jump to the kernel entry-point. | 7 | * the kernel global pointer and jump to the kernel entry-point. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/system.h> | 10 | #include <asm/system.h> |
| 12 | #include <asm/asm-offsets.h> | 11 | #include <asm/asm-offsets.h> |
| 13 | 12 | ||
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c index 63af36cf7f6e..bd193ffd6fe0 100644 --- a/arch/alpha/kernel/irq.c +++ b/arch/alpha/kernel/irq.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * should be easier. | 10 | * should be easier. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c index f20f2dff9c43..ffa4ac543cf2 100644 --- a/arch/alpha/kernel/irq_alpha.c +++ b/arch/alpha/kernel/irq_alpha.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Alpha specific irq code. | 2 | * Alpha specific irq code. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | #include <linux/irq.h> | 7 | #include <linux/irq.h> |
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c index ac893bd48036..ebbadbc0c36a 100644 --- a/arch/alpha/kernel/irq_i8259.c +++ b/arch/alpha/kernel/irq_i8259.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Started hacking from linux-2.3.30pre6/arch/i386/kernel/i8259.c. | 7 | * Started hacking from linux-2.3.30pre6/arch/i386/kernel/i8259.c. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/cache.h> | 11 | #include <linux/cache.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h index 11f996f24fde..08b8302e64ca 100644 --- a/arch/alpha/kernel/machvec_impl.h +++ b/arch/alpha/kernel/machvec_impl.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * This file has goodies to help simplify instantiation of machine vectors. | 6 | * This file has goodies to help simplify instantiation of machine vectors. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/pgalloc.h> | 9 | #include <asm/pgalloc.h> |
| 11 | 10 | ||
| 12 | /* Whee. These systems don't have an HAE: | 11 | /* Whee. These systems don't have an HAE: |
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 4ea6711e55aa..ffb7d5423cc0 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 12 | * Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru> |
| 13 | * PCI-PCI bridges cleanup | 13 | * PCI-PCI bridges cleanup |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 17 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index c760a831fd1a..01c8c8b23337 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * This file handles the architecture-dependent parts of process handling. | 8 | * This file handles the architecture-dependent parts of process handling. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h index e1560fb15610..2a6e3da8144f 100644 --- a/arch/alpha/kernel/proto.h +++ b/arch/alpha/kernel/proto.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/interrupt.h> | 1 | #include <linux/interrupt.h> |
| 3 | 2 | ||
| 4 | 3 | ||
diff --git a/arch/alpha/kernel/smc37c93x.c b/arch/alpha/kernel/smc37c93x.c index 421e51ea6bb7..2636cc028d06 100644 --- a/arch/alpha/kernel/smc37c93x.c +++ b/arch/alpha/kernel/smc37c93x.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * SMC 37C93X initialization code | 2 | * SMC 37C93X initialization code |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | 6 | ||
| 8 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |
diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c index 5c98fc83e238..990ac61028f8 100644 --- a/arch/alpha/kernel/srm_env.c +++ b/arch/alpha/kernel/srm_env.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <linux/kernel.h> | 59 | #include <linux/kernel.h> |
| 60 | #include <linux/config.h> | ||
| 61 | #include <linux/module.h> | 60 | #include <linux/module.h> |
| 62 | #include <linux/init.h> | 61 | #include <linux/init.h> |
| 63 | #include <linux/proc_fs.h> | 62 | #include <linux/proc_fs.h> |
diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c index 3b30d4f1fc42..9d7dff27f815 100644 --- a/arch/alpha/kernel/srmcons.c +++ b/arch/alpha/kernel/srmcons.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * (TTY driver and console driver) | 5 | * (TTY driver and console driver) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/console.h> | 10 | #include <linux/console.h> |
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c index 1a1a2c7a3d94..d6926b7b1e99 100644 --- a/arch/alpha/kernel/sys_alcor.c +++ b/arch/alpha/kernel/sys_alcor.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Code supporting the ALCOR and XLT (XL-300/366/433). | 8 | * Code supporting the ALCOR and XLT (XL-300/366/433). |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c index 8c9e443d93ad..25a215067da8 100644 --- a/arch/alpha/kernel/sys_cabriolet.c +++ b/arch/alpha/kernel/sys_cabriolet.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * PC164 and LX164. | 9 | * PC164 and LX164. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c index b28c8f1c6e10..dd6103b867e7 100644 --- a/arch/alpha/kernel/sys_dp264.c +++ b/arch/alpha/kernel/sys_dp264.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Code supporting the DP264 (EV6+TSUNAMI). | 12 | * Code supporting the DP264 (EV6+TSUNAMI). |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c index aeb8e0277905..ed108b66ec09 100644 --- a/arch/alpha/kernel/sys_eb64p.c +++ b/arch/alpha/kernel/sys_eb64p.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Code supporting the EB64+ and EB66. | 8 | * Code supporting the EB64+ and EB66. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c index b741600e3761..cc4c58111366 100644 --- a/arch/alpha/kernel/sys_mikasa.c +++ b/arch/alpha/kernel/sys_mikasa.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Code supporting the MIKASA (AlphaServer 1000). | 8 | * Code supporting the MIKASA (AlphaServer 1000). |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c index 55db02d318d7..2d3cff7e8c5f 100644 --- a/arch/alpha/kernel/sys_noritake.c +++ b/arch/alpha/kernel/sys_noritake.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * CORELLE (AlphaServer 800), and ALCOR Primo (AlphaStation 600A). | 9 | * CORELLE (AlphaServer 800), and ALCOR Primo (AlphaStation 600A). |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c index 24dea40c9bfe..a7a14647b50e 100644 --- a/arch/alpha/kernel/sys_sable.c +++ b/arch/alpha/kernel/sys_sable.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Code supporting the Sable, Sable-Gamma, and Lynx systems. | 8 | * Code supporting the Sable, Sable-Gamma, and Lynx systems. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c index 131a2d9f79d3..cd85ef725e0e 100644 --- a/arch/alpha/kernel/sys_sio.c +++ b/arch/alpha/kernel/sys_sio.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Kenetics's Platform 2000, Avanti (AlphaStation), XL, and AlphaBook1. | 10 | * Kenetics's Platform 2000, Avanti (AlphaStation), XL, and AlphaBook1. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 13f3ed8ed7ac..a8bfc8c16a7d 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Granite | 12 | * Granite |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index 3859749810b4..50eccde2dcd8 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * 2003-06-03 R. Scott Bailey <scott.bailey@eds.com> | 27 | * 2003-06-03 R. Scott Bailey <scott.bailey@eds.com> |
| 28 | * Tighten sanity in time_init from 1% (10,000 PPM) to 250 PPM | 28 | * Tighten sanity in time_init from 1% (10,000 PPM) to 250 PPM |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index f9d12319e0fb..d6e665d567bd 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * This file initializes the trap entry points | 8 | * This file initializes the trap entry points |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/tty.h> | 13 | #include <linux/tty.h> |
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index 0922e0785ddb..71470e9d93ba 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <asm-generic/vmlinux.lds.h> | 1 | #include <asm-generic/vmlinux.lds.h> |
| 3 | 2 | ||
| 4 | OUTPUT_FORMAT("elf64-alpha") | 3 | OUTPUT_FORMAT("elf64-alpha") |
diff --git a/arch/alpha/lib/callback_srm.S b/arch/alpha/lib/callback_srm.S index 0528acd0d9ad..8804bec2c644 100644 --- a/arch/alpha/lib/callback_srm.S +++ b/arch/alpha/lib/callback_srm.S | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * arch/alpha/lib/callback_srm.S | 2 | * arch/alpha/lib/callback_srm.S |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/console.h> | 5 | #include <asm/console.h> |
| 7 | 6 | ||
| 8 | .text | 7 | .text |
diff --git a/arch/alpha/lib/udelay.c b/arch/alpha/lib/udelay.c index 1c879bbce419..69d52aa37bae 100644 --- a/arch/alpha/lib/udelay.c +++ b/arch/alpha/lib/udelay.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Delay routines, using a pre-computed "loops_per_jiffy" value. | 4 | * Delay routines, using a pre-computed "loops_per_jiffy" value. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/sched.h> /* for udelay's use of smp_processor_id */ | 8 | #include <linux/sched.h> /* for udelay's use of smp_processor_id */ |
| 10 | #include <asm/param.h> | 9 | #include <asm/param.h> |
diff --git a/arch/alpha/mm/extable.c b/arch/alpha/mm/extable.c index c3849baebd57..dc7aeda15773 100644 --- a/arch/alpha/mm/extable.c +++ b/arch/alpha/mm/extable.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/alpha/mm/extable.c | 2 | * linux/arch/alpha/mm/extable.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <asm/uaccess.h> | 6 | #include <asm/uaccess.h> |
| 8 | 7 | ||
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 64ace5a9cd3d..622dabd84680 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1995 Linus Torvalds | 4 | * Copyright (C) 1995 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 544ac5dc09eb..917dad1b74c8 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | /* 2.3.x zone allocator, 1999 Andrea Arcangeli <andrea@suse.de> */ | 7 | /* 2.3.x zone allocator, 1999 Andrea Arcangeli <andrea@suse.de> */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/pagemap.h> | 9 | #include <linux/pagemap.h> |
| 11 | #include <linux/signal.h> | 10 | #include <linux/signal.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index bf6b65c81bef..b826f58c6e72 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE | 6 | * Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
diff --git a/arch/arm/boot/compressed/head-clps7500.S b/arch/arm/boot/compressed/head-clps7500.S index 4a8a689d15e6..941c5f5cbacf 100644 --- a/arch/arm/boot/compressed/head-clps7500.S +++ b/arch/arm/boot/compressed/head-clps7500.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd | 4 | * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | /* There are three different ways the kernel can be | 8 | /* There are three different ways the kernel can be |
| 10 | booted on a 7500 system: from Angel (loaded in RAM), from | 9 | booted on a 7500 system: from Angel (loaded in RAM), from |
diff --git a/arch/arm/boot/compressed/head-l7200.S b/arch/arm/boot/compressed/head-l7200.S index b08bd23f8d16..d0e3b20856cd 100644 --- a/arch/arm/boot/compressed/head-l7200.S +++ b/arch/arm/boot/compressed/head-l7200.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * is merged with head.S by the linker. | 7 | * is merged with head.S by the linker. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
| 12 | 11 | ||
| 13 | #ifndef CONFIG_ARCH_L7200 | 12 | #ifndef CONFIG_ARCH_L7200 |
diff --git a/arch/arm/boot/compressed/head-sa1100.S b/arch/arm/boot/compressed/head-sa1100.S index 5aefffd46048..4c8c0e46027d 100644 --- a/arch/arm/boot/compressed/head-sa1100.S +++ b/arch/arm/boot/compressed/head-sa1100.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | #include <asm/mach-types.h> | 11 | #include <asm/mach-types.h> |
| 13 | 12 | ||
diff --git a/arch/arm/boot/compressed/head-sharpsl.S b/arch/arm/boot/compressed/head-sharpsl.S index 59ad69640d6b..eb0084ea1ec4 100644 --- a/arch/arm/boot/compressed/head-sharpsl.S +++ b/arch/arm/boot/compressed/head-sharpsl.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 17 | #include <asm/mach-types.h> | 16 | #include <asm/mach-types.h> |
| 18 | 17 | ||
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index d3fe2533907e..73c5d9e0201c 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
| 10 | #include <asm/mach-types.h> | 9 | #include <asm/mach-types.h> |
| 11 | 10 | ||
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 23016f6aa645..f7b5c6db30f5 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
| 13 | 12 | ||
| 14 | /* | 13 | /* |
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 0dafba3a701d..fbc3ab0e1011 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Based on sa1111.c | 15 | * Based on sa1111.c |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 3f68db84e5e6..fe06a36a2130 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * All initialization functions provided here are intended to be called | 14 | * All initialization functions provided here are intended to be called |
| 15 | * from machine specific code with proper arguments when required. | 15 | * from machine specific code with proper arguments when required. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c index dfca596a9a27..95c8508c29b7 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * License, or (at your option) any later version. | 11 | * License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
diff --git a/arch/arm/common/via82c505.c b/arch/arm/common/via82c505.c index ef716a5b07ac..ba2e62986a57 100644 --- a/arch/arm/common/via82c505.c +++ b/arch/arm/common/via82c505.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 4 | #include <linux/ptrace.h> | 3 | #include <linux/ptrace.h> |
diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c index 2bed290fec76..33c55689f999 100644 --- a/arch/arm/kernel/apm.c +++ b/arch/arm/kernel/apm.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * [This document is available from Microsoft at: | 10 | * [This document is available from Microsoft at: |
| 11 | * http://www.microsoft.com/hwdev/busbios/amp_12.htm] | 11 | * http://www.microsoft.com/hwdev/busbios/amp_12.htm] |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/poll.h> | 14 | #include <linux/poll.h> |
| 16 | #include <linux/timer.h> | 15 | #include <linux/timer.h> |
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 45da06fc1ba1..964faac104fb 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * Bits taken from various places. | 6 | * Bits taken from various places. |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
diff --git a/arch/arm/kernel/compat.c b/arch/arm/kernel/compat.c index 60cfa7f3226c..0a1385442f43 100644 --- a/arch/arm/kernel/compat.c +++ b/arch/arm/kernel/compat.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * the kernel for 5 years from now (2001). This will allow boot loaders | 15 | * the kernel for 5 years from now (2001). This will allow boot loaders |
| 16 | * to convert to the new struct tag way. | 16 | * to convert to the new struct tag way. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index da280bae3d07..a5747e58a9dc 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * 32-bit debugging code | 10 | * 32-bit debugging code |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | 13 | ||
| 15 | .text | 14 | .text |
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 00aa225e8d95..68a257666d95 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | #define ECARD_C | 28 | #define ECARD_C |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 6423a38839b8..26f197afd204 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Note: there is a StrongARM bug in the STMIA rn, {regs}^ instruction that causes | 14 | * Note: there is a StrongARM bug in the STMIA rn, {regs}^ instruction that causes |
| 15 | * it to save wrong values... Be aware! | 15 | * it to save wrong values... Be aware! |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #include <asm/memory.h> | 18 | #include <asm/memory.h> |
| 20 | #include <asm/glue.h> | 19 | #include <asm/glue.h> |
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 75af6d6e2f28..6f5e7c50d42f 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
| 13 | 12 | ||
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index f1c2fd5b63e4..87ab4e157997 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 3 | #include <linux/linkage.h> | 2 | #include <linux/linkage.h> |
| 4 | 3 | ||
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 2af7e44218af..ac9eb3d30518 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * for 32-bit CPUs which has a process ID register(CP15). | 12 | * for 32-bit CPUs which has a process ID register(CP15). |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | 17 | ||
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 330b9476c398..518b80cd87de 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | * Kernel startup code for all 32-bit CPUs | 12 | * Kernel startup code for all 32-bit CPUs |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | 16 | ||
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index ec20f8935e8b..4d31cf8d02d5 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * IRQ's are in fact implemented a bit like signal handlers for the kernel. | 21 | * IRQ's are in fact implemented a bit like signal handlers for the kernel. |
| 22 | * Naturally it's not a 1:1 relation, but there are similarities. | 22 | * Naturally it's not a 1:1 relation, but there are similarities. |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kernel_stat.h> | 24 | #include <linux/kernel_stat.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/signal.h> | 26 | #include <linux/signal.h> |
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 055bf5d28894..298363d97047 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * Module allocation method suggested by Andi Kleen. | 10 | * Module allocation method suggested by Andi Kleen. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/moduleloader.h> | 13 | #include <linux/moduleloader.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index e1c77ee885a7..c3258b763c5d 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #include <stdarg.h> | 11 | #include <stdarg.h> |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index c40bdc770054..9254ba2f46fc 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 6bdf70def01f..7447a1987322 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 83a8d3c95eb3..48cf7fffddf2 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
| 13 | #include <linux/ptrace.h> | 12 | #include <linux/ptrace.h> |
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 1370d726dc10..68e9634d260a 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/spinlock.h> | 12 | #include <linux/spinlock.h> |
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 9c12d4fefbd3..09a67d771857 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * 1998-12-20 Updated NTP code according to technical memorandum Jan '96 | 16 | * 1998-12-20 Updated NTP code according to technical memorandum Jan '96 |
| 17 | * "A Kernel Model for Precision Timekeeping" by Dave Mills | 17 | * "A Kernel Model for Precision Timekeeping" by Dave Mills |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 35230a060108..35a052fc177a 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 'linux/arch/arm/lib/traps.S'. Mostly a debugging aid, but will probably | 12 | * 'linux/arch/arm/lib/traps.S'. Mostly a debugging aid, but will probably |
| 13 | * kill the offending process. | 13 | * kill the offending process. |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/signal.h> | 16 | #include <linux/signal.h> |
| 18 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 2df9688a7028..3ca574ee2772 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <asm-generic/vmlinux.lds.h> | 6 | #include <asm-generic/vmlinux.lds.h> |
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/thread_info.h> | 7 | #include <asm/thread_info.h> |
| 9 | #include <asm/memory.h> | 8 | #include <asm/memory.h> |
| 10 | 9 | ||
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S index 91f993f2e9db..74230083cbf4 100644 --- a/arch/arm/lib/backtrace.S +++ b/arch/arm/lib/backtrace.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 27/03/03 Ian Molton Clean up CONFIG_CPU | 10 | * 27/03/03 Ian Molton Clean up CONFIG_CPU |
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
| 16 | .text | 15 | .text |
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index b8c14e936697..542251021744 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_32v6K) | 2 | #if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_32v6K) |
| 4 | .macro bitop, instr | 3 | .macro bitop, instr |
diff --git a/arch/arm/lib/ucmpdi2.S b/arch/arm/lib/ucmpdi2.S index d847a62834cb..f76de07ac182 100644 --- a/arch/arm/lib/ucmpdi2.S +++ b/arch/arm/lib/ucmpdi2.S | |||
| @@ -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 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | 14 | ||
| 16 | #ifdef __ARMEB__ | 15 | #ifdef __ARMEB__ |
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index 65be5efd633c..aa01d6753d6e 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/arm/mach-at91rm9200/board-csb337.c b/arch/arm/mach-at91rm9200/board-csb337.c index e94645d77f7a..794d3fbb449b 100644 --- a/arch/arm/mach-at91rm9200/board-csb337.c +++ b/arch/arm/mach-at91rm9200/board-csb337.c | |||
| @@ -18,7 +18,6 @@ | |||
| 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 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-at91rm9200/board-csb637.c b/arch/arm/mach-at91rm9200/board-csb637.c index 67d5f7786cdb..c8b6f334246a 100644 --- a/arch/arm/mach-at91rm9200/board-csb637.c +++ b/arch/arm/mach-at91rm9200/board-csb637.c | |||
| @@ -18,7 +18,6 @@ | |||
| 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 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91rm9200/board-dk.c index 48d7390fa584..65873037e02a 100644 --- a/arch/arm/mach-at91rm9200/board-dk.c +++ b/arch/arm/mach-at91rm9200/board-dk.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-at91rm9200/board-ek.c b/arch/arm/mach-at91rm9200/board-ek.c index 72202ed830ad..868192351dda 100644 --- a/arch/arm/mach-at91rm9200/board-ek.c +++ b/arch/arm/mach-at91rm9200/board-ek.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-at91rm9200/common.c b/arch/arm/mach-at91rm9200/common.c index e836f8537a1d..cc55f4c28d95 100644 --- a/arch/arm/mach-at91rm9200/common.c +++ b/arch/arm/mach-at91rm9200/common.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | 14 | ||
| 16 | #include <asm/mach/arch.h> | 15 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c index 1cf85d231baa..4352acb88178 100644 --- a/arch/arm/mach-at91rm9200/devices.c +++ b/arch/arm/mach-at91rm9200/devices.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/mach/arch.h> | 13 | #include <asm/mach/arch.h> |
| 14 | #include <asm/mach/map.h> | 14 | #include <asm/mach/map.h> |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 18 | 17 | ||
| 19 | #include <asm/hardware.h> | 18 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-at91rm9200/irq.c b/arch/arm/mach-at91rm9200/irq.c index 70f4d7ac1533..dcd560dbcfb7 100644 --- a/arch/arm/mach-at91rm9200/irq.c +++ b/arch/arm/mach-at91rm9200/irq.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-at91rm9200/leds.c b/arch/arm/mach-at91rm9200/leds.c index 28150e8905ba..1a333730466e 100644 --- a/arch/arm/mach-at91rm9200/leds.c +++ b/arch/arm/mach-at91rm9200/leds.c | |||
| @@ -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/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/arm/mach-at91rm9200/time.c b/arch/arm/mach-at91rm9200/time.c index fc2d7d5e4637..f2f080350ccb 100644 --- a/arch/arm/mach-at91rm9200/time.c +++ b/arch/arm/mach-at91rm9200/time.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 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 <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index ff26a85aa4ba..3792ab4f0996 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * along with this program; if not, write to the Free Software | 19 | * along with this program; if not, write to the Free Software |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/initrd.h> | 24 | #include <linux/initrd.h> |
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c index 9ba45f4d5a7e..c8ecd2480c27 100644 --- a/arch/arm/mach-clps711x/p720t.c +++ b/arch/arm/mach-clps711x/p720t.c | |||
| @@ -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 <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 1fe73c0a9d01..26df3b666b56 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * your option) any later version. | 13 | * your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 2c28d66d260e..e760fd4f3655 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * your option) any later version. | 10 | * your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 0b3b875b1875..df315f2e9beb 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * your option) any later version. | 10 | * your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c index bbe6e4a0bf6a..af900f4755a4 100644 --- a/arch/arm/mach-footbridge/common.c +++ b/arch/arm/mach-footbridge/common.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c index 7a54578b51af..1f9b09b8ed88 100644 --- a/arch/arm/mach-footbridge/dma.c +++ b/arch/arm/mach-footbridge/dma.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 17-Mar-1999 RMK Allow any EBSA285-like architecture to have | 10 | * 17-Mar-1999 RMK Allow any EBSA285-like architecture to have |
| 11 | * ISA DMA controllers. | 11 | * ISA DMA controllers. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
| 16 | #include <asm/dma.h> | 15 | #include <asm/dma.h> |
diff --git a/arch/arm/mach-footbridge/ebsa285-leds.c b/arch/arm/mach-footbridge/ebsa285-leds.c index 2c7c3630401b..a64e22226515 100644 --- a/arch/arm/mach-footbridge/ebsa285-leds.c +++ b/arch/arm/mach-footbridge/ebsa285-leds.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Changelog: | 16 | * Changelog: |
| 17 | * 02-05-1999 RMK Various cleanups | 17 | * 02-05-1999 RMK Various cleanups |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c index 229bf0585e40..a1f381c64a30 100644 --- a/arch/arm/mach-footbridge/netwinder-hw.c +++ b/arch/arm/mach-footbridge/netwinder-hw.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 1998, 1999 Russell King, Phil Blundell | 6 | * Copyright (C) 1998, 1999 Russell King, Phil Blundell |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/ioport.h> | 9 | #include <linux/ioport.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
diff --git a/arch/arm/mach-footbridge/netwinder-leds.c b/arch/arm/mach-footbridge/netwinder-leds.c index 7451fc07b85a..8e9cac5a213b 100644 --- a/arch/arm/mach-footbridge/netwinder-leds.c +++ b/arch/arm/mach-footbridge/netwinder-leds.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Changelog: | 16 | * Changelog: |
| 17 | * 02-05-1999 RMK Various cleanups | 17 | * 02-05-1999 RMK Various cleanups |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c index 193f968edac3..407cd4c0aa8a 100644 --- a/arch/arm/mach-h720x/h7201-eval.c +++ b/arch/arm/mach-h720x/h7201-eval.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c index 36266896979c..bf2acdce62e5 100644 --- a/arch/arm/mach-h720x/h7202-eval.c +++ b/arch/arm/mach-h720x/h7202-eval.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index ea805bfa5e54..294b1c450f21 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index 229a63a525cd..f9043592e299 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * along with this program; if not, write to the Free Software | 20 | * along with this program; if not, write to the Free Software |
| 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 26 | #include <linux/ptrace.h> | 25 | #include <linux/ptrace.h> |
diff --git a/arch/arm/mach-iop3xx/common.c b/arch/arm/mach-iop3xx/common.c index fdeeef489a73..d7f50e57e753 100644 --- a/arch/arm/mach-iop3xx/common.c +++ b/arch/arm/mach-iop3xx/common.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * warranty of any kind, whether express or implied. | 12 | * warranty of any kind, whether express or implied. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <asm/hardware.h> | 16 | #include <asm/hardware.h> |
| 18 | 17 | ||
diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c index 0ebbcb20c6ae..b6d096903c4a 100644 --- a/arch/arm/mach-iop3xx/iop321-setup.c +++ b/arch/arm/mach-iop3xx/iop321-setup.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/major.h> | 15 | #include <linux/major.h> |
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
| 18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c index 7b7b6eea3846..3cc98d892ad4 100644 --- a/arch/arm/mach-iop3xx/iop331-setup.c +++ b/arch/arm/mach-iop3xx/iop331-setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/major.h> | 14 | #include <linux/major.h> |
| 16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index ebe4391dd7f9..3cfc5aab8259 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * warranty of any kind, whether express or implied. | 14 | * warranty of any kind, whether express or implied. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c index 52fac89e95b5..ac29298c5d3f 100644 --- a/arch/arm/mach-ixp2000/enp2611.c +++ b/arch/arm/mach-ixp2000/enp2611.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * option) any later version. | 18 | * option) any later version. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index 09101271298e..a6f14801872d 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Free Software Foundation; either version 2 of the License, or (at your | 14 | * Free Software Foundation; either version 2 of the License, or (at your |
| 15 | * option) any later version. | 15 | * option) any later version. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index 076e3f8acc96..91d36d91dac0 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Free Software Foundation; either version 2 of the License, or (at your | 14 | * Free Software Foundation; either version 2 of the License, or (at your |
| 15 | * option) any later version. | 15 | * option) any later version. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index d628da56b4bc..9b8ded259807 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Free Software Foundation; either version 2 of the License, or (at your | 14 | * Free Software Foundation; either version 2 of the License, or (at your |
| 15 | * option) any later version. | 15 | * option) any later version. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 66915282a463..8477ae1d8f72 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * option) any later version. | 15 | * option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index 051e3d70026e..82ad6ef90a38 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * warranty of any kind, whether express or implied. | 14 | * warranty of any kind, whether express or implied. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
diff --git a/arch/arm/mach-ixp23xx/espresso.c b/arch/arm/mach-ixp23xx/espresso.c index 357351fbb1e2..7a85ced56718 100644 --- a/arch/arm/mach-ixp23xx/espresso.c +++ b/arch/arm/mach-ixp23xx/espresso.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * warranty of any kind, whether express or implied. | 10 | * warranty of any kind, whether express or implied. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/spinlock.h> | 15 | #include <linux/spinlock.h> |
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c index e0886871cc77..bba9d9f08691 100644 --- a/arch/arm/mach-ixp23xx/ixdp2351.c +++ b/arch/arm/mach-ixp23xx/ixdp2351.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * warranty of any kind, whether express or implied. | 14 | * warranty of any kind, whether express or implied. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c index ac72f94c5b4d..3b34fa35e36b 100644 --- a/arch/arm/mach-ixp23xx/pci.c +++ b/arch/arm/mach-ixp23xx/pci.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * option) any later version. | 16 | * option) any later version. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c index 92ad18f41251..d06e21b70de5 100644 --- a/arch/arm/mach-ixp23xx/roadrunner.c +++ b/arch/arm/mach-ixp23xx/roadrunner.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * warranty of any kind, whether express or implied. | 14 | * warranty of any kind, whether express or implied. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index bf25a76e9bdf..13c7c629d037 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c index da415d5d7f37..8b8ca80c9449 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c index 26b7c001ff64..2d3b770d9e82 100644 --- a/arch/arm/mach-ixp4xx/nas100d-pci.c +++ b/arch/arm/mach-ixp4xx/nas100d-pci.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | 20 | ||
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c index ece860444d5b..0de639d6e60a 100644 --- a/arch/arm/mach-ixp4xx/nslu2-pci.c +++ b/arch/arm/mach-ixp4xx/nslu2-pci.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | 20 | ||
diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c index ef9af375fcc4..1919835d9610 100644 --- a/arch/arm/mach-lh7a40x/time.c +++ b/arch/arm/mach-lh7a40x/time.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * version 2 as published by the Free Software Foundation. | 8 | * version 2 as published by the Free Software Foundation. |
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 4b8d0ec73cb7..7b206116cd03 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/major.h> | 19 | #include <linux/major.h> |
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 847329cafc5c..a611c3b63954 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index aca2a120813a..880cd2d8f4aa 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * published by the Free Software Foundation. | 16 | * published by the Free Software Foundation. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c index 5c637c048368..da13c3e82850 100644 --- a/arch/arm/mach-omap1/id.c +++ b/arch/arm/mach-omap1/id.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index be3a2a4ee2b8..fab8b0b27cfb 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index a0431c00fa81..9e039845b50e 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 36 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 42 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c index 650650815915..8976fbb21f7c 100644 --- a/arch/arm/mach-omap1/leds-h2p2-debug.c +++ b/arch/arm/mach-omap1/leds-h2p2-debug.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * The "surfer" expansion board and H2 sample board also have two-color | 9 | * The "surfer" expansion board and H2 sample board also have two-color |
| 10 | * green+red LEDs (in parallel), used here for timer and idle indicators. | 10 | * green+red LEDs (in parallel), used here for timer and idle indicators. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/kernel_stat.h> | 13 | #include <linux/kernel_stat.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
diff --git a/arch/arm/mach-omap1/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c index c8ffd1ddcded..a0cd001ac39a 100644 --- a/arch/arm/mach-omap1/leds-innovator.c +++ b/arch/arm/mach-omap1/leds-innovator.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/mach-omap1/leds-innovator.c | 2 | * linux/arch/arm/mach-omap1/leds-innovator.c |
| 3 | */ | 3 | */ |
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/init.h> | 4 | #include <linux/init.h> |
| 6 | 5 | ||
| 7 | #include <asm/hardware.h> | 6 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c index 2c8bda847c18..3b29e59b0e6f 100644 --- a/arch/arm/mach-omap1/leds-osk.c +++ b/arch/arm/mach-omap1/leds-osk.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * LED driver for OSK, and optionally Mistral QVGA, boards | 4 | * LED driver for OSK, and optionally Mistral QVGA, boards |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/workqueue.h> | 7 | #include <linux/workqueue.h> |
| 9 | 8 | ||
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index 10fe0b3efcac..fa74ef7af15f 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 9b4cd698bec8..56319742aa1b 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/arm/mach-omap1/sleep.S b/arch/arm/mach-omap1/sleep.S index e58295e2d3b2..abef33d10f01 100644 --- a/arch/arm/mach-omap1/sleep.S +++ b/arch/arm/mach-omap1/sleep.S | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 32 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/linkage.h> | 35 | #include <linux/linkage.h> |
| 37 | #include <asm/assembler.h> | 36 | #include <asm/assembler.h> |
| 38 | #include <asm/arch/io.h> | 37 | #include <asm/arch/io.h> |
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index a85fe6066bc4..c2d3205bc592 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 72eb4bf571ac..7edf0f69da1e 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * it under the terms of the GNU General Public License version 2 as | 15 | * it under the terms of the GNU General Public License version 2 as |
| 16 | * published by the Free Software Foundation. | 16 | * published by the Free Software Foundation. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/device.h> | 20 | #include <linux/device.h> |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index fb7f91da1aad..4842ffe26705 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 76187300f2b6..871ace4fccb8 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 7d5711611f2f..20dd6e74e91d 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index d7baff675cfe..3eed6a737bf8 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 17 | #include <asm/hardware.h> | 16 | #include <asm/hardware.h> |
| 18 | #include <asm/mach/irq.h> | 17 | #include <asm/mach/irq.h> |
diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 1d925d69fc35..85cbc2a2e663 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/device.h> | 19 | #include <linux/device.h> |
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 1197dc38c20a..4c5f2c04883e 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 8893479dc7e0..c2bf57ef6825 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * it under the terms of the GNU General Public License version 2 as | 13 | * it under the terms of the GNU General Public License version 2 as |
| 14 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep.S index 00299cbeb911..16247d557853 100644 --- a/arch/arm/mach-omap2/sleep.S +++ b/arch/arm/mach-omap2/sleep.S | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * MA 02111-1307 USA | 21 | * MA 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/linkage.h> | 24 | #include <linux/linkage.h> |
| 26 | #include <asm/assembler.h> | 25 | #include <asm/assembler.h> |
| 27 | #include <asm/arch/io.h> | 26 | #include <asm/arch/io.h> |
diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S index d261e4ff4d9b..a5ef7f611da9 100644 --- a/arch/arm/mach-omap2/sram-fn.S +++ b/arch/arm/mach-omap2/sram-fn.S | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
| 23 | * MA 02111-1307 USA | 23 | * MA 02111-1307 USA |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/linkage.h> | 25 | #include <linux/linkage.h> |
| 27 | #include <asm/assembler.h> | 26 | #include <asm/assembler.h> |
| 28 | #include <asm/arch/io.h> | 27 | #include <asm/arch/io.h> |
diff --git a/arch/arm/mach-pxa/leds-idp.c b/arch/arm/mach-pxa/leds-idp.c index 5eba6ea0b0f7..38aa9270540e 100644 --- a/arch/arm/mach-pxa/leds-idp.c +++ b/arch/arm/mach-pxa/leds-idp.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | 16 | ||
| 18 | #include <asm/hardware.h> | 17 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-pxa/leds-lubbock.c b/arch/arm/mach-pxa/leds-lubbock.c index 05cf56059a0f..afbc6698e27c 100644 --- a/arch/arm/mach-pxa/leds-lubbock.c +++ b/arch/arm/mach-pxa/leds-lubbock.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * namespace collision. Mostly adapted the Mainstone version. | 11 | * namespace collision. Mostly adapted the Mainstone version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | 15 | ||
| 17 | #include <asm/hardware.h> | 16 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c index c06d3d7a8dd4..065293eb0d82 100644 --- a/arch/arm/mach-pxa/leds-mainstone.c +++ b/arch/arm/mach-pxa/leds-mainstone.c | |||
| @@ -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 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
| 16 | #include <asm/hardware.h> | 15 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 852ea72d8c80..2112c414f0e2 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * This program is free software; you can redistribute it and/or | 10 | * This program is free software; you can redistribute it and/or |
| 11 | * modify it under the terms of the GNU General Public License. | 11 | * modify it under the terms of the GNU General Public License. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/suspend.h> | 15 | #include <linux/suspend.h> |
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 573a5758e781..c1f21739bf71 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * initialization stuff for PXA machines which can be overridden later if | 16 | * initialization stuff for PXA machines which can be overridden later if |
| 17 | * need be. | 17 | * need be. |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 3baa70819f24..74eeada1e2fc 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S index 0650bed3b96e..15874b360e51 100644 --- a/arch/arm/mach-pxa/sleep.S +++ b/arch/arm/mach-pxa/sleep.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * modify it under the terms of the GNU General Public License. | 11 | * modify it under the terms of the GNU General Public License. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | #include <asm/assembler.h> | 15 | #include <asm/assembler.h> |
| 17 | #include <asm/hardware.h> | 16 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S index 6f6dbbd08021..d774430d02c0 100644 --- a/arch/arm/mach-pxa/standby.S +++ b/arch/arm/mach-pxa/standby.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
| 15 | #include <asm/hardware.h> | 14 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index b9b2057349eb..1ef85fcc6c06 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
| @@ -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 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index d13270c5d7cd..eb09d3859d6d 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 24 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 693fb1e396e0..84a959530fb6 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 25 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
diff --git a/arch/arm/mach-s3c2410/devs.h b/arch/arm/mach-s3c2410/devs.h index fa124ed920e0..726e2eaf8797 100644 --- a/arch/arm/mach-s3c2410/devs.h +++ b/arch/arm/mach-s3c2410/devs.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 27-Aug-2004 BJD Added timers 0 through 3 | 14 | * 27-Aug-2004 BJD Added timers 0 through 3 |
| 15 | * 10-Feb-2005 BJD Added camera from guillaume.gourat@nexvision.tv | 15 | * 10-Feb-2005 BJD Added camera from guillaume.gourat@nexvision.tv |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 19 | 18 | ||
| 20 | struct s3c24xx_uart_resources { | 19 | struct s3c24xx_uart_resources { |
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index 4dbd8e758ea6..b0aaf4328732 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * possible DMA function | 31 | * possible DMA function |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | 34 | ||
| 36 | #ifdef CONFIG_S3C2410_DMA_DEBUG | 35 | #ifdef CONFIG_S3C2410_DMA_DEBUG |
| 37 | #define DEBUG | 36 | #define DEBUG |
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index 43e9a550a203..a589fe76d915 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * 10-Mar-2005 LCVR Changed S3C2410_VA_UART to S3C24XX_VA_UART | 29 | * 10-Mar-2005 LCVR Changed S3C2410_VA_UART to S3C24XX_VA_UART |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/suspend.h> | 33 | #include <linux/suspend.h> |
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S index dc27167f4d59..a7561a79fc82 100644 --- a/arch/arm/mach-s3c2410/sleep.S +++ b/arch/arm/mach-s3c2410/sleep.S | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/linkage.h> | 27 | #include <linux/linkage.h> |
| 29 | #include <asm/assembler.h> | 28 | #include <asm/assembler.h> |
| 30 | #include <asm/hardware.h> | 29 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c index 9d7b799ea4a4..47387c5b9723 100644 --- a/arch/arm/mach-s3c2410/time.c +++ b/arch/arm/mach-s3c2410/time.c | |||
| @@ -18,7 +18,6 @@ | |||
| 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 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index c58f12ba7a93..be06d668a3c9 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index 8269a9ef9afe..e0f6d57b5065 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Jan-2004 : Removed io map for flash [FB] | 10 | * Jan-2004 : Removed io map for flash [FB] |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/tty.h> | 15 | #include <linux/tty.h> |
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 676b5c5b75bb..a6bab50dab61 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * 04-16-2001 Lineo Japan,Inc. ... | 17 | * 04-16-2001 Lineo Japan,Inc. ... |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/tty.h> | 22 | #include <linux/tty.h> |
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 9ea71551fc04..4575f316e141 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index b04d92271020..e727ba87b9f2 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * and abstracted EGPIO interface. | 19 | * and abstracted EGPIO interface. |
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/arch/arm/mach-sa1100/leds-assabet.c b/arch/arm/mach-sa1100/leds-assabet.c index e9aa9dff211a..ee9788989875 100644 --- a/arch/arm/mach-sa1100/leds-assabet.c +++ b/arch/arm/mach-sa1100/leds-assabet.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * - Green - toggles state every 50 timer interrupts | 9 | * - Green - toggles state every 50 timer interrupts |
| 10 | * - Red - on if system is not idle | 10 | * - Red - on if system is not idle |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | 13 | ||
| 15 | #include <asm/hardware.h> | 14 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-sa1100/leds-badge4.c b/arch/arm/mach-sa1100/leds-badge4.c index 0a8f87bb6c4f..280929be972d 100644 --- a/arch/arm/mach-sa1100/leds-badge4.c +++ b/arch/arm/mach-sa1100/leds-badge4.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
| 16 | #include <asm/hardware.h> | 15 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-sa1100/leds-cerf.c b/arch/arm/mach-sa1100/leds-cerf.c index f6635a2d0e83..f38eeddbef10 100644 --- a/arch/arm/mach-sa1100/leds-cerf.c +++ b/arch/arm/mach-sa1100/leds-cerf.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Author: ??? | 4 | * Author: ??? |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | 7 | ||
| 9 | #include <asm/hardware.h> | 8 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-sa1100/leds-hackkit.c b/arch/arm/mach-sa1100/leds-hackkit.c index 2e5fa14aa4eb..7e91cc90b5ae 100644 --- a/arch/arm/mach-sa1100/leds-hackkit.c +++ b/arch/arm/mach-sa1100/leds-hackkit.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * The HackKit has two leds (GPIO 22/23). The red led (gpio 22) is used | 9 | * The HackKit has two leds (GPIO 22/23). The red led (gpio 22) is used |
| 10 | * as cpu led, the green one is used as timer led. | 10 | * as cpu led, the green one is used as timer led. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | 13 | ||
| 15 | #include <asm/hardware.h> | 14 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-sa1100/leds-lart.c b/arch/arm/mach-sa1100/leds-lart.c index 187501490713..2d27d76cfc6b 100644 --- a/arch/arm/mach-sa1100/leds-lart.c +++ b/arch/arm/mach-sa1100/leds-lart.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * time, but in that case the timer events will still dictate the | 9 | * time, but in that case the timer events will still dictate the |
| 10 | * pace of the LED. | 10 | * pace of the LED. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | 13 | ||
| 15 | #include <asm/hardware.h> | 14 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-sa1100/leds-simpad.c b/arch/arm/mach-sa1100/leds-simpad.c index 6a27a2d32206..def090a87385 100644 --- a/arch/arm/mach-sa1100/leds-simpad.c +++ b/arch/arm/mach-sa1100/leds-simpad.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Author: Juergen Messerer <juergen.messerer@siemens.ch> | 4 | * Author: Juergen Messerer <juergen.messerer@siemens.ch> |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | 7 | ||
| 9 | #include <asm/hardware.h> | 8 | #include <asm/hardware.h> |
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 5aafe0b56992..8acab7b1e4c2 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/arm/mach-sa1100/shannon.c | 2 | * linux/arch/arm/mach-sa1100/shannon.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 7 | #include <linux/device.h> | 6 | #include <linux/device.h> |
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index d2c23b2c34d1..a9ae1b581aa6 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/arm/mach-sa1100/simpad.c | 2 | * linux/arch/arm/mach-sa1100/simpad.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
diff --git a/arch/arm/mach-shark/dma.c b/arch/arm/mach-shark/dma.c index 835989a02918..6774b8d5d13d 100644 --- a/arch/arm/mach-shark/dma.c +++ b/arch/arm/mach-shark/dma.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1998 Phil Blundell | 8 | * Copyright (C) 1998 Phil Blundell |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | 12 | ||
| 14 | #include <asm/dma.h> | 13 | #include <asm/dma.h> |
diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c index 7bdeb70a0c10..7cd86d357a3c 100644 --- a/arch/arm/mach-shark/leds.c +++ b/arch/arm/mach-shark/leds.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | * Changelog: | 16 | * Changelog: |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index cebd48a3dae4..08de8490fb69 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 24 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c index 722fbabc9cfb..41b370090b60 100644 --- a/arch/arm/mach-versatile/pci.c +++ b/arch/arm/mach-versatile/pci.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 14/04/2005 Initial version, colin.king@philips.com | 14 | * 14/04/2005 Initial version, colin.king@philips.com |
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 20 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c index 1eb596782078..b257ef78ef45 100644 --- a/arch/arm/mach-versatile/versatile_ab.c +++ b/arch/arm/mach-versatile/versatile_ab.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 25 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c index f17ab4fb548a..503725b166fc 100644 --- a/arch/arm/mach-versatile/versatile_pb.c +++ b/arch/arm/mach-versatile/versatile_pb.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 25 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 705c98921c37..e0d21bbbe7d7 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/compiler.h> | 14 | #include <linux/compiler.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S index 54e3c5bb5186..2ebc1b3bf856 100644 --- a/arch/arm/mm/cache-v4wb.S +++ b/arch/arm/mm/cache-v4wb.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <asm/memory.h> | 12 | #include <asm/memory.h> |
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 4a884baf3b9c..c5e0622c7765 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
| 14 | #include <linux/ptrace.h> | 13 | #include <linux/ptrace.h> |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 989fd681c822..fe3f7f625008 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/ptrace.h> | 12 | #include <linux/ptrace.h> |
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c index 95273de4f772..b0242c6ea066 100644 --- a/arch/arm/mm/mm-armv.c +++ b/arch/arm/mm/mm-armv.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * Page table sludge for ARM v3 and v4 processor architectures. | 10 | * Page table sludge for ARM v3 and v4 processor architectures. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| @@ -227,7 +226,7 @@ void free_pgd_slow(pgd_t *pgd) | |||
| 227 | 226 | ||
| 228 | pte = pmd_page(*pmd); | 227 | pte = pmd_page(*pmd); |
| 229 | pmd_clear(pmd); | 228 | pmd_clear(pmd); |
| 230 | dec_page_state(nr_page_table_pages); | 229 | dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE); |
| 231 | pte_lock_deinit(pte); | 230 | pte_lock_deinit(pte); |
| 232 | pte_free(pte); | 231 | pte_free(pte); |
| 233 | pmd_free(pmd); | 232 | pmd_free(pmd); |
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 3de7f84b53c2..29e54807c5bc 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/mm/mmap.c | 2 | * linux/arch/arm/mm/mmap.c |
| 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 | #include <linux/mman.h> | 6 | #include <linux/mman.h> |
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S index b9abbafca812..cc609666df05 100644 --- a/arch/arm/mm/proc-arm1020.S +++ b/arch/arm/mm/proc-arm1020.S | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * CONFIG_CPU_ARM1020_CPU_IDLE -> nohlt | 26 | * CONFIG_CPU_ARM1020_CPU_IDLE -> nohlt |
| 27 | */ | 27 | */ |
| 28 | #include <linux/linkage.h> | 28 | #include <linux/linkage.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
| 32 | #include <asm/asm-offsets.h> | 31 | #include <asm/asm-offsets.h> |
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S index bcd5ee022e00..117a946c28c8 100644 --- a/arch/arm/mm/proc-arm1020e.S +++ b/arch/arm/mm/proc-arm1020e.S | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * CONFIG_CPU_ARM1020_CPU_IDLE -> nohlt | 26 | * CONFIG_CPU_ARM1020_CPU_IDLE -> nohlt |
| 27 | */ | 27 | */ |
| 28 | #include <linux/linkage.h> | 28 | #include <linux/linkage.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
| 32 | #include <asm/asm-offsets.h> | 31 | #include <asm/asm-offsets.h> |
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S index b0ccff4fadd2..39b7c102180a 100644 --- a/arch/arm/mm/proc-arm1022.S +++ b/arch/arm/mm/proc-arm1022.S | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * functions on the ARM1022E. | 15 | * functions on the ARM1022E. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <asm/assembler.h> | 19 | #include <asm/assembler.h> |
| 21 | #include <asm/asm-offsets.h> | 20 | #include <asm/asm-offsets.h> |
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S index abe850c9a641..33e1ab8eb1d6 100644 --- a/arch/arm/mm/proc-arm1026.S +++ b/arch/arm/mm/proc-arm1026.S | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * functions on the ARM1026EJ-S. | 15 | * functions on the ARM1026EJ-S. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <asm/assembler.h> | 19 | #include <asm/assembler.h> |
| 21 | #include <asm/asm-offsets.h> | 20 | #include <asm/asm-offsets.h> |
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S index 31dc839ba07c..6f0db29ab842 100644 --- a/arch/arm/mm/proc-arm920.S +++ b/arch/arm/mm/proc-arm920.S | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * CONFIG_CPU_ARM920_CPU_IDLE -> nohlt | 26 | * CONFIG_CPU_ARM920_CPU_IDLE -> nohlt |
| 27 | */ | 27 | */ |
| 28 | #include <linux/linkage.h> | 28 | #include <linux/linkage.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
| 32 | #include <asm/pgtable-hwdef.h> | 31 | #include <asm/pgtable-hwdef.h> |
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S index 9e57c34f5c09..1ad464cc7bcb 100644 --- a/arch/arm/mm/proc-arm922.S +++ b/arch/arm/mm/proc-arm922.S | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * CONFIG_CPU_ARM922_CPU_IDLE -> nohlt | 27 | * CONFIG_CPU_ARM922_CPU_IDLE -> nohlt |
| 28 | */ | 28 | */ |
| 29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <asm/assembler.h> | 31 | #include <asm/assembler.h> |
| 33 | #include <asm/pgtable-hwdef.h> | 32 | #include <asm/pgtable-hwdef.h> |
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S index 8d47c9f3f931..a55d56ce2264 100644 --- a/arch/arm/mm/proc-arm925.S +++ b/arch/arm/mm/proc-arm925.S | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <linux/linkage.h> | 52 | #include <linux/linkage.h> |
| 53 | #include <linux/config.h> | ||
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
| 55 | #include <asm/assembler.h> | 54 | #include <asm/assembler.h> |
| 56 | #include <asm/pgtable-hwdef.h> | 55 | #include <asm/pgtable-hwdef.h> |
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S index cb4d8f33d2a3..20275967663d 100644 --- a/arch/arm/mm/proc-arm926.S +++ b/arch/arm/mm/proc-arm926.S | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * CONFIG_CPU_ARM926_CPU_IDLE -> nohlt | 26 | * CONFIG_CPU_ARM926_CPU_IDLE -> nohlt |
| 27 | */ | 27 | */ |
| 28 | #include <linux/linkage.h> | 28 | #include <linux/linkage.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
| 32 | #include <asm/pgtable-hwdef.h> | 31 | #include <asm/pgtable-hwdef.h> |
diff --git a/arch/arm/nwfpe/fpa11.c b/arch/arm/nwfpe/fpa11.c index 7b3d74d73c80..cc60acde84d9 100644 --- a/arch/arm/nwfpe/fpa11.c +++ b/arch/arm/nwfpe/fpa11.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include "fpmodule.h" | 26 | #include "fpmodule.h" |
| 27 | #include "fpmodule.inl" | 27 | #include "fpmodule.inl" |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/compiler.h> | 29 | #include <linux/compiler.h> |
| 31 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 32 | #include <asm/system.h> | 31 | #include <asm/system.h> |
diff --git a/arch/arm/nwfpe/fpa11.h b/arch/arm/nwfpe/fpa11.h index 28cd79a451d3..4a4d02c09112 100644 --- a/arch/arm/nwfpe/fpa11.h +++ b/arch/arm/nwfpe/fpa11.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | */ | 31 | */ |
| 32 | #define GET_USERREG() ((struct pt_regs *)(THREAD_START_SP + (unsigned long)current_thread_info()) - 1) | 32 | #define GET_USERREG() ((struct pt_regs *)(THREAD_START_SP + (unsigned long)current_thread_info()) - 1) |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/thread_info.h> | 34 | #include <linux/thread_info.h> |
| 36 | 35 | ||
| 37 | /* includes */ | 36 | /* includes */ |
diff --git a/arch/arm/nwfpe/fpa11_cpdo.c b/arch/arm/nwfpe/fpa11_cpdo.c index 4a31dfd94068..2cebb1529607 100644 --- a/arch/arm/nwfpe/fpa11_cpdo.c +++ b/arch/arm/nwfpe/fpa11_cpdo.c | |||
| @@ -20,7 +20,6 @@ | |||
| 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 | #include <linux/config.h> | ||
| 24 | #include "fpa11.h" | 23 | #include "fpa11.h" |
| 25 | #include "fpopcode.h" | 24 | #include "fpopcode.h" |
| 26 | 25 | ||
diff --git a/arch/arm/nwfpe/fpa11_cpdt.c b/arch/arm/nwfpe/fpa11_cpdt.c index 32859fa8dcfc..79f8e67cc6c1 100644 --- a/arch/arm/nwfpe/fpa11_cpdt.c +++ b/arch/arm/nwfpe/fpa11_cpdt.c | |||
| @@ -20,7 +20,6 @@ | |||
| 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 | #include <linux/config.h> | ||
| 24 | #include "fpa11.h" | 23 | #include "fpa11.h" |
| 25 | #include "softfloat.h" | 24 | #include "softfloat.h" |
| 26 | #include "fpopcode.h" | 25 | #include "fpopcode.h" |
diff --git a/arch/arm/nwfpe/fpa11_cprt.c b/arch/arm/nwfpe/fpa11_cprt.c index 7c67023655e4..9843dc533047 100644 --- a/arch/arm/nwfpe/fpa11_cprt.c +++ b/arch/arm/nwfpe/fpa11_cprt.c | |||
| @@ -20,7 +20,6 @@ | |||
| 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 | #include <linux/config.h> | ||
| 24 | #include "fpa11.h" | 23 | #include "fpa11.h" |
| 25 | #include "fpopcode.h" | 24 | #include "fpopcode.h" |
| 26 | #include "fpa11.inl" | 25 | #include "fpa11.inl" |
diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c index 7d977d23f026..4c0ab50f399a 100644 --- a/arch/arm/nwfpe/fpmodule.c +++ b/arch/arm/nwfpe/fpmodule.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include "fpa11.h" | 24 | #include "fpa11.h" |
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | /* XXX */ | 28 | /* XXX */ |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
diff --git a/arch/arm/nwfpe/fpopcode.c b/arch/arm/nwfpe/fpopcode.c index 67ff2ab08ea0..922b81107585 100644 --- a/arch/arm/nwfpe/fpopcode.c +++ b/arch/arm/nwfpe/fpopcode.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include "fpa11.h" | 22 | #include "fpa11.h" |
| 24 | #include "softfloat.h" | 23 | #include "softfloat.h" |
| 25 | #include "fpopcode.h" | 24 | #include "fpopcode.h" |
diff --git a/arch/arm/nwfpe/fpopcode.h b/arch/arm/nwfpe/fpopcode.h index 6528e081c83f..ec78e3517fc9 100644 --- a/arch/arm/nwfpe/fpopcode.h +++ b/arch/arm/nwfpe/fpopcode.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #ifndef __FPOPCODE_H__ | 23 | #ifndef __FPOPCODE_H__ |
| 24 | #define __FPOPCODE_H__ | 24 | #define __FPOPCODE_H__ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | /* | 27 | /* |
| 29 | ARM Floating Point Instruction Classes | 28 | ARM Floating Point Instruction Classes |
diff --git a/arch/arm/nwfpe/softfloat.h b/arch/arm/nwfpe/softfloat.h index 978c699673c6..e1125bc39ee4 100644 --- a/arch/arm/nwfpe/softfloat.h +++ b/arch/arm/nwfpe/softfloat.h | |||
| @@ -32,7 +32,6 @@ this code that are retained. | |||
| 32 | #ifndef __SOFTFLOAT_H__ | 32 | #ifndef __SOFTFLOAT_H__ |
| 33 | #define __SOFTFLOAT_H__ | 33 | #define __SOFTFLOAT_H__ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | 35 | ||
| 37 | /* | 36 | /* |
| 38 | ------------------------------------------------------------------------------- | 37 | ------------------------------------------------------------------------------- |
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 32ec04c58bcd..c520e9dcdd8a 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/version.h> | 13 | #include <linux/version.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index adffc5a859ee..57b7b93674a4 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 5d5d6eb222dd..ca486c9f36b5 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index 305e9b990b71..56acb8720f78 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index d3c8ea7eecfd..418b88fbea8e 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c index 8c1c016aa689..042105ac30b8 100644 --- a/arch/arm/plat-omap/mux.c +++ b/arch/arm/plat-omap/mux.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c index 37792d43738b..b5d307026c82 100644 --- a/arch/arm/plat-omap/ocpi.c +++ b/arch/arm/plat-omap/ocpi.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S index 66414cc8e6e3..85cffe2c6266 100644 --- a/arch/arm/plat-omap/sram-fn.S +++ b/arch/arm/plat-omap/sram-fn.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
| 13 | #include <asm/assembler.h> | 12 | #include <asm/assembler.h> |
| 14 | #include <asm/arch/io.h> | 13 | #include <asm/arch/io.h> |
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index b7bf09b1b412..72ce52ce815b 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c index 3461a6c9665c..053c18132ef4 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/plat-omap/timer32k.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 00afc7a8c2ab..9b815327b6a5 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #undef DEBUG | 21 | #undef DEBUG |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 2476f4c2e760..9d265d5e748c 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/signal.h> | 14 | #include <linux/signal.h> |
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig index cf4ebf4c274d..c14fe918bc4c 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig | |||
| @@ -79,7 +79,7 @@ config ARCH_A5K | |||
| 79 | bool "A5000" | 79 | bool "A5000" |
| 80 | select ARCH_MAY_HAVE_PC_FDC | 80 | select ARCH_MAY_HAVE_PC_FDC |
| 81 | help | 81 | help |
| 82 | Say Y here to to support the Acorn A5000. | 82 | Say Y here to support the Acorn A5000. |
| 83 | 83 | ||
| 84 | Linux can support the | 84 | Linux can support the |
| 85 | internal IDE disk and CD-ROM interface, serial and parallel port, | 85 | internal IDE disk and CD-ROM interface, serial and parallel port, |
| @@ -129,7 +129,7 @@ config ZBOOT_ROM_BSS | |||
| 129 | config XIP_KERNEL | 129 | config XIP_KERNEL |
| 130 | bool "Execute In Place (XIP) kernel image" | 130 | bool "Execute In Place (XIP) kernel image" |
| 131 | help | 131 | help |
| 132 | Select this option to create a kernel that can be programed into | 132 | Select this option to create a kernel that can be programmed into |
| 133 | the OS ROMs. | 133 | the OS ROMs. |
| 134 | 134 | ||
| 135 | comment "At least one math emulation must be selected" | 135 | comment "At least one math emulation must be selected" |
| @@ -140,7 +140,7 @@ config FPE_NWFPE | |||
| 140 | Say Y to include the NWFPE floating point emulator in the kernel. | 140 | Say Y to include the NWFPE floating point emulator in the kernel. |
| 141 | This is necessary to run most binaries. Linux does not currently | 141 | This is necessary to run most binaries. Linux does not currently |
| 142 | support floating point hardware so you need to say Y here even if | 142 | support floating point hardware so you need to say Y here even if |
| 143 | your machine has an FPA or floating point co-processor podule. | 143 | your machine has an FPA or floating point co-processor module. |
| 144 | 144 | ||
| 145 | It is also possible to say M to build the emulator as a module | 145 | It is also possible to say M to build the emulator as a module |
| 146 | (nwfpe) or indeed to leave it out altogether. However, unless you | 146 | (nwfpe) or indeed to leave it out altogether. However, unless you |
diff --git a/arch/arm26/boot/compressed/head.S b/arch/arm26/boot/compressed/head.S index 0307804a6070..2a2cda36d83b 100644 --- a/arch/arm26/boot/compressed/head.S +++ b/arch/arm26/boot/compressed/head.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | 11 | ||
| 13 | /* | 12 | /* |
diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c index 9d66c27f2724..07907b6ecb63 100644 --- a/arch/arm26/kernel/armksyms.c +++ b/arch/arm26/kernel/armksyms.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/user.h> | 12 | #include <linux/user.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
diff --git a/arch/arm26/kernel/asm-offsets.c b/arch/arm26/kernel/asm-offsets.c index ac682d5fd039..76d9d7d489a8 100644 --- a/arch/arm26/kernel/asm-offsets.c +++ b/arch/arm26/kernel/asm-offsets.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 18 | 17 | ||
diff --git a/arch/arm26/kernel/compat.c b/arch/arm26/kernel/compat.c index db0310db8998..21e966ff0aa7 100644 --- a/arch/arm26/kernel/compat.c +++ b/arch/arm26/kernel/compat.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * the kernel for 5 years from now (2001). This will allow boot loaders | 16 | * the kernel for 5 years from now (2001). This will allow boot loaders |
| 17 | * to convert to the new struct tag way. | 17 | * to convert to the new struct tag way. |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/string.h> | 21 | #include <linux/string.h> |
diff --git a/arch/arm26/kernel/ecard.c b/arch/arm26/kernel/ecard.c index f2278aadac8a..047d0a408b9d 100644 --- a/arch/arm26/kernel/ecard.c +++ b/arch/arm26/kernel/ecard.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | #define ECARD_C | 25 | #define ECARD_C |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
diff --git a/arch/arm26/kernel/fiq.c b/arch/arm26/kernel/fiq.c index a24272b61f30..c4776c96be6b 100644 --- a/arch/arm26/kernel/fiq.c +++ b/arch/arm26/kernel/fiq.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * - enables FIQ. | 36 | * - enables FIQ. |
| 37 | * 6. Goto 3 | 37 | * 6. Goto 3 |
| 38 | */ | 38 | */ |
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/mm.h> | 40 | #include <linux/mm.h> |
| 42 | #include <linux/mman.h> | 41 | #include <linux/mman.h> |
diff --git a/arch/arm26/kernel/head.S b/arch/arm26/kernel/head.S index 8bfc62539ba6..93575e0e58fe 100644 --- a/arch/arm26/kernel/head.S +++ b/arch/arm26/kernel/head.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | * 26-bit kernel startup code | 11 | * 26-bit kernel startup code |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
| 16 | 15 | ||
diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c index 0934e6fba606..e08ba2955ec7 100644 --- a/arch/arm26/kernel/irq.c +++ b/arch/arm26/kernel/irq.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * IRQ's are in fact implemented a bit like signal handlers for the kernel. | 18 | * IRQ's are in fact implemented a bit like signal handlers for the kernel. |
| 19 | * Naturally it's not a 1:1 relation, but there are similarities. | 19 | * Naturally it's not a 1:1 relation, but there are similarities. |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/ptrace.h> | 22 | #include <linux/ptrace.h> |
| 24 | #include <linux/kernel_stat.h> | 23 | #include <linux/kernel_stat.h> |
diff --git a/arch/arm26/kernel/process.c b/arch/arm26/kernel/process.c index 386305659171..dcd81e62ff4e 100644 --- a/arch/arm26/kernel/process.c +++ b/arch/arm26/kernel/process.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/arm26/kernel/ptrace.c b/arch/arm26/kernel/ptrace.c index 282e24d79328..9343889b27fe 100644 --- a/arch/arm26/kernel/ptrace.c +++ b/arch/arm26/kernel/ptrace.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/arch/arm26/kernel/semaphore.c b/arch/arm26/kernel/semaphore.c index 3023a53431ff..5447a06db3fa 100644 --- a/arch/arm26/kernel/semaphore.c +++ b/arch/arm26/kernel/semaphore.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * published by the Free Software Foundation. | 13 | * published by the Free Software Foundation. |
| 14 | */ | 14 | */ |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c index 4eb329e3828a..843c29fe9af5 100644 --- a/arch/arm26/kernel/setup.c +++ b/arch/arm26/kernel/setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/ioport.h> | 13 | #include <linux/ioport.h> |
diff --git a/arch/arm26/kernel/signal.c b/arch/arm26/kernel/signal.c index 2a48c12100c0..6a8ef8da6dab 100644 --- a/arch/arm26/kernel/signal.c +++ b/arch/arm26/kernel/signal.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 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 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
diff --git a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c index 335525339ad6..718de9bed950 100644 --- a/arch/arm26/kernel/time.c +++ b/arch/arm26/kernel/time.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * "A Kernel Model for Precision Timekeeping" by Dave Mills | 18 | * "A Kernel Model for Precision Timekeeping" by Dave Mills |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
diff --git a/arch/arm26/kernel/traps.c b/arch/arm26/kernel/traps.c index a79de041b50e..d594fb59e945 100644 --- a/arch/arm26/kernel/traps.c +++ b/arch/arm26/kernel/traps.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/signal.h> | 20 | #include <linux/signal.h> |
diff --git a/arch/arm26/kernel/vmlinux.lds.S b/arch/arm26/kernel/vmlinux.lds.S index 811a69048010..1fa39f02e07c 100644 --- a/arch/arm26/kernel/vmlinux.lds.S +++ b/arch/arm26/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #ifdef CONFIG_XIP_KERNEL | 2 | #ifdef CONFIG_XIP_KERNEL |
| 4 | 3 | ||
diff --git a/arch/arm26/lib/backtrace.S b/arch/arm26/lib/backtrace.S index d793fe4339fc..e27feb1e891d 100644 --- a/arch/arm26/lib/backtrace.S +++ b/arch/arm26/lib/backtrace.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
| 13 | .text | 12 | .text |
diff --git a/arch/arm26/lib/csumpartialcopyuser.S b/arch/arm26/lib/csumpartialcopyuser.S index 261dd154c1a4..a98eea74305a 100644 --- a/arch/arm26/lib/csumpartialcopyuser.S +++ b/arch/arm26/lib/csumpartialcopyuser.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
| 13 | #include <asm/errno.h> | 12 | #include <asm/errno.h> |
diff --git a/arch/arm26/lib/kbd.c b/arch/arm26/lib/kbd.c index 22d2c93aaf1a..cb56e943e006 100644 --- a/arch/arm26/lib/kbd.c +++ b/arch/arm26/lib/kbd.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kd.h> | 1 | #include <linux/kd.h> |
| 3 | //#include <linux/kbd_ll.h> | 2 | //#include <linux/kbd_ll.h> |
| 4 | #include <linux/kbd_kern.h> | 3 | #include <linux/kbd_kern.h> |
diff --git a/arch/arm26/lib/lib1funcs.S b/arch/arm26/lib/lib1funcs.S index b8f9518db871..0e29970b0e8a 100644 --- a/arch/arm26/lib/lib1funcs.S +++ b/arch/arm26/lib/lib1funcs.S | |||
| @@ -39,7 +39,6 @@ Boston, MA 02111-1307, USA. */ | |||
| 39 | #include <linux/linkage.h> | 39 | #include <linux/linkage.h> |
| 40 | #include <asm/assembler.h> | 40 | #include <asm/assembler.h> |
| 41 | #include <asm/hardware.h> | 41 | #include <asm/hardware.h> |
| 42 | #include <linux/config.h> | ||
| 43 | 42 | ||
| 44 | #define RET movs | 43 | #define RET movs |
| 45 | #define RETc(x) mov##x##s | 44 | #define RETc(x) mov##x##s |
diff --git a/arch/arm26/machine/dma.c b/arch/arm26/machine/dma.c index cbc7c61d5b32..4402a5a1b78f 100644 --- a/arch/arm26/machine/dma.c +++ b/arch/arm26/machine/dma.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | * DMA functions specific to Archimedes and A5000 architecture | 11 | * DMA functions specific to Archimedes and A5000 architecture |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | 15 | ||
diff --git a/arch/arm26/machine/irq.c b/arch/arm26/machine/irq.c index 4361863f7ed2..a60d543edecc 100644 --- a/arch/arm26/machine/irq.c +++ b/arch/arm26/machine/irq.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * 08-09-2002 IM Brought up to date for 2.5 | 16 | * 08-09-2002 IM Brought up to date for 2.5 |
| 17 | * 01-06-2003 JMA Removed arc_fiq_chip | 17 | * 01-06-2003 JMA Removed arc_fiq_chip |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | 20 | ||
| 22 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
diff --git a/arch/arm26/mm/extable.c b/arch/arm26/mm/extable.c index 2d9f5b5a78d6..38e1958d9538 100644 --- a/arch/arm26/mm/extable.c +++ b/arch/arm26/mm/extable.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/arm26/mm/extable.c | 2 | * linux/arch/arm26/mm/extable.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <asm/uaccess.h> | 6 | #include <asm/uaccess.h> |
| 8 | 7 | ||
diff --git a/arch/arm26/mm/fault.c b/arch/arm26/mm/fault.c index bd6f2db608b7..761938b56679 100644 --- a/arch/arm26/mm/fault.c +++ b/arch/arm26/mm/fault.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c index 7da8a5205678..562fac12eb95 100644 --- a/arch/arm26/mm/init.c +++ b/arch/arm26/mm/init.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/signal.h> | 10 | #include <linux/signal.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/arm26/nwfpe/fpmodule.c b/arch/arm26/nwfpe/fpmodule.c index 5258c6096fb9..a8fad92eb44f 100644 --- a/arch/arm26/nwfpe/fpmodule.c +++ b/arch/arm26/nwfpe/fpmodule.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/version.h> | 27 | #include <linux/version.h> |
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | /* XXX */ | 29 | /* XXX */ |
| 31 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
diff --git a/arch/arm26/nwfpe/fpmodule.h b/arch/arm26/nwfpe/fpmodule.h index ef71aab46a32..f971ddd60cc1 100644 --- a/arch/arm26/nwfpe/fpmodule.h +++ b/arch/arm26/nwfpe/fpmodule.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef __FPMODULE_H__ | 22 | #ifndef __FPMODULE_H__ |
| 23 | #define __FPMODULE_H__ | 23 | #define __FPMODULE_H__ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | #define REG_ORIG_R0 16 | 26 | #define REG_ORIG_R0 16 |
| 28 | #define REG_CPSR 15 | 27 | #define REG_CPSR 15 |
diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/arch-v10/boot/compressed/head.S index e73f44c998d9..610bdb237553 100644 --- a/arch/cris/arch-v10/boot/compressed/head.S +++ b/arch/cris/arch-v10/boot/compressed/head.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #define ASSEMBLER_MACROS_ONLY | 11 | #define ASSEMBLER_MACROS_ONLY |
| 13 | #include <asm/arch/sv_addr_ag.h> | 12 | #include <asm/arch/sv_addr_ag.h> |
| 14 | 13 | ||
diff --git a/arch/cris/arch-v10/boot/compressed/misc.c b/arch/cris/arch-v10/boot/compressed/misc.c index 1b5e83f1f846..ffb8d21b2f83 100644 --- a/arch/cris/arch-v10/boot/compressed/misc.c +++ b/arch/cris/arch-v10/boot/compressed/misc.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #define KERNEL_LOAD_ADR 0x40004000 | 21 | #define KERNEL_LOAD_ADR 0x40004000 |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | 23 | ||
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 26 | #include <asm/arch/svinto.h> | 25 | #include <asm/arch/svinto.h> |
diff --git a/arch/cris/arch-v10/boot/rescue/head.S b/arch/cris/arch-v10/boot/rescue/head.S index addb2194de0f..f223cc0c00bb 100644 --- a/arch/cris/arch-v10/boot/rescue/head.S +++ b/arch/cris/arch-v10/boot/rescue/head.S | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | * Copyright (C) 1999, 2000, 2001, 2002, 2003 Axis Communications AB | 63 | * Copyright (C) 1999, 2000, 2001, 2002, 2003 Axis Communications AB |
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | #include <linux/config.h> | ||
| 67 | #define ASSEMBLER_MACROS_ONLY | 66 | #define ASSEMBLER_MACROS_ONLY |
| 68 | #include <asm/arch/sv_addr_ag.h> | 67 | #include <asm/arch/sv_addr_ag.h> |
| 69 | 68 | ||
diff --git a/arch/cris/arch-v10/boot/rescue/kimagerescue.S b/arch/cris/arch-v10/boot/rescue/kimagerescue.S index 264bf7afc9ad..cbccd6316d39 100644 --- a/arch/cris/arch-v10/boot/rescue/kimagerescue.S +++ b/arch/cris/arch-v10/boot/rescue/kimagerescue.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * 4004000 and after a timeout jump to it. | 6 | * 4004000 and after a timeout jump to it. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #define ASSEMBLER_MACROS_ONLY | 9 | #define ASSEMBLER_MACROS_ONLY |
| 11 | #include <asm/sv_addr_ag.h> | 10 | #include <asm/sv_addr_ag.h> |
| 12 | 11 | ||
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index 56b038c8d482..4fa81abab0c7 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
| @@ -138,7 +138,6 @@ | |||
| 138 | #include <linux/module.h> | 138 | #include <linux/module.h> |
| 139 | #include <linux/types.h> | 139 | #include <linux/types.h> |
| 140 | #include <linux/kernel.h> | 140 | #include <linux/kernel.h> |
| 141 | #include <linux/config.h> | ||
| 142 | #include <linux/init.h> | 141 | #include <linux/init.h> |
| 143 | #include <linux/slab.h> | 142 | #include <linux/slab.h> |
| 144 | 143 | ||
diff --git a/arch/cris/arch-v10/drivers/ds1302.c b/arch/cris/arch-v10/drivers/ds1302.c index b100f26497c4..3cf4f23de1d0 100644 --- a/arch/cris/arch-v10/drivers/ds1302.c +++ b/arch/cris/arch-v10/drivers/ds1302.c | |||
| @@ -139,7 +139,6 @@ | |||
| 139 | *! | 139 | *! |
| 140 | *!***************************************************************************/ | 140 | *!***************************************************************************/ |
| 141 | 141 | ||
| 142 | #include <linux/config.h> | ||
| 143 | 142 | ||
| 144 | #include <linux/fs.h> | 143 | #include <linux/fs.h> |
| 145 | #include <linux/init.h> | 144 | #include <linux/init.h> |
diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c index 512f16dec060..037582028560 100644 --- a/arch/cris/arch-v10/drivers/eeprom.c +++ b/arch/cris/arch-v10/drivers/eeprom.c | |||
| @@ -93,7 +93,6 @@ | |||
| 93 | *! (c) 1999 Axis Communications AB, Lund, Sweden | 93 | *! (c) 1999 Axis Communications AB, Lund, Sweden |
| 94 | *!*****************************************************************************/ | 94 | *!*****************************************************************************/ |
| 95 | 95 | ||
| 96 | #include <linux/config.h> | ||
| 97 | #include <linux/kernel.h> | 96 | #include <linux/kernel.h> |
| 98 | #include <linux/sched.h> | 97 | #include <linux/sched.h> |
| 99 | #include <linux/fs.h> | 98 | #include <linux/fs.h> |
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c index 09963fe299a7..25df4ada951a 100644 --- a/arch/cris/arch-v10/drivers/gpio.c +++ b/arch/cris/arch-v10/drivers/gpio.c | |||
| @@ -135,7 +135,6 @@ | |||
| 135 | * | 135 | * |
| 136 | */ | 136 | */ |
| 137 | 137 | ||
| 138 | #include <linux/config.h> | ||
| 139 | 138 | ||
| 140 | #include <linux/module.h> | 139 | #include <linux/module.h> |
| 141 | #include <linux/sched.h> | 140 | #include <linux/sched.h> |
diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c index b38267d60d30..6114596c3b33 100644 --- a/arch/cris/arch-v10/drivers/i2c.c +++ b/arch/cris/arch-v10/drivers/i2c.c | |||
| @@ -96,7 +96,6 @@ | |||
| 96 | #include <linux/fs.h> | 96 | #include <linux/fs.h> |
| 97 | #include <linux/string.h> | 97 | #include <linux/string.h> |
| 98 | #include <linux/init.h> | 98 | #include <linux/init.h> |
| 99 | #include <linux/config.h> | ||
| 100 | 99 | ||
| 101 | #include <asm/etraxi2c.h> | 100 | #include <asm/etraxi2c.h> |
| 102 | 101 | ||
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c index af517c210383..8c830eefc89c 100644 --- a/arch/cris/arch-v10/drivers/pcf8563.c +++ b/arch/cris/arch-v10/drivers/pcf8563.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * $Id: pcf8563.c,v 1.11 2005/03/07 13:13:07 starvik Exp $ | 18 | * $Id: pcf8563.c,v 1.11 2005/03/07 13:13:07 starvik Exp $ |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
diff --git a/arch/cris/arch-v10/kernel/crisksyms.c b/arch/cris/arch-v10/kernel/crisksyms.c index b332bf9b312b..e6b80135502f 100644 --- a/arch/cris/arch-v10/kernel/crisksyms.c +++ b/arch/cris/arch-v10/kernel/crisksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <asm/io.h> | 2 | #include <asm/io.h> |
| 4 | #include <asm/arch/svinto.h> | 3 | #include <asm/arch/svinto.h> |
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c index dde813e16294..2b536ca6f444 100644 --- a/arch/cris/arch-v10/kernel/debugport.c +++ b/arch/cris/arch-v10/kernel/debugport.c | |||
| @@ -103,7 +103,6 @@ | |||
| 103 | * | 103 | * |
| 104 | */ | 104 | */ |
| 105 | 105 | ||
| 106 | #include <linux/config.h> | ||
| 107 | #include <linux/console.h> | 106 | #include <linux/console.h> |
| 108 | #include <linux/init.h> | 107 | #include <linux/init.h> |
| 109 | #include <linux/major.h> | 108 | #include <linux/major.h> |
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index c808005e8457..ae45d4522e65 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S | |||
| @@ -263,7 +263,6 @@ | |||
| 263 | * | 263 | * |
| 264 | */ | 264 | */ |
| 265 | 265 | ||
| 266 | #include <linux/config.h> | ||
| 267 | #include <linux/linkage.h> | 266 | #include <linux/linkage.h> |
| 268 | #include <linux/sys.h> | 267 | #include <linux/sys.h> |
| 269 | #include <asm/unistd.h> | 268 | #include <asm/unistd.h> |
diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c index cac05a5e514c..8cbdf594b369 100644 --- a/arch/cris/arch-v10/kernel/fasttimer.c +++ b/arch/cris/arch-v10/kernel/fasttimer.c | |||
| @@ -111,7 +111,6 @@ | |||
| 111 | #include <asm/delay.h> | 111 | #include <asm/delay.h> |
| 112 | #include <asm/rtc.h> | 112 | #include <asm/rtc.h> |
| 113 | 113 | ||
| 114 | #include <linux/config.h> | ||
| 115 | 114 | ||
| 116 | #include <asm/arch/svinto.h> | 115 | #include <asm/arch/svinto.h> |
| 117 | #include <asm/fasttimer.h> | 116 | #include <asm/fasttimer.h> |
diff --git a/arch/cris/arch-v10/kernel/head.S b/arch/cris/arch-v10/kernel/head.S index f00c145b43f1..d946d8b8d277 100644 --- a/arch/cris/arch-v10/kernel/head.S +++ b/arch/cris/arch-v10/kernel/head.S | |||
| @@ -183,7 +183,6 @@ | |||
| 183 | * | 183 | * |
| 184 | */ | 184 | */ |
| 185 | 185 | ||
| 186 | #include <linux/config.h> | ||
| 187 | #define ASSEMBLER_MACROS_ONLY | 186 | #define ASSEMBLER_MACROS_ONLY |
| 188 | /* The IO_* macros use the ## token concatenation operator, so | 187 | /* The IO_* macros use the ## token concatenation operator, so |
| 189 | -traditional must not be used when assembling this file. */ | 188 | -traditional must not be used when assembling this file. */ |
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c index 2d5be93b5197..96094cbf1255 100644 --- a/arch/cris/arch-v10/kernel/irq.c +++ b/arch/cris/arch-v10/kernel/irq.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr)); | 19 | #define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr)); |
| 21 | #define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr)); | 20 | #define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr)); |
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c index 0a675ce9e099..b6831ceb6a62 100644 --- a/arch/cris/arch-v10/kernel/process.c +++ b/arch/cris/arch-v10/kernel/process.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * This file handles the architecture-dependent parts of process handling.. | 11 | * This file handles the architecture-dependent parts of process handling.. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
diff --git a/arch/cris/arch-v10/kernel/setup.c b/arch/cris/arch-v10/kernel/setup.c index b668d7fb68ee..682ef955aec4 100644 --- a/arch/cris/arch-v10/kernel/setup.c +++ b/arch/cris/arch-v10/kernel/setup.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * This file handles the architecture-dependent parts of initialization | 10 | * This file handles the architecture-dependent parts of initialization |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/seq_file.h> | 13 | #include <linux/seq_file.h> |
| 15 | #include <linux/proc_fs.h> | 14 | #include <linux/proc_fs.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index dc3dfe9b4a1a..fe65cb89f54c 100644 --- a/arch/cris/arch-v10/kernel/time.c +++ b/arch/cris/arch-v10/kernel/time.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/timex.h> | 10 | #include <linux/timex.h> |
| 12 | #include <linux/time.h> | 11 | #include <linux/time.h> |
| 13 | #include <linux/jiffies.h> | 12 | #include <linux/jiffies.h> |
diff --git a/arch/cris/arch-v10/kernel/traps.c b/arch/cris/arch-v10/kernel/traps.c index 34a27ea2052d..4becc1bcced9 100644 --- a/arch/cris/arch-v10/kernel/traps.c +++ b/arch/cris/arch-v10/kernel/traps.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/ptrace.h> | 14 | #include <linux/ptrace.h> |
| 16 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
| 17 | #include <asm/arch/sv_addr_ag.h> | 16 | #include <asm/arch/sv_addr_ag.h> |
diff --git a/arch/cris/arch-v10/lib/dram_init.S b/arch/cris/arch-v10/lib/dram_init.S index 2ef4ad5706ef..9cf83932cd5d 100644 --- a/arch/cris/arch-v10/lib/dram_init.S +++ b/arch/cris/arch-v10/lib/dram_init.S | |||
| @@ -70,7 +70,6 @@ | |||
| 70 | * uses this code. | 70 | * uses this code. |
| 71 | */ | 71 | */ |
| 72 | 72 | ||
| 73 | #include <linux/config.h> | ||
| 74 | 73 | ||
| 75 | ;; WARNING! The registers r8 and r9 are used as parameters carrying | 74 | ;; WARNING! The registers r8 and r9 are used as parameters carrying |
| 76 | ;; information from the decompressor (if the kernel was compressed). | 75 | ;; information from the decompressor (if the kernel was compressed). |
diff --git a/arch/cris/arch-v10/mm/init.c b/arch/cris/arch-v10/mm/init.c index ff3481e76dd4..e0fcd1a9bfd5 100644 --- a/arch/cris/arch-v10/mm/init.c +++ b/arch/cris/arch-v10/mm/init.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/cris/arch-v10/mm/init.c | 2 | * linux/arch/cris/arch-v10/mm/init.c |
| 3 | * | 3 | * |
| 4 | */ | 4 | */ |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/mmzone.h> | 5 | #include <linux/mmzone.h> |
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/bootmem.h> | 7 | #include <linux/bootmem.h> |
diff --git a/arch/cris/arch-v10/vmlinux.lds.S b/arch/cris/arch-v10/vmlinux.lds.S index 71ba736be8f0..689729a7e66e 100644 --- a/arch/cris/arch-v10/vmlinux.lds.S +++ b/arch/cris/arch-v10/vmlinux.lds.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * the kernel has booted. | 8 | * the kernel has booted. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm-generic/vmlinux.lds.h> | 11 | #include <asm-generic/vmlinux.lds.h> |
| 13 | 12 | ||
| 14 | jiffies = jiffies_64; | 13 | jiffies = jiffies_64; |
diff --git a/arch/cris/arch-v32/boot/compressed/head.S b/arch/cris/arch-v32/boot/compressed/head.S index 0c55b83b8287..34cea10a8998 100644 --- a/arch/cris/arch-v32/boot/compressed/head.S +++ b/arch/cris/arch-v32/boot/compressed/head.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1999 - 2003, Axis Communications AB | 5 | * Copyright (C) 1999 - 2003, Axis Communications AB |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #define ASSEMBLER_MACROS_ONLY | 8 | #define ASSEMBLER_MACROS_ONLY |
| 10 | #include <asm/arch/hwregs/asm/reg_map_asm.h> | 9 | #include <asm/arch/hwregs/asm/reg_map_asm.h> |
| 11 | #include <asm/arch/hwregs/asm/gio_defs_asm.h> | 10 | #include <asm/arch/hwregs/asm/gio_defs_asm.h> |
diff --git a/arch/cris/arch-v32/boot/compressed/misc.c b/arch/cris/arch-v32/boot/compressed/misc.c index 54644238ed59..11902697196d 100644 --- a/arch/cris/arch-v32/boot/compressed/misc.c +++ b/arch/cris/arch-v32/boot/compressed/misc.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #define KERNEL_LOAD_ADR 0x40004000 | 21 | #define KERNEL_LOAD_ADR 0x40004000 |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | 23 | ||
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 26 | #include <asm/arch/hwregs/reg_rdwr.h> | 25 | #include <asm/arch/hwregs/reg_rdwr.h> |
diff --git a/arch/cris/arch-v32/boot/rescue/head.S b/arch/cris/arch-v32/boot/rescue/head.S index 61ede5f30f99..8cdb4011bc16 100644 --- a/arch/cris/arch-v32/boot/rescue/head.S +++ b/arch/cris/arch-v32/boot/rescue/head.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * RedBoot based RFL instead. Nothing to see here, move along. | 4 | * RedBoot based RFL instead. Nothing to see here, move along. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/arch/hwregs/reg_map_asm.h> | 7 | #include <asm/arch/hwregs/reg_map_asm.h> |
| 9 | #include <asm/arch/hwregs/config_defs_asm.h> | 8 | #include <asm/arch/hwregs/config_defs_asm.h> |
| 10 | 9 | ||
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c index b679f983b90a..41952320e00a 100644 --- a/arch/cris/arch-v32/drivers/axisflashmap.c +++ b/arch/cris/arch-v32/drivers/axisflashmap.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | 23 | ||
diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c index a551237dcb5e..113bdff4fd3c 100644 --- a/arch/cris/arch-v32/drivers/gpio.c +++ b/arch/cris/arch-v32/drivers/gpio.c | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | * | 62 | * |
| 63 | */ | 63 | */ |
| 64 | 64 | ||
| 65 | #include <linux/config.h> | ||
| 66 | 65 | ||
| 67 | #include <linux/module.h> | 66 | #include <linux/module.h> |
| 68 | #include <linux/sched.h> | 67 | #include <linux/sched.h> |
diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c index 440c20a94963..95f00188c628 100644 --- a/arch/cris/arch-v32/drivers/i2c.c +++ b/arch/cris/arch-v32/drivers/i2c.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/fs.h> | 33 | #include <linux/fs.h> |
| 34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/config.h> | ||
| 37 | 36 | ||
| 38 | #include <asm/etraxi2c.h> | 37 | #include <asm/etraxi2c.h> |
| 39 | 38 | ||
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c index d788bda3578c..ffc6d2572f2b 100644 --- a/arch/cris/arch-v32/drivers/pcf8563.c +++ b/arch/cris/arch-v32/drivers/pcf8563.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 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/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c index c85a6df8558f..7c29957f5f02 100644 --- a/arch/cris/arch-v32/drivers/sync_serial.c +++ b/arch/cris/arch-v32/drivers/sync_serial.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/major.h> | 14 | #include <linux/major.h> |
diff --git a/arch/cris/arch-v32/kernel/arbiter.c b/arch/cris/arch-v32/kernel/arbiter.c index 3870d2fd5160..82d44c9afc1e 100644 --- a/arch/cris/arch-v32/kernel/arbiter.c +++ b/arch/cris/arch-v32/kernel/arbiter.c | |||
| @@ -1,15 +1,14 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Memory arbiter functions. Allocates bandwith through the | 2 | * Memory arbiter functions. Allocates bandwidth through the |
| 3 | * arbiter and sets up arbiter breakpoints. | 3 | * arbiter and sets up arbiter breakpoints. |
| 4 | * | 4 | * |
| 5 | * The algorithm first assigns slots to the clients that has specified | 5 | * The algorithm first assigns slots to the clients that has specified |
| 6 | * bandwith (e.g. ethernet) and then the remaining slots are divided | 6 | * bandwidth (e.g. ethernet) and then the remaining slots are divided |
| 7 | * on all the active clients. | 7 | * on all the active clients. |
| 8 | * | 8 | * |
| 9 | * Copyright (c) 2004, 2005 Axis Communications AB. | 9 | * Copyright (c) 2004, 2005 Axis Communications AB. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/arch/hwregs/reg_map.h> | 12 | #include <asm/arch/hwregs/reg_map.h> |
| 14 | #include <asm/arch/hwregs/reg_rdwr.h> | 13 | #include <asm/arch/hwregs/reg_rdwr.h> |
| 15 | #include <asm/arch/hwregs/marb_defs.h> | 14 | #include <asm/arch/hwregs/marb_defs.h> |
| @@ -133,8 +132,8 @@ static void crisv32_arbiter_init(void) | |||
| 133 | 132 | ||
| 134 | 133 | ||
| 135 | 134 | ||
| 136 | int crisv32_arbiter_allocate_bandwith(int client, int region, | 135 | int crisv32_arbiter_allocate_bandwidth(int client, int region, |
| 137 | unsigned long bandwidth) | 136 | unsigned long bandwidth) |
| 138 | { | 137 | { |
| 139 | int i; | 138 | int i; |
| 140 | int total_assigned = 0; | 139 | int total_assigned = 0; |
diff --git a/arch/cris/arch-v32/kernel/crisksyms.c b/arch/cris/arch-v32/kernel/crisksyms.c index 2c3bb9a0afe2..e513da711245 100644 --- a/arch/cris/arch-v32/kernel/crisksyms.c +++ b/arch/cris/arch-v32/kernel/crisksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/irq.h> | 2 | #include <linux/irq.h> |
| 4 | #include <asm/arch/dma.h> | 3 | #include <asm/arch/dma.h> |
diff --git a/arch/cris/arch-v32/kernel/debugport.c b/arch/cris/arch-v32/kernel/debugport.c index 3dc587e6201a..d1272ad92153 100644 --- a/arch/cris/arch-v32/kernel/debugport.c +++ b/arch/cris/arch-v32/kernel/debugport.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright (C) 2003, Axis Communications AB. | 2 | * Copyright (C) 2003, Axis Communications AB. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/console.h> | 5 | #include <linux/console.h> |
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/major.h> | 7 | #include <linux/major.h> |
diff --git a/arch/cris/arch-v32/kernel/dma.c b/arch/cris/arch-v32/kernel/dma.c index b92e85799b44..570e19128ffd 100644 --- a/arch/cris/arch-v32/kernel/dma.c +++ b/arch/cris/arch-v32/kernel/dma.c | |||
| @@ -25,8 +25,8 @@ int crisv32_request_dma(unsigned int dmanr, const char * device_id, | |||
| 25 | reg_config_rw_clk_ctrl clk_ctrl; | 25 | reg_config_rw_clk_ctrl clk_ctrl; |
| 26 | reg_strmux_rw_cfg strmux_cfg; | 26 | reg_strmux_rw_cfg strmux_cfg; |
| 27 | 27 | ||
| 28 | if (crisv32_arbiter_allocate_bandwith(dmanr, | 28 | if (crisv32_arbiter_allocate_bandwidth(dmanr, |
| 29 | options & DMA_INT_MEM ? INT_REGION : EXT_REGION, | 29 | options & DMA_INT_MEM ? INT_REGION : EXT_REGION, |
| 30 | bandwidth)) | 30 | bandwidth)) |
| 31 | return -ENOMEM; | 31 | return -ENOMEM; |
| 32 | 32 | ||
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index 3bd8503fec68..f9d27807b914 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/linkage.h> | 20 | #include <linux/linkage.h> |
| 22 | #include <linux/sys.h> | 21 | #include <linux/sys.h> |
| 23 | #include <asm/unistd.h> | 22 | #include <asm/unistd.h> |
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index ea2b4a97c8c7..caaa86bd5e87 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c | |||
| @@ -120,7 +120,6 @@ | |||
| 120 | #include <asm/irq.h> | 120 | #include <asm/irq.h> |
| 121 | #include <asm/system.h> | 121 | #include <asm/system.h> |
| 122 | 122 | ||
| 123 | #include <linux/config.h> | ||
| 124 | #include <linux/version.h> | 123 | #include <linux/version.h> |
| 125 | 124 | ||
| 126 | #include <asm/arch/hwregs/reg_map.h> | 125 | #include <asm/arch/hwregs/reg_map.h> |
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S index 3cfe57dc391d..20bd80a84e48 100644 --- a/arch/cris/arch-v32/kernel/head.S +++ b/arch/cris/arch-v32/kernel/head.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 2003, Axis Communications AB | 4 | * Copyright (C) 2003, Axis Communications AB |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #define ASSEMBLER_MACROS_ONLY | 8 | #define ASSEMBLER_MACROS_ONLY |
| 10 | 9 | ||
diff --git a/arch/cris/arch-v32/kernel/io.c b/arch/cris/arch-v32/kernel/io.c index 6bc9f263c3d6..dfbfcb8d2585 100644 --- a/arch/cris/arch-v32/kernel/io.c +++ b/arch/cris/arch-v32/kernel/io.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (c) 2004 Axis Communications AB. | 4 | * Copyright (c) 2004 Axis Communications AB. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 9 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index 06260874f018..e2d2b3fdb5b1 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/irq.h> | 6 | #include <linux/irq.h> |
| 7 | #include <linux/interrupt.h> | 7 | #include <linux/interrupt.h> |
| 8 | #include <linux/smp.h> | 8 | #include <linux/smp.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
diff --git a/arch/cris/arch-v32/kernel/kgdb_asm.S b/arch/cris/arch-v32/kernel/kgdb_asm.S index b350dd279ed2..3e7fa9ef8510 100644 --- a/arch/cris/arch-v32/kernel/kgdb_asm.S +++ b/arch/cris/arch-v32/kernel/kgdb_asm.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * port exceptions for kernel debugging purposes. | 5 | * port exceptions for kernel debugging purposes. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/arch/hwregs/intr_vect.h> | 8 | #include <asm/arch/hwregs/intr_vect.h> |
| 10 | 9 | ||
| 11 | ;; Exported functions. | 10 | ;; Exported functions. |
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c index 843513102d3c..6326351af252 100644 --- a/arch/cris/arch-v32/kernel/process.c +++ b/arch/cris/arch-v32/kernel/process.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * This file handles the architecture-dependent parts of process handling.. | 8 | * This file handles the architecture-dependent parts of process handling.. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/err.h> | 12 | #include <linux/err.h> |
| 14 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
diff --git a/arch/cris/arch-v32/kernel/setup.c b/arch/cris/arch-v32/kernel/setup.c index b17a39a2e164..4662f363df63 100644 --- a/arch/cris/arch-v32/kernel/setup.c +++ b/arch/cris/arch-v32/kernel/setup.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 2003, Axis Communications AB. | 4 | * Copyright (C) 2003, Axis Communications AB. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/seq_file.h> | 7 | #include <linux/seq_file.h> |
| 9 | #include <linux/proc_fs.h> | 8 | #include <linux/proc_fs.h> |
| 10 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index d48e397f5fa4..4bac1d6c37fb 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/timex.h> | 9 | #include <linux/timex.h> |
| 11 | #include <linux/time.h> | 10 | #include <linux/time.h> |
| 12 | #include <linux/jiffies.h> | 11 | #include <linux/jiffies.h> |
diff --git a/arch/cris/arch-v32/kernel/traps.c b/arch/cris/arch-v32/kernel/traps.c index 6e3787045560..2462b1ef1fbb 100644 --- a/arch/cris/arch-v32/kernel/traps.c +++ b/arch/cris/arch-v32/kernel/traps.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright (C) 2003, Axis Communications AB. | 2 | * Copyright (C) 2003, Axis Communications AB. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/ptrace.h> | 5 | #include <linux/ptrace.h> |
| 7 | #include <asm/uaccess.h> | 6 | #include <asm/uaccess.h> |
| 8 | 7 | ||
diff --git a/arch/cris/arch-v32/lib/dram_init.S b/arch/cris/arch-v32/lib/dram_init.S index 47b6cf5f4afd..158b3dbb4d9d 100644 --- a/arch/cris/arch-v32/lib/dram_init.S +++ b/arch/cris/arch-v32/lib/dram_init.S | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * uses this code. | 16 | * uses this code. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <asm/arch/hwregs/asm/reg_map_asm.h> | 19 | #include <asm/arch/hwregs/asm/reg_map_asm.h> |
| 21 | #include <asm/arch/hwregs/asm/bif_core_defs_asm.h> | 20 | #include <asm/arch/hwregs/asm/bif_core_defs_asm.h> |
| 22 | 21 | ||
diff --git a/arch/cris/arch-v32/lib/hw_settings.S b/arch/cris/arch-v32/lib/hw_settings.S index 5182e8c2cff2..fff9443513d1 100644 --- a/arch/cris/arch-v32/lib/hw_settings.S +++ b/arch/cris/arch-v32/lib/hw_settings.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Authors: Mikael Starvik (starvik@axis.com) | 10 | * Authors: Mikael Starvik (starvik@axis.com) |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/arch/hwregs/asm/reg_map_asm.h> | 13 | #include <asm/arch/hwregs/asm/reg_map_asm.h> |
| 15 | #include <asm/arch/hwregs/asm/bif_core_defs_asm.h> | 14 | #include <asm/arch/hwregs/asm/bif_core_defs_asm.h> |
| 16 | #include <asm/arch/hwregs/asm/gio_defs_asm.h> | 15 | #include <asm/arch/hwregs/asm/gio_defs_asm.h> |
diff --git a/arch/cris/arch-v32/lib/nand_init.S b/arch/cris/arch-v32/lib/nand_init.S index aba5c751c282..e019816facd7 100644 --- a/arch/cris/arch-v32/lib/nand_init.S +++ b/arch/cris/arch-v32/lib/nand_init.S | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <asm/arch/hwregs/asm/pinmux_defs_asm.h> | 27 | #include <asm/arch/hwregs/asm/pinmux_defs_asm.h> |
| 28 | #include <asm/arch/hwregs/asm/bif_core_defs_asm.h> | 28 | #include <asm/arch/hwregs/asm/bif_core_defs_asm.h> |
| 29 | #include <asm/arch/hwregs/asm/config_defs_asm.h> | 29 | #include <asm/arch/hwregs/asm/config_defs_asm.h> |
| 30 | #include <linux/config.h> | ||
| 31 | 30 | ||
| 32 | ;; There are 8-bit NAND flashes and 16-bit NAND flashes. | 31 | ;; There are 8-bit NAND flashes and 16-bit NAND flashes. |
| 33 | ;; We need to treat them slightly different. | 32 | ;; We need to treat them slightly different. |
diff --git a/arch/cris/arch-v32/mm/init.c b/arch/cris/arch-v32/mm/init.c index f2fba27d822c..a84ba7ff22d2 100644 --- a/arch/cris/arch-v32/mm/init.c +++ b/arch/cris/arch-v32/mm/init.c | |||
| @@ -6,12 +6,10 @@ | |||
| 6 | * Authors: Bjorn Wesen <bjornw@axis.com> | 6 | * Authors: Bjorn Wesen <bjornw@axis.com> |
| 7 | * Tobias Anderberg <tobiasa@axis.com>, CRISv32 port. | 7 | * Tobias Anderberg <tobiasa@axis.com>, CRISv32 port. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/mmzone.h> | 9 | #include <linux/mmzone.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/bootmem.h> | 11 | #include <linux/bootmem.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
| 16 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 17 | #include <asm/types.h> | 15 | #include <asm/types.h> |
diff --git a/arch/cris/arch-v32/vmlinux.lds.S b/arch/cris/arch-v32/vmlinux.lds.S index adb94605d92a..472d4b3c4cf4 100644 --- a/arch/cris/arch-v32/vmlinux.lds.S +++ b/arch/cris/arch-v32/vmlinux.lds.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * the kernel has booted. | 8 | * the kernel has booted. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm-generic/vmlinux.lds.h> | 11 | #include <asm-generic/vmlinux.lds.h> |
| 13 | 12 | ||
| 14 | jiffies = jiffies_64; | 13 | jiffies = jiffies_64; |
diff --git a/arch/cris/kernel/crisksyms.c b/arch/cris/kernel/crisksyms.c index d57859053ce7..1f20c16ac2a4 100644 --- a/arch/cris/kernel/crisksyms.c +++ b/arch/cris/kernel/crisksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/user.h> | 2 | #include <linux/user.h> |
| 4 | #include <linux/elfcore.h> | 3 | #include <linux/elfcore.h> |
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c index 6547bb646364..1f9099627a72 100644 --- a/arch/cris/kernel/irq.c +++ b/arch/cris/kernel/irq.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Naturally it's not a 1:1 relation, but there are similarities. | 19 | * Naturally it's not a 1:1 relation, but there are similarities. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/ptrace.h> | 23 | #include <linux/ptrace.h> |
| 25 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c index 619a6eefd893..6d941fb9f379 100644 --- a/arch/cris/kernel/setup.c +++ b/arch/cris/kernel/setup.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * This file handles the architecture-dependent parts of initialization | 10 | * This file handles the architecture-dependent parts of initialization |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
| 16 | #include <linux/bootmem.h> | 15 | #include <linux/bootmem.h> |
diff --git a/arch/frv/kernel/break.S b/arch/frv/kernel/break.S index 687c48d62dde..ea161f0ca427 100644 --- a/arch/frv/kernel/break.S +++ b/arch/frv/kernel/break.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/sys.h> | 12 | #include <linux/sys.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/setup.h> | 14 | #include <asm/setup.h> |
| 16 | #include <asm/segment.h> | 15 | #include <asm/segment.h> |
diff --git a/arch/frv/kernel/cmode.S b/arch/frv/kernel/cmode.S index 6591e6a37ae9..81ba28ad2207 100644 --- a/arch/frv/kernel/cmode.S +++ b/arch/frv/kernel/cmode.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/sys.h> | 13 | #include <linux/sys.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | #include <asm/setup.h> | 15 | #include <asm/setup.h> |
| 17 | #include <asm/segment.h> | 16 | #include <asm/segment.h> |
diff --git a/arch/frv/kernel/entry-table.S b/arch/frv/kernel/entry-table.S index 81568acea9cd..d3b9253d862a 100644 --- a/arch/frv/kernel/entry-table.S +++ b/arch/frv/kernel/entry-table.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/sys.h> | 13 | #include <linux/sys.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | #include <asm/spr-regs.h> | 15 | #include <asm/spr-regs.h> |
| 17 | 16 | ||
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 81d94e41a189..2a1ff1ff8692 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/sys.h> | 30 | #include <linux/sys.h> |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/linkage.h> | 31 | #include <linux/linkage.h> |
| 33 | #include <asm/thread_info.h> | 32 | #include <asm/thread_info.h> |
| 34 | #include <asm/setup.h> | 33 | #include <asm/setup.h> |
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c index dee637fffda5..f772704b3d28 100644 --- a/arch/frv/kernel/frv_ksyms.c +++ b/arch/frv/kernel/frv_ksyms.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/elfcore.h> | 7 | #include <linux/elfcore.h> |
| 8 | #include <linux/in6.h> | 8 | #include <linux/in6.h> |
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/setup.h> | 11 | #include <asm/setup.h> |
| 13 | #include <asm/pgalloc.h> | 12 | #include <asm/pgalloc.h> |
diff --git a/arch/frv/kernel/head-mmu-fr451.S b/arch/frv/kernel/head-mmu-fr451.S index a143c2f66ee5..c8f210d84ff5 100644 --- a/arch/frv/kernel/head-mmu-fr451.S +++ b/arch/frv/kernel/head-mmu-fr451.S | |||
| @@ -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 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
diff --git a/arch/frv/kernel/head-uc-fr401.S b/arch/frv/kernel/head-uc-fr401.S index 4ccf8414ae44..ee282be20fff 100644 --- a/arch/frv/kernel/head-uc-fr401.S +++ b/arch/frv/kernel/head-uc-fr401.S | |||
| @@ -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 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
diff --git a/arch/frv/kernel/head-uc-fr451.S b/arch/frv/kernel/head-uc-fr451.S index 31cb54a6f080..b10d9c8295d2 100644 --- a/arch/frv/kernel/head-uc-fr451.S +++ b/arch/frv/kernel/head-uc-fr451.S | |||
| @@ -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 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
diff --git a/arch/frv/kernel/head-uc-fr555.S b/arch/frv/kernel/head-uc-fr555.S index d088db2699bf..39937c19b460 100644 --- a/arch/frv/kernel/head-uc-fr555.S +++ b/arch/frv/kernel/head-uc-fr555.S | |||
| @@ -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 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S index 29a5265489b7..47c990af2e06 100644 --- a/arch/frv/kernel/head.S +++ b/arch/frv/kernel/head.S | |||
| @@ -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 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
diff --git a/arch/frv/kernel/irq-mb93091.c b/arch/frv/kernel/irq-mb93091.c index 9778e0ff7c1c..1381abcd5cc9 100644 --- a/arch/frv/kernel/irq-mb93091.c +++ b/arch/frv/kernel/irq-mb93091.c | |||
| @@ -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/ptrace.h> | 12 | #include <linux/ptrace.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/signal.h> | 14 | #include <linux/signal.h> |
diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c index 21ca2b298247..48b2a6420888 100644 --- a/arch/frv/kernel/irq-mb93093.c +++ b/arch/frv/kernel/irq-mb93093.c | |||
| @@ -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/ptrace.h> | 12 | #include <linux/ptrace.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/signal.h> | 14 | #include <linux/signal.h> |
diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c index c003ae5e2b30..988d035640e1 100644 --- a/arch/frv/kernel/irq-mb93493.c +++ b/arch/frv/kernel/irq-mb93493.c | |||
| @@ -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/ptrace.h> | 12 | #include <linux/ptrace.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/signal.h> | 14 | #include <linux/signal.h> |
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c index 8b112b361914..5920f52bf9c8 100644 --- a/arch/frv/kernel/irq.c +++ b/arch/frv/kernel/irq.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Naturally it's not a 1:1 relation, but there are similarities. | 16 | * Naturally it's not a 1:1 relation, but there are similarities. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 22 | #include <linux/signal.h> | 21 | #include <linux/signal.h> |
diff --git a/arch/frv/kernel/pm-mb93093.c b/arch/frv/kernel/pm-mb93093.c index 34d01d7dcc3b..eaa7b582ef52 100644 --- a/arch/frv/kernel/pm-mb93093.c +++ b/arch/frv/kernel/pm-mb93093.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c index 43ce28a13a5d..e65a9f1c0c26 100644 --- a/arch/frv/kernel/pm.c +++ b/arch/frv/kernel/pm.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 489e6c489cbe..eeeb1e2641d5 100644 --- a/arch/frv/kernel/process.c +++ b/arch/frv/kernel/process.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c index f953484e7d59..fcff819b4340 100644 --- a/arch/frv/kernel/ptrace.c +++ b/arch/frv/kernel/ptrace.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/user.h> | 20 | #include <linux/user.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/security.h> | 21 | #include <linux/security.h> |
| 23 | #include <linux/signal.h> | 22 | #include <linux/signal.h> |
| 24 | 23 | ||
diff --git a/arch/frv/kernel/semaphore.c b/arch/frv/kernel/semaphore.c index 7971d680ae29..f278cdf3a72f 100644 --- a/arch/frv/kernel/semaphore.c +++ b/arch/frv/kernel/semaphore.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <asm/semaphore.h> | 15 | #include <asm/semaphore.h> |
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 1f7d65f29e78..5db3d4eff909 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/version.h> | 13 | #include <linux/version.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/arch/frv/kernel/sleep.S b/arch/frv/kernel/sleep.S index e6079b8cac60..c9b2d51ab9ad 100644 --- a/arch/frv/kernel/sleep.S +++ b/arch/frv/kernel/sleep.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/sys.h> | 13 | #include <linux/sys.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | #include <asm/setup.h> | 15 | #include <asm/setup.h> |
| 17 | #include <asm/segment.h> | 16 | #include <asm/segment.h> |
diff --git a/arch/frv/kernel/switch_to.S b/arch/frv/kernel/switch_to.S index 1703dc20174e..9e5a583991a3 100644 --- a/arch/frv/kernel/switch_to.S +++ b/arch/frv/kernel/switch_to.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | # 2 of the License, or (at your option) any later version. | 11 | # 2 of the License, or (at your option) any later version. |
| 12 | # | 12 | # |
| 13 | ############################################################################### | 13 | ############################################################################### |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
| 17 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c index b908863d6593..ce676803eb6f 100644 --- a/arch/frv/kernel/sysctl.c +++ b/arch/frv/kernel/sysctl.c | |||
| @@ -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/slab.h> | 12 | #include <linux/slab.h> |
| 14 | #include <linux/sysctl.h> | 13 | #include <linux/sysctl.h> |
| 15 | #include <linux/proc_fs.h> | 14 | #include <linux/proc_fs.h> |
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c index 9eb84b2e6abc..98ce3628ebde 100644 --- a/arch/frv/kernel/traps.c +++ b/arch/frv/kernel/traps.c | |||
| @@ -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/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/signal.h> | 13 | #include <linux/signal.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c index 45ae39d84b69..2278c80bd88c 100644 --- a/arch/frv/mb93090-mb00/pci-irq.c +++ b/arch/frv/mb93090-mb00/pci-irq.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * derived from: arch/i386/kernel/pci-irq.c: (c) 1999--2000 Martin Mares <mj@suse.cz> | 5 | * derived from: arch/i386/kernel/pci-irq.c: (c) 1999--2000 Martin Mares <mj@suse.cz> |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index c8817f7b8605..fb98e90c5794 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c | |||
| @@ -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/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c index 636b2f8b5d98..dc6522c464d4 100644 --- a/arch/frv/mm/dma-alloc.c +++ b/arch/frv/mm/dma-alloc.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * published by the Free Software Foundation. | 21 | * published by the Free Software Foundation. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/signal.h> | 25 | #include <linux/signal.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
diff --git a/arch/frv/mm/extable.c b/arch/frv/mm/extable.c index caacf030ac75..6aea124f574d 100644 --- a/arch/frv/mm/extable.c +++ b/arch/frv/mm/extable.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/frv/mm/extable.c | 2 | * linux/arch/frv/mm/extable.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 8 | #include <asm/uaccess.h> | 7 | #include <asm/uaccess.h> |
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c index 8899aa1a4f06..b5b4286f9dd4 100644 --- a/arch/frv/mm/init.c +++ b/arch/frv/mm/init.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * - Copyright (C) 1995 Hamish Macdonald | 16 | * - Copyright (C) 1995 Hamish Macdonald |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/signal.h> | 19 | #include <linux/signal.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/pagemap.h> | 21 | #include <linux/pagemap.h> |
diff --git a/arch/frv/mm/kmap.c b/arch/frv/mm/kmap.c index 40b62c5c2951..fb78be38ea02 100644 --- a/arch/frv/mm/kmap.c +++ b/arch/frv/mm/kmap.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
diff --git a/arch/frv/mm/tlb-flush.S b/arch/frv/mm/tlb-flush.S index 6f43c74c5d95..79b3c70910ac 100644 --- a/arch/frv/mm/tlb-flush.S +++ b/arch/frv/mm/tlb-flush.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/sys.h> | 12 | #include <linux/sys.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 16 | #include <asm/ptrace.h> | 15 | #include <asm/ptrace.h> |
diff --git a/arch/frv/mm/tlb-miss.S b/arch/frv/mm/tlb-miss.S index 8729f7d7c6e0..04da67468378 100644 --- a/arch/frv/mm/tlb-miss.S +++ b/arch/frv/mm/tlb-miss.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/sys.h> | 12 | #include <linux/sys.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 16 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
diff --git a/arch/frv/mm/unaligned.c b/arch/frv/mm/unaligned.c index 09b361443fc2..8f0375fc15a8 100644 --- a/arch/frv/mm/unaligned.c +++ b/arch/frv/mm/unaligned.c | |||
| @@ -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/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/signal.h> | 13 | #include <linux/signal.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/h8300/kernel/gpio.c b/arch/h8300/kernel/gpio.c index d195568ca8a2..6a25dd5530e7 100644 --- a/arch/h8300/kernel/gpio.c +++ b/arch/h8300/kernel/gpio.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Internal I/O Port Management | 9 | * Internal I/O Port Management |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c index f8d6dee84781..9b4be053de3c 100644 --- a/arch/h8300/kernel/h8300_ksyms.c +++ b/arch/h8300/kernel/h8300_ksyms.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/elfcore.h> | 7 | #include <linux/elfcore.h> |
| 8 | #include <linux/in6.h> | 8 | #include <linux/in6.h> |
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/setup.h> | 11 | #include <asm/setup.h> |
| 13 | #include <asm/pgalloc.h> | 12 | #include <asm/pgalloc.h> |
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c index 16ccddc69c2b..e061b63a0038 100644 --- a/arch/h8300/kernel/process.c +++ b/arch/h8300/kernel/process.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * This file handles the architecture-dependent parts of process handling.. | 22 | * This file handles the architecture-dependent parts of process handling.. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c index 0ff6f79b0fed..f6031373dc21 100644 --- a/arch/h8300/kernel/ptrace.c +++ b/arch/h8300/kernel/ptrace.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/ptrace.h> | 24 | #include <linux/ptrace.h> |
| 25 | #include <linux/user.h> | 25 | #include <linux/user.h> |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/signal.h> | 26 | #include <linux/signal.h> |
| 28 | 27 | ||
| 29 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
diff --git a/arch/h8300/kernel/semaphore.c b/arch/h8300/kernel/semaphore.c index 1ebb79baaa8c..d12cbbfe6ebd 100644 --- a/arch/h8300/kernel/semaphore.c +++ b/arch/h8300/kernel/semaphore.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * specific changes in <asm/semaphore-helper.h> | 3 | * specific changes in <asm/semaphore-helper.h> |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <asm/semaphore-helper.h> | 8 | #include <asm/semaphore-helper.h> |
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index f469d9160730..1077b71d5226 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * This file handles the architecture-dependent parts of system setup | 16 | * This file handles the architecture-dependent parts of system setup |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S index 79b3bda5c6e3..dab98fd99e63 100644 --- a/arch/h8300/kernel/syscalls.S +++ b/arch/h8300/kernel/syscalls.S | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | /* Systemcall Entry Table */ | 1 | /* Systemcall Entry Table */ |
| 2 | #include <linux/config.h> | ||
| 3 | #include <linux/sys.h> | 2 | #include <linux/sys.h> |
| 4 | #include <asm/linkage.h> | 3 | #include <asm/linkage.h> |
| 5 | #include <asm/unistd.h> | 4 | #include <asm/unistd.h> |
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S index 17fa11da1e4a..6406c388f88a 100644 --- a/arch/h8300/kernel/vmlinux.lds.S +++ b/arch/h8300/kernel/vmlinux.lds.S | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #define VMLINUX_SYMBOL(_sym_) _##_sym_ | 1 | #define VMLINUX_SYMBOL(_sym_) _##_sym_ |
| 2 | #include <asm-generic/vmlinux.lds.h> | 2 | #include <asm-generic/vmlinux.lds.h> |
| 3 | #include <linux/config.h> | ||
| 4 | 3 | ||
| 5 | /* target memory map */ | 4 | /* target memory map */ |
| 6 | #ifdef CONFIG_H8300H_GENERIC | 5 | #ifdef CONFIG_H8300H_GENERIC |
diff --git a/arch/h8300/lib/romfs.S b/arch/h8300/lib/romfs.S index b72f93a47e31..68910d8e1ff4 100644 --- a/arch/h8300/lib/romfs.S +++ b/arch/h8300/lib/romfs.S | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* romfs move to __ebss */ | 1 | /* romfs move to __ebss */ |
| 2 | 2 | ||
| 3 | #include <asm/linkage.h> | 3 | #include <asm/linkage.h> |
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #if defined(__H8300H__) | 5 | #if defined(__H8300H__) |
| 7 | .h8300h | 6 | .h8300h |
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c index 09efc4b1f038..d3d40bdc2d6a 100644 --- a/arch/h8300/mm/init.c +++ b/arch/h8300/mm/init.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * DEC/2000 -- linux 2.4 support <davidm@snapgear.com> | 16 | * DEC/2000 -- linux 2.4 support <davidm@snapgear.com> |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/signal.h> | 19 | #include <linux/signal.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/arch/h8300/mm/kmap.c b/arch/h8300/mm/kmap.c index 4101ab54fc17..26ab17286a53 100644 --- a/arch/h8300/mm/kmap.c +++ b/arch/h8300/mm/kmap.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com> | 8 | * Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
diff --git a/arch/h8300/mm/memory.c b/arch/h8300/mm/memory.c index 81eace93f867..ccd6ade816dd 100644 --- a/arch/h8300/mm/memory.c +++ b/arch/h8300/mm/memory.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Copyright (C) 1995 Hamish Macdonald | 17 | * Copyright (C) 1995 Hamish Macdonald |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/string.h> | 22 | #include <linux/string.h> |
diff --git a/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S b/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S index 31c3703d8d60..ecaeb31ae9a4 100644 --- a/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S +++ b/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | 14 | ||
| 16 | #if !defined(CONFIG_BLKDEV_RESERVE) | 15 | #if !defined(CONFIG_BLKDEV_RESERVE) |
diff --git a/arch/h8300/platform/h8300h/aki3068net/timer.c b/arch/h8300/platform/h8300h/aki3068net/timer.c index 086efb1fd283..27cd85d56128 100644 --- a/arch/h8300/platform/h8300h/aki3068net/timer.c +++ b/arch/h8300/platform/h8300h/aki3068net/timer.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/h8300/platform/h8300h/entry.S b/arch/h8300/platform/h8300h/entry.S index 2052dbb9483f..d2dea2432fb2 100644 --- a/arch/h8300/platform/h8300h/entry.S +++ b/arch/h8300/platform/h8300h/entry.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/sys.h> | 16 | #include <linux/sys.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/unistd.h> | 17 | #include <asm/unistd.h> |
| 19 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
| 20 | #include <asm/segment.h> | 19 | #include <asm/segment.h> |
diff --git a/arch/h8300/platform/h8300h/generic/crt0_ram.S b/arch/h8300/platform/h8300h/generic/crt0_ram.S index b735042a7c3f..80d0e16a4499 100644 --- a/arch/h8300/platform/h8300h/generic/crt0_ram.S +++ b/arch/h8300/platform/h8300h/generic/crt0_ram.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | 14 | ||
| 16 | #if !defined(CONFIG_BLKDEV_RESERVE) | 15 | #if !defined(CONFIG_BLKDEV_RESERVE) |
diff --git a/arch/h8300/platform/h8300h/generic/crt0_rom.S b/arch/h8300/platform/h8300h/generic/crt0_rom.S index 2e32d8179db3..120add7ca832 100644 --- a/arch/h8300/platform/h8300h/generic/crt0_rom.S +++ b/arch/h8300/platform/h8300h/generic/crt0_rom.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | 14 | ||
| 16 | .global SYMBOL_NAME(_start) | 15 | .global SYMBOL_NAME(_start) |
diff --git a/arch/h8300/platform/h8300h/generic/timer.c b/arch/h8300/platform/h8300h/generic/timer.c index 6590f89e521a..6f5cefe0cceb 100644 --- a/arch/h8300/platform/h8300h/generic/timer.c +++ b/arch/h8300/platform/h8300h/generic/timer.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/h8300/platform/h8300h/h8max/crt0_ram.S b/arch/h8300/platform/h8300h/h8max/crt0_ram.S index a5c5a9156e04..efcbefb91b67 100644 --- a/arch/h8300/platform/h8300h/h8max/crt0_ram.S +++ b/arch/h8300/platform/h8300h/h8max/crt0_ram.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | 14 | ||
| 16 | #if !defined(CONFIG_BLKDEV_RESERVE) | 15 | #if !defined(CONFIG_BLKDEV_RESERVE) |
diff --git a/arch/h8300/platform/h8300h/h8max/timer.c b/arch/h8300/platform/h8300h/h8max/timer.c index 9ac9fa6691c0..85a574afe9d0 100644 --- a/arch/h8300/platform/h8300h/h8max/timer.c +++ b/arch/h8300/platform/h8300h/h8max/timer.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/h8300/platform/h8300h/ints_h8300h.c b/arch/h8300/platform/h8300h/ints_h8300h.c index 86a155479167..f1777119b871 100644 --- a/arch/h8300/platform/h8300h/ints_h8300h.c +++ b/arch/h8300/platform/h8300h/ints_h8300h.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | 11 | ||
diff --git a/arch/h8300/platform/h8s/edosk2674/crt0_ram.S b/arch/h8300/platform/h8s/edosk2674/crt0_ram.S index 8105dc17d735..d12b0debe478 100644 --- a/arch/h8300/platform/h8s/edosk2674/crt0_ram.S +++ b/arch/h8300/platform/h8s/edosk2674/crt0_ram.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | #include <asm/regs267x.h> | 14 | #include <asm/regs267x.h> |
| 16 | 15 | ||
diff --git a/arch/h8300/platform/h8s/edosk2674/crt0_rom.S b/arch/h8300/platform/h8s/edosk2674/crt0_rom.S index 65748bf18556..c03d23c6fe12 100644 --- a/arch/h8300/platform/h8s/edosk2674/crt0_rom.S +++ b/arch/h8300/platform/h8s/edosk2674/crt0_rom.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | #include <asm/regs267x.h> | 14 | #include <asm/regs267x.h> |
| 16 | 15 | ||
diff --git a/arch/h8300/platform/h8s/edosk2674/timer.c b/arch/h8300/platform/h8s/edosk2674/timer.c index 9441a4f1631f..bfb1424482f4 100644 --- a/arch/h8300/platform/h8s/edosk2674/timer.c +++ b/arch/h8300/platform/h8s/edosk2674/timer.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/h8300/platform/h8s/entry.S b/arch/h8300/platform/h8s/entry.S index a7a53c84c801..aeb2e9faa9b2 100644 --- a/arch/h8300/platform/h8s/entry.S +++ b/arch/h8300/platform/h8s/entry.S | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/sys.h> | 17 | #include <linux/sys.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <asm/unistd.h> | 18 | #include <asm/unistd.h> |
| 20 | #include <asm/setup.h> | 19 | #include <asm/setup.h> |
| 21 | #include <asm/segment.h> | 20 | #include <asm/segment.h> |
diff --git a/arch/h8300/platform/h8s/generic/crt0_ram.S b/arch/h8300/platform/h8s/generic/crt0_ram.S index 86f450178466..b04541069976 100644 --- a/arch/h8300/platform/h8s/generic/crt0_ram.S +++ b/arch/h8300/platform/h8s/generic/crt0_ram.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | #include <asm/regs267x.h> | 14 | #include <asm/regs267x.h> |
| 16 | 15 | ||
diff --git a/arch/h8300/platform/h8s/generic/crt0_rom.S b/arch/h8300/platform/h8s/generic/crt0_rom.S index e18e41202282..95b6f2898f52 100644 --- a/arch/h8300/platform/h8s/generic/crt0_rom.S +++ b/arch/h8300/platform/h8s/generic/crt0_rom.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define ASSEMBLY | 11 | #define ASSEMBLY |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
| 15 | #include <asm/regs267x.h> | 14 | #include <asm/regs267x.h> |
| 16 | 15 | ||
diff --git a/arch/h8300/platform/h8s/generic/timer.c b/arch/h8300/platform/h8s/generic/timer.c index 633cd8e1c21d..c2211c6e79da 100644 --- a/arch/h8300/platform/h8s/generic/timer.c +++ b/arch/h8300/platform/h8s/generic/timer.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/h8300/platform/h8s/ints_h8s.c b/arch/h8300/platform/h8s/ints_h8s.c index 8268dfd12f1f..93395d2a8a07 100644 --- a/arch/h8300/platform/h8s/ints_h8s.c +++ b/arch/h8300/platform/h8s/ints_h8s.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 1718429286d4..27d8dddbaa47 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -176,7 +176,7 @@ endchoice | |||
| 176 | config ACPI_SRAT | 176 | config ACPI_SRAT |
| 177 | bool | 177 | bool |
| 178 | default y | 178 | default y |
| 179 | depends on NUMA && (X86_SUMMIT || X86_GENERICARCH) | 179 | depends on ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) |
| 180 | select ACPI_NUMA | 180 | select ACPI_NUMA |
| 181 | 181 | ||
| 182 | config HAVE_ARCH_PARSE_SRAT | 182 | config HAVE_ARCH_PARSE_SRAT |
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S index ca668d9df164..0a5a3be6d69c 100644 --- a/arch/i386/boot/setup.S +++ b/arch/i386/boot/setup.S | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * by Robert Schwebel, December 2001 <robert@schwebel.de> | 46 | * by Robert Schwebel, December 2001 <robert@schwebel.de> |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <asm/segment.h> | 49 | #include <asm/segment.h> |
| 51 | #include <linux/version.h> | 50 | #include <linux/version.h> |
| 52 | #include <linux/compile.h> | 51 | #include <linux/compile.h> |
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 5e70c2fb273a..cbc1184e9473 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
| @@ -38,6 +38,7 @@ obj-$(CONFIG_VM86) += vm86.o | |||
| 38 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 38 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
| 39 | obj-$(CONFIG_HPET_TIMER) += hpet.o | 39 | obj-$(CONFIG_HPET_TIMER) += hpet.o |
| 40 | obj-$(CONFIG_K8_NB) += k8.o | 40 | obj-$(CONFIG_K8_NB) += k8.o |
| 41 | obj-$(CONFIG_AUDIT) += audit.o | ||
| 41 | 42 | ||
| 42 | EXTRA_AFLAGS := -traditional | 43 | EXTRA_AFLAGS := -traditional |
| 43 | 44 | ||
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 97ca17189af5..0db6387025ca 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/acpi.h> | 27 | #include <linux/acpi.h> |
| 29 | #include <linux/efi.h> | 28 | #include <linux/efi.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c index 50eb0e03777e..7b421b3a053e 100644 --- a/arch/i386/kernel/alternative.c +++ b/arch/i386/kernel/alternative.c | |||
| @@ -168,6 +168,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end) | |||
| 168 | } | 168 | } |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | #ifdef CONFIG_SMP | ||
| 172 | |||
| 171 | static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end) | 173 | static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end) |
| 172 | { | 174 | { |
| 173 | struct alt_instr *a; | 175 | struct alt_instr *a; |
| @@ -328,6 +330,8 @@ void alternatives_smp_switch(int smp) | |||
| 328 | spin_unlock_irqrestore(&smp_alt, flags); | 330 | spin_unlock_irqrestore(&smp_alt, flags); |
| 329 | } | 331 | } |
| 330 | 332 | ||
| 333 | #endif | ||
| 334 | |||
| 331 | void __init alternative_instructions(void) | 335 | void __init alternative_instructions(void) |
| 332 | { | 336 | { |
| 333 | if (no_replacement) { | 337 | if (no_replacement) { |
| @@ -349,6 +353,7 @@ void __init alternative_instructions(void) | |||
| 349 | smp_alt_once = 1; | 353 | smp_alt_once = 1; |
| 350 | #endif | 354 | #endif |
| 351 | 355 | ||
| 356 | #ifdef CONFIG_SMP | ||
| 352 | if (smp_alt_once) { | 357 | if (smp_alt_once) { |
| 353 | if (1 == num_possible_cpus()) { | 358 | if (1 == num_possible_cpus()) { |
| 354 | printk(KERN_INFO "SMP alternatives: switching to UP code\n"); | 359 | printk(KERN_INFO "SMP alternatives: switching to UP code\n"); |
| @@ -370,4 +375,5 @@ void __init alternative_instructions(void) | |||
| 370 | _text, _etext); | 375 | _text, _etext); |
| 371 | alternatives_smp_switch(0); | 376 | alternatives_smp_switch(0); |
| 372 | } | 377 | } |
| 378 | #endif | ||
| 373 | } | 379 | } |
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index 7ce09492fc0c..8c844d07862f 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Mikael Pettersson : PM converted to driver model. | 14 | * Mikael Pettersson : PM converted to driver model. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | 18 | ||
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index 7c5729d1fd06..8591f2fa920c 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c | |||
| @@ -201,7 +201,6 @@ | |||
| 201 | * http://www.microsoft.com/hwdev/busbios/amp_12.htm] | 201 | * http://www.microsoft.com/hwdev/busbios/amp_12.htm] |
| 202 | */ | 202 | */ |
| 203 | 203 | ||
| 204 | #include <linux/config.h> | ||
| 205 | #include <linux/module.h> | 204 | #include <linux/module.h> |
| 206 | 205 | ||
| 207 | #include <linux/poll.h> | 206 | #include <linux/poll.h> |
diff --git a/arch/i386/kernel/audit.c b/arch/i386/kernel/audit.c new file mode 100644 index 000000000000..5a53c6f371ff --- /dev/null +++ b/arch/i386/kernel/audit.c | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | #include <linux/init.h> | ||
| 2 | #include <linux/types.h> | ||
| 3 | #include <linux/audit.h> | ||
| 4 | #include <asm/unistd.h> | ||
| 5 | |||
| 6 | static unsigned dir_class[] = { | ||
| 7 | #include <asm-generic/audit_dir_write.h> | ||
| 8 | ~0U | ||
| 9 | }; | ||
| 10 | |||
| 11 | static unsigned chattr_class[] = { | ||
| 12 | #include <asm-generic/audit_change_attr.h> | ||
| 13 | ~0U | ||
| 14 | }; | ||
| 15 | |||
| 16 | static int __init audit_classes_init(void) | ||
| 17 | { | ||
| 18 | audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); | ||
| 19 | audit_register_class(AUDIT_CLASS_CHATTR, chattr_class); | ||
| 20 | return 0; | ||
| 21 | } | ||
| 22 | |||
| 23 | __initcall(audit_classes_init); | ||
diff --git a/arch/i386/kernel/bootflag.c b/arch/i386/kernel/bootflag.c index 4c30ed01f4e1..0b9860530a6b 100644 --- a/arch/i386/kernel/bootflag.c +++ b/arch/i386/kernel/bootflag.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index cf0ddc9ee0cd..567b39bea07e 100644 --- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 24 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c index ab6504efd801..304d2eaa4a1b 100644 --- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c +++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c index 694d4793bf6a..54382760983a 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * - We disable half multipliers if ACPI is used on A0 stepping CPUs. | 12 | * - We disable half multipliers if ACPI is used on A0 stepping CPUs. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c index 8d765509ef59..b77f1358bd79 100644 --- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c +++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/cpufreq.h> | 19 | #include <linux/cpufreq.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/sched.h> /* current */ | 20 | #include <linux/sched.h> /* current */ |
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/compiler.h> | 22 | #include <linux/compiler.h> |
diff --git a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c index 10afc645c540..5a2e270924b1 100644 --- a/arch/i386/kernel/cpu/intel.c +++ b/arch/i386/kernel/cpu/intel.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 4 | 3 | ||
diff --git a/arch/i386/kernel/cpu/mcheck/k7.c b/arch/i386/kernel/cpu/mcheck/k7.c index fc5d5215e23d..b0862af595aa 100644 --- a/arch/i386/kernel/cpu/mcheck/k7.c +++ b/arch/i386/kernel/cpu/mcheck/k7.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 11 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
| 12 | 11 | ||
diff --git a/arch/i386/kernel/cpu/mcheck/mce.c b/arch/i386/kernel/cpu/mcheck/mce.c index afa0888f9a1e..d555bec0db99 100644 --- a/arch/i386/kernel/cpu/mcheck/mce.c +++ b/arch/i386/kernel/cpu/mcheck/mce.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
| 12 | #include <linux/thread_info.h> | 11 | #include <linux/thread_info.h> |
diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c index 82dffe0d4954..1f9153ae5b03 100644 --- a/arch/i386/kernel/cpu/mcheck/non-fatal.c +++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/jiffies.h> | 13 | #include <linux/jiffies.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/workqueue.h> | 14 | #include <linux/workqueue.h> |
| 16 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 17 | #include <linux/smp.h> | 16 | #include <linux/smp.h> |
diff --git a/arch/i386/kernel/cpu/mcheck/p4.c b/arch/i386/kernel/cpu/mcheck/p4.c index fd2c459a31ef..b95f1b3d53aa 100644 --- a/arch/i386/kernel/cpu/mcheck/p4.c +++ b/arch/i386/kernel/cpu/mcheck/p4.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 10 | #include <linux/smp.h> | 9 | #include <linux/smp.h> |
| 11 | 10 | ||
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c index f6dfa9fb675c..a8d3ecdc3897 100644 --- a/arch/i386/kernel/cpuid.c +++ b/arch/i386/kernel/cpuid.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c index 8beb0f07d999..fe158042110b 100644 --- a/arch/i386/kernel/efi.c +++ b/arch/i386/kernel/efi.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Skip non-WB memory and ignore empty memory ranges. | 19 | * Skip non-WB memory and ignore empty memory ranges. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
diff --git a/arch/i386/kernel/efi_stub.S b/arch/i386/kernel/efi_stub.S index 08c0312d9b6c..d3ee73a3eee3 100644 --- a/arch/i386/kernel/efi_stub.S +++ b/arch/i386/kernel/efi_stub.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * turned off. | 5 | * turned off. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
| 10 | #include <asm/page.h> | 9 | #include <asm/page.h> |
| 11 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index fbdb933251b6..787190c45fdb 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | * "current" is in register %ebx during any slow entries. | 40 | * "current" is in register %ebx during any slow entries. |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/linkage.h> | 43 | #include <linux/linkage.h> |
| 45 | #include <asm/thread_info.h> | 44 | #include <asm/thread_info.h> |
| 46 | #include <asm/errno.h> | 45 | #include <asm/errno.h> |
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index 3debc2e26542..eb79aa2fa8bb 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | .text | 10 | .text |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/threads.h> | 11 | #include <linux/threads.h> |
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | #include <asm/segment.h> | 13 | #include <asm/segment.h> |
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c index 036a9857936f..e3d4b73bfdb0 100644 --- a/arch/i386/kernel/i386_ksyms.c +++ b/arch/i386/kernel/i386_ksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <asm/checksum.h> | 2 | #include <asm/checksum.h> |
| 4 | #include <asm/desc.h> | 3 | #include <asm/desc.h> |
diff --git a/arch/i386/kernel/i387.c b/arch/i386/kernel/i387.c index c4351972d9af..665847281ed2 100644 --- a/arch/i386/kernel/i387.c +++ b/arch/i386/kernel/i387.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Gareth Hughes <gareth@valinux.com>, May 2000 | 8 | * Gareth Hughes <gareth@valinux.com>, May 2000 |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c index 3c6063671a9f..d4756d154f47 100644 --- a/arch/i386/kernel/i8259.c +++ b/arch/i386/kernel/i8259.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/errno.h> | 1 | #include <linux/errno.h> |
| 3 | #include <linux/signal.h> | 2 | #include <linux/signal.h> |
| 4 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index ec9ea0269d36..4fb32c551fe0 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/smp_lock.h> | 28 | #include <linux/smp_lock.h> |
| 30 | #include <linux/mc146818rtc.h> | 29 | #include <linux/mc146818rtc.h> |
| 31 | #include <linux/compiler.h> | 30 | #include <linux/compiler.h> |
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c index 727e419ad78a..de2e16e561c0 100644 --- a/arch/i386/kernel/kprobes.c +++ b/arch/i386/kernel/kprobes.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * <prasanna@in.ibm.com> added function-return probes. | 28 | * <prasanna@in.ibm.com> added function-return probes. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/kprobes.h> | 31 | #include <linux/kprobes.h> |
| 33 | #include <linux/ptrace.h> | 32 | #include <linux/ptrace.h> |
| 34 | #include <linux/preempt.h> | 33 | #include <linux/preempt.h> |
diff --git a/arch/i386/kernel/mca.c b/arch/i386/kernel/mca.c index 558bb207720f..cd5456f14af4 100644 --- a/arch/i386/kernel/mca.c +++ b/arch/i386/kernel/mca.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 47 | #include <linux/proc_fs.h> | 47 | #include <linux/proc_fs.h> |
| 48 | #include <linux/mman.h> | 48 | #include <linux/mman.h> |
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/mm.h> | 49 | #include <linux/mm.h> |
| 51 | #include <linux/pagemap.h> | 50 | #include <linux/pagemap.h> |
| 52 | #include <linux/ioport.h> | 51 | #include <linux/ioport.h> |
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c index 6b1392d33ed5..a70b5fa0ef06 100644 --- a/arch/i386/kernel/mpparse.c +++ b/arch/i386/kernel/mpparse.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/acpi.h> | 18 | #include <linux/acpi.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/bootmem.h> | 20 | #include <linux/bootmem.h> |
| 22 | #include <linux/smp_lock.h> | 21 | #include <linux/smp_lock.h> |
| 23 | #include <linux/kernel_stat.h> | 22 | #include <linux/kernel_stat.h> |
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c index d022cb8fd725..d535cdbbfd25 100644 --- a/arch/i386/kernel/msr.c +++ b/arch/i386/kernel/msr.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| @@ -251,7 +250,9 @@ static int msr_class_device_create(int i) | |||
| 251 | return err; | 250 | return err; |
| 252 | } | 251 | } |
| 253 | 252 | ||
| 254 | static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | 253 | #ifdef CONFIG_HOTPLUG_CPU |
| 254 | static int msr_class_cpu_callback(struct notifier_block *nfb, | ||
| 255 | unsigned long action, void *hcpu) | ||
| 255 | { | 256 | { |
| 256 | unsigned int cpu = (unsigned long)hcpu; | 257 | unsigned int cpu = (unsigned long)hcpu; |
| 257 | 258 | ||
| @@ -270,6 +271,7 @@ static struct notifier_block __cpuinitdata msr_class_cpu_notifier = | |||
| 270 | { | 271 | { |
| 271 | .notifier_call = msr_class_cpu_callback, | 272 | .notifier_call = msr_class_cpu_callback, |
| 272 | }; | 273 | }; |
| 274 | #endif | ||
| 273 | 275 | ||
| 274 | static int __init msr_init(void) | 276 | static int __init msr_init(void) |
| 275 | { | 277 | { |
| @@ -292,7 +294,7 @@ static int __init msr_init(void) | |||
| 292 | if (err != 0) | 294 | if (err != 0) |
| 293 | goto out_class; | 295 | goto out_class; |
| 294 | } | 296 | } |
| 295 | register_cpu_notifier(&msr_class_cpu_notifier); | 297 | register_hotcpu_notifier(&msr_class_cpu_notifier); |
| 296 | 298 | ||
| 297 | err = 0; | 299 | err = 0; |
| 298 | goto out; | 300 | goto out; |
| @@ -315,7 +317,7 @@ static void __exit msr_exit(void) | |||
| 315 | class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu)); | 317 | class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu)); |
| 316 | class_destroy(msr_class); | 318 | class_destroy(msr_class); |
| 317 | unregister_chrdev(MSR_MAJOR, "cpu/msr"); | 319 | unregister_chrdev(MSR_MAJOR, "cpu/msr"); |
| 318 | unregister_cpu_notifier(&msr_class_cpu_notifier); | 320 | unregister_hotcpu_notifier(&msr_class_cpu_notifier); |
| 319 | } | 321 | } |
| 320 | 322 | ||
| 321 | module_init(msr_init); | 323 | module_init(msr_init); |
diff --git a/arch/i386/kernel/numaq.c b/arch/i386/kernel/numaq.c index 0caf14652bad..9000d82c6dc0 100644 --- a/arch/i386/kernel/numaq.c +++ b/arch/i386/kernel/numaq.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Send feedback to <gone@us.ibm.com> | 23 | * Send feedback to <gone@us.ibm.com> |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 28 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
| 29 | #include <linux/mmzone.h> | 28 | #include <linux/mmzone.h> |
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c index 6946b06e2784..94e2c87edeaa 100644 --- a/arch/i386/kernel/process.c +++ b/arch/i386/kernel/process.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/user.h> | 28 | #include <linux/user.h> |
| 29 | #include <linux/a.out.h> | 29 | #include <linux/a.out.h> |
| 30 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/utsname.h> | 31 | #include <linux/utsname.h> |
| 33 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 34 | #include <linux/reboot.h> | 33 | #include <linux/reboot.h> |
diff --git a/arch/i386/kernel/quirks.c b/arch/i386/kernel/quirks.c index 87ccdac84928..9f6ab1789bb0 100644 --- a/arch/i386/kernel/quirks.c +++ b/arch/i386/kernel/quirks.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * This file contains work-arounds for x86 and x86_64 platform bugs. | 2 | * This file contains work-arounds for x86 and x86_64 platform bugs. |
| 3 | */ | 3 | */ |
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/pci.h> | 4 | #include <linux/pci.h> |
| 6 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
| 7 | 6 | ||
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index d207242976d3..54cfeabbc5e4 100644 --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/i386/kernel/reboot.c | 2 | * linux/arch/i386/kernel/reboot.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 7 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 8 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c index 9bf590cefc7d..c7d3df23f589 100644 --- a/arch/i386/kernel/scx200.c +++ b/arch/i386/kernel/scx200.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | National Semiconductor SCx200 support. */ | 5 | National Semiconductor SCx200 support. */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
diff --git a/arch/i386/kernel/semaphore.c b/arch/i386/kernel/semaphore.c index 967dc74df9ee..98352c374c76 100644 --- a/arch/i386/kernel/semaphore.c +++ b/arch/i386/kernel/semaphore.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org> | 13 | * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org> |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/semaphore.h> | 15 | #include <asm/semaphore.h> |
| 17 | 16 | ||
| 18 | /* | 17 | /* |
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 6712f0d2eb37..08c00d20f162 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * This file handles the architecture-dependent parts of initialization | 23 | * This file handles the architecture-dependent parts of initialization |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 29 | #include <linux/mmzone.h> | 28 | #include <linux/mmzone.h> |
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 89e7315e539c..6f5fea05f1d7 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * Rusty Russell : Hacked into shape for new "hotplug" boot process. */ | 34 | * Rusty Russell : Hacked into shape for new "hotplug" boot process. */ |
| 35 | 35 | ||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | 39 | ||
diff --git a/arch/i386/kernel/srat.c b/arch/i386/kernel/srat.c index 989c85255dbe..b1809c9a0899 100644 --- a/arch/i386/kernel/srat.c +++ b/arch/i386/kernel/srat.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | * Send feedback to Pat Gaughen <gone@us.ibm.com> | 24 | * Send feedback to Pat Gaughen <gone@us.ibm.com> |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 28 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
| 29 | #include <linux/mmzone.h> | 28 | #include <linux/mmzone.h> |
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 5f43d0410122..316421a7f56f 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | #include "mach_time.h" | 60 | #include "mach_time.h" |
| 61 | 61 | ||
| 62 | #include <linux/timex.h> | 62 | #include <linux/timex.h> |
| 63 | #include <linux/config.h> | ||
| 64 | 63 | ||
| 65 | #include <asm/hpet.h> | 64 | #include <asm/hpet.h> |
| 66 | 65 | ||
diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c index a529f0cdce17..14a1376fedd1 100644 --- a/arch/i386/kernel/time_hpet.c +++ b/arch/i386/kernel/time_hpet.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/apic.h> | 18 | #include <asm/apic.h> |
| 19 | 19 | ||
| 20 | #include <linux/timex.h> | 20 | #include <linux/timex.h> |
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | #include <asm/hpet.h> | 22 | #include <asm/hpet.h> |
| 24 | #include <linux/hpet.h> | 23 | #include <linux/hpet.h> |
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 78464097470a..e8c6086b2aa1 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 'Traps.c' handles hardware traps and faults after we have saved some | 11 | * 'Traps.c' handles hardware traps and faults after we have saved some |
| 12 | * state in 'asm.s'. | 12 | * state in 'asm.s'. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c index 00e0118e717c..8355d8d87d18 100644 --- a/arch/i386/kernel/vm86.c +++ b/arch/i386/kernel/vm86.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/capability.h> | 33 | #include <linux/capability.h> |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 37 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
diff --git a/arch/i386/lib/checksum.S b/arch/i386/lib/checksum.S index 94c7867ddc33..75ffd02654fc 100644 --- a/arch/i386/lib/checksum.S +++ b/arch/i386/lib/checksum.S | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * 2 of the License, or (at your option) any later version. | 25 | * 2 of the License, or (at your option) any later version. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <asm/errno.h> | 28 | #include <asm/errno.h> |
| 30 | 29 | ||
| 31 | /* | 30 | /* |
diff --git a/arch/i386/lib/memcpy.c b/arch/i386/lib/memcpy.c index 891b2359d18a..8ac51b82a632 100644 --- a/arch/i386/lib/memcpy.c +++ b/arch/i386/lib/memcpy.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/string.h> | 1 | #include <linux/string.h> |
| 3 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 4 | 3 | ||
diff --git a/arch/i386/lib/mmx.c b/arch/i386/lib/mmx.c index 2afda94dffd3..28084d2e8dd4 100644 --- a/arch/i386/lib/mmx.c +++ b/arch/i386/lib/mmx.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 3 | #include <linux/string.h> | 2 | #include <linux/string.h> |
| 4 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
diff --git a/arch/i386/lib/usercopy.c b/arch/i386/lib/usercopy.c index c5aa65f7c02a..4b75212ab6dd 100644 --- a/arch/i386/lib/usercopy.c +++ b/arch/i386/lib/usercopy.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright 1997 Andi Kleen <ak@muc.de> | 5 | * Copyright 1997 Andi Kleen <ak@muc.de> |
| 6 | * Copyright 1997 Linus Torvalds | 6 | * Copyright 1997 Linus Torvalds |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/highmem.h> | 9 | #include <linux/highmem.h> |
| 11 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
diff --git a/arch/i386/mach-default/setup.c b/arch/i386/mach-default/setup.c index 004837c58793..77c8c83815c1 100644 --- a/arch/i386/mach-default/setup.c +++ b/arch/i386/mach-default/setup.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Machine specific setup for generic | 2 | * Machine specific setup for generic |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/smp.h> | 5 | #include <linux/smp.h> |
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/interrupt.h> | 7 | #include <linux/interrupt.h> |
diff --git a/arch/i386/mach-generic/bigsmp.c b/arch/i386/mach-generic/bigsmp.c index 037b2af1a1f4..ef7a6e6fcb9f 100644 --- a/arch/i386/mach-generic/bigsmp.c +++ b/arch/i386/mach-generic/bigsmp.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Drives the local APIC in "clustered mode". | 3 | * Drives the local APIC in "clustered mode". |
| 4 | */ | 4 | */ |
| 5 | #define APIC_DEFINITION 1 | 5 | #define APIC_DEFINITION 1 |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/threads.h> | 6 | #include <linux/threads.h> |
| 8 | #include <linux/cpumask.h> | 7 | #include <linux/cpumask.h> |
| 9 | #include <asm/mpspec.h> | 8 | #include <asm/mpspec.h> |
diff --git a/arch/i386/mach-generic/default.c b/arch/i386/mach-generic/default.c index 7da14e9a79c3..96c19821e47d 100644 --- a/arch/i386/mach-generic/default.c +++ b/arch/i386/mach-generic/default.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Default generic APIC driver. This handles upto 8 CPUs. | 2 | * Default generic APIC driver. This handles upto 8 CPUs. |
| 3 | */ | 3 | */ |
| 4 | #define APIC_DEFINITION 1 | 4 | #define APIC_DEFINITION 1 |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <linux/cpumask.h> | 6 | #include <linux/cpumask.h> |
| 8 | #include <asm/mpspec.h> | 7 | #include <asm/mpspec.h> |
diff --git a/arch/i386/mach-generic/es7000.c b/arch/i386/mach-generic/es7000.c index 48d3ec37241b..845cdd0b3593 100644 --- a/arch/i386/mach-generic/es7000.c +++ b/arch/i386/mach-generic/es7000.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * APIC driver for the Unisys ES7000 chipset. | 2 | * APIC driver for the Unisys ES7000 chipset. |
| 3 | */ | 3 | */ |
| 4 | #define APIC_DEFINITION 1 | 4 | #define APIC_DEFINITION 1 |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <linux/cpumask.h> | 6 | #include <linux/cpumask.h> |
| 8 | #include <asm/mpspec.h> | 7 | #include <asm/mpspec.h> |
diff --git a/arch/i386/mach-generic/probe.c b/arch/i386/mach-generic/probe.c index d55fa7b187ab..bcd1bcfaa723 100644 --- a/arch/i386/mach-generic/probe.c +++ b/arch/i386/mach-generic/probe.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Generic x86 APIC driver probe layer. | 4 | * Generic x86 APIC driver probe layer. |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/threads.h> | 6 | #include <linux/threads.h> |
| 8 | #include <linux/cpumask.h> | 7 | #include <linux/cpumask.h> |
| 9 | #include <linux/string.h> | 8 | #include <linux/string.h> |
diff --git a/arch/i386/mach-generic/summit.c b/arch/i386/mach-generic/summit.c index 65ddf74d7f25..b73501ddd653 100644 --- a/arch/i386/mach-generic/summit.c +++ b/arch/i386/mach-generic/summit.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * APIC driver for the IBM "Summit" chipset. | 2 | * APIC driver for the IBM "Summit" chipset. |
| 3 | */ | 3 | */ |
| 4 | #define APIC_DEFINITION 1 | 4 | #define APIC_DEFINITION 1 |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <linux/cpumask.h> | 6 | #include <linux/cpumask.h> |
| 8 | #include <asm/mpspec.h> | 7 | #include <asm/mpspec.h> |
diff --git a/arch/i386/mach-visws/mpparse.c b/arch/i386/mach-visws/mpparse.c index 5f3d7e6de37b..f3c74fab8b95 100644 --- a/arch/i386/mach-visws/mpparse.c +++ b/arch/i386/mach-visws/mpparse.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/config.h> | ||
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include <linux/smp.h> | 3 | #include <linux/smp.h> |
| 5 | 4 | ||
diff --git a/arch/i386/mach-visws/traps.c b/arch/i386/mach-visws/traps.c index 964353992031..5199bd03254a 100644 --- a/arch/i386/mach-visws/traps.c +++ b/arch/i386/mach-visws/traps.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | /* VISWS traps */ | 1 | /* VISWS traps */ |
| 2 | 2 | ||
| 3 | #include <linux/config.h> | ||
| 4 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
| 5 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 6 | #include <linux/init.h> | 5 | #include <linux/init.h> |
diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c index c418521dd554..828522541a88 100644 --- a/arch/i386/mach-visws/visws_apic.c +++ b/arch/i386/mach-visws/visws_apic.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * 25/11/2002 - Updated for 2.5 by Andrey Panin <pazke@orbita1.ru> | 16 | * 25/11/2002 - Updated for 2.5 by Andrey Panin <pazke@orbita1.ru> |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel_stat.h> | 19 | #include <linux/kernel_stat.h> |
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/smp_lock.h> | 21 | #include <linux/smp_lock.h> |
diff --git a/arch/i386/mach-voyager/setup.c b/arch/i386/mach-voyager/setup.c index defc6ebbd565..9da9ef09068d 100644 --- a/arch/i386/mach-voyager/setup.c +++ b/arch/i386/mach-voyager/setup.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Machine specific setup for generic | 2 | * Machine specific setup for generic |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 7 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 8 | #include <asm/arch_hooks.h> | 7 | #include <asm/arch_hooks.h> |
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c index b584060ec004..80b7f2fc4f46 100644 --- a/arch/i386/mach-voyager/voyager_basic.c +++ b/arch/i386/mach-voyager/voyager_basic.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * voyager_smp.c - Voyager SMP hal (emulates linux smp.c) | 12 | * voyager_smp.c - Voyager SMP hal (emulates linux smp.c) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c index 10d21df14531..f50c6c6ad680 100644 --- a/arch/i386/mach-voyager/voyager_cat.c +++ b/arch/i386/mach-voyager/voyager_cat.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * of bit shift manipulations to send and receive packets on the | 16 | * of bit shift manipulations to send and receive packets on the |
| 17 | * serial bus */ | 17 | * serial bus */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 21 | #include <linux/completion.h> | 20 | #include <linux/completion.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c index 5b8b579a079f..6c86575ffdcb 100644 --- a/arch/i386/mach-voyager/voyager_smp.c +++ b/arch/i386/mach-voyager/voyager_smp.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * This file provides all the same external entries as smp.c but uses | 9 | * This file provides all the same external entries as smp.c but uses |
| 10 | * the voyager hal to provide the functionality | 10 | * the voyager hal to provide the functionality |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
| @@ -1938,3 +1937,9 @@ smp_cpus_done(unsigned int max_cpus) | |||
| 1938 | { | 1937 | { |
| 1939 | zap_low_mappings(); | 1938 | zap_low_mappings(); |
| 1940 | } | 1939 | } |
| 1940 | |||
| 1941 | void __init | ||
| 1942 | smp_setup_processor_id(void) | ||
| 1943 | { | ||
| 1944 | current_thread_info()->cpu = hard_smp_processor_id(); | ||
| 1945 | } | ||
diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/i386/mach-voyager/voyager_thread.c index 2b03884fdb2a..50f6de6ff64d 100644 --- a/arch/i386/mach-voyager/voyager_thread.c +++ b/arch/i386/mach-voyager/voyager_thread.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * */ | 14 | * */ |
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 19 | #include <linux/kernel_stat.h> | 18 | #include <linux/kernel_stat.h> |
| 20 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
diff --git a/arch/i386/mm/boot_ioremap.c b/arch/i386/mm/boot_ioremap.c index 523b30634e0a..5d44f4f5ff59 100644 --- a/arch/i386/mm/boot_ioremap.c +++ b/arch/i386/mm/boot_ioremap.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * boot_pte_t is defined only if this all works correctly | 15 | * boot_pte_t is defined only if this all works correctly |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #undef CONFIG_X86_PAE | 18 | #undef CONFIG_X86_PAE |
| 20 | #include <asm/page.h> | 19 | #include <asm/page.h> |
| 21 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c index fe6eb901326e..7c392dc553b8 100644 --- a/arch/i386/mm/discontig.c +++ b/arch/i386/mm/discontig.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 27 | #include <linux/bootmem.h> | 26 | #include <linux/bootmem.h> |
| 28 | #include <linux/mmzone.h> | 27 | #include <linux/mmzone.h> |
| @@ -43,7 +42,7 @@ EXPORT_SYMBOL(node_data); | |||
| 43 | bootmem_data_t node0_bdata; | 42 | bootmem_data_t node0_bdata; |
| 44 | 43 | ||
| 45 | /* | 44 | /* |
| 46 | * numa interface - we expect the numa architecture specfic code to have | 45 | * numa interface - we expect the numa architecture specific code to have |
| 47 | * populated the following initialisation. | 46 | * populated the following initialisation. |
| 48 | * | 47 | * |
| 49 | * 1) node_online_map - the map of all nodes configured (online) in the system | 48 | * 1) node_online_map - the map of all nodes configured (online) in the system |
diff --git a/arch/i386/mm/extable.c b/arch/i386/mm/extable.c index f706449319c4..de03c5430abc 100644 --- a/arch/i386/mm/extable.c +++ b/arch/i386/mm/extable.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/i386/mm/extable.c | 2 | * linux/arch/i386/mm/extable.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 8 | #include <asm/uaccess.h> | 7 | #include <asm/uaccess.h> |
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c index 6ee7faaf2c1b..f7279468323a 100644 --- a/arch/i386/mm/fault.c +++ b/arch/i386/mm/fault.c | |||
| @@ -389,7 +389,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 389 | /* When running in the kernel we expect faults to occur only to | 389 | /* When running in the kernel we expect faults to occur only to |
| 390 | * addresses in user space. All other faults represent errors in the | 390 | * addresses in user space. All other faults represent errors in the |
| 391 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 391 | * kernel and should generate an OOPS. Unfortunatly, in the case of an |
| 392 | * erroneous fault occuring in a code path which already holds mmap_sem | 392 | * erroneous fault occurring in a code path which already holds mmap_sem |
| 393 | * we will deadlock attempting to validate the fault against the | 393 | * we will deadlock attempting to validate the fault against the |
| 394 | * address space. Luckily the kernel only validly references user | 394 | * address space. Luckily the kernel only validly references user |
| 395 | * space from well defined areas of code, which are listed in the | 395 | * space from well defined areas of code, which are listed in the |
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c index a7d891585411..1719a8141f81 100644 --- a/arch/i386/mm/hugetlbpage.c +++ b/arch/i386/mm/hugetlbpage.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 2002, Rohit Seth <rohit.seth@intel.com> | 4 | * Copyright (C) 2002, Rohit Seth <rohit.seth@intel.com> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index f84b16e007ff..89e8486aac34 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 | 6 | * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/signal.h> | 10 | #include <linux/signal.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| @@ -726,16 +725,15 @@ static int noinline do_test_wp_bit(void) | |||
| 726 | 725 | ||
| 727 | #ifdef CONFIG_DEBUG_RODATA | 726 | #ifdef CONFIG_DEBUG_RODATA |
| 728 | 727 | ||
| 729 | extern char __start_rodata, __end_rodata; | ||
| 730 | void mark_rodata_ro(void) | 728 | void mark_rodata_ro(void) |
| 731 | { | 729 | { |
| 732 | unsigned long addr = (unsigned long)&__start_rodata; | 730 | unsigned long addr = (unsigned long)__start_rodata; |
| 733 | 731 | ||
| 734 | for (; addr < (unsigned long)&__end_rodata; addr += PAGE_SIZE) | 732 | for (; addr < (unsigned long)__end_rodata; addr += PAGE_SIZE) |
| 735 | change_page_attr(virt_to_page(addr), 1, PAGE_KERNEL_RO); | 733 | change_page_attr(virt_to_page(addr), 1, PAGE_KERNEL_RO); |
| 736 | 734 | ||
| 737 | printk ("Write protecting the kernel read-only data: %luk\n", | 735 | printk("Write protecting the kernel read-only data: %uk\n", |
| 738 | (unsigned long)(&__end_rodata - &__start_rodata) >> 10); | 736 | (__end_rodata - __start_rodata) >> 10); |
| 739 | 737 | ||
| 740 | /* | 738 | /* |
| 741 | * change_page_attr() requires a global_flush_tlb() call after it. | 739 | * change_page_attr() requires a global_flush_tlb() call after it. |
diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c index 353a836ed63c..8564b6ae17e3 100644 --- a/arch/i386/mm/pageattr.c +++ b/arch/i386/mm/pageattr.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Thanks to Ben LaHaise for precious feedback. | 3 | * Thanks to Ben LaHaise for precious feedback. |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/mm.h> | 6 | #include <linux/mm.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/highmem.h> | 8 | #include <linux/highmem.h> |
diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c index 2889567e21a1..bd98768d8764 100644 --- a/arch/i386/mm/pgtable.c +++ b/arch/i386/mm/pgtable.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/i386/mm/pgtable.c | 2 | * linux/arch/i386/mm/pgtable.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
| 7 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 8 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
| @@ -30,7 +29,6 @@ void show_mem(void) | |||
| 30 | struct page *page; | 29 | struct page *page; |
| 31 | pg_data_t *pgdat; | 30 | pg_data_t *pgdat; |
| 32 | unsigned long i; | 31 | unsigned long i; |
| 33 | struct page_state ps; | ||
| 34 | unsigned long flags; | 32 | unsigned long flags; |
| 35 | 33 | ||
| 36 | printk(KERN_INFO "Mem-info:\n"); | 34 | printk(KERN_INFO "Mem-info:\n"); |
| @@ -58,12 +56,13 @@ void show_mem(void) | |||
| 58 | printk(KERN_INFO "%d pages shared\n", shared); | 56 | printk(KERN_INFO "%d pages shared\n", shared); |
| 59 | printk(KERN_INFO "%d pages swap cached\n", cached); | 57 | printk(KERN_INFO "%d pages swap cached\n", cached); |
| 60 | 58 | ||
| 61 | get_page_state(&ps); | 59 | printk(KERN_INFO "%lu pages dirty\n", global_page_state(NR_FILE_DIRTY)); |
| 62 | printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty); | 60 | printk(KERN_INFO "%lu pages writeback\n", |
| 63 | printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback); | 61 | global_page_state(NR_WRITEBACK)); |
| 64 | printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped); | 62 | printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED)); |
| 65 | printk(KERN_INFO "%lu pages slab\n", ps.nr_slab); | 63 | printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB)); |
| 66 | printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); | 64 | printk(KERN_INFO "%lu pages pagetables\n", |
| 65 | global_page_state(NR_PAGETABLE)); | ||
| 67 | } | 66 | } |
| 68 | 67 | ||
| 69 | /* | 68 | /* |
diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c index f9156d3ac723..c7650a7e0b07 100644 --- a/arch/i386/pci/init.c +++ b/arch/i386/pci/init.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/pci.h> | 1 | #include <linux/pci.h> |
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include "pci.h" | 3 | #include "pci.h" |
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 8ce69508f3c7..bdb4896c56e6 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * (c) 1999--2000 Martin Mares <mj@ucw.cz> | 4 | * (c) 1999--2000 Martin Mares <mj@ucw.cz> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 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/pci.h> | 9 | #include <linux/pci.h> |
diff --git a/arch/i386/pci/visws.c b/arch/i386/pci/visws.c index 6c17433fdf7d..f1b486d4190b 100644 --- a/arch/i386/pci/visws.c +++ b/arch/i386/pci/visws.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * (c) 1999--2000 Martin Mares <mj@ucw.cz> | 4 | * (c) 1999--2000 Martin Mares <mj@ucw.cz> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c index e6517915fe3e..5a1abeff033b 100644 --- a/arch/i386/power/cpu.c +++ b/arch/i386/power/cpu.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> | 7 | * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/suspend.h> | 11 | #include <linux/suspend.h> |
| 13 | #include <asm/mtrr.h> | 12 | #include <asm/mtrr.h> |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index b487e227a1f7..47de9ee6bcd6 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -70,6 +70,11 @@ config DMA_IS_DMA32 | |||
| 70 | bool | 70 | bool |
| 71 | default y | 71 | default y |
| 72 | 72 | ||
| 73 | config DMA_IS_NORMAL | ||
| 74 | bool | ||
| 75 | depends on IA64_SGI_SN2 | ||
| 76 | default y | ||
| 77 | |||
| 73 | choice | 78 | choice |
| 74 | prompt "System type" | 79 | prompt "System type" |
| 75 | default IA64_GENERIC | 80 | default IA64_GENERIC |
diff --git a/arch/ia64/dig/setup.c b/arch/ia64/dig/setup.c index 38aa9c108857..5ab12b8351d0 100644 --- a/arch/ia64/dig/setup.c +++ b/arch/ia64/dig/setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1999 Walt Drummond <drummond@valinux.com> | 8 | * Copyright (C) 1999 Walt Drummond <drummond@valinux.com> |
| 9 | * Copyright (C) 1999 Vijay Chander <vijay@engr.sgi.com> | 9 | * Copyright (C) 1999 Vijay Chander <vijay@engr.sgi.com> |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 5825ddee58d6..db8e1fcfa047 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | ** | 19 | ** |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
diff --git a/arch/ia64/hp/sim/boot/bootloader.c b/arch/ia64/hp/sim/boot/bootloader.c index 51a7b7b4dd0e..c5e9baafafe0 100644 --- a/arch/ia64/hp/sim/boot/bootloader.c +++ b/arch/ia64/hp/sim/boot/bootloader.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | struct task_struct; /* forward declaration for elf.h */ | 12 | struct task_struct; /* forward declaration for elf.h */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/elf.h> | 14 | #include <linux/elf.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/ia64/hp/sim/boot/fw-emu.c b/arch/ia64/hp/sim/boot/fw-emu.c index 30fdfb1d0a53..5a0a7afcfc3a 100644 --- a/arch/ia64/hp/sim/boot/fw-emu.c +++ b/arch/ia64/hp/sim/boot/fw-emu.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1998-2001 Hewlett-Packard Co | 4 | * Copyright (C) 1998-2001 Hewlett-Packard Co |
| 5 | * David Mosberger-Tang <davidm@hpl.hp.com> | 5 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifdef CONFIG_PCI | 8 | #ifdef CONFIG_PCI |
| 10 | # include <linux/pci.h> | 9 | # include <linux/pci.h> |
diff --git a/arch/ia64/hp/sim/hpsim_console.c b/arch/ia64/hp/sim/hpsim_console.c index 5deff21e5877..6e149c8ab835 100644 --- a/arch/ia64/hp/sim/hpsim_console.c +++ b/arch/ia64/hp/sim/hpsim_console.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * David Mosberger-Tang <davidm@hpl.hp.com> | 5 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 6 | * Copyright (C) 1999 Vijay Chander <vijay@engr.sgi.com> | 6 | * Copyright (C) 1999 Vijay Chander <vijay@engr.sgi.com> |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c index 694fc86bfbd5..f2297192a582 100644 --- a/arch/ia64/hp/sim/hpsim_setup.c +++ b/arch/ia64/hp/sim/hpsim_setup.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * David Mosberger-Tang <davidm@hpl.hp.com> | 5 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 6 | * Copyright (C) 1999 Vijay Chander <vijay@engr.sgi.com> | 6 | * Copyright (C) 1999 Vijay Chander <vijay@engr.sgi.com> |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/console.h> | 8 | #include <linux/console.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/kdev_t.h> | 10 | #include <linux/kdev_t.h> |
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index 0639ec0ed015..b5195be62818 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1999-2001, 2003 Hewlett-Packard Co | 4 | * Copyright (C) 1999-2001, 2003 Hewlett-Packard Co |
| 5 | * Stephane Eranian <eranian@hpl.hp.com> | 5 | * Stephane Eranian <eranian@hpl.hp.com> |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 0e5c6ae50228..33a3bbc8f67f 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * 07/30/02 D. Mosberger Replace sti()/cli() with explicit spinlocks & local irq masking | 16 | * 07/30/02 D. Mosberger Replace sti()/cli() with explicit spinlocks & local irq masking |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
diff --git a/arch/ia64/ia32/Makefile b/arch/ia64/ia32/Makefile index 61cb60affd95..baad8c7699c0 100644 --- a/arch/ia64/ia32/Makefile +++ b/arch/ia64/ia32/Makefile | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \ | 5 | obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \ |
| 6 | ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o | 6 | ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o |
| 7 | obj-$(CONFIG_AUDIT) += audit.o | ||
| 7 | 8 | ||
| 8 | # Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and | 9 | # Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and |
| 9 | # restore_ia32_fpstate_live() can be sure the live register contain user-level state. | 10 | # restore_ia32_fpstate_live() can be sure the live register contain user-level state. |
diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c new file mode 100644 index 000000000000..ab94f2e58cdd --- /dev/null +++ b/arch/ia64/ia32/audit.c | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | #include <asm-i386/unistd.h> | ||
| 2 | |||
| 3 | unsigned ia32_dir_class[] = { | ||
| 4 | #include <asm-generic/audit_dir_write.h> | ||
| 5 | ~0U | ||
| 6 | }; | ||
| 7 | |||
| 8 | unsigned ia32_chattr_class[] = { | ||
| 9 | #include <asm-generic/audit_change_attr.h> | ||
| 10 | ~0U | ||
| 11 | }; | ||
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index da03c06744f1..daa6b91bc921 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * 04/13/01 D. Mosberger dropped saving tssd in ar.k1---it's not needed | 9 | * 04/13/01 D. Mosberger dropped saving tssd in ar.k1---it's not needed |
| 10 | * 09/14/01 D. Mosberger fixed memory management for gdt/tss page | 10 | * 09/14/01 D. Mosberger fixed memory management for gdt/tss page |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h index ccb98ed48e58..703a67c934f8 100644 --- a/arch/ia64/ia32/ia32priv.h +++ b/arch/ia64/ia32/ia32priv.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_IA64_IA32_PRIV_H | 1 | #ifndef _ASM_IA64_IA32_PRIV_H |
| 2 | #define _ASM_IA64_IA32_PRIV_H | 2 | #define _ASM_IA64_IA32_PRIV_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include <asm/ia32.h> | 5 | #include <asm/ia32.h> |
| 7 | 6 | ||
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 5366b3b23d09..6aa3c51619ca 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * environment. | 14 | * environment. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/syscalls.h> | 18 | #include <linux/syscalls.h> |
| 20 | #include <linux/sysctl.h> | 19 | #include <linux/sysctl.h> |
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 09a0dbc17fb6..0e4553f320bf 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile | |||
| @@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ | |||
| 29 | obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o | 29 | obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o |
| 30 | obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o | 30 | obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o |
| 31 | obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o | 31 | obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o |
| 32 | obj-$(CONFIG_AUDIT) += audit.o | ||
| 32 | mca_recovery-y += mca_drv.o mca_drv_asm.o | 33 | mca_recovery-y += mca_drv.o mca_drv_asm.o |
| 33 | 34 | ||
| 34 | # The gate DSO image is built using a special linker script. | 35 | # The gate DSO image is built using a special linker script. |
diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c index fff82929d225..b7515bc808a8 100644 --- a/arch/ia64/kernel/acpi-ext.c +++ b/arch/ia64/kernel/acpi-ext.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/acpi.h> | 13 | #include <linux/acpi.h> |
| @@ -51,7 +50,7 @@ static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length) | |||
| 51 | memcpy(length, vendor->byte_data + 8, sizeof(*length)); | 50 | memcpy(length, vendor->byte_data + 8, sizeof(*length)); |
| 52 | 51 | ||
| 53 | exit: | 52 | exit: |
| 54 | acpi_os_free(buffer.pointer); | 53 | kfree(buffer.pointer); |
| 55 | return status; | 54 | return status; |
| 56 | } | 55 | } |
| 57 | 56 | ||
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index ca16d9556bde..99761b81db44 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 32 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| @@ -857,7 +856,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
| 857 | obj = buffer.pointer; | 856 | obj = buffer.pointer; |
| 858 | if (obj->type != ACPI_TYPE_BUFFER || | 857 | if (obj->type != ACPI_TYPE_BUFFER || |
| 859 | obj->buffer.length < sizeof(*lsapic)) { | 858 | obj->buffer.length < sizeof(*lsapic)) { |
| 860 | acpi_os_free(buffer.pointer); | 859 | kfree(buffer.pointer); |
| 861 | return -EINVAL; | 860 | return -EINVAL; |
| 862 | } | 861 | } |
| 863 | 862 | ||
| @@ -865,13 +864,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
| 865 | 864 | ||
| 866 | if ((lsapic->header.type != ACPI_MADT_LSAPIC) || | 865 | if ((lsapic->header.type != ACPI_MADT_LSAPIC) || |
| 867 | (!lsapic->flags.enabled)) { | 866 | (!lsapic->flags.enabled)) { |
| 868 | acpi_os_free(buffer.pointer); | 867 | kfree(buffer.pointer); |
| 869 | return -EINVAL; | 868 | return -EINVAL; |
| 870 | } | 869 | } |
| 871 | 870 | ||
| 872 | physid = ((lsapic->id << 8) | (lsapic->eid)); | 871 | physid = ((lsapic->id << 8) | (lsapic->eid)); |
| 873 | 872 | ||
| 874 | acpi_os_free(buffer.pointer); | 873 | kfree(buffer.pointer); |
| 875 | buffer.length = ACPI_ALLOCATE_BUFFER; | 874 | buffer.length = ACPI_ALLOCATE_BUFFER; |
| 876 | buffer.pointer = NULL; | 875 | buffer.pointer = NULL; |
| 877 | 876 | ||
| @@ -935,20 +934,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) | |||
| 935 | obj = buffer.pointer; | 934 | obj = buffer.pointer; |
| 936 | if (obj->type != ACPI_TYPE_BUFFER || | 935 | if (obj->type != ACPI_TYPE_BUFFER || |
| 937 | obj->buffer.length < sizeof(*iosapic)) { | 936 | obj->buffer.length < sizeof(*iosapic)) { |
| 938 | acpi_os_free(buffer.pointer); | 937 | kfree(buffer.pointer); |
| 939 | return AE_OK; | 938 | return AE_OK; |
| 940 | } | 939 | } |
| 941 | 940 | ||
| 942 | iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer; | 941 | iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer; |
| 943 | 942 | ||
| 944 | if (iosapic->header.type != ACPI_MADT_IOSAPIC) { | 943 | if (iosapic->header.type != ACPI_MADT_IOSAPIC) { |
| 945 | acpi_os_free(buffer.pointer); | 944 | kfree(buffer.pointer); |
| 946 | return AE_OK; | 945 | return AE_OK; |
| 947 | } | 946 | } |
| 948 | 947 | ||
| 949 | gsi_base = iosapic->global_irq_base; | 948 | gsi_base = iosapic->global_irq_base; |
| 950 | 949 | ||
| 951 | acpi_os_free(buffer.pointer); | 950 | kfree(buffer.pointer); |
| 952 | 951 | ||
| 953 | /* | 952 | /* |
| 954 | * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell | 953 | * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell |
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c index 16e7b6600ae6..75a2a2c12258 100644 --- a/arch/ia64/kernel/asm-offsets.c +++ b/arch/ia64/kernel/asm-offsets.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #define ASM_OFFSETS_C 1 | 7 | #define ASM_OFFSETS_C 1 |
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | 10 | ||
diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c new file mode 100644 index 000000000000..f2512931ccaf --- /dev/null +++ b/arch/ia64/kernel/audit.c | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | #include <linux/init.h> | ||
| 2 | #include <linux/types.h> | ||
| 3 | #include <linux/audit.h> | ||
| 4 | #include <asm/unistd.h> | ||
| 5 | |||
| 6 | static unsigned dir_class[] = { | ||
| 7 | #include <asm-generic/audit_dir_write.h> | ||
| 8 | ~0U | ||
| 9 | }; | ||
| 10 | |||
| 11 | static unsigned chattr_class[] = { | ||
| 12 | #include <asm-generic/audit_change_attr.h> | ||
| 13 | ~0U | ||
| 14 | }; | ||
| 15 | |||
| 16 | static int __init audit_classes_init(void) | ||
| 17 | { | ||
| 18 | #ifdef CONFIG_IA32_SUPPORT | ||
| 19 | extern __u32 ia32_dir_class[]; | ||
| 20 | extern __u32 ia32_chattr_class[]; | ||
| 21 | audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class); | ||
| 22 | audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class); | ||
| 23 | #endif | ||
| 24 | audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); | ||
| 25 | audit_register_class(AUDIT_CLASS_CHATTR, chattr_class); | ||
| 26 | return 0; | ||
| 27 | } | ||
| 28 | |||
| 29 | __initcall(audit_classes_init); | ||
diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c index 5a1bf815282d..86faf221a070 100644 --- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c +++ b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 9 | * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index c33d0ba7e300..b13c0555c3ba 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Goutham Rao: <goutham.rao@intel.com> | 20 | * Goutham Rao: <goutham.rao@intel.com> |
| 21 | * Skip non-WB memory and ignore empty memory ranges. | 21 | * Skip non-WB memory and ignore empty memory ranges. |
| 22 | */ | 22 | */ |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 32c999f58d12..12701cf32d99 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * pNonSys: !pSys | 31 | * pNonSys: !pSys |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | 34 | ||
| 36 | #include <asm/asmmacro.h> | 35 | #include <asm/asmmacro.h> |
| 37 | #include <asm/cache.h> | 36 | #include <asm/cache.h> |
diff --git a/arch/ia64/kernel/entry.h b/arch/ia64/kernel/entry.h index ebc3dfb88826..b83edac02965 100644 --- a/arch/ia64/kernel/entry.h +++ b/arch/ia64/kernel/entry.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | /* | 2 | /* |
| 4 | * Preserved registers that are shared between code in ivt.S and | 3 | * Preserved registers that are shared between code in ivt.S and |
diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S index 86064ca98952..3274850cf272 100644 --- a/arch/ia64/kernel/gate.S +++ b/arch/ia64/kernel/gate.S | |||
| @@ -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/asmmacro.h> | 10 | #include <asm/asmmacro.h> |
| 12 | #include <asm/errno.h> | 11 | #include <asm/errno.h> |
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S index 7c99e6ec3daf..cc35cddfd4cf 100644 --- a/arch/ia64/kernel/gate.lds.S +++ b/arch/ia64/kernel/gate.lds.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * in one page). This script controls its layout. | 4 | * in one page). This script controls its layout. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #include <asm/system.h> | 8 | #include <asm/system.h> |
| 10 | 9 | ||
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index f1778a84ea61..561b8f1d3bc7 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Support for CPU Hotplug | 19 | * Support for CPU Hotplug |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #include <asm/asmmacro.h> | 23 | #include <asm/asmmacro.h> |
| 25 | #include <asm/fpu.h> | 24 | #include <asm/fpu.h> |
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index bbcfd08378a6..b7cf651ceb14 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * All other exports should be put directly after the definition. | 5 | * All other exports should be put directly after the definition. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | 9 | ||
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index efc7df4b0fd2..9bf15fefa7e4 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
| @@ -79,7 +79,6 @@ | |||
| 79 | * describeinterrupts. Now we use "IRQ" only for Linux IRQ's. ISA IRQ | 79 | * describeinterrupts. Now we use "IRQ" only for Linux IRQ's. ISA IRQ |
| 80 | * (isa_irq) is the only exception in this source code. | 80 | * (isa_irq) is the only exception in this source code. |
| 81 | */ | 81 | */ |
| 82 | #include <linux/config.h> | ||
| 83 | 82 | ||
| 84 | #include <linux/acpi.h> | 83 | #include <linux/acpi.h> |
| 85 | #include <linux/init.h> | 84 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index f5035304594e..3e6fcb056bcb 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Added CPU Hotplug handling for IPF. | 14 | * Added CPU Hotplug handling for IPF. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | 18 | ||
| 20 | #include <linux/jiffies.h> | 19 | #include <linux/jiffies.h> |
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index 829a43cab797..6b7fcbd3f6f1 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * Table is based upon EAS2.6 (Oct 1999) | 38 | * Table is based upon EAS2.6 (Oct 1999) |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | 41 | ||
| 43 | #include <asm/asmmacro.h> | 42 | #include <asm/asmmacro.h> |
| 44 | #include <asm/break.h> | 43 | #include <asm/break.h> |
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index f9039f88d01d..00d9c83b8020 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * <anil.s.keshavamurthy@intel.com> adapted from i386 | 23 | * <anil.s.keshavamurthy@intel.com> adapted from i386 |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kprobes.h> | 26 | #include <linux/kprobes.h> |
| 28 | #include <linux/ptrace.h> | 27 | #include <linux/ptrace.h> |
| 29 | #include <linux/string.h> | 28 | #include <linux/string.h> |
diff --git a/arch/ia64/kernel/machvec.c b/arch/ia64/kernel/machvec.c index 4b0b71d5aef4..d4a546aa5048 100644 --- a/arch/ia64/kernel/machvec.c +++ b/arch/ia64/kernel/machvec.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | 2 | ||
| 4 | #include <asm/machvec.h> | 3 | #include <asm/machvec.h> |
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index d7dc5e63de63..584df1772845 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | * 2005-10-07 Keith Owens <kaos@sgi.com> | 55 | * 2005-10-07 Keith Owens <kaos@sgi.com> |
| 56 | * Add notify_die() hooks. | 56 | * Add notify_die() hooks. |
| 57 | */ | 57 | */ |
| 58 | #include <linux/config.h> | ||
| 59 | #include <linux/types.h> | 58 | #include <linux/types.h> |
| 60 | #include <linux/init.h> | 59 | #include <linux/init.h> |
| 61 | #include <linux/sched.h> | 60 | #include <linux/sched.h> |
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S index c1bd1feffab0..96047491d1b9 100644 --- a/arch/ia64/kernel/mca_asm.S +++ b/arch/ia64/kernel/mca_asm.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | // 12/08/05 Keith Owens <kaos@sgi.com> | 19 | // 12/08/05 Keith Owens <kaos@sgi.com> |
| 20 | // Use per cpu MCA/INIT stacks for all data. | 20 | // Use per cpu MCA/INIT stacks for all data. |
| 21 | // | 21 | // |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/threads.h> | 22 | #include <linux/threads.h> |
| 24 | 23 | ||
| 25 | #include <asm/asmmacro.h> | 24 | #include <asm/asmmacro.h> |
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index ca6666b51ccb..8db6e0cedadc 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2005 Keith Owens <kaos@sgi.com> | 8 | * Copyright (C) 2005 Keith Owens <kaos@sgi.com> |
| 9 | * Copyright (C) 2006 Russ Anderson <rja@sgi.com> | 9 | * Copyright (C) 2006 Russ Anderson <rja@sgi.com> |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/ia64/kernel/mca_drv_asm.S b/arch/ia64/kernel/mca_drv_asm.S index e6a580d354b9..f2d4900751ba 100644 --- a/arch/ia64/kernel/mca_drv_asm.S +++ b/arch/ia64/kernel/mca_drv_asm.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2004 FUJITSU LIMITED | 5 | * Copyright (C) 2004 FUJITSU LIMITED |
| 6 | * Copyright (C) Hidetoshi Seto (seto.hidetoshi@jp.fujitsu.com) | 6 | * Copyright (C) Hidetoshi Seto (seto.hidetoshi@jp.fujitsu.com) |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/threads.h> | 8 | #include <linux/threads.h> |
| 10 | 9 | ||
| 11 | #include <asm/asmmacro.h> | 10 | #include <asm/asmmacro.h> |
diff --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h index 85ed54179afa..c9ac8bada786 100644 --- a/arch/ia64/kernel/minstate.h +++ b/arch/ia64/kernel/minstate.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #include <asm/cache.h> | 2 | #include <asm/cache.h> |
| 4 | 3 | ||
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index 3a30cfc9574f..158e3c51bb77 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | SEGREL64LSB | 25 | SEGREL64LSB |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c index 0766493d4d00..1cc360c83e7a 100644 --- a/arch/ia64/kernel/numa.c +++ b/arch/ia64/kernel/numa.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Copyright (C) 2004 Silicon Graphics, Inc. | 19 | * Copyright (C) 2004 Silicon Graphics, Inc. |
| 20 | * Jesse Barnes <jbarnes@sgi.com> | 20 | * Jesse Barnes <jbarnes@sgi.com> |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/topology.h> | 22 | #include <linux/topology.h> |
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c index 8a1208419138..3f5bac59209a 100644 --- a/arch/ia64/kernel/palinfo.c +++ b/arch/ia64/kernel/palinfo.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * 10/23/2001 S.Eranian updated pal_perf_mon_info bug fixes | 17 | * 10/23/2001 S.Eranian updated pal_perf_mon_info bug fixes |
| 18 | * 03/24/2004 Ashok Raj updated to work with CPU Hotplug | 18 | * 03/24/2004 Ashok Raj updated to work with CPU Hotplug |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index a0055d3d695c..92b815d13418 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * http://www.hpl.hp.com/research/linux/perfmon | 19 | * http://www.hpl.hp.com/research/linux/perfmon |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
diff --git a/arch/ia64/kernel/perfmon_default_smpl.c b/arch/ia64/kernel/perfmon_default_smpl.c index 344941db0a9e..ff80eab83b38 100644 --- a/arch/ia64/kernel/perfmon_default_smpl.c +++ b/arch/ia64/kernel/perfmon_default_smpl.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <asm/delay.h> | 12 | #include <asm/delay.h> |
| 14 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index b045c279136c..ea914cc6812a 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Add notify_die() hooks. | 9 | * Add notify_die() hooks. |
| 10 | */ | 10 | */ |
| 11 | #define __KERNEL_SYSCALLS__ /* see <asm/unistd.h> */ | 11 | #define __KERNEL_SYSCALLS__ /* see <asm/unistd.h> */ |
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <linux/cpu.h> | 13 | #include <linux/cpu.h> |
| 15 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index e61e15e28d8b..aa705e46b974 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Derived from the x86 and Alpha versions. | 7 | * Derived from the x86 and Alpha versions. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 12 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c index 77fa65903d94..642fdc7b969d 100644 --- a/arch/ia64/kernel/sal.c +++ b/arch/ia64/kernel/sal.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1999 VA Linux Systems | 6 | * Copyright (C) 1999 VA Linux Systems |
| 7 | * Copyright (C) 1999 Walt Drummond <drummond@valinux.com> | 7 | * Copyright (C) 1999 Walt Drummond <drummond@valinux.com> |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 6dba2d63f24d..6a33f414de58 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * 06/24/99 W.Drummond added boot_cpu_data. | 22 | * 06/24/99 W.Drummond added boot_cpu_data. |
| 23 | * 05/28/05 Z. Menyhart Dynamic stride size for "flush_icache_range()" | 23 | * 05/28/05 Z. Menyhart Dynamic stride size for "flush_icache_range()" |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | 27 | ||
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c index 1d7903ee2126..77f8b49c7882 100644 --- a/arch/ia64/kernel/signal.c +++ b/arch/ia64/kernel/signal.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Derived from i386 and Alpha versions. | 7 | * Derived from i386 and Alpha versions. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 5203df78f150..e1960979be29 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * 05/01/30 Suresh Siddha <suresh.b.siddha@intel.com> | 21 | * 05/01/30 Suresh Siddha <suresh.b.siddha@intel.com> |
| 22 | * Setup cpu_sibling_map and cpu_core_map | 22 | * Setup cpu_sibling_map and cpu_core_map |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | 24 | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/acpi.h> | 26 | #include <linux/acpi.h> |
diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index c7b943f10199..40722d88607a 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1999-2000, 2002-2003, 2005 Hewlett-Packard Co | 5 | * Copyright (C) 1999-2000, 2002-2003, 2005 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 <linux/errno.h> | 8 | #include <linux/errno.h> |
| 10 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 49958904045b..71ccddabc715 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1999-2000 VA Linux Systems | 8 | * Copyright (C) 1999-2000 VA Linux Systems |
| 9 | * Copyright (C) 1999-2000 Walt Drummond <drummond@valinux.com> | 9 | * Copyright (C) 1999-2000 Walt Drummond <drummond@valinux.com> |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <linux/cpu.h> | 12 | #include <linux/cpu.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 5511d9c6c701..b146f1cfad31 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Populate cpu cache entries in sysfs for cpu cache info | 13 | * Populate cpu cache entries in sysfs for cpu cache info |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/cpu.h> | 16 | #include <linux/cpu.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index 7c1ddc8ac443..e7bbb0f40aa2 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * 05/12/00 grao <goutham.rao@intel.com> : added isr in siginfo for SIGFPE | 7 | * 05/12/00 grao <goutham.rao@intel.com> : added isr in siginfo for SIGFPE |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 783600fe52b2..5b0d5f64a9b1 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #include <asm/cache.h> | 2 | #include <asm/cache.h> |
| 4 | #include <asm/ptrace.h> | 3 | #include <asm/ptrace.h> |
diff --git a/arch/ia64/lib/clear_page.S b/arch/ia64/lib/clear_page.S index d4987061dda7..2d814e7ed191 100644 --- a/arch/ia64/lib/clear_page.S +++ b/arch/ia64/lib/clear_page.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * 2/12/02 kchen Tuned for both Itanium and McKinley | 8 | * 2/12/02 kchen Tuned for both Itanium and McKinley |
| 9 | * 3/08/02 davidm Some more tweaking | 9 | * 3/08/02 davidm Some more tweaking |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <asm/asmmacro.h> | 12 | #include <asm/asmmacro.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
diff --git a/arch/ia64/lib/io.c b/arch/ia64/lib/io.c index 8949e44091ac..bcd16f8ad9d9 100644 --- a/arch/ia64/lib/io.c +++ b/arch/ia64/lib/io.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 4 | 3 | ||
diff --git a/arch/ia64/lib/memcpy_mck.S b/arch/ia64/lib/memcpy_mck.S index 9e534d52b1d5..ab0f87639729 100644 --- a/arch/ia64/lib/memcpy_mck.S +++ b/arch/ia64/lib/memcpy_mck.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Copyright (C) 2002 Intel Corp. | 13 | * Copyright (C) 2002 Intel Corp. |
| 14 | * Copyright (C) 2002 Ken Chen <kenneth.w.chen@intel.com> | 14 | * Copyright (C) 2002 Ken Chen <kenneth.w.chen@intel.com> |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/asmmacro.h> | 16 | #include <asm/asmmacro.h> |
| 18 | #include <asm/page.h> | 17 | #include <asm/page.h> |
| 19 | 18 | ||
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 84fd1c14c8a9..2a88cdd6d924 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Routines used by ia64 machines with contiguous (or virtually contiguous) | 14 | * Routines used by ia64 machines with contiguous (or virtually contiguous) |
| 15 | * memory. | 15 | * memory. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/bootmem.h> | 17 | #include <linux/bootmem.h> |
| 19 | #include <linux/efi.h> | 18 | #include <linux/efi.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c index 6d259e34f359..71c50dd8f870 100644 --- a/arch/ia64/mm/extable.c +++ b/arch/ia64/mm/extable.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * David Mosberger-Tang <davidm@hpl.hp.com> | 5 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/sort.h> | 8 | #include <linux/sort.h> |
| 10 | 9 | ||
| 11 | #include <asm/uaccess.h> | 10 | #include <asm/uaccess.h> |
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c index 8d506710fdbd..eee5c1cfbe32 100644 --- a/arch/ia64/mm/hugetlbpage.c +++ b/arch/ia64/mm/hugetlbpage.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Feb, 2004: dynamic hugetlb page size via boot parameter | 8 | * Feb, 2004: dynamic hugetlb page size via boot parameter |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 38306e98f04b..2f50c064513c 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1998-2003 Hewlett-Packard Co | 4 | * Copyright (C) 1998-2003 Hewlett-Packard Co |
| 5 | * David Mosberger-Tang <davidm@hpl.hp.com> | 5 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | 9 | ||
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c index 4e5c8b36ad93..64e4c21f311c 100644 --- a/arch/ia64/mm/numa.c +++ b/arch/ia64/mm/numa.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2002/08/07 Erich Focht <efocht@ess.nec.de> | 10 | * 2002/08/07 Erich Focht <efocht@ess.nec.de> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/cpu.h> | 13 | #include <linux/cpu.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index 4dbbca0b5e9c..ffad7624436c 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Rohit Seth <rohit.seth@intel.com> | 11 | * Rohit Seth <rohit.seth@intel.com> |
| 12 | * Ken Chen <kenneth.w.chen@intel.com> | 12 | * Ken Chen <kenneth.w.chen@intel.com> |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/ia64/oprofile/perfmon.c b/arch/ia64/oprofile/perfmon.c index b7975a469fb8..bc41dd32fec6 100644 --- a/arch/ia64/oprofile/perfmon.c +++ b/arch/ia64/oprofile/perfmon.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/oprofile.h> | 11 | #include <linux/oprofile.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <asm/perfmon.h> | 13 | #include <asm/perfmon.h> |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 5bef0e3603f2..276512fd8922 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | * Note: Above list of copyright holders is incomplete... | 11 | * Note: Above list of copyright holders is incomplete... |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c index e952ef4f6d91..27dee4584061 100644 --- a/arch/ia64/sn/kernel/bte.c +++ b/arch/ia64/sn/kernel/bte.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved. | 6 | * Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <asm/sn/nodepda.h> | 10 | #include <asm/sn/nodepda.h> |
| 12 | #include <asm/sn/addrs.h> | 11 | #include <asm/sn/addrs.h> |
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index 3bfccf354343..dd6bcf4d58bf 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved. | 6 | * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
diff --git a/arch/ia64/sn/kernel/sn2/prominfo_proc.c b/arch/ia64/sn/kernel/sn2/prominfo_proc.c index 6ae276d5d50c..4dcce3d0e04c 100644 --- a/arch/ia64/sn/kernel/sn2/prominfo_proc.c +++ b/arch/ia64/sn/kernel/sn2/prominfo_proc.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Module to export the system's Firmware Interface Tables, including | 8 | * Module to export the system's Firmware Interface Tables, including |
| 9 | * PROM revision numbers and banners, in /proc | 9 | * PROM revision numbers and banners, in /proc |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 14 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c index 5100261310f7..43ddc2eccb96 100644 --- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c +++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2000-2005 Silicon Graphics, Inc. All rights reserved. | 6 | * Copyright (C) 2000-2005 Silicon Graphics, Inc. All rights reserved. |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #ifdef CONFIG_PROC_FS | 9 | #ifdef CONFIG_PROC_FS |
| 11 | #include <linux/proc_fs.h> | 10 | #include <linux/proc_fs.h> |
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c index e5c6d3c0a8e9..007703c494a4 100644 --- a/arch/ia64/sn/kernel/xpnet.c +++ b/arch/ia64/sn/kernel/xpnet.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
diff --git a/arch/m32r/boot/compressed/head.S b/arch/m32r/boot/compressed/head.S index 234d8b1e0ac1..95a0563ff076 100644 --- a/arch/m32r/boot/compressed/head.S +++ b/arch/m32r/boot/compressed/head.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | .text | 9 | .text |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | #include <asm/addrspace.h> | 11 | #include <asm/addrspace.h> |
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c index 8f9a57271f83..bce8af5e3bb2 100644 --- a/arch/m32r/boot/compressed/m32r_sio.c +++ b/arch/m32r/boot/compressed/m32r_sio.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <asm/processor.h> | 8 | #include <asm/processor.h> |
| 10 | 9 | ||
| 11 | static void putc(char c); | 10 | static void putc(char c); |
diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c index 70fa799005c3..600d40e33495 100644 --- a/arch/m32r/boot/compressed/misc.c +++ b/arch/m32r/boot/compressed/misc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * This is based on arch/sh/boot/compressed/misc.c. | 12 | * This is based on arch/sh/boot/compressed/misc.c. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 17 | 16 | ||
| 18 | /* | 17 | /* |
diff --git a/arch/m32r/boot/compressed/vmlinux.lds.S b/arch/m32r/boot/compressed/vmlinux.lds.S index a18431759633..dd11963f6939 100644 --- a/arch/m32r/boot/compressed/vmlinux.lds.S +++ b/arch/m32r/boot/compressed/vmlinux.lds.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | OUTPUT_ARCH(m32r) | 2 | OUTPUT_ARCH(m32r) |
| 4 | ENTRY(startup) | 3 | ENTRY(startup) |
diff --git a/arch/m32r/boot/setup.S b/arch/m32r/boot/setup.S index 398542507d84..ef843d63083d 100644 --- a/arch/m32r/boot/setup.S +++ b/arch/m32r/boot/setup.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 12 | #include <asm/pgtable.h> | 12 | #include <asm/pgtable.h> |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
| 16 | #include <asm/mmu_context.h> | 15 | #include <asm/mmu_context.h> |
| 17 | #include <asm/m32r.h> | 16 | #include <asm/m32r.h> |
diff --git a/arch/m32r/kernel/align.c b/arch/m32r/kernel/align.c index 48ec29714238..ab871ccd33f8 100644 --- a/arch/m32r/kernel/align.c +++ b/arch/m32r/kernel/align.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (c) 2003 Hitoshi Yamamoto | 4 | * Copyright (c) 2003 Hitoshi Yamamoto |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/ptrace.h> | 7 | #include <asm/ptrace.h> |
| 9 | #include <asm/uaccess.h> | 8 | #include <asm/uaccess.h> |
| 10 | 9 | ||
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index 920bb742b7a2..ac6d840b382b 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | * @(0x6c,sp) - orig_r0 ditto | 54 | * @(0x6c,sp) - orig_r0 ditto |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/linkage.h> | 57 | #include <linux/linkage.h> |
| 59 | #include <asm/irq.h> | 58 | #include <asm/irq.h> |
| 60 | #include <asm/unistd.h> | 59 | #include <asm/unistd.h> |
diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S index 3e83173995cd..0d3c8ee0e03d 100644 --- a/arch/m32r/kernel/head.S +++ b/arch/m32r/kernel/head.S | |||
| @@ -14,7 +14,6 @@ __INIT | |||
| 14 | __INITDATA | 14 | __INITDATA |
| 15 | 15 | ||
| 16 | .text | 16 | .text |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
| 19 | #include <asm/segment.h> | 18 | #include <asm/segment.h> |
| 20 | #include <asm/page.h> | 19 | #include <asm/page.h> |
diff --git a/arch/m32r/kernel/io_m32104ut.c b/arch/m32r/kernel/io_m32104ut.c index d26adab9586c..2189eca30b56 100644 --- a/arch/m32r/kernel/io_m32104ut.c +++ b/arch/m32r/kernel/io_m32104ut.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Naoto Sugai, Hayato Fujiwara | 8 | * Naoto Sugai, Hayato Fujiwara |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm/m32r.h> | 11 | #include <asm/m32r.h> |
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/kernel/io_m32700ut.c index 939932d6cc00..5898f4031a0c 100644 --- a/arch/m32r/kernel/io_m32700ut.c +++ b/arch/m32r/kernel/io_m32700ut.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * archive for more details. | 11 | * archive for more details. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/m32r.h> | 14 | #include <asm/m32r.h> |
| 16 | #include <asm/page.h> | 15 | #include <asm/page.h> |
| 17 | #include <asm/io.h> | 16 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/kernel/io_mappi.c index a662b537c5ba..31396789ab1b 100644 --- a/arch/m32r/kernel/io_mappi.c +++ b/arch/m32r/kernel/io_mappi.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto | 7 | * Hitoshi Yamamoto |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/m32r.h> | 10 | #include <asm/m32r.h> |
| 12 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/kernel/io_mappi2.c index e72d725606af..ecc6aa88f9ac 100644 --- a/arch/m32r/kernel/io_mappi2.c +++ b/arch/m32r/kernel/io_mappi2.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/m32r.h> | 10 | #include <asm/m32r.h> |
| 12 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/kernel/io_mappi3.c index ed6da930bc64..a13b5f6b07e9 100644 --- a/arch/m32r/kernel/io_mappi3.c +++ b/arch/m32r/kernel/io_mappi3.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/m32r.h> | 10 | #include <asm/m32r.h> |
| 12 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/kernel/io_oaks32r.c index 910dd131c227..068bf47060f8 100644 --- a/arch/m32r/kernel/io_oaks32r.c +++ b/arch/m32r/kernel/io_oaks32r.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/m32r.h> | 10 | #include <asm/m32r.h> |
| 12 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/kernel/io_opsput.c index bec69297db3c..da6c5f5c1f82 100644 --- a/arch/m32r/kernel/io_opsput.c +++ b/arch/m32r/kernel/io_opsput.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * archive for more details. | 11 | * archive for more details. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/m32r.h> | 14 | #include <asm/m32r.h> |
| 16 | #include <asm/page.h> | 15 | #include <asm/page.h> |
| 17 | #include <asm/io.h> | 16 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/kernel/io_usrv.c index 39a379af40bc..a8c0e2eceb4d 100644 --- a/arch/m32r/kernel/io_usrv.c +++ b/arch/m32r/kernel/io_usrv.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/m32r.h> | 15 | #include <asm/m32r.h> |
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
| 18 | #include <asm/io.h> | 17 | #include <asm/io.h> |
diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c index c50330fa83b9..8cbbb0b11e0c 100644 --- a/arch/m32r/kernel/m32r_ksyms.c +++ b/arch/m32r/kernel/m32r_ksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/smp.h> | 2 | #include <linux/smp.h> |
| 4 | #include <linux/user.h> | 3 | #include <linux/user.h> |
diff --git a/arch/m32r/kernel/module.c b/arch/m32r/kernel/module.c index f6a79a016ce0..8d4205794380 100644 --- a/arch/m32r/kernel/module.c +++ b/arch/m32r/kernel/module.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 15 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/moduleloader.h> | 18 | #include <linux/moduleloader.h> |
| 20 | #include <linux/elf.h> | 19 | #include <linux/elf.h> |
| 21 | #include <linux/vmalloc.h> | 20 | #include <linux/vmalloc.h> |
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 065f5e719058..44cbe0ce0f8f 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/fs.h> | 23 | #include <linux/fs.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/ptrace.h> | 25 | #include <linux/ptrace.h> |
| 27 | #include <linux/unistd.h> | 26 | #include <linux/unistd.h> |
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c index 340a3bf59b88..5f02b3144875 100644 --- a/arch/m32r/kernel/ptrace.c +++ b/arch/m32r/kernel/ptrace.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Copyright (C) 2000 Russell King | 14 | * Copyright (C) 2000 Russell King |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/m32r/kernel/semaphore.c b/arch/m32r/kernel/semaphore.c index 9a6e6d754ddc..940c2d37cfd1 100644 --- a/arch/m32r/kernel/semaphore.c +++ b/arch/m32r/kernel/semaphore.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org> | 22 | * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org> |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index 1ff483c8a4c9..0a6c6e677afe 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto | 7 | * Hitoshi Yamamoto |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
diff --git a/arch/m32r/kernel/setup_m32104ut.c b/arch/m32r/kernel/setup_m32104ut.c index f9f56c270195..1692b321f476 100644 --- a/arch/m32r/kernel/setup_m32104ut.c +++ b/arch/m32r/kernel/setup_m32104ut.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Naoto Sugai, Hayato Fujiwara | 8 | * Naoto Sugai, Hayato Fujiwara |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c index b6ab00eff580..7efc145c74c2 100644 --- a/arch/m32r/kernel/setup_m32700ut.c +++ b/arch/m32r/kernel/setup_m32700ut.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * archive for more details. | 11 | * archive for more details. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/kernel/setup_mappi.c index c268044185f5..67dbbdc9d111 100644 --- a/arch/m32r/kernel/setup_mappi.c +++ b/arch/m32r/kernel/setup_mappi.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto | 7 | * Hitoshi Yamamoto |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/kernel/setup_mappi2.c index bd2327d5cca2..55abb2102750 100644 --- a/arch/m32r/kernel/setup_mappi2.c +++ b/arch/m32r/kernel/setup_mappi2.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c index 014b51d17505..93dc010c7fc3 100644 --- a/arch/m32r/kernel/setup_mappi3.c +++ b/arch/m32r/kernel/setup_mappi3.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/kernel/setup_oaks32r.c index ea64831aef7a..cd62598e3cea 100644 --- a/arch/m32r/kernel/setup_oaks32r.c +++ b/arch/m32r/kernel/setup_oaks32r.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/kernel/setup_opsput.c index 55e8972d455a..61d3b01cbe07 100644 --- a/arch/m32r/kernel/setup_opsput.c +++ b/arch/m32r/kernel/setup_opsput.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * archive for more details. | 12 | * archive for more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/kernel/setup_usrv.c index 7fa12d8f66b4..f5b4b5ac31e7 100644 --- a/arch/m32r/kernel/setup_usrv.c +++ b/arch/m32r/kernel/setup_usrv.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Hitoshi Yamamoto | 7 | * Hitoshi Yamamoto |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 6498ee70bb73..a9174efe80cb 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2000-06-20 Pentium III FXSR, SSE support by Gareth Hughes | 10 | * 2000-06-20 Pentium III FXSR, SSE support by Gareth Hughes |
| 11 | */ | 11 | */ |
| 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 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index 840b4348bf0c..fa7865609495 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/init.h> | 43 | #include <linux/init.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 46 | #include <linux/mm.h> | 45 | #include <linux/mm.h> |
diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c index 670cb49210af..a9cea32eb824 100644 --- a/arch/m32r/kernel/sys_m32r.c +++ b/arch/m32r/kernel/sys_m32r.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Taken from i386 version. | 7 | * Taken from i386 version. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index b8e68b542302..efff6f5151df 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #undef DEBUG_TIMER | 18 | #undef DEBUG_TIMER |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c index 5fe8ed6d62dc..c1daf2c40c7c 100644 --- a/arch/m32r/kernel/traps.c +++ b/arch/m32r/kernel/traps.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * 'traps.c' handles hardware traps and faults after we have saved some | 9 | * 'traps.c' handles hardware traps and faults after we have saved some |
| 10 | * state in 'entry.S'. | 10 | * state in 'entry.S'. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/kallsyms.h> | 14 | #include <linux/kallsyms.h> |
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 729a2645a03f..13c7bb698e37 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* ld script to make M32R Linux kernel | 1 | /* ld script to make M32R Linux kernel |
| 2 | */ | 2 | */ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm-generic/vmlinux.lds.h> | 4 | #include <asm-generic/vmlinux.lds.h> |
| 6 | #include <asm/addrspace.h> | 5 | #include <asm/addrspace.h> |
| 7 | #include <asm/page.h> | 6 | #include <asm/page.h> |
diff --git a/arch/m32r/lib/ashxdi3.S b/arch/m32r/lib/ashxdi3.S index 78effca9d97a..107594b65d58 100644 --- a/arch/m32r/lib/ashxdi3.S +++ b/arch/m32r/lib/ashxdi3.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | */ | 6 | */ |
| 7 | /* $Id$ */ | 7 | /* $Id$ */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | ; | 10 | ; |
| 12 | ; input (r0,r1) src | 11 | ; input (r0,r1) src |
diff --git a/arch/m32r/lib/checksum.S b/arch/m32r/lib/checksum.S index f6fc1bdb87e4..cfbe00e5184a 100644 --- a/arch/m32r/lib/checksum.S +++ b/arch/m32r/lib/checksum.S | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | /* $Id$ */ | 28 | /* $Id$ */ |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/linkage.h> | 31 | #include <linux/linkage.h> |
| 33 | #include <asm/assembler.h> | 32 | #include <asm/assembler.h> |
| 34 | #include <asm/errno.h> | 33 | #include <asm/errno.h> |
diff --git a/arch/m32r/lib/delay.c b/arch/m32r/lib/delay.c index fb29632c7eaa..06382a38c318 100644 --- a/arch/m32r/lib/delay.c +++ b/arch/m32r/lib/delay.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | /* $Id$ */ | 8 | /* $Id$ */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/param.h> | 10 | #include <linux/param.h> |
| 12 | #ifdef CONFIG_SMP | 11 | #ifdef CONFIG_SMP |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
diff --git a/arch/m32r/lib/memcpy.S b/arch/m32r/lib/memcpy.S index 800898a2d2e3..2089a215314e 100644 --- a/arch/m32r/lib/memcpy.S +++ b/arch/m32r/lib/memcpy.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | .text | 16 | .text |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
| 19 | #include <asm/assembler.h> | 18 | #include <asm/assembler.h> |
| 20 | 19 | ||
diff --git a/arch/m32r/lib/memset.S b/arch/m32r/lib/memset.S index 6e26df120acb..b47fa3537aa4 100644 --- a/arch/m32r/lib/memset.S +++ b/arch/m32r/lib/memset.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | /* $Id$ */ | 15 | /* $Id$ */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | .text | 18 | .text |
| 20 | .global memset | 19 | .global memset |
diff --git a/arch/m32r/lib/strlen.S b/arch/m32r/lib/strlen.S index 8d23cfbd600c..5f41aacd7b3e 100644 --- a/arch/m32r/lib/strlen.S +++ b/arch/m32r/lib/strlen.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | /* $Id$ */ | 9 | /* $Id$ */ |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
| 15 | 14 | ||
diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c index 2d1dd2106c4d..896cef1aca5f 100644 --- a/arch/m32r/lib/usercopy.c +++ b/arch/m32r/lib/usercopy.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright 1997 Linus Torvalds | 6 | * Copyright 1997 Linus Torvalds |
| 7 | * Copyright 2001, 2002, 2004 Hirokazu Takata | 7 | * Copyright 2001, 2002, 2004 Hirokazu Takata |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/prefetch.h> | 9 | #include <linux/prefetch.h> |
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
| 12 | #include <linux/thread_info.h> | 11 | #include <linux/thread_info.h> |
diff --git a/arch/m32r/mm/cache.c b/arch/m32r/mm/cache.c index 9f54dd937013..fac759584875 100644 --- a/arch/m32r/mm/cache.c +++ b/arch/m32r/mm/cache.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 2002-2005 Hirokazu Takata, Hayato Fujiwara | 4 | * Copyright (C) 2002-2005 Hirokazu Takata, Hayato Fujiwara |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/pgtable.h> | 7 | #include <asm/pgtable.h> |
| 9 | 8 | ||
| 10 | #undef MCCR | 9 | #undef MCCR |
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c index cf610a7c5ff0..abb34ccd5986 100644 --- a/arch/m32r/mm/discontig.c +++ b/arch/m32r/mm/discontig.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (c) 2003 Hitoshi Yamamoto | 6 | * Copyright (c) 2003 Hitoshi Yamamoto |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/bootmem.h> | 10 | #include <linux/bootmem.h> |
| 12 | #include <linux/mmzone.h> | 11 | #include <linux/mmzone.h> |
diff --git a/arch/m32r/mm/fault-nommu.c b/arch/m32r/mm/fault-nommu.c index d9d488d782e8..03fc4c858e0e 100644 --- a/arch/m32r/mm/fault-nommu.c +++ b/arch/m32r/mm/fault-nommu.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | /* $Id: fault-nommu.c,v 1.1 2004/03/30 06:40:59 sakugawa Exp $ */ | 10 | /* $Id: fault-nommu.c,v 1.1 2004/03/30 06:40:59 sakugawa Exp $ */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index bf7fb58ef02c..dc18a33eefef 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1995 Linus Torvalds | 8 | * Copyright (C) 1995 Linus Torvalds |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| @@ -148,7 +147,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
| 148 | /* When running in the kernel we expect faults to occur only to | 147 | /* When running in the kernel we expect faults to occur only to |
| 149 | * addresses in user space. All other faults represent errors in the | 148 | * addresses in user space. All other faults represent errors in the |
| 150 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 149 | * kernel and should generate an OOPS. Unfortunatly, in the case of an |
| 151 | * erroneous fault occuring in a code path which already holds mmap_sem | 150 | * erroneous fault occurring in a code path which already holds mmap_sem |
| 152 | * we will deadlock attempting to validate the fault against the | 151 | * we will deadlock attempting to validate the fault against the |
| 153 | * address space. Luckily the kernel only validly references user | 152 | * address space. Luckily the kernel only validly references user |
| 154 | * space from well defined areas of code, which are listed in the | 153 | * space from well defined areas of code, which are listed in the |
diff --git a/arch/m68k/amiga/amiga_ksyms.c b/arch/m68k/amiga/amiga_ksyms.c index 8f2e0587ae2f..7fdcf6bf3ada 100644 --- a/arch/m68k/amiga/amiga_ksyms.c +++ b/arch/m68k/amiga/amiga_ksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 4 | #include <asm/ptrace.h> | 3 | #include <asm/ptrace.h> |
diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c index ae94db5d93b2..1f5bfb584297 100644 --- a/arch/m68k/amiga/amisound.c +++ b/arch/m68k/amiga/amisound.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * for more details. | 8 | * for more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/jiffies.h> | 11 | #include <linux/jiffies.h> |
| 13 | #include <linux/timer.h> | 12 | #include <linux/timer.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c index 558d5fd2d2ba..de1304c91112 100644 --- a/arch/m68k/amiga/chipram.c +++ b/arch/m68k/amiga/chipram.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | ** Rewritten 15/9/2000 by Geert to use resource management | 7 | ** Rewritten 15/9/2000 by Geert to use resource management |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index b5b8a416a07a..092e50d2cb13 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Miscellaneous Amiga stuff | 12 | * Miscellaneous Amiga stuff |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 99c70978aafa..6f4581575fb4 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 4 | #include <linux/mm.h> | 3 | #include <linux/mm.h> |
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 727289acad7e..b2079252a954 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Miscellaneous atari stuff | 24 | * Miscellaneous atari stuff |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
| 30 | #include <linux/console.h> | 29 | #include <linux/console.h> |
diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c index ace05f79d968..4ae01004d8dd 100644 --- a/arch/m68k/atari/debug.c +++ b/arch/m68k/atari/debug.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * for more details. | 10 | * for more details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/tty.h> | 14 | #include <linux/tty.h> |
| 16 | #include <linux/console.h> | 15 | #include <linux/console.h> |
diff --git a/arch/m68k/atari/hades-pci.c b/arch/m68k/atari/hades-pci.c index 8888debf71ec..6ca57b6564da 100644 --- a/arch/m68k/atari/hades-pci.c +++ b/arch/m68k/atari/hades-pci.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Written by Wout Klaren. | 4 | * Written by Wout Klaren. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <asm/io.h> | 9 | #include <asm/io.h> |
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index 22e0481a5f7b..bf4588cbe371 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * for more details. | 8 | * for more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index 2ef271cd818b..1c05a6260546 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * called by setup.c. | 7 | * called by setup.c. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
diff --git a/arch/m68k/kernel/bios32.c b/arch/m68k/kernel/bios32.c index a901685eb6a9..af170c2be735 100644 --- a/arch/m68k/kernel/bios32.c +++ b/arch/m68k/kernel/bios32.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Based on the DEC Alpha bios32.c by Dave Rusling and David Mosberger. | 6 | * Based on the DEC Alpha bios32.c by Dave Rusling and David Mosberger. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | 11 | ||
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 449b62b30f45..9083c8b7659f 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * for 68040 | 33 | * for 68040 |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/linkage.h> | 36 | #include <linux/linkage.h> |
| 38 | #include <asm/entry.h> | 37 | #include <asm/entry.h> |
| 39 | #include <asm/errno.h> | 38 | #include <asm/errno.h> |
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index 70002c146eed..6739e87fe825 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S | |||
| @@ -255,7 +255,6 @@ | |||
| 255 | * MAC_USE_SCC_B: Use the SCC port B (printer) for serial debug (default). | 255 | * MAC_USE_SCC_B: Use the SCC port B (printer) for serial debug (default). |
| 256 | */ | 256 | */ |
| 257 | 257 | ||
| 258 | #include <linux/config.h> | ||
| 259 | #include <linux/linkage.h> | 258 | #include <linux/linkage.h> |
| 260 | #include <linux/init.h> | 259 | #include <linux/init.h> |
| 261 | #include <asm/bootinfo.h> | 260 | #include <asm/bootinfo.h> |
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 5a8344b93547..e969f0477640 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * which must be served /Roman Zippel | 25 | * which must be served /Roman Zippel |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c index 1f5e1b5aeda4..aff26a52167c 100644 --- a/arch/m68k/kernel/m68k_ksyms.c +++ b/arch/m68k/kernel/m68k_ksyms.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/elfcore.h> | 7 | #include <linux/elfcore.h> |
| 8 | #include <linux/in6.h> | 8 | #include <linux/in6.h> |
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/setup.h> | 11 | #include <asm/setup.h> |
| 13 | #include <asm/machdep.h> | 12 | #include <asm/machdep.h> |
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 33648efb772e..45a46646c1b3 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * This file handles the architecture-dependent parts of process handling.. | 10 | * This file handles the architecture-dependent parts of process handling.. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 540638ca81f9..ef89060ea328 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/user.h> | 20 | #include <linux/user.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/signal.h> | 21 | #include <linux/signal.h> |
| 23 | 22 | ||
| 24 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
diff --git a/arch/m68k/kernel/semaphore.c b/arch/m68k/kernel/semaphore.c index 1ebb79baaa8c..d12cbbfe6ebd 100644 --- a/arch/m68k/kernel/semaphore.c +++ b/arch/m68k/kernel/semaphore.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * specific changes in <asm/semaphore-helper.h> | 3 | * specific changes in <asm/semaphore-helper.h> |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <asm/semaphore-helper.h> | 8 | #include <asm/semaphore-helper.h> |
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 214a95f9f3ac..f2d7ee0ee18c 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * This file handles the architecture-dependent parts of system setup | 8 | * This file handles the architecture-dependent parts of system setup |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index e86de7b061cd..4569406a2e1f 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Sets up all exception vectors | 18 | * Sets up all exception vectors |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 23 | #include <linux/signal.h> | 22 | #include <linux/signal.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S index 497b924f3c86..99ba315bd0a8 100644 --- a/arch/m68k/kernel/vmlinux.lds.S +++ b/arch/m68k/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | PHDRS | 1 | PHDRS |
| 3 | { | 2 | { |
| 4 | text PT_LOAD FILEHDR PHDRS FLAGS (7); | 3 | text PT_LOAD FILEHDR PHDRS FLAGS (7); |
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 5a9990e436bb..85dda1095b1f 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Miscellaneous linux stuff | 10 | * Miscellaneous linux stuff |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c index cc62ed61cda2..4eeb09dc0e8f 100644 --- a/arch/m68k/mac/debug.c +++ b/arch/m68k/mac/debug.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * for more details. | 14 | * for more details. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/tty.h> | 19 | #include <linux/tty.h> |
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index 4c8ece7e64a3..bc657b1057a7 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c | |||
| @@ -104,7 +104,6 @@ | |||
| 104 | * should execute quickly.) | 104 | * should execute quickly.) |
| 105 | */ | 105 | */ |
| 106 | 106 | ||
| 107 | #include <linux/config.h> | ||
| 108 | #include <linux/types.h> | 107 | #include <linux/types.h> |
| 109 | #include <linux/kernel.h> | 108 | #include <linux/kernel.h> |
| 110 | #include <linux/mm.h> | 109 | #include <linux/mm.h> |
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index bbb0c3b95e9c..56d1f5676ade 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Miscellaneous Mac68K-specific stuff | 2 | * Miscellaneous Mac68K-specific stuff |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 7 | #include <linux/errno.h> | 6 | #include <linux/errno.h> |
| 8 | #include <linux/miscdevice.h> | 7 | #include <linux/miscdevice.h> |
diff --git a/arch/m68k/math-emu/fp_entry.S b/arch/m68k/math-emu/fp_entry.S index 5ec2d9101ea3..954b4f304a7d 100644 --- a/arch/m68k/math-emu/fp_entry.S +++ b/arch/m68k/math-emu/fp_entry.S | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | * OF THE POSSIBILITY OF SUCH DAMAGE. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/linkage.h> | 38 | #include <linux/linkage.h> |
| 40 | #include <asm/entry.h> | 39 | #include <asm/entry.h> |
| 41 | 40 | ||
diff --git a/arch/m68k/math-emu/fp_util.S b/arch/m68k/math-emu/fp_util.S index a9f7f0129067..b093b85fcdd2 100644 --- a/arch/m68k/math-emu/fp_util.S +++ b/arch/m68k/math-emu/fp_util.S | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | * OF THE POSSIBILITY OF SUCH DAMAGE. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include "fp_emu.h" | 38 | #include "fp_emu.h" |
| 40 | 39 | ||
| 41 | /* | 40 | /* |
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index a190e39c907a..ab90213e5c54 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * to motorola.c and sun3mmu.c | 7 | * to motorola.c and sun3mmu.c |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/signal.h> | 10 | #include <linux/signal.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c index 43ffab048724..f46f049d29ff 100644 --- a/arch/m68k/mm/kmap.c +++ b/arch/m68k/mm/kmap.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * used by other architectures /Roman Zippel | 7 | * used by other architectures /Roman Zippel |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c index a226668f20c3..a0c095e17222 100644 --- a/arch/m68k/mm/memory.c +++ b/arch/m68k/mm/memory.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1995 Hamish Macdonald | 4 | * Copyright (C) 1995 Hamish Macdonald |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index bdb11103694b..49015e32d8fc 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Moved 8/20/1999 Sam Creasey | 8 | * Moved 8/20/1999 Sam Creasey |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index efa52d302d67..9a1827876408 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * for more details. | 12 | * for more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 553c304aa2c5..d09d03b3d956 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * for more details. | 8 | * for more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/m68k/sun3/prom/init.c b/arch/m68k/sun3/prom/init.c index 2e6ae56aec12..202adfcc316e 100644 --- a/arch/m68k/sun3/prom/init.c +++ b/arch/m68k/sun3/prom/init.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | 10 | ||
diff --git a/arch/m68k/sun3/prom/printf.c b/arch/m68k/sun3/prom/printf.c index e6ee1006344e..e7bfde377b5e 100644 --- a/arch/m68k/sun3/prom/printf.c +++ b/arch/m68k/sun3/prom/printf.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * about or use it! It's simple and smelly anyway.... | 8 | * about or use it! It's simple and smelly anyway.... |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | 12 | ||
| 14 | #include <asm/openprom.h> | 13 | #include <asm/openprom.h> |
diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c index 97c7bfde8ae8..6c265222cbcd 100644 --- a/arch/m68k/sun3/sun3dvma.c +++ b/arch/m68k/sun3/sun3dvma.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Contains common routines for sun3/sun3x DVMA management. | 6 | * Contains common routines for sun3/sun3x DVMA management. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 12 | #include <linux/list.h> | 11 | #include <linux/list.h> |
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c index 0912435e9e90..f18b9d3ef16d 100644 --- a/arch/m68k/sun3/sun3ints.c +++ b/arch/m68k/sun3/sun3ints.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * for more details. | 6 | * for more details. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index 52fb17408869..987891783a47 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * based on code from Oliver Jowett <oliver@jowett.manawatu.gen.nz> | 6 | * based on code from Oliver Jowett <oliver@jowett.manawatu.gen.nz> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 12 | #include <linux/console.h> | 11 | #include <linux/console.h> |
diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c index db7a0c1cebae..6ee00effbad2 100644 --- a/arch/m68knommu/kernel/comempci.c +++ b/arch/m68knommu/kernel/comempci.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | /*****************************************************************************/ | 10 | /*****************************************************************************/ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
diff --git a/arch/m68knommu/kernel/entry.S b/arch/m68knommu/kernel/entry.S index 8b1f47239b9a..1e7ea6a3e1a1 100644 --- a/arch/m68knommu/kernel/entry.S +++ b/arch/m68knommu/kernel/entry.S | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * linux 2.4 support David McCullough <davidm@snapgear.com> | 24 | * linux 2.4 support David McCullough <davidm@snapgear.com> |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/sys.h> | 27 | #include <linux/sys.h> |
| 29 | #include <linux/linkage.h> | 28 | #include <linux/linkage.h> |
| 30 | #include <asm/thread_info.h> | 29 | #include <asm/thread_info.h> |
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c index 4320d5dcc9cb..1e62150f3588 100644 --- a/arch/m68knommu/kernel/m68k_ksyms.c +++ b/arch/m68knommu/kernel/m68k_ksyms.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/elfcore.h> | 7 | #include <linux/elfcore.h> |
| 8 | #include <linux/in6.h> | 8 | #include <linux/in6.h> |
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/setup.h> | 11 | #include <asm/setup.h> |
| 13 | #include <asm/machdep.h> | 12 | #include <asm/machdep.h> |
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c index f861755ec88b..c18a83306953 100644 --- a/arch/m68knommu/kernel/process.c +++ b/arch/m68knommu/kernel/process.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * This file handles the architecture-dependent parts of process handling.. | 13 | * This file handles the architecture-dependent parts of process handling.. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c index 382ca5797b97..9130119537b9 100644 --- a/arch/m68knommu/kernel/ptrace.c +++ b/arch/m68knommu/kernel/ptrace.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/user.h> | 20 | #include <linux/user.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/signal.h> | 21 | #include <linux/signal.h> |
| 23 | 22 | ||
| 24 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
diff --git a/arch/m68knommu/kernel/semaphore.c b/arch/m68knommu/kernel/semaphore.c index c083f4772add..bce2bc7d87c6 100644 --- a/arch/m68knommu/kernel/semaphore.c +++ b/arch/m68knommu/kernel/semaphore.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * specific changes in <asm/semaphore-helper.h> | 3 | * specific changes in <asm/semaphore-helper.h> |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | #include <linux/err.h> | 7 | #include <linux/err.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index 99d038e9ab31..bde9811cf98c 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * This file handles the architecture-dependent parts of system setup | 16 | * This file handles the architecture-dependent parts of system setup |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index 897deaa06b01..617e43ec95ae 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (C) 1991, 1992 Linus Torvalds | 11 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sys.h> | 14 | #include <linux/sys.h> |
| 16 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 17 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c index b9d8abb45430..1db987272220 100644 --- a/arch/m68knommu/kernel/time.c +++ b/arch/m68knommu/kernel/time.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * "A Kernel Model for Precision Timekeeping" by Dave Mills | 10 | * "A Kernel Model for Precision Timekeeping" by Dave Mills |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c index 44ff74e643b1..17649d2543ef 100644 --- a/arch/m68knommu/kernel/traps.c +++ b/arch/m68knommu/kernel/traps.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | /* | 16 | /* |
| 17 | * Sets up all exception vectors | 17 | * Sets up all exception vectors |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/signal.h> | 20 | #include <linux/signal.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 59ced831b792..ccd2ceb05cfb 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * run kernels. | 7 | * run kernels. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm-generic/vmlinux.lds.h> | 10 | #include <asm-generic/vmlinux.lds.h> |
| 12 | 11 | ||
| 13 | #if defined(CONFIG_RAMKERNEL) | 12 | #if defined(CONFIG_RAMKERNEL) |
diff --git a/arch/m68knommu/lib/semaphore.S b/arch/m68knommu/lib/semaphore.S index 76765362fea6..87c746034376 100644 --- a/arch/m68knommu/lib/semaphore.S +++ b/arch/m68knommu/lib/semaphore.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/semaphore.h> | 12 | #include <asm/semaphore.h> |
| 14 | 13 | ||
| 15 | /* | 14 | /* |
diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c index 70d1653be3da..e4c233eef195 100644 --- a/arch/m68knommu/mm/init.c +++ b/arch/m68knommu/mm/init.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * DEC/2000 -- linux 2.4 support <davidm@snapgear.com> | 15 | * DEC/2000 -- linux 2.4 support <davidm@snapgear.com> |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/signal.h> | 18 | #include <linux/signal.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/arch/m68knommu/mm/kmap.c b/arch/m68knommu/mm/kmap.c index 04213e1c1e57..bc32f38843f0 100644 --- a/arch/m68knommu/mm/kmap.c +++ b/arch/m68knommu/mm/kmap.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com> | 5 | * Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com> |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
diff --git a/arch/m68knommu/mm/memory.c b/arch/m68knommu/mm/memory.c index 0eef72915e61..411e45248e5c 100644 --- a/arch/m68knommu/mm/memory.c +++ b/arch/m68knommu/mm/memory.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (C) 1995 Hamish Macdonald | 11 | * Copyright (C) 1995 Hamish Macdonald |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
diff --git a/arch/m68knommu/platform/5206/config.c b/arch/m68knommu/platform/5206/config.c index 987c91a9a206..34657f85e702 100644 --- a/arch/m68knommu/platform/5206/config.c +++ b/arch/m68knommu/platform/5206/config.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | /***************************************************************************/ | 10 | /***************************************************************************/ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/param.h> | 14 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5206e/config.c b/arch/m68knommu/platform/5206e/config.c index f35b8606c1ee..48e4d6266507 100644 --- a/arch/m68knommu/platform/5206e/config.c +++ b/arch/m68knommu/platform/5206e/config.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | /***************************************************************************/ | 9 | /***************************************************************************/ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/param.h> | 13 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/520x/config.c b/arch/m68knommu/platform/520x/config.c index 71dea2e0f452..823f561f35b0 100644 --- a/arch/m68knommu/platform/520x/config.c +++ b/arch/m68knommu/platform/520x/config.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | /***************************************************************************/ | 12 | /***************************************************************************/ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/param.h> | 15 | #include <linux/param.h> |
| 17 | #include <asm/machdep.h> | 16 | #include <asm/machdep.h> |
diff --git a/arch/m68knommu/platform/523x/config.c b/arch/m68knommu/platform/523x/config.c index 22767ce506e0..85de817e9ec5 100644 --- a/arch/m68knommu/platform/523x/config.c +++ b/arch/m68knommu/platform/523x/config.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 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/param.h> | 17 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5249/config.c b/arch/m68knommu/platform/5249/config.c index 289c1821b841..9d19d5bdb8af 100644 --- a/arch/m68knommu/platform/5249/config.c +++ b/arch/m68knommu/platform/5249/config.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | /***************************************************************************/ | 9 | /***************************************************************************/ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/param.h> | 13 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c index cf36e7d007b9..d500e27eda57 100644 --- a/arch/m68knommu/platform/5272/config.c +++ b/arch/m68knommu/platform/5272/config.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | /***************************************************************************/ | 10 | /***************************************************************************/ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/param.h> | 14 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/527x/config.c b/arch/m68knommu/platform/527x/config.c index 804de33cd6b7..bbae51597457 100644 --- a/arch/m68knommu/platform/527x/config.c +++ b/arch/m68knommu/platform/527x/config.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 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/param.h> | 17 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/528x/config.c b/arch/m68knommu/platform/528x/config.c index a5d2aa38a27a..18dad9046144 100644 --- a/arch/m68knommu/platform/528x/config.c +++ b/arch/m68knommu/platform/528x/config.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 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/param.h> | 17 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c index 7ed5782e9236..8074ac56f479 100644 --- a/arch/m68knommu/platform/5307/config.c +++ b/arch/m68knommu/platform/5307/config.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | /***************************************************************************/ | 10 | /***************************************************************************/ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/param.h> | 14 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5307/entry.S b/arch/m68knommu/platform/5307/entry.S index 9ddf5476ef8f..f0dba84d9101 100644 --- a/arch/m68knommu/platform/5307/entry.S +++ b/arch/m68knommu/platform/5307/entry.S | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Bug, speed and maintainability fixes by Philippe De Muyter <phdm@macqel.be> | 26 | * Bug, speed and maintainability fixes by Philippe De Muyter <phdm@macqel.be> |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/sys.h> | 29 | #include <linux/sys.h> |
| 31 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 32 | #include <asm/unistd.h> | 31 | #include <asm/unistd.h> |
diff --git a/arch/m68knommu/platform/5307/head.S b/arch/m68knommu/platform/5307/head.S index 1d9eb301d7ac..f2edb6498cd9 100644 --- a/arch/m68knommu/platform/5307/head.S +++ b/arch/m68knommu/platform/5307/head.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | /*****************************************************************************/ | 9 | /*****************************************************************************/ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/sys.h> | 11 | #include <linux/sys.h> |
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | #include <asm/asm-offsets.h> | 13 | #include <asm/asm-offsets.h> |
diff --git a/arch/m68knommu/platform/5307/ints.c b/arch/m68knommu/platform/5307/ints.c index a134fb2f0566..b4b55093ae7e 100644 --- a/arch/m68knommu/platform/5307/ints.c +++ b/arch/m68knommu/platform/5307/ints.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 22 | #include <linux/kernel_stat.h> | 22 | #include <linux/kernel_stat.h> |
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/seq_file.h> | 24 | #include <linux/seq_file.h> |
| 26 | 25 | ||
| 27 | #include <asm/system.h> | 26 | #include <asm/system.h> |
diff --git a/arch/m68knommu/platform/5307/pit.c b/arch/m68knommu/platform/5307/pit.c index ef174748825f..994c893df1a4 100644 --- a/arch/m68knommu/platform/5307/pit.c +++ b/arch/m68knommu/platform/5307/pit.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 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/param.h> | 17 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c index 83b8b89dfa09..c3a9755c2d1f 100644 --- a/arch/m68knommu/platform/5307/timers.c +++ b/arch/m68knommu/platform/5307/timers.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | /***************************************************************************/ | 9 | /***************************************************************************/ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/param.h> | 13 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5307/vectors.c b/arch/m68knommu/platform/5307/vectors.c index ac313a160d8d..2a8b0d044ce5 100644 --- a/arch/m68knommu/platform/5307/vectors.c +++ b/arch/m68knommu/platform/5307/vectors.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | /***************************************************************************/ | 9 | /***************************************************************************/ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/param.h> | 13 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/5407/config.c b/arch/m68knommu/platform/5407/config.c index f7c9018b85a7..5aad2645f0f1 100644 --- a/arch/m68knommu/platform/5407/config.c +++ b/arch/m68knommu/platform/5407/config.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | /***************************************************************************/ | 10 | /***************************************************************************/ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/param.h> | 14 | #include <linux/param.h> |
diff --git a/arch/m68knommu/platform/68328/config.c b/arch/m68knommu/platform/68328/config.c index bcfa5d7fe1e2..26ffeba28642 100644 --- a/arch/m68knommu/platform/68328/config.c +++ b/arch/m68knommu/platform/68328/config.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/dbg.h> | 18 | #include <asm/dbg.h> |
| 19 | #include <stdarg.h> | 19 | #include <stdarg.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
diff --git a/arch/m68knommu/platform/68328/entry.S b/arch/m68knommu/platform/68328/entry.S index 7d8990d784a2..f97862715450 100644 --- a/arch/m68knommu/platform/68328/entry.S +++ b/arch/m68knommu/platform/68328/entry.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Linux/m68k support by Hamish Macdonald | 10 | * Linux/m68k support by Hamish Macdonald |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sys.h> | 13 | #include <linux/sys.h> |
| 15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 16 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
diff --git a/arch/m68knommu/platform/68328/head-de2.S b/arch/m68knommu/platform/68328/head-de2.S index 94c5a1609a75..92d96456d363 100644 --- a/arch/m68knommu/platform/68328/head-de2.S +++ b/arch/m68knommu/platform/68328/head-de2.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #if defined(CONFIG_RAM32MB) | 2 | #if defined(CONFIG_RAM32MB) |
| 4 | #define MEM_END 0x02000000 /* Memory size 32Mb */ | 3 | #define MEM_END 0x02000000 /* Memory size 32Mb */ |
diff --git a/arch/m68knommu/platform/68328/head-pilot.S b/arch/m68knommu/platform/68328/head-pilot.S index 46b3604f999c..9e07faa3e81d 100644 --- a/arch/m68knommu/platform/68328/head-pilot.S +++ b/arch/m68knommu/platform/68328/head-pilot.S | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #define IMMED # | 15 | #define IMMED # |
| 16 | #define DBG_PUTC(x) moveb IMMED x, 0xfffff907 | 16 | #define DBG_PUTC(x) moveb IMMED x, 0xfffff907 |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | .global _stext | 19 | .global _stext |
| 21 | .global _start | 20 | .global _start |
diff --git a/arch/m68knommu/platform/68328/head-ram.S b/arch/m68knommu/platform/68328/head-ram.S index e8dc9241ff96..252b80b02038 100644 --- a/arch/m68knommu/platform/68328/head-ram.S +++ b/arch/m68knommu/platform/68328/head-ram.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | .global __main | 2 | .global __main |
| 4 | .global __rom_start | 3 | .global __rom_start |
diff --git a/arch/m68knommu/platform/68328/head-rom.S b/arch/m68knommu/platform/68328/head-rom.S index 234430b9551c..6ec77d3ea0b3 100644 --- a/arch/m68knommu/platform/68328/head-rom.S +++ b/arch/m68knommu/platform/68328/head-rom.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | .global _start | 2 | .global _start |
| 4 | .global _stext | 3 | .global _stext |
diff --git a/arch/m68knommu/platform/68328/timers.c b/arch/m68knommu/platform/68328/timers.c index 68c2cd6b0030..438ef6ee9720 100644 --- a/arch/m68knommu/platform/68328/timers.c +++ b/arch/m68knommu/platform/68328/timers.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | /***************************************************************************/ | 15 | /***************************************************************************/ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/m68knommu/platform/68360/config.c b/arch/m68knommu/platform/68360/config.c index 69c670dfd62b..c5482e3622eb 100644 --- a/arch/m68knommu/platform/68360/config.c +++ b/arch/m68knommu/platform/68360/config.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <stdarg.h> | 13 | #include <stdarg.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S index 8ff48adf24ab..f1af8977f294 100644 --- a/arch/m68knommu/platform/68360/entry.S +++ b/arch/m68knommu/platform/68360/entry.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * M68360 Port by SED Systems, and Lineo. | 12 | * M68360 Port by SED Systems, and Lineo. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sys.h> | 15 | #include <linux/sys.h> |
| 17 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
| 18 | #include <asm/thread_info.h> | 17 | #include <asm/thread_info.h> |
diff --git a/arch/m68knommu/platform/68360/head-ram.S b/arch/m68knommu/platform/68360/head-ram.S index f497713a4ec7..2ea51479f13a 100644 --- a/arch/m68knommu/platform/68360/head-ram.S +++ b/arch/m68knommu/platform/68360/head-ram.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | #define ASSEMBLY | 14 | #define ASSEMBLY |
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | .global _stext | 16 | .global _stext |
| 18 | .global _start | 17 | .global _start |
diff --git a/arch/m68knommu/platform/68360/head-rom.S b/arch/m68knommu/platform/68360/head-rom.S index 2d28c3e19a88..62ecf4144b3b 100644 --- a/arch/m68knommu/platform/68360/head-rom.S +++ b/arch/m68knommu/platform/68360/head-rom.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (C) 1998 D. Jeff Dionne <jeff@uclinux.org>, | 11 | * Copyright (C) 1998 D. Jeff Dionne <jeff@uclinux.org>, |
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | .global _stext | 15 | .global _stext |
| 17 | .global _sbss | 16 | .global _sbss |
diff --git a/arch/m68knommu/platform/68360/ints.c b/arch/m68knommu/platform/68360/ints.c index 0245fc4a4781..4df3c146eb74 100644 --- a/arch/m68knommu/platform/68360/ints.c +++ b/arch/m68knommu/platform/68360/ints.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (c) 1999 D. Jeff Dionne <jeff@uclinux.org> | 10 | * Copyright (c) 1999 D. Jeff Dionne <jeff@uclinux.org> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/m68knommu/platform/68EZ328/config.c b/arch/m68knommu/platform/68EZ328/config.c index 15a14a67c2bf..659b80aca118 100644 --- a/arch/m68knommu/platform/68EZ328/config.c +++ b/arch/m68knommu/platform/68EZ328/config.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | /***************************************************************************/ | 14 | /***************************************************************************/ |
| 15 | 15 | ||
| 16 | #include <stdarg.h> | 16 | #include <stdarg.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/m68knommu/platform/68VZ328/config.c b/arch/m68knommu/platform/68VZ328/config.c index 4058de5c8fa2..fcd100b7594d 100644 --- a/arch/m68knommu/platform/68VZ328/config.c +++ b/arch/m68knommu/platform/68VZ328/config.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | /***************************************************************************/ | 15 | /***************************************************************************/ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/mips/arc/identify.c b/arch/mips/arc/identify.c index 1bd6199e174a..3ba7c47f9f23 100644 --- a/arch/mips/arc/identify.c +++ b/arch/mips/arc/identify.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 12 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
diff --git a/arch/mips/au1000/common/au1xxx_irqmap.c b/arch/mips/au1000/common/au1xxx_irqmap.c index 5a1e3687cafa..7acfe9bf5fc3 100644 --- a/arch/mips/au1000/common/au1xxx_irqmap.c +++ b/arch/mips/au1000/common/au1xxx_irqmap.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * with this program; if not, write to the Free Software Foundation, Inc., | 25 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 26 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/irq.h> | 30 | #include <linux/irq.h> |
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index a547e47dd5fd..69cabb7463ff 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * | 30 | * |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
diff --git a/arch/mips/au1000/common/dbg_io.c b/arch/mips/au1000/common/dbg_io.c index 7bc768e558db..0a50af7f34b8 100644 --- a/arch/mips/au1000/common/dbg_io.c +++ b/arch/mips/au1000/common/dbg_io.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/config.h> | ||
| 3 | #include <asm/io.h> | 2 | #include <asm/io.h> |
| 4 | #include <asm/mach-au1x00/au1000.h> | 3 | #include <asm/mach-au1x00/au1000.h> |
| 5 | 4 | ||
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c index 1d82f2277517..fb7c47c1585d 100644 --- a/arch/mips/au1000/common/dma.c +++ b/arch/mips/au1000/common/dma.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 30 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 36 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c index 5f5915b83142..ce55297dcb8c 100644 --- a/arch/mips/au1000/common/gpio.c +++ b/arch/mips/au1000/common/gpio.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * with this program; if not, write to the Free Software Foundation, Inc., | 19 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 20 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 20 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <au1000.h> | 23 | #include <au1000.h> |
| 25 | #include <au1xxx_gpio.h> | 24 | #include <au1xxx_gpio.h> |
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index 12d6edee895e..c0d56c130a59 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * with this program; if not, write to the Free Software Foundation, Inc., | 26 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 27 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 27 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c index b1392abac809..da591f674893 100644 --- a/arch/mips/au1000/common/pci.c +++ b/arch/mips/au1000/common/pci.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * with this program; if not, write to the Free Software Foundation, Inc., | 30 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 32 | */ | 32 | */ |
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 35 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 32702e5fbf67..8fd203d4a339 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * License version 2. This program is licensed "as is" without any | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/device.h> | 10 | #include <linux/device.h> |
| 12 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c index b035513fe30a..7504a6364616 100644 --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * with this program; if not, write to the Free Software Foundation, Inc., | 29 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 30 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 30 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/pm.h> | 33 | #include <linux/pm.h> |
| 35 | #include <linux/pm_legacy.h> | 34 | #include <linux/pm_legacy.h> |
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c index c93af224c1b3..de5447e83849 100644 --- a/arch/mips/au1000/common/reset.c +++ b/arch/mips/au1000/common/reset.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * with this program; if not, write to the Free Software Foundation, Inc., | 27 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 32 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 33 | #include <asm/io.h> | 32 | #include <asm/io.h> |
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index 97165b6b3894..cc5138ce9c95 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * with this program; if not, write to the Free Software Foundation, Inc., | 25 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 26 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 31 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index 842e1b5ac4a1..7e988b0b0130 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/types.h> | 35 | #include <linux/types.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/kernel_stat.h> | 37 | #include <linux/kernel_stat.h> |
| 39 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
diff --git a/arch/mips/au1000/csb250/board_setup.c b/arch/mips/au1000/csb250/board_setup.c index 1c55c5f59d75..348c3024d3d1 100644 --- a/arch/mips/au1000/csb250/board_setup.c +++ b/arch/mips/au1000/csb250/board_setup.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * with this program; if not, write to the Free Software Foundation, Inc., | 26 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 27 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 27 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 32 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c index f00ec3b175d8..7a79293f8527 100644 --- a/arch/mips/au1000/db1x00/board_setup.c +++ b/arch/mips/au1000/db1x00/board_setup.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * with this program; if not, write to the Free Software Foundation, Inc., | 27 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index 41e0522f3cf1..0a3f025eb023 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
| 34 | #include <asm/addrspace.h> | 34 | #include <asm/addrspace.h> |
| 35 | #include <asm/bootinfo.h> | 35 | #include <asm/bootinfo.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/string.h> | 36 | #include <linux/string.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 39 | 38 | ||
diff --git a/arch/mips/au1000/db1x00/irqmap.c b/arch/mips/au1000/db1x00/irqmap.c index 0138c5b7c860..3e5729145c2b 100644 --- a/arch/mips/au1000/db1x00/irqmap.c +++ b/arch/mips/au1000/db1x00/irqmap.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * with this program; if not, write to the Free Software Foundation, Inc., | 25 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 26 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/irq.h> | 30 | #include <linux/irq.h> |
diff --git a/arch/mips/au1000/db1x00/mirage_ts.c b/arch/mips/au1000/db1x00/mirage_ts.c index c29852c24b4f..0942dcf69518 100644 --- a/arch/mips/au1000/db1x00/mirage_ts.c +++ b/arch/mips/au1000/db1x00/mirage_ts.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
diff --git a/arch/mips/au1000/hydrogen3/board_setup.c b/arch/mips/au1000/hydrogen3/board_setup.c index 2efae1064647..d081640e2e00 100644 --- a/arch/mips/au1000/hydrogen3/board_setup.c +++ b/arch/mips/au1000/hydrogen3/board_setup.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * with this program; if not, write to the Free Software Foundation, Inc., | 27 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/hydrogen3/init.c b/arch/mips/au1000/hydrogen3/init.c index 01ab28483959..8f02bb80a55a 100644 --- a/arch/mips/au1000/hydrogen3/init.c +++ b/arch/mips/au1000/hydrogen3/init.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/bootmem.h> | 34 | #include <linux/bootmem.h> |
| 35 | #include <asm/addrspace.h> | 35 | #include <asm/addrspace.h> |
| 36 | #include <asm/bootinfo.h> | 36 | #include <asm/bootinfo.h> |
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/string.h> | 37 | #include <linux/string.h> |
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | 39 | ||
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c index 638de7bb43f0..e917e54fc683 100644 --- a/arch/mips/au1000/mtx-1/board_setup.c +++ b/arch/mips/au1000/mtx-1/board_setup.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * with this program; if not, write to the Free Software Foundation, Inc., | 28 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 29 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 29 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 30 | */ | 30 | */ |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 33 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 34 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c index 0b4807dc9f44..1cf18e16ab54 100644 --- a/arch/mips/au1000/pb1000/board_setup.c +++ b/arch/mips/au1000/pb1000/board_setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * with this program; if not, write to the Free Software Foundation, Inc., | 23 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 29 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c index 13c2f6ca7e33..db27b9331ff3 100644 --- a/arch/mips/au1000/pb1100/board_setup.c +++ b/arch/mips/au1000/pb1100/board_setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * with this program; if not, write to the Free Software Foundation, Inc., | 23 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 29 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c index a45b17538ac9..8b953b9fc25c 100644 --- a/arch/mips/au1000/pb1200/board_setup.c +++ b/arch/mips/au1000/pb1200/board_setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * with this program; if not, write to the Free Software Foundation, Inc., | 23 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 29 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c index 5dd164fc1889..2d49f32f4622 100644 --- a/arch/mips/au1000/pb1200/irqmap.c +++ b/arch/mips/au1000/pb1200/irqmap.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * with this program; if not, write to the Free Software Foundation, Inc., | 22 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 23 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/irq.h> | 27 | #include <linux/irq.h> |
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c index 30bb87282b1f..1a9a293de6ab 100644 --- a/arch/mips/au1000/pb1500/board_setup.c +++ b/arch/mips/au1000/pb1500/board_setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * with this program; if not, write to the Free Software Foundation, Inc., | 23 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 29 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c index 1e59433dfd66..ae3d6b19e94d 100644 --- a/arch/mips/au1000/xxs1500/board_setup.c +++ b/arch/mips/au1000/xxs1500/board_setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * with this program; if not, write to the Free Software Foundation, Inc., | 23 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 29 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c index 300797d5f558..46c23b66bc17 100644 --- a/arch/mips/cobalt/console.c +++ b/arch/mips/cobalt/console.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * (C) P. Horton 2006 | 2 | * (C) P. Horton 2006 |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 7 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 8 | #include <linux/console.h> | 7 | #include <linux/console.h> |
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index ca719d6398bd..c99714587ce8 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv) | 9 | * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv) |
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 14 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/mips/ddb5xxx/common/prom.c b/arch/mips/ddb5xxx/common/prom.c index 20c845c84d4b..efef0f57ce1e 100644 --- a/arch/mips/ddb5xxx/common/prom.c +++ b/arch/mips/ddb5xxx/common/prom.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Free Software Foundation; either version 2 of the License, or (at your | 7 | * Free Software Foundation; either version 2 of the License, or (at your |
| 8 | * option) any later version. | 8 | * option) any later version. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
diff --git a/arch/mips/ddb5xxx/ddb5477/irq.c b/arch/mips/ddb5xxx/ddb5477/irq.c index de433cf9fb50..22fb94b7c440 100644 --- a/arch/mips/ddb5xxx/ddb5477/irq.c +++ b/arch/mips/ddb5xxx/ddb5477/irq.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Free Software Foundation; either version 2 of the License, or (at your | 10 | * Free Software Foundation; either version 2 of the License, or (at your |
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 16 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
diff --git a/arch/mips/ddb5xxx/ddb5477/setup.c b/arch/mips/ddb5xxx/ddb5477/setup.c index 93167ecdb424..47ba0b6f210f 100644 --- a/arch/mips/ddb5xxx/ddb5477/setup.c +++ b/arch/mips/ddb5xxx/ddb5477/setup.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Free Software Foundation; either version 2 of the License, or (at your | 13 | * Free Software Foundation; either version 2 of the License, or (at your |
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S index e8ec93e33fe6..455a65b91cb0 100644 --- a/arch/mips/dec/int-handler.S +++ b/arch/mips/dec/int-handler.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Rewritten extensively for controller-driven IRQ support | 13 | * Rewritten extensively for controller-driven IRQ support |
| 14 | * by Maciej W. Rozycki. | 14 | * by Maciej W. Rozycki. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #include <asm/addrspace.h> | 17 | #include <asm/addrspace.h> |
| 19 | #include <asm/asm.h> | 18 | #include <asm/asm.h> |
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c index 32a7cc7e4c65..bf2858071f1f 100644 --- a/arch/mips/dec/prom/init.c +++ b/arch/mips/dec/prom/init.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1998 Harald Koerfgen | 4 | * Copyright (C) 1998 Harald Koerfgen |
| 5 | * Copyright (C) 2002, 2004 Maciej W. Rozycki | 5 | * Copyright (C) 2002, 2004 Maciej W. Rozycki |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/linkage.h> | 9 | #include <linux/linkage.h> |
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index 1edaf3074ee9..3027ce782797 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1998 Harald Koerfgen, Frieder Streffer and Paul M. Antoine | 4 | * Copyright (C) 1998 Harald Koerfgen, Frieder Streffer and Paul M. Antoine |
| 5 | * Copyright (C) 2000, 2002 Maciej W. Rozycki | 5 | * Copyright (C) 2000, 2002 Maciej W. Rozycki |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
diff --git a/arch/mips/galileo-boards/ev96100/setup.c b/arch/mips/galileo-boards/ev96100/setup.c index a04aea6123da..639ad5562c63 100644 --- a/arch/mips/galileo-boards/ev96100/setup.c +++ b/arch/mips/galileo-boards/ev96100/setup.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * with this program; if not, write to the Free Software Foundation, Inc., | 32 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 34 | */ | 34 | */ |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 37 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
| 38 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
diff --git a/arch/mips/galileo-boards/ev96100/time.c b/arch/mips/galileo-boards/ev96100/time.c index bff5b1c174e4..8cbe8426491a 100644 --- a/arch/mips/galileo-boards/ev96100/time.c +++ b/arch/mips/galileo-boards/ev96100/time.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * with this program; if not, write to the Free Software Foundation, Inc., | 32 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 34 | */ | 34 | */ |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 37 | #include <linux/kernel_stat.h> | 36 | #include <linux/kernel_stat.h> |
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c index 2287b59536e5..c64a7723cafb 100644 --- a/arch/mips/gt64120/common/time.c +++ b/arch/mips/gt64120/common/time.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/kernel_stat.h> | 12 | #include <linux/kernel_stat.h> |
| 14 | #include <asm/ptrace.h> | 13 | #include <asm/ptrace.h> |
diff --git a/arch/mips/gt64120/momenco_ocelot/dbg_io.c b/arch/mips/gt64120/momenco_ocelot/dbg_io.c index f0a6a38fcf4d..2128684584f5 100644 --- a/arch/mips/gt64120/momenco_ocelot/dbg_io.c +++ b/arch/mips/gt64120/momenco_ocelot/dbg_io.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #ifdef CONFIG_KGDB | 2 | #ifdef CONFIG_KGDB |
| 4 | 3 | ||
diff --git a/arch/mips/ite-boards/generic/dbg_io.c b/arch/mips/ite-boards/generic/dbg_io.c index 6a7ccaf93502..8e9cd8a9670a 100644 --- a/arch/mips/ite-boards/generic/dbg_io.c +++ b/arch/mips/ite-boards/generic/dbg_io.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/config.h> | ||
| 3 | 2 | ||
| 4 | #ifdef CONFIG_KGDB | 3 | #ifdef CONFIG_KGDB |
| 5 | 4 | ||
diff --git a/arch/mips/ite-boards/generic/it8172_cir.c b/arch/mips/ite-boards/generic/it8172_cir.c index 19deb153d005..bfc25adcfec6 100644 --- a/arch/mips/ite-boards/generic/it8172_cir.c +++ b/arch/mips/ite-boards/generic/it8172_cir.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | 31 | ||
| 33 | #ifdef CONFIG_IT8172_CIR | 32 | #ifdef CONFIG_IT8172_CIR |
| 34 | 33 | ||
diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c index da6ae0991199..a4615a5904aa 100644 --- a/arch/mips/ite-boards/generic/it8172_setup.c +++ b/arch/mips/ite-boards/generic/it8172_setup.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * with this program; if not, write to the Free Software Foundation, Inc., | 26 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 27 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 27 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 32 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
diff --git a/arch/mips/ite-boards/generic/pmon_prom.c b/arch/mips/ite-boards/generic/pmon_prom.c index 6e505af0cc08..7d0a79be34d8 100644 --- a/arch/mips/ite-boards/generic/pmon_prom.c +++ b/arch/mips/ite-boards/generic/pmon_prom.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 35 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/string.h> | 40 | #include <linux/string.h> |
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index c8d0df7d0c36..385413e30fdd 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1996, 1997, 1998, 2001 by Ralf Baechle | 8 | * Copyright (C) 1996, 1997, 1998, 2001 by Ralf Baechle |
| 9 | * Copyright (C) 2001 MIPS Technologies, Inc. | 9 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/eisa.h> | 11 | #include <linux/eisa.h> |
| 13 | #include <linux/hdreg.h> | 12 | #include <linux/hdreg.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c index a0674d73962f..a55cb4572ded 100644 --- a/arch/mips/jmr3927/rbhma3100/init.c +++ b/arch/mips/jmr3927/rbhma3100/init.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * with this program; if not, write to the Free Software Foundation, Inc., | 27 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 33 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c index 380046ea1db5..9c43702e7a93 100644 --- a/arch/mips/jmr3927/rbhma3100/irq.c +++ b/arch/mips/jmr3927/rbhma3100/irq.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * with this program; if not, write to the Free Software Foundation, Inc., | 29 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 30 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 30 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | 33 | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 308e6cdcd245..6d4635d89d94 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | *********************************************************************** | 33 | *********************************************************************** |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 39 | #include <linux/kdev_t.h> | 38 | #include <linux/kdev_t.h> |
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c index f1bb6a2dc5fc..ec28077d5ee2 100644 --- a/arch/mips/kernel/asm-offsets.c +++ b/arch/mips/kernel/asm-offsets.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Kevin Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com | 8 | * Kevin Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com |
| 9 | * Copyright (C) 2000 MIPS Technologies, Inc. | 9 | * Copyright (C) 2000 MIPS Technologies, Inc. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/compat.h> | 11 | #include <linux/compat.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c index d268827c62bd..c09337b947b9 100644 --- a/arch/mips/kernel/cpu-bugs64.c +++ b/arch/mips/kernel/cpu-bugs64.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * as published by the Free Software Foundation; either version | 6 | * as published by the Free Software Foundation; either version |
| 7 | * 2 of the License, or (at your option) any later version. | 7 | * 2 of the License, or (at your option) any later version. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/ptrace.h> | 11 | #include <linux/ptrace.h> |
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index e045aba4ebda..ba08f055feb2 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version |
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/ptrace.h> | 16 | #include <linux/ptrace.h> |
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index 457565162dd5..ecfd637d702a 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 8 | * Copyright (C) 2001 MIPS Technologies, Inc. | 8 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/asm.h> | 11 | #include <asm/asm.h> |
| 13 | #include <asm/asmmacro.h> | 12 | #include <asm/asmmacro.h> |
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S index 8760131f89d9..666bc9014cbd 100644 --- a/arch/mips/kernel/gdb-low.S +++ b/arch/mips/kernel/gdb-low.S | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 Andreas Busse | 4 | * Copyright (C) 1995 Andreas Busse |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/sys.h> | 6 | #include <linux/sys.h> |
| 8 | 7 | ||
| 9 | #include <asm/asm.h> | 8 | #include <asm/asm.h> |
diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index 6ecbdc1fefd1..719d26968cb2 100644 --- a/arch/mips/kernel/gdb-stub.c +++ b/arch/mips/kernel/gdb-stub.c | |||
| @@ -120,7 +120,6 @@ | |||
| 120 | * breakpoints, single stepping, | 120 | * breakpoints, single stepping, |
| 121 | * printing variables, etc. | 121 | * printing variables, etc. |
| 122 | */ | 122 | */ |
| 123 | #include <linux/config.h> | ||
| 124 | #include <linux/string.h> | 123 | #include <linux/string.h> |
| 125 | #include <linux/kernel.h> | 124 | #include <linux/kernel.h> |
| 126 | #include <linux/signal.h> | 125 | #include <linux/signal.h> |
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 6888cde560af..5254a2222d2b 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2001 MIPS Technologies, Inc. | 8 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 9 | * Copyright (C) 2002 Maciej W. Rozycki | 9 | * Copyright (C) 2002 Maciej W. Rozycki |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | 12 | ||
| 14 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index c018098c9a56..476c1eb33c94 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Kevin Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com | 13 | * Kevin Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com |
| 14 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. | 14 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/threads.h> | 17 | #include <linux/threads.h> |
| 19 | 18 | ||
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 5c9dcd5eed59..cde5e5afa179 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1992 Linus Torvalds | 8 | * Copyright (C) 1992 Linus Torvalds |
| 9 | * Copyright (C) 1994 - 2000 Ralf Baechle | 9 | * Copyright (C) 1994 - 2000 Ralf Baechle |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index a7d2bb3cf835..450ac592da57 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Written by Ulf Carlsson (ulfc@engr.sgi.com) | 5 | * Written by Ulf Carlsson (ulfc@engr.sgi.com) |
| 6 | * sys32_execve from ia64/ia32 code, Feb 2000, Kanoj Sarcar (kanoj@sgi.com) | 6 | * sys32_execve from ia64/ia32 code, Feb 2000, Kanoj Sarcar (kanoj@sgi.com) |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/compiler.h> | 8 | #include <linux/compiler.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 0a71a4c33716..f44a01357ada 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05 by Ralf Baechle | 8 | * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05 by Ralf Baechle |
| 9 | * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc. | 9 | * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <asm/checksum.h> | 13 | #include <asm/checksum.h> |
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 9def554f335b..d8beef107902 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2001, 2004 MIPS Technologies, Inc. | 5 | * Copyright (C) 2001, 2004 MIPS Technologies, Inc. |
| 6 | * Copyright (C) 2004 Maciej W. Rozycki | 6 | * Copyright (C) 2004 Maciej W. Rozycki |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/delay.h> | 8 | #include <linux/delay.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 199a06e873c6..7ab67f786bfe 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 9 | * Copyright (C) 2004 Thiemo Seufer | 9 | * Copyright (C) 2004 Thiemo Seufer |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index 1d44025188d8..362d1728e531 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * At this time Linux/MIPS64 only supports syscall tracing, even for 32-bit | 14 | * At this time Linux/MIPS64 only supports syscall tracing, even for 32-bit |
| 15 | * binaries. | 15 | * binaries. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/compiler.h> | 17 | #include <linux/compiler.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S index 0d9c4a32a9c2..656bde2e11b1 100644 --- a/arch/mips/kernel/r2300_switch.S +++ b/arch/mips/kernel/r2300_switch.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Further modifications to make this work: | 10 | * Further modifications to make this work: |
| 11 | * Copyright (c) 1998-2000 Harald Koerfgen | 11 | * Copyright (c) 1998-2000 Harald Koerfgen |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
| 15 | #include <asm/cachectl.h> | 14 | #include <asm/cachectl.h> |
| 16 | #include <asm/fpregdef.h> | 15 | #include <asm/fpregdef.h> |
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S index 283a98508fc8..880fa6e841ee 100644 --- a/arch/mips/kernel/r4k_fpu.S +++ b/arch/mips/kernel/r4k_fpu.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 2000 MIPS Technologies, Inc. | 12 | * Copyright (C) 2000 MIPS Technologies, Inc. |
| 13 | * Copyright (C) 1999, 2001 Silicon Graphics, Inc. | 13 | * Copyright (C) 1999, 2001 Silicon Graphics, Inc. |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/asm.h> | 15 | #include <asm/asm.h> |
| 17 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
| 18 | #include <asm/fpregdef.h> | 17 | #include <asm/fpregdef.h> |
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index e1b85e6c486a..d5c8b82fed72 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) 2000 MIPS Technologies, Inc. | 10 | * Copyright (C) 2000 MIPS Technologies, Inc. |
| 11 | * written by Carsten Langgaard, carstenl@mips.com | 11 | * written by Carsten Langgaard, carstenl@mips.com |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
| 15 | #include <asm/cachectl.h> | 14 | #include <asm/cachectl.h> |
| 16 | #include <asm/fpregdef.h> | 15 | #include <asm/fpregdef.h> |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 6344be46ca8c..8f8101f878ca 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 2001 MIPS Technologies, Inc. | 7 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 8 | * Copyright (C) 2004 Thiemo Seufer | 8 | * Copyright (C) 2004 Thiemo Seufer |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <asm/asm.h> | 11 | #include <asm/asm.h> |
| 13 | #include <asm/asmmacro.h> | 12 | #include <asm/asmmacro.h> |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 12d96c7d0bb2..b4a34a625a2e 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 8 | * Copyright (C) 2001 MIPS Technologies, Inc. | 8 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <asm/asm.h> | 11 | #include <asm/asm.h> |
| 13 | #include <asm/asmmacro.h> | 12 | #include <asm/asmmacro.h> |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 685698554a8a..df8c4f8ccd61 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 8 | * Copyright (C) 2001 MIPS Technologies, Inc. | 8 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <asm/asm.h> | 11 | #include <asm/asm.h> |
| 13 | #include <asm/asmmacro.h> | 12 | #include <asm/asmmacro.h> |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 0e632934cb76..f04fe4f085c3 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * to ABI64 calling convention. 64-bit syscalls are also processed | 13 | * to ABI64 calling convention. 64-bit syscalls are also processed |
| 14 | * here for now. | 14 | * here for now. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 18 | #include <asm/asm.h> | 17 | #include <asm/asm.h> |
| 19 | #include <asm/asmmacro.h> | 18 | #include <asm/asmmacro.h> |
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index d3e087115023..5edd8d4bb665 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) 1999 Silicon Graphics, Inc. | 10 | * Copyright (C) 1999 Silicon Graphics, Inc. |
| 11 | * Copyright (C) 2000 2001, 2002 Maciej W. Rozycki | 11 | * Copyright (C) 2000 2001, 2002 Maciej W. Rozycki |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h index ce6cb915c0a7..b1f09d54ebe6 100644 --- a/arch/mips/kernel/signal-common.h +++ b/arch/mips/kernel/signal-common.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | static inline int | 12 | static inline int |
| 14 | setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) | 13 | setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) |
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 402efd27c79e..6b4d9be31615 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1994 - 2000 Ralf Baechle | 7 | * Copyright (C) 1994 - 2000 Ralf Baechle |
| 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/cache.h> | 10 | #include <linux/cache.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 6da8c68e89db..0721314db657 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 8 | * Copyright (C) 2001 MIPS Technologies, Inc. | 8 | * Copyright (C) 2001 MIPS Technologies, Inc. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/a.out.h> | 10 | #include <linux/a.out.h> |
| 12 | #include <linux/capability.h> | 11 | #include <linux/capability.h> |
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 13ff4da598cd..c2b1fcf6024f 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Free Software Foundation; either version 2 of the License, or (at your | 11 | * Free Software Foundation; either version 2 of the License, or (at your |
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 67971938a2cb..8b95eca9ac74 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (C) 2000, 01 MIPS Technologies, Inc. | 11 | * Copyright (C) 2000, 01 MIPS Technologies, Inc. |
| 12 | * Copyright (C) 2002, 2003, 2004, 2005 Maciej W. Rozycki | 12 | * Copyright (C) 2002, 2003, 2004, 2005 Maciej W. Rozycki |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index 5b5a3736cbbc..7e7d54823486 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c | |||
| @@ -72,7 +72,6 @@ | |||
| 72 | * A store crossing a page boundary might be executed only partially. | 72 | * A store crossing a page boundary might be executed only partially. |
| 73 | * Undo the partial store in this case. | 73 | * Undo the partial store in this case. |
| 74 | */ | 74 | */ |
| 75 | #include <linux/config.h> | ||
| 76 | #include <linux/mm.h> | 75 | #include <linux/mm.h> |
| 77 | #include <linux/module.h> | 76 | #include <linux/module.h> |
| 78 | #include <linux/signal.h> | 77 | #include <linux/signal.h> |
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index b84d1f9ce28e..0bb9cd889456 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <asm/asm-offsets.h> | 1 | #include <asm/asm-offsets.h> |
| 3 | #include <asm-generic/vmlinux.lds.h> | 2 | #include <asm-generic/vmlinux.lds.h> |
| 4 | 3 | ||
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index fc9b0e2a6be1..d425120b0282 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | * Routines specific to the LASAT boards | 18 | * Routines specific to the LASAT boards |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/crc32.h> | 21 | #include <linux/crc32.h> |
| 23 | #include <asm/lasat/lasat.h> | 22 | #include <asm/lasat/lasat.h> |
diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c index 181bf68175fc..9e22acf03083 100644 --- a/arch/mips/lasat/reset.c +++ b/arch/mips/lasat/reset.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | * Reset the LASAT board. | 18 | * Reset the LASAT board. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/pm.h> | 21 | #include <linux/pm.h> |
| 23 | 22 | ||
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index 3f64277429e4..2187e63c6d88 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | * Lasat specific setup. | 23 | * Lasat specific setup. |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index e3d5aaa90f0d..6dd7ae1b7c25 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <asm/lasat/lasat.h> | 21 | #include <asm/lasat/lasat.h> |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/sysctl.h> | 24 | #include <linux/sysctl.h> |
| 26 | #include <linux/stddef.h> | 25 | #include <linux/stddef.h> |
diff --git a/arch/mips/lib-32/dump_tlb.c b/arch/mips/lib-32/dump_tlb.c index c49a925d0169..6a68deb51aae 100644 --- a/arch/mips/lib-32/dump_tlb.c +++ b/arch/mips/lib-32/dump_tlb.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle. | 4 | * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle. |
| 5 | * Copyright (C) 1999 by Silicon Graphics, Inc. | 5 | * Copyright (C) 1999 by Silicon Graphics, Inc. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/arch/mips/lib-64/dump_tlb.c b/arch/mips/lib-64/dump_tlb.c index 11a5f015f040..be8261be679b 100644 --- a/arch/mips/lib-64/dump_tlb.c +++ b/arch/mips/lib-64/dump_tlb.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle. | 4 | * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle. |
| 5 | * Copyright (C) 1999 by Silicon Graphics, Inc. | 5 | * Copyright (C) 1999 by Silicon Graphics, Inc. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index 7f9aafa4d80e..a526c62cb76a 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | * Mnemonic names for arguments to memcpy/__copy_user | 13 | * Mnemonic names for arguments to memcpy/__copy_user |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * Hack to resolve longstanding prefetch issue | 17 | * Hack to resolve longstanding prefetch issue |
diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c index 56ca0c6a7178..5b3390f64917 100644 --- a/arch/mips/math-emu/kernel_linkage.c +++ b/arch/mips/math-emu/kernel_linkage.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * manipulation primitives for the Algorithmics MIPS | 19 | * manipulation primitives for the Algorithmics MIPS |
| 20 | * FPU Emulator | 20 | * FPU Emulator |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 24 | #include <asm/processor.h> | 23 | #include <asm/processor.h> |
| 25 | #include <asm/signal.h> | 24 | #include <asm/signal.h> |
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c index 8cc9effcb832..3a7c3d28aa0d 100644 --- a/arch/mips/mips-boards/atlas/atlas_setup.c +++ b/arch/mips/mips-boards/atlas/atlas_setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * with this program; if not, write to the Free Software Foundation, Inc., | 15 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index df4e94735604..58a0fe883591 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | * PROM library initialisation code. | 20 | * PROM library initialisation code. |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c index fd492562584a..c89fcf9e9c22 100644 --- a/arch/mips/mips-boards/generic/memory.c +++ b/arch/mips/mips-boards/generic/memory.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * PROM library functions for acquiring/using memory descriptors given to | 18 | * PROM library functions for acquiring/using memory descriptors given to |
| 19 | * us from the YAMON. | 19 | * us from the YAMON. |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 24 | #include <linux/bootmem.h> | 23 | #include <linux/bootmem.h> |
diff --git a/arch/mips/mips-boards/generic/printf.c b/arch/mips/mips-boards/generic/printf.c index 2c1ab1f19fdc..1a711bd79b51 100644 --- a/arch/mips/mips-boards/generic/printf.c +++ b/arch/mips/mips-boards/generic/printf.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | * Putting things on the screen/serial line using YAMONs facilities. | 18 | * Putting things on the screen/serial line using YAMONs facilities. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/serial_reg.h> | 22 | #include <linux/serial_reg.h> |
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c index 7213c395fb6b..0996ba368b2a 100644 --- a/arch/mips/mips-boards/generic/reset.c +++ b/arch/mips/mips-boards/generic/reset.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Reset the MIPS boards. | 22 | * Reset the MIPS boards. |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/pm.h> | 25 | #include <linux/pm.h> |
| 27 | 26 | ||
| 28 | #include <asm/io.h> | 27 | #include <asm/io.h> |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index a9f6124b3a22..5e207760826b 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/kernel_stat.h> | 23 | #include <linux/kernel_stat.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index 0766e434b6bd..bc4ac6f01877 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * with this program; if not, write to the Free Software Foundation, Inc., | 15 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c index 6430f11f3a95..a856bd664879 100644 --- a/arch/mips/mips-boards/sead/sead_setup.c +++ b/arch/mips/mips-boards/sead/sead_setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | * SEAD specific setup. | 18 | * SEAD specific setup. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 23 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
diff --git a/arch/mips/mips-boards/sim/sim_IRQ.c b/arch/mips/mips-boards/sim/sim_IRQ.c index 5b84c7fe1022..ec549f3e2011 100644 --- a/arch/mips/mips-boards/sim/sim_IRQ.c +++ b/arch/mips/mips-boards/sim/sim_IRQ.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | * Interrupt exception dispatch code. | 18 | * Interrupt exception dispatch code. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #include <asm/asm.h> | 21 | #include <asm/asm.h> |
| 23 | #include <asm/mipsregs.h> | 22 | #include <asm/mipsregs.h> |
diff --git a/arch/mips/mips-boards/sim/sim_irq.S b/arch/mips/mips-boards/sim/sim_irq.S index d16cf3822076..b7444e74a6a1 100644 --- a/arch/mips/mips-boards/sim/sim_irq.S +++ b/arch/mips/mips-boards/sim/sim_irq.S | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Interrupt exception dispatch code. | 17 | * Interrupt exception dispatch code. |
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #include <asm/asm.h> | 21 | #include <asm/asm.h> |
| 23 | #include <asm/mipsregs.h> | 22 | #include <asm/mipsregs.h> |
diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c index 15a5dac4ae19..3d4a785b565a 100644 --- a/arch/mips/mips-boards/sim/sim_setup.c +++ b/arch/mips/mips-boards/sim/sim_setup.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/arch/mips/mips-boards/sim/sim_smp.c b/arch/mips/mips-boards/sim/sim_smp.c index 004070956cca..cb47863ecf10 100644 --- a/arch/mips/mips-boards/sim/sim_smp.c +++ b/arch/mips/mips-boards/sim/sim_smp.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | /* | 18 | /* |
| 19 | * Simulator Platform-specific hooks for SMP operation | 19 | * Simulator Platform-specific hooks for SMP operation |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 24 | #include <linux/cpumask.h> | 23 | #include <linux/cpumask.h> |
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c index 18b968c696d1..e7f6003357f7 100644 --- a/arch/mips/mips-boards/sim/sim_time.c +++ b/arch/mips/mips-boards/sim/sim_time.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 2 | #include <linux/config.h> | ||
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include <linux/kernel_stat.h> | 3 | #include <linux/kernel_stat.h> |
| 5 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 75d887e89739..857b726f4d41 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org) | 7 | * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org) |
| 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c index f9b129491b1e..2d71efb82ac5 100644 --- a/arch/mips/mm/c-sb1.c +++ b/arch/mips/mm/c-sb1.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
| 19 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 19 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | 22 | ||
| 24 | #include <asm/asm.h> | 23 | #include <asm/asm.h> |
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 83a56296be86..ddd3a2de1d73 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 1994 - 2003 by Ralf Baechle | 6 | * Copyright (C) 1994 - 2003 by Ralf Baechle |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index 1cf3c6006ccd..e19fbb9ee47f 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
| 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <asm/mipsregs.h> | 19 | #include <asm/mipsregs.h> |
| 21 | #include <asm/sibyte/sb1250.h> | 20 | #include <asm/sibyte/sb1250.h> |
diff --git a/arch/mips/mm/dma-coherent.c b/arch/mips/mm/dma-coherent.c index f6b3c722230c..7fa5fd16e46b 100644 --- a/arch/mips/mm/dma-coherent.c +++ b/arch/mips/mm/dma-coherent.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org> | 7 | * Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org> |
| 8 | * swiped from i386, and cloned for MIPS by Geert, polished by Ralf. | 8 | * swiped from i386, and cloned for MIPS by Geert, polished by Ralf. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/dma-mapping.h> | 11 | #include <linux/dma-mapping.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index cd4ea8474f89..2eeffe5c2a3a 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org> | 7 | * Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org> |
| 8 | * swiped from i386, and cloned for MIPS by Geert, polished by Ralf. | 8 | * swiped from i386, and cloned for MIPS by Geert, polished by Ralf. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c index 0c544375b856..99ebf3ccc222 100644 --- a/arch/mips/mm/highmem.c +++ b/arch/mips/mm/highmem.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/highmem.h> | 2 | #include <linux/highmem.h> |
| 4 | #include <asm/tlbflush.h> | 3 | #include <asm/tlbflush.h> |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 33f6e1cdfd5b..802bdd32aa2b 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com | 8 | * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com |
| 9 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. | 9 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/signal.h> | 13 | #include <linux/signal.h> |
diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c index 148c65b9cd8b..fc3c7878fb45 100644 --- a/arch/mips/mm/pg-sb1.c +++ b/arch/mips/mm/pg-sb1.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * along with this program; if not, write to the Free Software | 22 | * along with this program; if not, write to the Free Software |
| 23 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 23 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/smp.h> | 27 | #include <linux/smp.h> |
diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c index 4a3c4919e314..4bdaa05f485b 100644 --- a/arch/mips/mm/pgtable-32.c +++ b/arch/mips/mm/pgtable-32.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2003 by Ralf Baechle | 6 | * Copyright (C) 2003 by Ralf Baechle |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/bootmem.h> | 10 | #include <linux/bootmem.h> |
diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c index 3fe94202da8c..792c6eb44232 100644 --- a/arch/mips/mm/pgtable.c +++ b/arch/mips/mm/pgtable.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/mm.h> | 2 | #include <linux/mm.h> |
| 4 | #include <linux/swap.h> | 3 | #include <linux/swap.h> |
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c index 965cb4c4359d..2cde1b772443 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Carsten Langgaard, carstenl@mips.com | 8 | * Carsten Langgaard, carstenl@mips.com |
| 9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. | 9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c index 1bfb09198ce3..266a47d65eed 100644 --- a/arch/mips/mm/tlb-r8k.c +++ b/arch/mips/mm/tlb-r8k.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Carsten Langgaard, carstenl@mips.com | 8 | * Carsten Langgaard, carstenl@mips.com |
| 9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. | 9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 54507be2ab5b..e1a8139fc8fb 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #include <stdarg.h> | 22 | #include <stdarg.h> |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/types.h> | 26 | #include <linux/types.h> |
diff --git a/arch/mips/momentum/jaguar_atx/dbg_io.c b/arch/mips/momentum/jaguar_atx/dbg_io.c index d7dea0a136aa..b85a6521f72d 100644 --- a/arch/mips/momentum/jaguar_atx/dbg_io.c +++ b/arch/mips/momentum/jaguar_atx/dbg_io.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #if defined(CONFIG_REMOTE_DEBUG) | 2 | #if defined(CONFIG_REMOTE_DEBUG) |
| 4 | 3 | ||
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c index 1cadaa92946a..3d2712929293 100644 --- a/arch/mips/momentum/jaguar_atx/prom.c +++ b/arch/mips/momentum/jaguar_atx/prom.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | * Added changes for SMP - Manish Lachwani (lachwani@pmc-sierra.com) | 17 | * Added changes for SMP - Manish Lachwani (lachwani@pmc-sierra.com) |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
diff --git a/arch/mips/momentum/jaguar_atx/reset.c b/arch/mips/momentum/jaguar_atx/reset.c index ce9fb2e3d952..c73b0897dc52 100644 --- a/arch/mips/momentum/jaguar_atx/reset.c +++ b/arch/mips/momentum/jaguar_atx/reset.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Louis Hamilton, Red Hat, Inc. | 14 | * Louis Hamilton, Red Hat, Inc. |
| 15 | * hamilton@redhat.com [MIPS64 modifications] | 15 | * hamilton@redhat.com [MIPS64 modifications] |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index d0419480b097..b08e6a0456c1 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | * with this program; if not, write to the Free Software Foundation, Inc., | 39 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 40 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 40 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 41 | */ | 41 | */ |
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/bcd.h> | 42 | #include <linux/bcd.h> |
| 44 | #include <linux/init.h> | 43 | #include <linux/init.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
diff --git a/arch/mips/momentum/ocelot_3/prom.c b/arch/mips/momentum/ocelot_3/prom.c index 9803daa2a792..296d945bc248 100644 --- a/arch/mips/momentum/ocelot_3/prom.c +++ b/arch/mips/momentum/ocelot_3/prom.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Author: Manish Lachwani, mlachwani@mvista.com | 21 | * Author: Manish Lachwani, mlachwani@mvista.com |
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
| 27 | #include <linux/mv643xx.h> | 26 | #include <linux/mv643xx.h> |
diff --git a/arch/mips/momentum/ocelot_c/dbg_io.c b/arch/mips/momentum/ocelot_c/dbg_io.c index f0a6a38fcf4d..2128684584f5 100644 --- a/arch/mips/momentum/ocelot_c/dbg_io.c +++ b/arch/mips/momentum/ocelot_c/dbg_io.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #ifdef CONFIG_KGDB | 2 | #ifdef CONFIG_KGDB |
| 4 | 3 | ||
diff --git a/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h b/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h index 97fb77dad723..7228cd19e5ea 100644 --- a/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h +++ b/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #ifndef __OCELOT_C_FPGA_H__ | 30 | #ifndef __OCELOT_C_FPGA_H__ |
| 31 | #define __OCELOT_C_FPGA_H__ | 31 | #define __OCELOT_C_FPGA_H__ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | 33 | ||
| 35 | #ifdef CONFIG_64BIT | 34 | #ifdef CONFIG_64BIT |
| 36 | #define OCELOT_C_CS0_ADDR (0xfffffffffc000000) | 35 | #define OCELOT_C_CS0_ADDR (0xfffffffffc000000) |
diff --git a/arch/mips/momentum/ocelot_c/prom.c b/arch/mips/momentum/ocelot_c/prom.c index e92364482c7b..4c50a147f429 100644 --- a/arch/mips/momentum/ocelot_c/prom.c +++ b/arch/mips/momentum/ocelot_c/prom.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Free Software Foundation; either version 2 of the License, or (at your | 14 | * Free Software Foundation; either version 2 of the License, or (at your |
| 15 | * option) any later version. | 15 | * option) any later version. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
diff --git a/arch/mips/momentum/ocelot_c/reset.c b/arch/mips/momentum/ocelot_c/reset.c index 9dcd154c7767..3fdcb64ff1e6 100644 --- a/arch/mips/momentum/ocelot_c/reset.c +++ b/arch/mips/momentum/ocelot_c/reset.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Louis Hamilton, Red Hat, Inc. | 14 | * Louis Hamilton, Red Hat, Inc. |
| 15 | * hamilton@redhat.com [MIPS64 modifications] | 15 | * hamilton@redhat.com [MIPS64 modifications] |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c index a0ee006d75cf..6a4519936ee9 100644 --- a/arch/mips/momentum/ocelot_c/setup.c +++ b/arch/mips/momentum/ocelot_c/setup.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 40 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 41 | * | 41 | * |
| 42 | */ | 42 | */ |
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/bcd.h> | 43 | #include <linux/bcd.h> |
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
diff --git a/arch/mips/momentum/ocelot_g/dbg_io.c b/arch/mips/momentum/ocelot_g/dbg_io.c index f0a6a38fcf4d..2128684584f5 100644 --- a/arch/mips/momentum/ocelot_g/dbg_io.c +++ b/arch/mips/momentum/ocelot_g/dbg_io.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #ifdef CONFIG_KGDB | 2 | #ifdef CONFIG_KGDB |
| 4 | 3 | ||
diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c index 8bd9b844fa9e..047457f3b97a 100644 --- a/arch/mips/momentum/ocelot_g/gt-irq.c +++ b/arch/mips/momentum/ocelot_g/gt-irq.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Free Software Foundation; either version 2 of the License, or (at your | 11 | * Free Software Foundation; either version 2 of the License, or (at your |
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/mips/momentum/ocelot_g/prom.c b/arch/mips/momentum/ocelot_g/prom.c index 6b4f577c2757..6509a9c9863c 100644 --- a/arch/mips/momentum/ocelot_g/prom.c +++ b/arch/mips/momentum/ocelot_g/prom.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Free Software Foundation; either version 2 of the License, or (at your | 11 | * Free Software Foundation; either version 2 of the License, or (at your |
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c index 39da02b4e076..c580b1de33bc 100644 --- a/arch/mips/momentum/ocelot_g/setup.c +++ b/arch/mips/momentum/ocelot_g/setup.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 37 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 38 | * | 38 | * |
| 39 | */ | 39 | */ |
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 42 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 43 | #include <linux/types.h> | 42 | #include <linux/types.h> |
diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c index 87920b245931..439510af3037 100644 --- a/arch/mips/pci/fixup-atlas.c +++ b/arch/mips/pci/fixup-atlas.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * with this program; if not, write to the Free Software Foundation, Inc., | 16 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 17 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 17 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 22 | 21 | ||
diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c index a8a47b494b23..8e01d0c1b76b 100644 --- a/arch/mips/pci/fixup-vr4133.c +++ b/arch/mips/pci/fixup-vr4133.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Author: Manish Lachwani (mlachwani@mvista.com) | 15 | * Author: Manish Lachwani (mlachwani@mvista.com) |
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 21 | 20 | ||
diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c index be1420126c42..0c0c1e6519f9 100644 --- a/arch/mips/pci/ops-au1000.c +++ b/arch/mips/pci/ops-au1000.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * with this program; if not, write to the Free Software Foundation, Inc., | 28 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 29 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 29 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 30 | */ | 30 | */ |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 33 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index f4ef1a35ca18..f6774f54cd3c 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * | 32 | * |
| 33 | * XXX: AT THIS TIME, ONLY the NATIVE PCI-X INTERFACE IS SUPPORTED. | 33 | * XXX: AT THIS TIME, ONLY the NATIVE PCI-X INTERFACE IS SUPPORTED. |
| 34 | */ | 34 | */ |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/types.h> | 35 | #include <linux/types.h> |
| 37 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c index a3eebe5890a7..ba2e34b09231 100644 --- a/arch/mips/pci/pci-bcm1480ht.c +++ b/arch/mips/pci/pci-bcm1480ht.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * problem. | 31 | * problem. |
| 32 | * | 32 | * |
| 33 | */ | 33 | */ |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 36 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 37 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
diff --git a/arch/mips/pci/pci-ip32.c b/arch/mips/pci/pci-ip32.c index 180af89bcb1e..17c7932cf0ae 100644 --- a/arch/mips/pci/pci-ip32.c +++ b/arch/mips/pci/pci-ip32.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 2000, 2001 Keith M Wesolowski | 6 | * Copyright (C) 2000, 2001 Keith M Wesolowski |
| 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index 7cca3bde59b2..80f5e8c4bcd4 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * kernel mapped memory. Hopefully neither of these should be a huge | 30 | * kernel mapped memory. Hopefully neither of these should be a huge |
| 31 | * problem. | 31 | * problem. |
| 32 | */ | 32 | */ |
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 35 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index ba66f8c9bd4e..5ace368657ad 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 12 | #include <linux/bootmem.h> | 11 | #include <linux/bootmem.h> |
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c index 8f18764a2359..388a4df73040 100644 --- a/arch/mips/philips/pnx8550/common/int.c +++ b/arch/mips/philips/pnx8550/common/int.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 23 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/irq.h> | 27 | #include <linux/irq.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c index 0e791f4f6ea3..8ac81a9dc293 100644 --- a/arch/mips/philips/pnx8550/common/setup.c +++ b/arch/mips/philips/pnx8550/common/setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 18 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 18 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 23 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
diff --git a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c index fb523ebcafa8..1f7c999eb7c6 100644 --- a/arch/mips/pmc-sierra/yosemite/ht.c +++ b/arch/mips/pmc-sierra/yosemite/ht.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c index a1f524fc4c10..b91d0aa3b7ed 100644 --- a/arch/mips/pmc-sierra/yosemite/irq.c +++ b/arch/mips/pmc-sierra/yosemite/irq.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | * Second level Interrupt handlers for the PMC-Sierra Titan/Yosemite board | 27 | * Second level Interrupt handlers for the PMC-Sierra Titan/Yosemite board |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/kernel_stat.h> | 31 | #include <linux/kernel_stat.h> |
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c index 165275c00cbb..9fe4973377c3 100644 --- a/arch/mips/pmc-sierra/yosemite/prom.c +++ b/arch/mips/pmc-sierra/yosemite/prom.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Author: Manish Lachwani (lachwani@pmc-sierra.com) | 8 | * Author: Manish Lachwani (lachwani@pmc-sierra.com) |
| 9 | * Copyright (C) 2004 Ralf Baechle | 9 | * Copyright (C) 2004 Ralf Baechle |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c index 989167b49ce9..ce8e4a7869b0 100644 --- a/arch/mips/sgi-ip22/ip22-eisa.c +++ b/arch/mips/sgi-ip22/ip22-eisa.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * - Fix more bugs. | 19 | * - Fix more bugs. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/eisa.h> | 22 | #include <linux/eisa.h> |
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index 18906af69691..aee567dc372a 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * - Interrupt handling fixes | 9 | * - Interrupt handling fixes |
| 10 | * Copyright (C) 2001, 2003 Ladislav Michl (ladis@linux-mips.org) | 10 | * Copyright (C) 2001, 2003 Ladislav Michl (ladis@linux-mips.org) |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c index d7138906eb10..25097ecc9baa 100644 --- a/arch/mips/sgi-ip22/ip22-setup.c +++ b/arch/mips/sgi-ip22/ip22-setup.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) |
| 5 | * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) | 5 | * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/ds1286.h> | 7 | #include <linux/ds1286.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c index a6b490e99709..9094baf31d0e 100644 --- a/arch/mips/sgi-ip27/ip27-init.c +++ b/arch/mips/sgi-ip27/ip27-init.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 2000 - 2001 by Kanoj Sarcar (kanoj@sgi.com) | 6 | * Copyright (C) 2000 - 2001 by Kanoj Sarcar (kanoj@sgi.com) |
| 7 | * Copyright (C) 2000 - 2001 by Silicon Graphics, Inc. | 7 | * Copyright (C) 2000 - 2001 by Silicon Graphics, Inc. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index 869566c360ae..a94e4c785805 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #undef DEBUG | 9 | #undef DEBUG |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 12 | #include <linux/irq.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c index 41c3f405e00c..d777b7d1a9fe 100644 --- a/arch/mips/sgi-ip27/ip27-klnuma.c +++ b/arch/mips/sgi-ip27/ip27-klnuma.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright 2000 - 2001 Silicon Graphics, Inc. | 3 | * Copyright 2000 - 2001 Silicon Graphics, Inc. |
| 4 | * Copyright 2000 - 2001 Kanoj Sarcar (kanoj@sgi.com) | 4 | * Copyright 2000 - 2001 Kanoj Sarcar (kanoj@sgi.com) |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/mmzone.h> | 7 | #include <linux/mmzone.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index 6c00dce9f73f..efe6971fc800 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * On SGI IP27 the ARC memory configuration data is completly bogus but | 10 | * On SGI IP27 the ARC memory configuration data is completly bogus but |
| 11 | * alternate easier to use mechanisms are available. | 11 | * alternate easier to use mechanisms are available. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/mips/sgi-ip27/ip27-reset.c b/arch/mips/sgi-ip27/ip27-reset.c index 4322db57d3c1..c17076108d47 100644 --- a/arch/mips/sgi-ip27/ip27-reset.c +++ b/arch/mips/sgi-ip27/ip27-reset.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1997, 1998, 1999, 2000, 06 by Ralf Baechle | 8 | * Copyright (C) 1997, 1998, 1999, 2000, 06 by Ralf Baechle |
| 9 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 9 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/timer.h> | 13 | #include <linux/timer.h> |
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c index acbdad06fac1..240a2f981d08 100644 --- a/arch/mips/sgi-ip32/ip32-setup.c +++ b/arch/mips/sgi-ip32/ip32-setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2000 Harald Koerfgen | 8 | * Copyright (C) 2000 Harald Koerfgen |
| 9 | * Copyright (C) 2002, 2003, 2005 Ilya A. Volynets | 9 | * Copyright (C) 2002, 2003, 2005 Ilya A. Volynets |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/console.h> | 11 | #include <linux/console.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index 610df40cb820..29d3bbb5847d 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
| 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/linkage.h> | 20 | #include <linux/linkage.h> |
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c index d90a0b87874c..8236d0c48542 100644 --- a/arch/mips/sibyte/bcm1480/setup.c +++ b/arch/mips/sibyte/bcm1480/setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
| 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/reboot.h> | 19 | #include <linux/reboot.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
diff --git a/arch/mips/sibyte/bcm1480/time.c b/arch/mips/sibyte/bcm1480/time.c index efaf83efd2e4..7e088f6c4a86 100644 --- a/arch/mips/sibyte/bcm1480/time.c +++ b/arch/mips/sibyte/bcm1480/time.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * code to do general bookkeeping (e.g. update jiffies, run | 25 | * code to do general bookkeeping (e.g. update jiffies, run |
| 26 | * bottom halves, etc.) | 26 | * bottom halves, etc.) |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 30 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 31 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c index 7721100d0275..c6ec748175b0 100644 --- a/arch/mips/sibyte/cfe/console.c +++ b/arch/mips/sibyte/cfe/console.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 3 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 4 | #include <linux/console.h> | 3 | #include <linux/console.h> |
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c index ea308029450e..6e8952da6e2a 100644 --- a/arch/mips/sibyte/cfe/setup.c +++ b/arch/mips/sibyte/cfe/setup.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/linkage.h> | 21 | #include <linux/linkage.h> |
diff --git a/arch/mips/sibyte/sb1250/bus_watcher.c b/arch/mips/sibyte/sb1250/bus_watcher.c index 482dee054e68..bb90649fbc48 100644 --- a/arch/mips/sibyte/sb1250/bus_watcher.c +++ b/arch/mips/sibyte/sb1250/bus_watcher.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * /proc/bus_watcher if PROC_FS is on. | 25 | * /proc/bus_watcher if PROC_FS is on. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index fcc61940f1ff..1d280aabcf6a 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
| 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/linkage.h> | 20 | #include <linux/linkage.h> |
diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c index 742043f8d755..3c33a4517bc3 100644 --- a/arch/mips/sibyte/sb1250/prom.c +++ b/arch/mips/sibyte/sb1250/prom.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c index fde4751c84fe..d0ee1d5b8223 100644 --- a/arch/mips/sibyte/sb1250/setup.c +++ b/arch/mips/sibyte/sb1250/setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
| 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/reboot.h> | 20 | #include <linux/reboot.h> |
diff --git a/arch/mips/sibyte/sb1250/time.c b/arch/mips/sibyte/sb1250/time.c index 1588f6debd90..4b669dc86ef4 100644 --- a/arch/mips/sibyte/sb1250/time.c +++ b/arch/mips/sibyte/sb1250/time.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * code to do general bookkeeping (e.g. update jiffies, run | 25 | * code to do general bookkeeping (e.g. update jiffies, run |
| 26 | * bottom halves, etc.) | 26 | * bottom halves, etc.) |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 30 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 31 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index f9e694988cdf..a9a6dbc06849 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Setup code for the SWARM board | 21 | * Setup code for the SWARM board |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 26 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 27 | #include <linux/bootmem.h> | 26 | #include <linux/bootmem.h> |
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index a050bb6ae704..870486d6cd75 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org) | 8 | * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org) |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/eisa.h> | 10 | #include <linux/eisa.h> |
| 12 | #include <linux/hdreg.h> | 11 | #include <linux/hdreg.h> |
| 13 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c index a42be00483e6..ae9d5653a863 100644 --- a/arch/mips/tx4927/common/tx4927_irq.c +++ b/arch/mips/tx4927/common/tx4927_irq.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * with this program; if not, write to the Free Software Foundation, Inc., | 23 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/kernel_stat.h> | 28 | #include <linux/kernel_stat.h> |
diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c index 81a5acfe8c42..64a1b394b252 100644 --- a/arch/mips/tx4927/common/tx4927_setup.c +++ b/arch/mips/tx4927/common/tx4927_setup.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * with this program; if not, write to the Free Software Foundation, Inc., | 24 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 25 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 25 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 26 | */ | 26 | */ |
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/kernel_stat.h> | 29 | #include <linux/kernel_stat.h> |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index c67978b6dae4..ee943cb1328c 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |||
| @@ -111,7 +111,6 @@ SuperIO/PS2/Mouse, using INTR via ISA IRQ12 (mouse not currently supported) | |||
| 111 | JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthBridge, JP4, JP5, JP6 | 111 | JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthBridge, JP4, JP5, JP6 |
| 112 | */ | 112 | */ |
| 113 | 113 | ||
| 114 | #include <linux/config.h> | ||
| 115 | #include <linux/init.h> | 114 | #include <linux/init.h> |
| 116 | #include <linux/kernel.h> | 115 | #include <linux/kernel.h> |
| 117 | #include <linux/types.h> | 116 | #include <linux/types.h> |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index 6dcf077f61a0..f0d70c476005 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | * with this program; if not, write to the Free Software Foundation, Inc., | 42 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 43 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 43 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 44 | */ | 44 | */ |
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/init.h> | 45 | #include <linux/init.h> |
| 47 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| 48 | #include <linux/types.h> | 47 | #include <linux/types.h> |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c index 7df8b32ba265..e44daf30a7c1 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/prom.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) | 12 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c index 96e833cd4c14..66163ba452c8 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) | 12 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/ioport.h> | 16 | #include <linux/ioport.h> |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c b/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c index 951a208ee9b3..89596e62f909 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) | 10 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 15 | #include <linux/proc_fs.h> | 14 | #include <linux/proc_fs.h> |
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c index be590edb0b83..ae1af6b21c45 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/init.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/init.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Support for NEC-CMBVR4133 in 2.6 | 15 | * Support for NEC-CMBVR4133 in 2.6 |
| 16 | * Manish Lachwani (mlachwani@mvista.com) | 16 | * Manish Lachwani (mlachwani@mvista.com) |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifdef CONFIG_ROCKHOPPER | 19 | #ifdef CONFIG_ROCKHOPPER |
| 21 | #include <asm/io.h> | 20 | #include <asm/io.h> |
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c index 1f6b24ef8695..f45caccedc07 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Support for NEC-CMBVR4133 in 2.6 | 14 | * Support for NEC-CMBVR4133 in 2.6 |
| 15 | * Author: Manish Lachwani (mlachwani@mvista.com) | 15 | * Author: Manish Lachwani (mlachwani@mvista.com) |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/serial.h> | 19 | #include <linux/serial.h> |
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c index 53272a5c3cbe..b20b93b2b95e 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Support for CMBVR4133 board in 2.6 | 14 | * Support for CMBVR4133 board in 2.6 |
| 15 | * Author: Manish Lachwani (mlachwani@mvista.com) | 15 | * Author: Manish Lachwani (mlachwani@mvista.com) |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/ide.h> | 18 | #include <linux/ide.h> |
| 20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 630730c32a5a..95c1b8ec4289 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <asm/asm-offsets.h> | 25 | #include <asm/asm-offsets.h> |
| 27 | 26 | ||
| 28 | /* we have the following possibilities to act on an interruption: | 27 | /* we have the following possibilities to act on an interruption: |
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 82fe6ba29727..52761d96f991 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 23 | */ | 23 | */ |
| 24 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index f600556414d1..e81c9937d10a 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | .level 2.0 | 40 | .level 2.0 |
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | 43 | ||
| 45 | #include <asm/psw.h> | 44 | #include <asm/psw.h> |
| 46 | #include <asm/assembly.h> | 45 | #include <asm/assembly.h> |
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index fc107add627c..6d57553d8ef8 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/syscalls.h> | 29 | #include <linux/syscalls.h> |
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c index 7d6967ee367c..d3b8fc52dfc1 100644 --- a/arch/parisc/kernel/pci.c +++ b/arch/parisc/kernel/pci.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1999-2001 Hewlett-Packard Company | 9 | * Copyright (C) 1999-2001 Hewlett-Packard Company |
| 10 | * Copyright (C) 1999-2001 Grant Grundler | 10 | * Copyright (C) 1999-2001 Grant Grundler |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/eisa.h> | 12 | #include <linux/eisa.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c index 215d78c87bc5..ce78f412ff2e 100644 --- a/arch/parisc/kernel/pdc_cons.c +++ b/arch/parisc/kernel/pdc_cons.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #define EARLY_BOOTUP_DEBUG | 44 | #define EARLY_BOOTUP_DEBUG |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
| 49 | #include <linux/console.h> | 48 | #include <linux/console.h> |
| 50 | #include <linux/string.h> | 49 | #include <linux/string.h> |
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S index adb3c6444910..5e7bb90e7e08 100644 --- a/arch/parisc/kernel/perf_asm.S +++ b/arch/parisc/kernel/perf_asm.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <asm/assembly.h> | 22 | #include <asm/assembly.h> |
| 24 | 23 | ||
| 25 | #ifdef CONFIG_64BIT | 24 | #ifdef CONFIG_64BIT |
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index 6df9f62cecb5..99d7fca93104 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S index 453d01a9f971..789061f6ceb4 100644 --- a/arch/parisc/kernel/real2.S +++ b/arch/parisc/kernel/real2.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 2000 Hewlett Packard (Paul Bame bame@puffin.external.hp.com) | 7 | * Copyright (C) 2000 Hewlett Packard (Paul Bame bame@puffin.external.hp.com) |
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/psw.h> | 11 | #include <asm/psw.h> |
| 13 | #include <asm/assembly.h> | 12 | #include <asm/assembly.h> |
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 278f4b9f6a38..3c7a3faf78ed 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/initrd.h> | 31 | #include <linux/initrd.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index d6ac1c60a471..98e40959a564 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | */ | 18 | */ |
| 19 | #undef ENTRY_SYS_CPUS /* syscall support for iCOD-like functionality */ | 19 | #undef ENTRY_SYS_CPUS /* syscall support for iCOD-like functionality */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index d286f68a3d3a..b74869803081 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * environment. Based heavily on sys_ia32.c and sys_sparc32.c. | 9 | * environment. Based heavily on sys_ia32.c and sys_sparc32.c. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/compat.h> | 12 | #include <linux/compat.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index eb35e1c0bb53..5facc9bff4ef 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 1998-12-20 Updated NTP code according to technical memorandum Jan '96 | 10 | * 1998-12-20 Updated NTP code according to technical memorandum Jan '96 |
| 11 | * "A Kernel Model for Precision Timekeeping" by Dave Mills | 11 | * "A Kernel Model for Precision Timekeeping" by Dave Mills |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 348344a84bf7..77b28cb8aca6 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * state in 'asm.s'. | 10 | * state in 'asm.s'. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index 92328fbddb3e..bd2230d6a2a6 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <asm/uaccess.h> | 25 | #include <asm/uaccess.h> |
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c index cc1c1afc3187..920bdbf8404f 100644 --- a/arch/parisc/kernel/unwind.c +++ b/arch/parisc/kernel/unwind.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * understand what is happening here | 8 | * understand what is happening here |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 94dcc03a28ed..9989495a51dd 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * along with this program; if not, write to the Free Software | 23 | * along with this program; if not, write to the Free Software |
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <asm-generic/vmlinux.lds.h> | 26 | #include <asm-generic/vmlinux.lds.h> |
| 28 | /* needed for the processor specific cache alignment size */ | 27 | /* needed for the processor specific cache alignment size */ |
| 29 | #include <asm/cache.h> | 28 | #include <asm/cache.h> |
diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c index 90f400b10282..f352666b5b2f 100644 --- a/arch/parisc/lib/bitops.c +++ b/arch/parisc/lib/bitops.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright 2000 Grant Grundler (grundler@cup.hp.com) | 6 | * Copyright 2000 Grant Grundler (grundler@cup.hp.com) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
| 12 | #include <asm/system.h> | 11 | #include <asm/system.h> |
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index e0661c2978ed..ecce3d35401f 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | * Fixup routines for kernel exception handling. | 20 | * Fixup routines for kernel exception handling. |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <asm/asm-offsets.h> | 22 | #include <asm/asm-offsets.h> |
| 24 | #include <asm/assembly.h> | 23 | #include <asm/assembly.h> |
| 25 | #include <asm/errno.h> | 24 | #include <asm/errno.h> |
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index b7098035321f..5575e41f9d60 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | */ | 53 | */ |
| 54 | 54 | ||
| 55 | #ifdef __KERNEL__ | 55 | #ifdef __KERNEL__ |
| 56 | #include <linux/config.h> | ||
| 57 | #include <linux/module.h> | 56 | #include <linux/module.h> |
| 58 | #include <linux/compiler.h> | 57 | #include <linux/compiler.h> |
| 59 | #include <asm/uaccess.h> | 58 | #include <asm/uaccess.h> |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 631712562656..f2b96f1e0da7 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| @@ -28,6 +27,7 @@ | |||
| 28 | #include <asm/tlb.h> | 27 | #include <asm/tlb.h> |
| 29 | #include <asm/pdc_chassis.h> | 28 | #include <asm/pdc_chassis.h> |
| 30 | #include <asm/mmzone.h> | 29 | #include <asm/mmzone.h> |
| 30 | #include <asm/sections.h> | ||
| 31 | 31 | ||
| 32 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | 32 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
| 33 | 33 | ||
| @@ -418,11 +418,10 @@ void free_initmem(void) | |||
| 418 | #ifdef CONFIG_DEBUG_RODATA | 418 | #ifdef CONFIG_DEBUG_RODATA |
| 419 | void mark_rodata_ro(void) | 419 | void mark_rodata_ro(void) |
| 420 | { | 420 | { |
| 421 | extern char __start_rodata, __end_rodata; | ||
| 422 | /* rodata memory was already mapped with KERNEL_RO access rights by | 421 | /* rodata memory was already mapped with KERNEL_RO access rights by |
| 423 | pagetable_init() and map_pages(). No need to do additional stuff here */ | 422 | pagetable_init() and map_pages(). No need to do additional stuff here */ |
| 424 | printk (KERN_INFO "Write protecting the kernel read-only data: %luk\n", | 423 | printk (KERN_INFO "Write protecting the kernel read-only data: %luk\n", |
| 425 | (unsigned long)(&__end_rodata - &__start_rodata) >> 10); | 424 | (unsigned long)(__end_rodata - __start_rodata) >> 10); |
| 426 | } | 425 | } |
| 427 | #endif | 426 | #endif |
| 428 | 427 | ||
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index ff2940548929..7ee84968087b 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or (at your option) any later version. | 13 | * 2 of the License, or (at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/signal.h> | 16 | #include <linux/signal.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/kernel/binfmt_elf32.c b/arch/powerpc/kernel/binfmt_elf32.c index 8ad6b0f33651..5cb58757e1b1 100644 --- a/arch/powerpc/kernel/binfmt_elf32.c +++ b/arch/powerpc/kernel/binfmt_elf32.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #include <asm/processor.h> | 20 | #include <asm/processor.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/elfcore.h> | 22 | #include <linux/elfcore.h> |
| 24 | #include <linux/compat.h> | 23 | #include <linux/compat.h> |
| 25 | 24 | ||
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c index 6223d39177cb..a6920919d68e 100644 --- a/arch/powerpc/kernel/btext.c +++ b/arch/powerpc/kernel/btext.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Benjamin Herrenschmidt <benh@kernel.crashing.org> | 4 | * Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 8 | #include <linux/string.h> | 7 | #include <linux/string.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S index 365381fcb27c..8b4a4ee85eca 100644 --- a/arch/powerpc/kernel/cpu_setup_6xx.S +++ b/arch/powerpc/kernel/cpu_setup_6xx.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 15 | #include <asm/cputable.h> | 14 | #include <asm/cputable.h> |
diff --git a/arch/powerpc/kernel/cpu_setup_power4.S b/arch/powerpc/kernel/cpu_setup_power4.S index 1fc863261003..f69af2c5d7b3 100644 --- a/arch/powerpc/kernel/cpu_setup_power4.S +++ b/arch/powerpc/kernel/cpu_setup_power4.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 15 | #include <asm/cputable.h> | 14 | #include <asm/cputable.h> |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index abf7d42a8b07..272e43622fd6 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 8866fd26c6b9..c03e829fee3c 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 24 | #include <linux/sys.h> | 23 | #include <linux/sys.h> |
| 25 | #include <linux/threads.h> | 24 | #include <linux/threads.h> |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 221062c960c9..54d9f5cdaab4 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * 2 of the License, or (at your option) any later version. | 18 | * 2 of the License, or (at your option) any later version. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 23 | #include <asm/unistd.h> | 22 | #include <asm/unistd.h> |
| 24 | #include <asm/processor.h> | 23 | #include <asm/processor.h> |
diff --git a/arch/powerpc/kernel/firmware.c b/arch/powerpc/kernel/firmware.c index 0bfe9061720a..1679a70bbcad 100644 --- a/arch/powerpc/kernel/firmware.c +++ b/arch/powerpc/kernel/firmware.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or (at your option) any later version. | 13 | * 2 of the License, or (at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | 17 | ||
| 19 | #include <asm/firmware.h> | 18 | #include <asm/firmware.h> |
diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S index 01f71200c603..7e2c9fe44ac1 100644 --- a/arch/powerpc/kernel/fpu.S +++ b/arch/powerpc/kernel/fpu.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/reg.h> | 12 | #include <asm/reg.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 15 | #include <asm/mmu.h> | 14 | #include <asm/mmu.h> |
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index b25b25902d15..d88e182e40b3 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <asm/reg.h> | 25 | #include <asm/reg.h> |
| 27 | #include <asm/page.h> | 26 | #include <asm/page.h> |
| 28 | #include <asm/mmu.h> | 27 | #include <asm/mmu.h> |
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index 47c7fa148c9a..accb39d49911 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * option) any later version. | 28 | * option) any later version. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <asm/processor.h> | 31 | #include <asm/processor.h> |
| 33 | #include <asm/page.h> | 32 | #include <asm/page.h> |
| 34 | #include <asm/mmu.h> | 33 | #include <asm/mmu.h> |
diff --git a/arch/powerpc/kernel/head_4xx.S b/arch/powerpc/kernel/head_4xx.S index 2590e97f5539..adc7f8097cd4 100644 --- a/arch/powerpc/kernel/head_4xx.S +++ b/arch/powerpc/kernel/head_4xx.S | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
| 36 | #include <asm/page.h> | 35 | #include <asm/page.h> |
| 37 | #include <asm/mmu.h> | 36 | #include <asm/mmu.h> |
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 8cfd040d1f50..e16eb2a33173 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * 2 of the License, or (at your option) any later version. | 21 | * 2 of the License, or (at your option) any later version. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/threads.h> | 24 | #include <linux/threads.h> |
| 26 | #include <asm/reg.h> | 25 | #include <asm/reg.h> |
| 27 | #include <asm/page.h> | 26 | #include <asm/page.h> |
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 28941f5ce673..901be47a02a9 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
| 24 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 25 | #include <asm/mmu.h> | 24 | #include <asm/mmu.h> |
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index dd86bbed7627..66877bdfe0b7 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * option) any later version. | 30 | * option) any later version. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/threads.h> | 33 | #include <linux/threads.h> |
| 35 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
| 36 | #include <asm/page.h> | 35 | #include <asm/page.h> |
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index d491052c8e0c..4180c3998b39 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * 2 of the License, or (at your option) any later version. | 19 | * 2 of the License, or (at your option) any later version. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/smp.h> | 24 | #include <linux/smp.h> |
diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S index b45fa0e37212..01bcd52bbf8e 100644 --- a/arch/powerpc/kernel/idle_6xx.S +++ b/arch/powerpc/kernel/idle_6xx.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or (at your option) any later version. | 13 | * 2 of the License, or (at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
| 18 | #include <asm/reg.h> | 17 | #include <asm/reg.h> |
| 19 | #include <asm/page.h> | 18 | #include <asm/page.h> |
diff --git a/arch/powerpc/kernel/idle_power4.S b/arch/powerpc/kernel/idle_power4.S index d85c7c938eed..30de81da7b40 100644 --- a/arch/powerpc/kernel/idle_power4.S +++ b/arch/powerpc/kernel/idle_power4.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * 2 of the License, or (at your option) any later version. | 7 | * 2 of the License, or (at your option) any later version. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/threads.h> | 10 | #include <linux/threads.h> |
| 12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index 3d677ac99659..ba0694071728 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 24f6050aa4ab..525baab45d2d 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/ioport.h> | 38 | #include <linux/ioport.h> |
| 39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 40 | #include <linux/timex.h> | 40 | #include <linux/timex.h> |
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
| 43 | #include <linux/slab.h> | 42 | #include <linux/slab.h> |
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index f78866367b70..9f0898c89759 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * for PPC64 | 26 | * for PPC64 |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/kprobes.h> | 29 | #include <linux/kprobes.h> |
| 31 | #include <linux/ptrace.h> | 30 | #include <linux/ptrace.h> |
| 32 | #include <linux/preempt.h> | 31 | #include <linux/preempt.h> |
diff --git a/arch/powerpc/kernel/l2cr_6xx.S b/arch/powerpc/kernel/l2cr_6xx.S index d7f4e982b539..858f28ac8a06 100644 --- a/arch/powerpc/kernel/l2cr_6xx.S +++ b/arch/powerpc/kernel/l2cr_6xx.S | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | Author: Terry Greeniaus (tgree@phys.ualberta.ca) | 40 | Author: Terry Greeniaus (tgree@phys.ualberta.ca) |
| 41 | Please e-mail updates to this file to me, thanks! | 41 | Please e-mail updates to this file to me, thanks! |
| 42 | */ | 42 | */ |
| 43 | #include <linux/config.h> | ||
| 44 | #include <asm/processor.h> | 43 | #include <asm/processor.h> |
| 45 | #include <asm/cputable.h> | 44 | #include <asm/cputable.h> |
| 46 | #include <asm/ppc_asm.h> | 45 | #include <asm/ppc_asm.h> |
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 3a9b78d03542..4cf0b971976b 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/serial.h> | 2 | #include <linux/serial.h> |
| 4 | #include <linux/serial_8250.h> | 3 | #include <linux/serial_8250.h> |
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c index 73edc3c16137..23f34daa044a 100644 --- a/arch/powerpc/kernel/lparcfg.c +++ b/arch/powerpc/kernel/lparcfg.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * keyword - value pairs that specify the configuration of the partition. | 18 | * keyword - value pairs that specify the configuration of the partition. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index c74774e2175d..58758d883361 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/sys.h> | 19 | #include <linux/sys.h> |
| 21 | #include <asm/unistd.h> | 20 | #include <asm/unistd.h> |
| 22 | #include <asm/errno.h> | 21 | #include <asm/errno.h> |
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index 580891cb8ccb..0c3c70d115c6 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/sys.h> | 17 | #include <linux/sys.h> |
| 19 | #include <asm/unistd.h> | 18 | #include <asm/unistd.h> |
| 20 | #include <asm/errno.h> | 19 | #include <asm/errno.h> |
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index 9feeeef5a875..3262b73a3a68 100644 --- a/arch/powerpc/kernel/of_device.c +++ b/arch/powerpc/kernel/of_device.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/string.h> | 1 | #include <linux/string.h> |
| 3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index a0bb354c1c08..c68741fed14b 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * 2 of the License, or (at your option) any later version. | 7 | * 2 of the License, or (at your option) any later version. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/threads.h> | 11 | #include <linux/threads.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 8474355a1a4f..1333335c474e 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Common pmac/prep/chrp pci routines. -- Cort | 2 | * Common pmac/prep/chrp pci routines. -- Cort |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/pci.h> | 6 | #include <linux/pci.h> |
| 8 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 286aa52aae33..bea8451fb57b 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #undef DEBUG | 14 | #undef DEBUG |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/arch/powerpc/kernel/perfmon_fsl_booke.c b/arch/powerpc/kernel/perfmon_fsl_booke.c index 32455dfcc36b..bdc3977a7b06 100644 --- a/arch/powerpc/kernel/perfmon_fsl_booke.c +++ b/arch/powerpc/kernel/perfmon_fsl_booke.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/user.h> | 21 | #include <linux/user.h> |
| 22 | #include <linux/a.out.h> | 22 | #include <linux/a.out.h> |
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/prctl.h> | 26 | #include <linux/prctl.h> |
diff --git a/arch/powerpc/kernel/pmc.c b/arch/powerpc/kernel/pmc.c index e6fb194fe537..a0a2efadeabf 100644 --- a/arch/powerpc/kernel/pmc.c +++ b/arch/powerpc/kernel/pmc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 4b052ae5dc34..e3b80f71748e 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/threads.h> | 2 | #include <linux/threads.h> |
| 4 | #include <linux/smp.h> | 3 | #include <linux/smp.h> |
diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c index 2ab8f2be911e..f598cb519539 100644 --- a/arch/powerpc/kernel/proc_ppc64.c +++ b/arch/powerpc/kernel/proc_ppc64.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 22 | #include <linux/proc_fs.h> | 21 | #include <linux/proc_fs.h> |
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index e4732459c485..a127a1e3c097 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 2 of the License, or (at your option) any later version. | 14 | * 2 of the License, or (at your option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 320c913435cd..4c524cb52184 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #undef DEBUG | 16 | #undef DEBUG |
| 17 | 17 | ||
| 18 | #include <stdarg.h> | 18 | #include <stdarg.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 8c28eb0cbdac..1e95a9f8cda1 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #undef DEBUG_PROM | 16 | #undef DEBUG_PROM |
| 17 | 17 | ||
| 18 | #include <stdarg.h> | 18 | #include <stdarg.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| @@ -988,7 +987,7 @@ static void reserve_mem(u64 base, u64 size) | |||
| 988 | } | 987 | } |
| 989 | 988 | ||
| 990 | /* | 989 | /* |
| 991 | * Initialize memory allocation mecanism, parse "memory" nodes and | 990 | * Initialize memory allocation mechanism, parse "memory" nodes and |
| 992 | * obtain that way the top of memory and RMO to setup out local allocator | 991 | * obtain that way the top of memory and RMO to setup out local allocator |
| 993 | */ | 992 | */ |
| 994 | static void __init prom_init_mem(void) | 993 | static void __init prom_init_mem(void) |
diff --git a/arch/powerpc/kernel/ptrace-common.h b/arch/powerpc/kernel/ptrace-common.h index c42a860c8d25..8797ae737a7b 100644 --- a/arch/powerpc/kernel/ptrace-common.h +++ b/arch/powerpc/kernel/ptrace-common.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef _PPC64_PTRACE_COMMON_H | 10 | #ifndef _PPC64_PTRACE_COMMON_H |
| 11 | #define _PPC64_PTRACE_COMMON_H | 11 | #define _PPC64_PTRACE_COMMON_H |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/system.h> | 13 | #include <asm/system.h> |
| 15 | 14 | ||
| 16 | /* | 15 | /* |
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 5563e2e7d89c..dea75d73f983 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * this archive for more details. | 15 | * this archive for more details. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c index 826ee3d056de..9b9a230349bc 100644 --- a/arch/powerpc/kernel/ptrace32.c +++ b/arch/powerpc/kernel/ptrace32.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * this archive for more details. | 17 | * this archive for more details. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index bd328123af75..c6d7b98af7d5 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #undef DEBUG | 13 | #undef DEBUG |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 0932a62a1c96..ba7cd50d820d 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Common prep/pmac/chrp boot and setup code. | 2 | * Common prep/pmac/chrp boot and setup code. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 175539c9afa0..ac7276c40685 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #undef DEBUG | 13 | #undef DEBUG |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index d73b25e22fca..320353f0926f 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * 2 of the License, or (at your option) any later version. | 17 | * 2 of the License, or (at your option) any later version. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 23 | #include <linux/smp.h> | 22 | #include <linux/smp.h> |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 6e75d7ab6d4d..f72e8e823d78 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 18 | #include <linux/smp.h> | 17 | #include <linux/smp.h> |
diff --git a/arch/powerpc/kernel/smp-tbsync.c b/arch/powerpc/kernel/smp-tbsync.c index 9adef3bddad4..f19e2e0e61e7 100644 --- a/arch/powerpc/kernel/smp-tbsync.c +++ b/arch/powerpc/kernel/smp-tbsync.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index c5d179d4f818..46c56cfd1b2f 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #undef DEBUG | 18 | #undef DEBUG |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S index 69773cc1a85f..7369f9a6ad25 100644 --- a/arch/powerpc/kernel/swsusp_32.S +++ b/arch/powerpc/kernel/swsusp_32.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/threads.h> | 1 | #include <linux/threads.h> |
| 3 | #include <asm/processor.h> | 2 | #include <asm/processor.h> |
| 4 | #include <asm/page.h> | 3 | #include <asm/page.h> |
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index ec274e688816..2e292863e982 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 2 of the License, or (at your option) any later version. | 14 | * 2 of the License, or (at your option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 4662b580efa1..010435095550 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/sysdev.h> | 1 | #include <linux/sysdev.h> |
| 3 | #include <linux/cpu.h> | 2 | #include <linux/cpu.h> |
| 4 | #include <linux/smp.h> | 3 | #include <linux/smp.h> |
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index ee75ccf1a802..579de70e0b4d 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 2 of the License, or (at your option) any later version. | 14 | * 2 of the License, or (at your option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/ppc_asm.h> | 17 | #include <asm/ppc_asm.h> |
| 19 | 18 | ||
| 20 | #ifdef CONFIG_PPC64 | 19 | #ifdef CONFIG_PPC64 |
diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c index 26bd8ea35a4e..368a4934f7ee 100644 --- a/arch/powerpc/kernel/tau_6xx.c +++ b/arch/powerpc/kernel/tau_6xx.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * life in portables, and add a 'performance/watt' metric somewhere in /proc | 11 | * life in portables, and add a 'performance/watt' metric somewhere in /proc |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 16 | #include <linux/jiffies.h> | 15 | #include <linux/jiffies.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 7dd5dab789a1..774c0a3c5019 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * 2 of the License, or (at your option) any later version. | 32 | * 2 of the License, or (at your option) any later version. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index fa6bd97b6b9d..3c668078e524 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * This file handles the architecture-dependent parts of hardware exceptions | 14 | * This file handles the architecture-dependent parts of hardware exceptions |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c index 759afd5e0d8a..5730906b23d5 100644 --- a/arch/powerpc/kernel/udbg.c +++ b/arch/powerpc/kernel/udbg.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
| 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/console.h> | 15 | #include <linux/console.h> |
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c index 5d29dcca523c..0835b4841dea 100644 --- a/arch/powerpc/kernel/udbg_16550.c +++ b/arch/powerpc/kernel/udbg_16550.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
| 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 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <asm/udbg.h> | 12 | #include <asm/udbg.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index bc3e15be3087..1a7e19cdab39 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * 2 of the License, or (at your option) any later version. | 8 | * 2 of the License, or (at your option) any later version. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/powerpc/kernel/vdso32/cacheflush.S b/arch/powerpc/kernel/vdso32/cacheflush.S index 09629aea3e47..9cb319992c38 100644 --- a/arch/powerpc/kernel/vdso32/cacheflush.S +++ b/arch/powerpc/kernel/vdso32/cacheflush.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * as published by the Free Software Foundation; either version | 9 | * as published by the Free Software Foundation; either version |
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
| 14 | #include <asm/ppc_asm.h> | 13 | #include <asm/ppc_asm.h> |
| 15 | #include <asm/vdso.h> | 14 | #include <asm/vdso.h> |
diff --git a/arch/powerpc/kernel/vdso32/datapage.S b/arch/powerpc/kernel/vdso32/datapage.S index 4709f1d9542c..dc21e891d2e7 100644 --- a/arch/powerpc/kernel/vdso32/datapage.S +++ b/arch/powerpc/kernel/vdso32/datapage.S | |||
| @@ -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 <asm/processor.h> | 12 | #include <asm/processor.h> |
| 14 | #include <asm/ppc_asm.h> | 13 | #include <asm/ppc_asm.h> |
| 15 | #include <asm/asm-offsets.h> | 14 | #include <asm/asm-offsets.h> |
diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index 7eebff03a041..05909f754307 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * as published by the Free Software Foundation; either version | 10 | * as published by the Free Software Foundation; either version |
| 11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
| 15 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
| 16 | #include <asm/vdso.h> | 15 | #include <asm/vdso.h> |
diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S index 0c6a37b29dde..68d49dd71dcc 100644 --- a/arch/powerpc/kernel/vdso32/sigtramp.S +++ b/arch/powerpc/kernel/vdso32/sigtramp.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * as published by the Free Software Foundation; either version | 10 | * as published by the Free Software Foundation; either version |
| 11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
| 15 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
| 16 | #include <asm/unistd.h> | 15 | #include <asm/unistd.h> |
diff --git a/arch/powerpc/kernel/vdso64/cacheflush.S b/arch/powerpc/kernel/vdso64/cacheflush.S index cb4ae0a5edd0..66a36d3cc6ad 100644 --- a/arch/powerpc/kernel/vdso64/cacheflush.S +++ b/arch/powerpc/kernel/vdso64/cacheflush.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * as published by the Free Software Foundation; either version | 9 | * as published by the Free Software Foundation; either version |
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
| 14 | #include <asm/ppc_asm.h> | 13 | #include <asm/ppc_asm.h> |
| 15 | #include <asm/vdso.h> | 14 | #include <asm/vdso.h> |
diff --git a/arch/powerpc/kernel/vdso64/datapage.S b/arch/powerpc/kernel/vdso64/datapage.S index 3b2dd7d0c1eb..79796de11737 100644 --- a/arch/powerpc/kernel/vdso64/datapage.S +++ b/arch/powerpc/kernel/vdso64/datapage.S | |||
| @@ -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 <asm/processor.h> | 12 | #include <asm/processor.h> |
| 14 | #include <asm/ppc_asm.h> | 13 | #include <asm/ppc_asm.h> |
| 15 | #include <asm/asm-offsets.h> | 14 | #include <asm/asm-offsets.h> |
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index 4ee871f1cadb..56e76ff5498f 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version |
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
| 16 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
| 17 | #include <asm/vdso.h> | 16 | #include <asm/vdso.h> |
diff --git a/arch/powerpc/kernel/vdso64/sigtramp.S b/arch/powerpc/kernel/vdso64/sigtramp.S index 7479edb101b8..17a83fa6dc52 100644 --- a/arch/powerpc/kernel/vdso64/sigtramp.S +++ b/arch/powerpc/kernel/vdso64/sigtramp.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * as published by the Free Software Foundation; either version | 10 | * as published by the Free Software Foundation; either version |
| 11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
| 15 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
| 16 | #include <asm/unistd.h> | 15 | #include <asm/unistd.h> |
diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S index 9416b4ab92ec..49ac3d6e1399 100644 --- a/arch/powerpc/kernel/vector.S +++ b/arch/powerpc/kernel/vector.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <asm/ppc_asm.h> | 1 | #include <asm/ppc_asm.h> |
| 3 | #include <asm/reg.h> | 2 | #include <asm/reg.h> |
| 4 | 3 | ||
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 8b25953dc4f0..02665a02130d 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #ifdef CONFIG_PPC64 | 1 | #ifdef CONFIG_PPC64 |
| 3 | #include <asm/page.h> | 2 | #include <asm/page.h> |
| 4 | #define PROVIDE32(x) PROVIDE(__unused__##x) | 3 | #define PROVIDE32(x) PROVIDE(__unused__##x) |
diff --git a/arch/powerpc/lib/copy_32.S b/arch/powerpc/lib/copy_32.S index bee51414812e..c657de59abca 100644 --- a/arch/powerpc/lib/copy_32.S +++ b/arch/powerpc/lib/copy_32.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
| 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 | #include <linux/config.h> | ||
| 12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 13 | #include <asm/cache.h> | 12 | #include <asm/cache.h> |
| 14 | #include <asm/errno.h> | 13 | #include <asm/errno.h> |
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c index 8362fa272ca5..077bed7dc52b 100644 --- a/arch/powerpc/lib/locks.c +++ b/arch/powerpc/lib/locks.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index c251d9936612..9590ba780b98 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/ptrace.h> | 12 | #include <linux/ptrace.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/sstep.h> | 13 | #include <asm/sstep.h> |
| 15 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
| 16 | 15 | ||
diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S index b9ca84ed8927..c4c622d8e6ac 100644 --- a/arch/powerpc/lib/string.S +++ b/arch/powerpc/lib/string.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
| 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 | #include <linux/config.h> | ||
| 12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 13 | #include <asm/errno.h> | 12 | #include <asm/errno.h> |
| 14 | #include <asm/ppc_asm.h> | 13 | #include <asm/ppc_asm.h> |
diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c index 589153472761..69058b2873de 100644 --- a/arch/powerpc/math-emu/math.c +++ b/arch/powerpc/math-emu/math.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright (C) 1999 Eddie C. Dost (ecd@atecom.com) | 2 | * Copyright (C) 1999 Eddie C. Dost (ecd@atecom.com) |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | 7 | ||
diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c index 3d79ce281b67..376829ed2211 100644 --- a/arch/powerpc/mm/44x_mmu.c +++ b/arch/powerpc/mm/44x_mmu.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/signal.h> | 27 | #include <linux/signal.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/4xx_mmu.c b/arch/powerpc/mm/4xx_mmu.c index 4d006aa1a0d1..838e09db71d9 100644 --- a/arch/powerpc/mm/4xx_mmu.c +++ b/arch/powerpc/mm/4xx_mmu.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/signal.h> | 24 | #include <linux/signal.h> |
| 26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index a0a9e1e0061e..78a0d59903ee 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * 2 of the License, or (at your option) any later version. | 15 | * 2 of the License, or (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/signal.h> | 18 | #include <linux/signal.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index 5d581bb3aa12..123da03ab118 100644 --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/signal.h> | 29 | #include <linux/signal.h> |
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S index 94255beeecd3..bd68df5fa78a 100644 --- a/arch/powerpc/mm/hash_low_32.S +++ b/arch/powerpc/mm/hash_low_32.S | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <asm/reg.h> | 24 | #include <asm/reg.h> |
| 26 | #include <asm/page.h> | 25 | #include <asm/page.h> |
| 27 | #include <asm/pgtable.h> | 26 | #include <asm/pgtable.h> |
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S index 52e914238959..9bc0a9c2b9bc 100644 --- a/arch/powerpc/mm/hash_low_64.S +++ b/arch/powerpc/mm/hash_low_64.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * described in the kernel's COPYING file. | 10 | * described in the kernel's COPYING file. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/reg.h> | 13 | #include <asm/reg.h> |
| 15 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
| 16 | #include <asm/mmu.h> | 15 | #include <asm/mmu.h> |
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 3cc6d68f7117..1915661c2c81 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #undef DEBUG | 21 | #undef DEBUG |
| 22 | #undef DEBUG_LOW | 22 | #undef DEBUG_LOW |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index b57fb3a2b7bb..0e53ca8f02fb 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index d454caada265..3ff374697e34 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #undef DEBUG | 23 | #undef DEBUG |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/signal.h> | 25 | #include <linux/signal.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/lmb.c b/arch/powerpc/mm/lmb.c index 8b6f522655a6..4b17a7359924 100644 --- a/arch/powerpc/mm/lmb.c +++ b/arch/powerpc/mm/lmb.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 089d939a0b3e..eebd8b83a6b0 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/mmu_context_32.c b/arch/powerpc/mm/mmu_context_32.c index e326e4249e1a..792086b01000 100644 --- a/arch/powerpc/mm/mmu_context_32.c +++ b/arch/powerpc/mm/mmu_context_32.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | 28 | ||
diff --git a/arch/powerpc/mm/mmu_context_64.c b/arch/powerpc/mm/mmu_context_64.c index e2051efa09c5..90a06ac02d5e 100644 --- a/arch/powerpc/mm/mmu_context_64.c +++ b/arch/powerpc/mm/mmu_context_64.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 90628601fac7..8fcacb0239da 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 7b278d83739e..b1da03165496 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/signal.h> | 25 | #include <linux/signal.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c index 2ed43a493b31..7cceb2c44cb9 100644 --- a/arch/powerpc/mm/ppc_mmu_32.c +++ b/arch/powerpc/mm/ppc_mmu_32.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index 6a8bf6c6000e..de0c8842415c 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #undef DEBUG | 17 | #undef DEBUG |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
| 21 | #include <asm/mmu.h> | 20 | #include <asm/mmu.h> |
| 22 | #include <asm/mmu_context.h> | 21 | #include <asm/mmu_context.h> |
diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S index 8548dcf8ef8b..dbc1abbde038 100644 --- a/arch/powerpc/mm/slb_low.S +++ b/arch/powerpc/mm/slb_low.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 2 of the License, or (at your option) any later version. | 14 | * 2 of the License, or (at your option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 19 | #include <asm/ppc_asm.h> | 18 | #include <asm/ppc_asm.h> |
| 20 | #include <asm/asm-offsets.h> | 19 | #include <asm/asm-offsets.h> |
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c index 691320c90b78..eeeacab548e6 100644 --- a/arch/powerpc/mm/stab.c +++ b/arch/powerpc/mm/stab.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
| 17 | #include <asm/mmu.h> | 16 | #include <asm/mmu.h> |
| 18 | #include <asm/mmu_context.h> | 17 | #include <asm/mmu_context.h> |
diff --git a/arch/powerpc/mm/tlb_32.c b/arch/powerpc/mm/tlb_32.c index 02eb23e036d5..925ff70be8ba 100644 --- a/arch/powerpc/mm/tlb_32.c +++ b/arch/powerpc/mm/tlb_32.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c index e7449b068c82..f6eef78efd29 100644 --- a/arch/powerpc/mm/tlb_64.c +++ b/arch/powerpc/mm/tlb_64.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * 2 of the License, or (at your option) any later version. | 22 | * 2 of the License, or (at your option) any later version. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index 1455bcef4892..f0c6df61faa9 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * option) any later version. | 9 | * option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | 14 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_sys.c index 7e789d2420ba..3e1c16eb4a63 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_sys.c +++ b/arch/powerpc/platforms/83xx/mpc834x_sys.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c index 3baceb00fefa..3b5e563c279f 100644 --- a/arch/powerpc/platforms/83xx/pci.c +++ b/arch/powerpc/platforms/83xx/pci.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * option) any later version. | 9 | * option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/85xx/mpc8540_ads.h b/arch/powerpc/platforms/85xx/mpc8540_ads.h index f770cadb2080..c0d56d2bb5a5 100644 --- a/arch/powerpc/platforms/85xx/mpc8540_ads.h +++ b/arch/powerpc/platforms/85xx/mpc8540_ads.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __MACH_MPC8540ADS_H__ | 17 | #ifndef __MACH_MPC8540ADS_H__ |
| 18 | #define __MACH_MPC8540ADS_H__ | 18 | #define __MACH_MPC8540ADS_H__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/initrd.h> | 20 | #include <linux/initrd.h> |
| 22 | 21 | ||
| 23 | #define BOARD_CCSRBAR ((uint)0xe0000000) | 22 | #define BOARD_CCSRBAR ((uint)0xe0000000) |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index 5eeff370f5fc..06a497676c99 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c index 48c8849c07ca..1d51f3242ab1 100644 --- a/arch/powerpc/platforms/85xx/pci.c +++ b/arch/powerpc/platforms/85xx/pci.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * option) any later version. | 9 | * option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c index 7bff3cbc5723..880c8083d16f 100644 --- a/arch/powerpc/platforms/cell/interrupt.c +++ b/arch/powerpc/platforms/cell/interrupt.c | |||
| @@ -20,7 +20,6 @@ | |||
| 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 | #include <linux/config.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c index 695ac4e1617e..9f2e4ed20a57 100644 --- a/arch/powerpc/platforms/cell/pervasive.c +++ b/arch/powerpc/platforms/cell/pervasive.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | #undef DEBUG | 24 | #undef DEBUG |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 28 | #include <linux/irq.h> | 27 | #include <linux/irq.h> |
| 29 | #include <linux/percpu.h> | 28 | #include <linux/percpu.h> |
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 00d112f92272..d8c2a29b3c15 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | #undef DEBUG | 15 | #undef DEBUG |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c index bdf6c5fe58c0..46aef0640742 100644 --- a/arch/powerpc/platforms/cell/smp.c +++ b/arch/powerpc/platforms/cell/smp.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #undef DEBUG | 15 | #undef DEBUG |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c index f1d35ddc9df3..2d22cd59d6fc 100644 --- a/arch/powerpc/platforms/cell/spufs/backing_ops.c +++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/cell/spufs/hw_ops.c b/arch/powerpc/platforms/cell/spufs/hw_ops.c index ede2cac46b6d..c8670f519734 100644 --- a/arch/powerpc/platforms/cell/spufs/hw_ops.c +++ b/arch/powerpc/platforms/cell/spufs/hw_ops.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 3dcc5d8d66b9..1350294484b6 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #undef DEBUG | 27 | #undef DEBUG |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| 32 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c index c7fea2cca534..9d9d82dd32ba 100644 --- a/arch/powerpc/platforms/cell/spufs/switch.c +++ b/arch/powerpc/platforms/cell/spufs/switch.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 32 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 38 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c index 53515daf01b1..66c253498803 100644 --- a/arch/powerpc/platforms/chrp/pci.c +++ b/arch/powerpc/platforms/chrp/pci.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * CHRP pci routines. | 2 | * CHRP pci routines. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/pci.h> | 6 | #include <linux/pci.h> |
| 8 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index 18d89f38796b..1f1771b212b4 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * bootup setup stuff.. | 8 | * bootup setup stuff.. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c index b616053bc331..c298ca1ea680 100644 --- a/arch/powerpc/platforms/chrp/smp.c +++ b/arch/powerpc/platforms/chrp/smp.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c index 33bb4aa0e1e8..f70e820e7304 100644 --- a/arch/powerpc/platforms/iseries/irq.c +++ b/arch/powerpc/platforms/iseries/irq.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Created, December 13, 2000 by Wayne Holm | 23 | * Created, December 13, 2000 by Wayne Holm |
| 24 | * End Change Activity | 24 | * End Change Activity |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/threads.h> | 28 | #include <linux/threads.h> |
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c index 438e2dba63b5..a7769445d6c7 100644 --- a/arch/powerpc/platforms/iseries/lpardata.c +++ b/arch/powerpc/platforms/iseries/lpardata.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * as published by the Free Software Foundation; either version | 6 | * as published by the Free Software Foundation; either version |
| 7 | * 2 of the License, or (at your option) any later version. | 7 | * 2 of the License, or (at your option) any later version. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/threads.h> | 10 | #include <linux/threads.h> |
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 66c77e4f8ec2..c877074745b2 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #undef DEBUG | 17 | #undef DEBUG |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/threads.h> | 20 | #include <linux/threads.h> |
| 22 | #include <linux/smp.h> | 21 | #include <linux/smp.h> |
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c index 6f9d407a709f..2eb095edb472 100644 --- a/arch/powerpc/platforms/iseries/smp.c +++ b/arch/powerpc/platforms/iseries/smp.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #undef DEBUG | 15 | #undef DEBUG |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 4e32a5417fd1..5cf90c28b141 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #define DEBUG | 14 | #define DEBUG |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c index b9a2b3d4bf33..9f7579b38c72 100644 --- a/arch/powerpc/platforms/maple/time.c +++ b/arch/powerpc/platforms/maple/time.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #undef DEBUG | 12 | #undef DEBUG |
| 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/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c index c7a27eddca6d..69f65e215a5c 100644 --- a/arch/powerpc/platforms/powermac/backlight.c +++ b/arch/powerpc/platforms/powermac/backlight.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/fb.h> | 11 | #include <linux/fb.h> |
| 13 | #include <linux/backlight.h> | 12 | #include <linux/backlight.h> |
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c index eacbfd9beabc..cb257aeb91f6 100644 --- a/arch/powerpc/platforms/powermac/bootx_init.c +++ b/arch/powerpc/platforms/powermac/bootx_init.c | |||
| @@ -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/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/powermac/cache.S b/arch/powerpc/platforms/powermac/cache.S index fb977de6b704..6be1a4af3359 100644 --- a/arch/powerpc/platforms/powermac/cache.S +++ b/arch/powerpc/platforms/powermac/cache.S | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 19 | #include <asm/ppc_asm.h> | 18 | #include <asm/ppc_asm.h> |
| 20 | #include <asm/cputable.h> | 19 | #include <asm/cputable.h> |
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c index af2a8f9f1222..62926248bdb8 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_32.c +++ b/arch/powerpc/platforms/powermac/cpufreq_32.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| @@ -68,7 +67,7 @@ static unsigned int cur_freq; | |||
| 68 | static unsigned int sleep_freq; | 67 | static unsigned int sleep_freq; |
| 69 | 68 | ||
| 70 | /* | 69 | /* |
| 71 | * Different models uses different mecanisms to switch the frequency | 70 | * Different models uses different mechanisms to switch the frequency |
| 72 | */ | 71 | */ |
| 73 | static int (*set_speed_proc)(int low_speed); | 72 | static int (*set_speed_proc)(int low_speed); |
| 74 | static unsigned int (*get_speed_proc)(void); | 73 | static unsigned int (*get_speed_proc)(void); |
| @@ -268,7 +267,7 @@ static int pmu_set_cpu_speed(int low_speed) | |||
| 268 | 267 | ||
| 269 | /* Make sure the decrementer won't interrupt us */ | 268 | /* Make sure the decrementer won't interrupt us */ |
| 270 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); | 269 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); |
| 271 | /* Make sure any pending DEC interrupt occuring while we did | 270 | /* Make sure any pending DEC interrupt occurring while we did |
| 272 | * the above didn't re-enable the DEC */ | 271 | * the above didn't re-enable the DEC */ |
| 273 | mb(); | 272 | mb(); |
| 274 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); | 273 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); |
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c index b57e465a1b71..f08a14516139 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_64.c +++ b/arch/powerpc/platforms/powermac/cpufreq_64.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * that is iMac G5 and latest single CPU desktop. | 10 | * that is iMac G5 and latest single CPU desktop. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index 85e00cb0006e..f8313bf9a9f7 100644 --- a/arch/powerpc/platforms/powermac/feature.c +++ b/arch/powerpc/platforms/powermac/feature.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * - Split split split... | 16 | * - Split split split... |
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c index c896ce83d412..ceafaf52a668 100644 --- a/arch/powerpc/platforms/powermac/low_i2c.c +++ b/arch/powerpc/platforms/powermac/low_i2c.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #undef DEBUG | 30 | #undef DEBUG |
| 31 | #undef DEBUG_LOW | 31 | #undef DEBUG_LOW |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 35 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c index 262f967b880a..41fa2409482a 100644 --- a/arch/powerpc/platforms/powermac/nvram.c +++ b/arch/powerpc/platforms/powermac/nvram.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | * Todo: - add support for the OF persistent properties | 9 | * Todo: - add support for the OF persistent properties |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/stddef.h> | 13 | #include <linux/stddef.h> |
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c index a3bd3e728fa3..d6eab8b3f7de 100644 --- a/arch/powerpc/platforms/powermac/pfunc_base.c +++ b/arch/powerpc/platforms/powermac/pfunc_base.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include <linux/delay.h> | 3 | #include <linux/delay.h> |
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c index 93e7505debc5..b117adbf9571 100644 --- a/arch/powerpc/platforms/powermac/pfunc_core.c +++ b/arch/powerpc/platforms/powermac/pfunc_core.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * FIXME: LOCKING !!! | 5 | * FIXME: LOCKING !!! |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 9f6189af6dd6..532bce57c0dc 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/stddef.h> | 18 | #include <linux/stddef.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 89c5775f83be..8654b5f07836 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * bootup setup stuff.. | 23 | * bootup setup stuff.. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/powermac/sleep.S b/arch/powerpc/platforms/powermac/sleep.S index 22b113d19b24..1174ca128efa 100644 --- a/arch/powerpc/platforms/powermac/sleep.S +++ b/arch/powerpc/platforms/powermac/sleep.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
| 15 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 16 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 1065d87fc279..63affcb24219 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * as published by the Free Software Foundation; either version | 21 | * as published by the Free Software Foundation; either version |
| 22 | * 2 of the License, or (at your option) any later version. | 22 | * 2 of the License, or (at your option) any later version. |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 27 | #include <linux/smp.h> | 26 | #include <linux/smp.h> |
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c index 890758aa9667..a4173906e945 100644 --- a/arch/powerpc/platforms/powermac/time.c +++ b/arch/powerpc/platforms/powermac/time.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 2003-2005 Benjamin Herrenschmidt. | 9 | * Copyright (C) 2003-2005 Benjamin Herrenschmidt. |
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c index 06c8265c2baf..6124e59e1038 100644 --- a/arch/powerpc/platforms/powermac/udbg_adb.c +++ b/arch/powerpc/platforms/powermac/udbg_adb.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/string.h> | 1 | #include <linux/string.h> |
| 3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 4 | #include <linux/errno.h> | 3 | #include <linux/errno.h> |
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c index b4fa9f03b461..37e5b1eff911 100644 --- a/arch/powerpc/platforms/powermac/udbg_scc.c +++ b/arch/powerpc/platforms/powermac/udbg_scc.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
| 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 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <asm/udbg.h> | 12 | #include <asm/udbg.h> |
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 0ec9a5445b95..aaad2c0afcbf 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
| @@ -175,7 +175,7 @@ static void eeh_report_failure(struct pci_dev *dev, void *userdata) | |||
| 175 | * | 175 | * |
| 176 | * pSeries systems will isolate a PCI slot if the PCI-Host | 176 | * pSeries systems will isolate a PCI slot if the PCI-Host |
| 177 | * bridge detects address or data parity errors, DMA's | 177 | * bridge detects address or data parity errors, DMA's |
| 178 | * occuring to wild addresses (which usually happen due to | 178 | * occurring to wild addresses (which usually happen due to |
| 179 | * bugs in device drivers or in PCI adapter firmware). | 179 | * bugs in device drivers or in PCI adapter firmware). |
| 180 | * Slot isolations also occur if #SERR, #PERR or other misc | 180 | * Slot isolations also occur if #SERR, #PERR or other misc |
| 181 | * PCI-related errors are detected. | 181 | * PCI-related errors are detected. |
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 8cfb5706790e..d67af2c65754 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 27480705996f..3aeb40699042 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #undef DEBUG_LOW | 22 | #undef DEBUG_LOW |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
| 27 | #include <linux/console.h> | 26 | #include <linux/console.h> |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index b3197ff156c6..999509d28af8 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | #undef DEBUG | 19 | #undef DEBUG |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/cpu.h> | 21 | #include <linux/cpu.h> |
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index 3cf78a6cd27c..4ad144df49c2 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #undef DEBUG | 15 | #undef DEBUG |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 19c03dd43000..4d935d0817f2 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
| 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 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/threads.h> | 12 | #include <linux/threads.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 7c7f34ce4986..e32fadde1f77 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 27 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 71a3275935ec..e983972132d8 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * option) any later version. | 9 | * option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 28df9c827ca6..63ff89575cbb 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #undef DEBUG_IRQ | 17 | #undef DEBUG_IRQ |
| 18 | #undef DEBUG_LOW | 18 | #undef DEBUG_LOW |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 0741df8c41b7..179b10ced8c7 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
| 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 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c index 1e113d0f59b8..b81a367dc278 100644 --- a/arch/ppc/4xx_io/serial_sicc.c +++ b/arch/ppc/4xx_io/serial_sicc.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * is compatible with normal ttyS* devices. | 28 | * is compatible with normal ttyS* devices. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 4edeede9ccfd..cd5f3faa4b20 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 27 | #include <linux/string.h> | 26 | #include <linux/string.h> |
diff --git a/arch/ppc/8xx_io/cs4218.h b/arch/ppc/8xx_io/cs4218.h index f1c7392255f8..e5f943045afa 100644 --- a/arch/ppc/8xx_io/cs4218.h +++ b/arch/ppc/8xx_io/cs4218.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define _cs4218_h_ | 13 | #define _cs4218_h_ |
| 14 | 14 | ||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #define SND_NDEVS 256 /* Number of supported devices */ | 17 | #define SND_NDEVS 256 /* Number of supported devices */ |
| 19 | #define SND_DEV_CTL 0 /* Control port /dev/mixer */ | 18 | #define SND_DEV_CTL 0 /* Control port /dev/mixer */ |
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c index a892356d5c3b..f5f300fc213d 100644 --- a/arch/ppc/8xx_io/cs4218_tdm.c +++ b/arch/ppc/8xx_io/cs4218_tdm.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 15 | #include <linux/timer.h> | 15 | #include <linux/timer.h> |
| 16 | #include <linux/major.h> | 16 | #include <linux/major.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/fcntl.h> | 17 | #include <linux/fcntl.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c index ece6a9fbe09b..a695375c3e4c 100644 --- a/arch/ppc/8xx_io/enet.c +++ b/arch/ppc/8xx_io/enet.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * small packets. | 22 | * small packets. |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/string.h> | 27 | #include <linux/string.h> |
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 62f68d6181c6..8b6295bbb564 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * Thomas Lange, thomas@corelatus.com | 28 | * Thomas Lange, thomas@corelatus.com |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 34 | #include <linux/string.h> | 33 | #include <linux/string.h> |
diff --git a/arch/ppc/8xx_io/micropatch.c b/arch/ppc/8xx_io/micropatch.c index 312af0776c31..cfad46ba17e3 100644 --- a/arch/ppc/8xx_io/micropatch.c +++ b/arch/ppc/8xx_io/micropatch.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * also relocates SMC2, but this would require additional changes | 4 | * also relocates SMC2, but this would require additional changes |
| 5 | * to uart.c, so I am holding off on that for a moment. | 5 | * to uart.c, so I am holding off on that for a moment. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
| 9 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
diff --git a/arch/ppc/amiga/amiints.c b/arch/ppc/amiga/amiints.c index b2bba052ab93..265fcd3c6ab2 100644 --- a/arch/ppc/amiga/amiints.c +++ b/arch/ppc/amiga/amiints.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * /Jes | 35 | * /Jes |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 40 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 41 | #include <linux/sched.h> | 40 | #include <linux/sched.h> |
diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c index bbe47c9bd707..bc50ed11957d 100644 --- a/arch/ppc/amiga/config.c +++ b/arch/ppc/amiga/config.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Miscellaneous Amiga stuff | 12 | * Miscellaneous Amiga stuff |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
diff --git a/arch/ppc/boot/common/crt0.S b/arch/ppc/boot/common/crt0.S index 4d31b824bbd1..8f0ef04b8de5 100644 --- a/arch/ppc/boot/common/crt0.S +++ b/arch/ppc/boot/common/crt0.S | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * 2 of the License, or (at your option) any later version. | 18 | * 2 of the License, or (at your option) any later version. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <asm/ppc_asm.h> | 21 | #include <asm/ppc_asm.h> |
| 23 | 22 | ||
| 24 | .text | 23 | .text |
diff --git a/arch/ppc/boot/common/misc-common.c b/arch/ppc/boot/common/misc-common.c index 073830a8559a..8e1fccd96fc0 100644 --- a/arch/ppc/boot/common/misc-common.c +++ b/arch/ppc/boot/common/misc-common.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <stdarg.h> /* for va_ bits */ | 15 | #include <stdarg.h> /* for va_ bits */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 18 | #include <linux/zlib.h> | 17 | #include <linux/zlib.h> |
| 19 | #include "nonstdio.h" | 18 | #include "nonstdio.h" |
diff --git a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c index 4f00c93ac870..fc5b72041948 100644 --- a/arch/ppc/boot/common/ns16550.c +++ b/arch/ppc/boot/common/ns16550.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * COM1 NS16550 support | 2 | * COM1 NS16550 support |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 7 | #include <linux/serial.h> | 6 | #include <linux/serial.h> |
| 8 | #include <linux/serial_reg.h> | 7 | #include <linux/serial_reg.h> |
diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c index 3a51b1062940..840bff2a45fb 100644 --- a/arch/ppc/boot/simple/embed_config.c +++ b/arch/ppc/boot/simple/embed_config.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/string.h> | 11 | #include <linux/string.h> |
| 13 | #include <asm/reg.h> | 12 | #include <asm/reg.h> |
| 14 | #ifdef CONFIG_8xx | 13 | #ifdef CONFIG_8xx |
diff --git a/arch/ppc/boot/simple/head.S b/arch/ppc/boot/simple/head.S index 160da1006ff8..1b4d7b1d4ec1 100644 --- a/arch/ppc/boot/simple/head.S +++ b/arch/ppc/boot/simple/head.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * or implied. | 11 | * or implied. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/reg.h> | 14 | #include <asm/reg.h> |
| 16 | #include <asm/cache.h> | 15 | #include <asm/cache.h> |
| 17 | #include <asm/ppc_asm.h> | 16 | #include <asm/ppc_asm.h> |
diff --git a/arch/ppc/boot/simple/m8xx_tty.c b/arch/ppc/boot/simple/m8xx_tty.c index 1d2778e248c6..cacc40fdbcfa 100644 --- a/arch/ppc/boot/simple/m8xx_tty.c +++ b/arch/ppc/boot/simple/m8xx_tty.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * use COM1 instead of SMC1 as the console port. This kinda sucks | 8 | * use COM1 instead of SMC1 as the console port. This kinda sucks |
| 9 | * for the rest of the kernel, so here we force the use of SMC1 again. | 9 | * for the rest of the kernel, so here we force the use of SMC1 again. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
| 14 | #include <asm/mpc8xx.h> | 13 | #include <asm/mpc8xx.h> |
diff --git a/arch/ppc/boot/simple/misc-chestnut.c b/arch/ppc/boot/simple/misc-chestnut.c index b94e142ad892..14a4b56d4f84 100644 --- a/arch/ppc/boot/simple/misc-chestnut.c +++ b/arch/ppc/boot/simple/misc-chestnut.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <asm/mv64x60_defs.h> | 14 | #include <asm/mv64x60_defs.h> |
diff --git a/arch/ppc/boot/simple/misc-embedded.c b/arch/ppc/boot/simple/misc-embedded.c index 3865f3f8dcd1..10219eeca054 100644 --- a/arch/ppc/boot/simple/misc-embedded.c +++ b/arch/ppc/boot/simple/misc-embedded.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Currently maintained by: Tom Rini <trini@kernel.crashing.org> | 6 | * Currently maintained by: Tom Rini <trini@kernel.crashing.org> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
| 12 | #include <asm/bootinfo.h> | 11 | #include <asm/bootinfo.h> |
diff --git a/arch/ppc/boot/simple/misc-ev64260.c b/arch/ppc/boot/simple/misc-ev64260.c index 2678c224af22..0b3978632aca 100644 --- a/arch/ppc/boot/simple/misc-ev64260.c +++ b/arch/ppc/boot/simple/misc-ev64260.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * or implied. | 10 | * or implied. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <asm/reg.h> | 14 | #include <asm/reg.h> |
| 16 | #include <asm/io.h> | 15 | #include <asm/io.h> |
diff --git a/arch/ppc/boot/simple/misc-ev64360.c b/arch/ppc/boot/simple/misc-ev64360.c index a212b5b988cb..96eaebb78df5 100644 --- a/arch/ppc/boot/simple/misc-ev64360.c +++ b/arch/ppc/boot/simple/misc-ev64360.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 19 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <asm/mv64x60_defs.h> | 24 | #include <asm/mv64x60_defs.h> |
diff --git a/arch/ppc/boot/simple/misc-katana.c b/arch/ppc/boot/simple/misc-katana.c index d97f2ee6f04e..79a1bbcbc6c5 100644 --- a/arch/ppc/boot/simple/misc-katana.c +++ b/arch/ppc/boot/simple/misc-katana.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <asm/mv64x60_defs.h> | 14 | #include <asm/mv64x60_defs.h> |
diff --git a/arch/ppc/boot/simple/misc-mv64x60.c b/arch/ppc/boot/simple/misc-mv64x60.c index 71ff20fd494a..28b3108083ed 100644 --- a/arch/ppc/boot/simple/misc-mv64x60.c +++ b/arch/ppc/boot/simple/misc-mv64x60.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <asm/mv64x60_defs.h> | 14 | #include <asm/mv64x60_defs.h> |
diff --git a/arch/ppc/boot/simple/misc-prep.c b/arch/ppc/boot/simple/misc-prep.c index 63def9d13d70..0086e1cfb48c 100644 --- a/arch/ppc/boot/simple/misc-prep.c +++ b/arch/ppc/boot/simple/misc-prep.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * In the past: Gary Thomas, Cort Dougan <cort@cs.nmt.edu> | 4 | * In the past: Gary Thomas, Cort Dougan <cort@cs.nmt.edu> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/pci_ids.h> | 7 | #include <linux/pci_ids.h> |
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <asm/residual.h> | 9 | #include <asm/residual.h> |
diff --git a/arch/ppc/boot/simple/misc-spruce.c b/arch/ppc/boot/simple/misc-spruce.c index 0cad2f557a1e..5b3a6c6f113b 100644 --- a/arch/ppc/boot/simple/misc-spruce.c +++ b/arch/ppc/boot/simple/misc-spruce.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 18 | 17 | ||
| 19 | #include <asm/bootinfo.h> | 18 | #include <asm/bootinfo.h> |
diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c index 3d78571ad945..a5df08963695 100644 --- a/arch/ppc/boot/simple/misc.c +++ b/arch/ppc/boot/simple/misc.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 20 | 19 | ||
| 21 | #include <asm/page.h> | 20 | #include <asm/page.h> |
diff --git a/arch/ppc/boot/simple/mpc52xx_tty.c b/arch/ppc/boot/simple/mpc52xx_tty.c index 1964493cf3bd..7b5924cc3c02 100644 --- a/arch/ppc/boot/simple/mpc52xx_tty.c +++ b/arch/ppc/boot/simple/mpc52xx_tty.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * "as is" without any warranty of any kind, whether express or implied. | 9 | * "as is" without any warranty of any kind, whether express or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 15 | #include <asm/mpc52xx.h> | 14 | #include <asm/mpc52xx.h> |
diff --git a/arch/ppc/boot/simple/mv64x60_tty.c b/arch/ppc/boot/simple/mv64x60_tty.c index 0c52f5c784a2..781e040a97d1 100644 --- a/arch/ppc/boot/simple/mv64x60_tty.c +++ b/arch/ppc/boot/simple/mv64x60_tty.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | /* This code assumes that the data cache has been disabled (L1, L2, L3). */ | 13 | /* This code assumes that the data cache has been disabled (L1, L2, L3). */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/serial_reg.h> | 16 | #include <linux/serial_reg.h> |
| 18 | #include <asm/serial.h> | 17 | #include <asm/serial.h> |
diff --git a/arch/ppc/boot/simple/openbios.c b/arch/ppc/boot/simple/openbios.c index 3f2ed53f793a..6ff2701598f2 100644 --- a/arch/ppc/boot/simple/openbios.c +++ b/arch/ppc/boot/simple/openbios.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 17 | #include <asm/ppcboot.h> | 16 | #include <asm/ppcboot.h> |
| 18 | #include <asm/ibm4xx.h> | 17 | #include <asm/ibm4xx.h> |
diff --git a/arch/ppc/boot/simple/pibs.c b/arch/ppc/boot/simple/pibs.c index 67222d57c345..f39d01e0619d 100644 --- a/arch/ppc/boot/simple/pibs.c +++ b/arch/ppc/boot/simple/pibs.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
| 11 | #include <linux/ctype.h> | 10 | #include <linux/ctype.h> |
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
diff --git a/arch/ppc/boot/simple/relocate.S b/arch/ppc/boot/simple/relocate.S index 2533113c1cc5..0c021556d78e 100644 --- a/arch/ppc/boot/simple/relocate.S +++ b/arch/ppc/boot/simple/relocate.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * or implied. | 13 | * or implied. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/cache.h> | 16 | #include <asm/cache.h> |
| 18 | #include <asm/ppc_asm.h> | 17 | #include <asm/ppc_asm.h> |
| 19 | 18 | ||
diff --git a/arch/ppc/kernel/asm-offsets.c b/arch/ppc/kernel/asm-offsets.c index 2f5c5e157617..1f91eca2f3d7 100644 --- a/arch/ppc/kernel/asm-offsets.c +++ b/arch/ppc/kernel/asm-offsets.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * #defines from the assembly-language output. | 8 | * #defines from the assembly-language output. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/arch/ppc/kernel/cpu_setup_power4.S b/arch/ppc/kernel/cpu_setup_power4.S index d7bfd60e21fc..6a674e834eeb 100644 --- a/arch/ppc/kernel/cpu_setup_power4.S +++ b/arch/ppc/kernel/cpu_setup_power4.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
| 14 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 15 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c index 61465ec88bc7..10fec7363962 100644 --- a/arch/ppc/kernel/dma-mapping.c +++ b/arch/ppc/kernel/dma-mapping.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * published by the Free Software Foundation. | 22 | * published by the Free Software Foundation. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/signal.h> | 26 | #include <linux/signal.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index 1adc9145516f..a9d455369dc6 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 24 | #include <linux/sys.h> | 23 | #include <linux/sys.h> |
| 25 | #include <linux/threads.h> | 24 | #include <linux/threads.h> |
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S index 01303efeddad..100052aaea9a 100644 --- a/arch/ppc/kernel/head.S +++ b/arch/ppc/kernel/head.S | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <asm/processor.h> | 25 | #include <asm/processor.h> |
| 27 | #include <asm/page.h> | 26 | #include <asm/page.h> |
| 28 | #include <asm/mmu.h> | 27 | #include <asm/mmu.h> |
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S index 0d8b88219d38..7e44de5a26db 100644 --- a/arch/ppc/kernel/head_44x.S +++ b/arch/ppc/kernel/head_44x.S | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * option) any later version. | 28 | * option) any later version. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <asm/processor.h> | 31 | #include <asm/processor.h> |
| 33 | #include <asm/page.h> | 32 | #include <asm/page.h> |
| 34 | #include <asm/mmu.h> | 33 | #include <asm/mmu.h> |
diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S index 10c261c67021..51da157a629e 100644 --- a/arch/ppc/kernel/head_4xx.S +++ b/arch/ppc/kernel/head_4xx.S | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
| 36 | #include <asm/page.h> | 35 | #include <asm/page.h> |
| 37 | #include <asm/mmu.h> | 36 | #include <asm/mmu.h> |
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S index 7a2f20583be4..944c35c24278 100644 --- a/arch/ppc/kernel/head_8xx.S +++ b/arch/ppc/kernel/head_8xx.S | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
| 24 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 25 | #include <asm/mmu.h> | 24 | #include <asm/mmu.h> |
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S index dd86bbed7627..66877bdfe0b7 100644 --- a/arch/ppc/kernel/head_fsl_booke.S +++ b/arch/ppc/kernel/head_fsl_booke.S | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * option) any later version. | 30 | * option) any later version. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/threads.h> | 33 | #include <linux/threads.h> |
| 35 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
| 36 | #include <asm/page.h> | 35 | #include <asm/page.h> |
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index 5a936566fd61..2fa0075f2b5f 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sys.h> | 15 | #include <linux/sys.h> |
| 17 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
| 18 | #include <asm/errno.h> | 17 | #include <asm/errno.h> |
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 242bb052be67..63808e01cb0b 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Common prep/chrp pci routines. -- Cort | 2 | * Common prep/chrp pci routines. -- Cort |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/pci.h> | 6 | #include <linux/pci.h> |
| 8 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
diff --git a/arch/ppc/kernel/ppc-stub.c b/arch/ppc/kernel/ppc-stub.c index d61889c24046..5f9ee7bb67ec 100644 --- a/arch/ppc/kernel/ppc-stub.c +++ b/arch/ppc/kernel/ppc-stub.c | |||
| @@ -99,7 +99,6 @@ | |||
| 99 | * | 99 | * |
| 100 | ****************************************************************************/ | 100 | ****************************************************************************/ |
| 101 | 101 | ||
| 102 | #include <linux/config.h> | ||
| 103 | #include <linux/kernel.h> | 102 | #include <linux/kernel.h> |
| 104 | #include <linux/string.h> | 103 | #include <linux/string.h> |
| 105 | #include <linux/mm.h> | 104 | #include <linux/mm.h> |
diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c index 75c645043746..bd129d3c2cc1 100644 --- a/arch/ppc/kernel/ppc_htab.c +++ b/arch/ppc/kernel/ppc_htab.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/proc_fs.h> | 15 | #include <linux/proc_fs.h> |
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index b250b1b539b6..50c1b4739ca7 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/threads.h> | 2 | #include <linux/threads.h> |
| 4 | #include <linux/smp.h> | 3 | #include <linux/smp.h> |
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 4b4607d89bfa..faf2940300b0 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Common prep boot and setup code. | 2 | * Common prep boot and setup code. |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
diff --git a/arch/ppc/kernel/smp-tbsync.c b/arch/ppc/kernel/smp-tbsync.c index 6a5694fcc711..1576758debaf 100644 --- a/arch/ppc/kernel/smp-tbsync.c +++ b/arch/ppc/kernel/smp-tbsync.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c index f77795a64dae..ca57e896a36c 100644 --- a/arch/ppc/kernel/smp.c +++ b/arch/ppc/kernel/smp.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 53ea723af60a..6ab8cc7226ab 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | * "A Kernel Model for Precision Timekeeping" by Dave Mills | 42 | * "A Kernel Model for Precision Timekeeping" by Dave Mills |
| 43 | */ | 43 | */ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/errno.h> | 45 | #include <linux/errno.h> |
| 47 | #include <linux/sched.h> | 46 | #include <linux/sched.h> |
| 48 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index 1c0d68026abd..d7a433049b48 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/user.h> | 25 | #include <linux/user.h> |
| 26 | #include <linux/a.out.h> | 26 | #include <linux/a.out.h> |
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/prctl.h> | 30 | #include <linux/prctl.h> |
diff --git a/arch/ppc/lib/locks.c b/arch/ppc/lib/locks.c index c450dc4b766e..ea4aee6b20e6 100644 --- a/arch/ppc/lib/locks.c +++ b/arch/ppc/lib/locks.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Written by Cort Dougan (cort@cs.nmt.edu) | 4 | * Written by Cort Dougan (cort@cs.nmt.edu) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/spinlock.h> | 8 | #include <linux/spinlock.h> |
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
diff --git a/arch/ppc/lib/string.S b/arch/ppc/lib/string.S index 2e258c49e8be..84ed33ab4c2d 100644 --- a/arch/ppc/lib/string.S +++ b/arch/ppc/lib/string.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
| 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 | #include <linux/config.h> | ||
| 12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 13 | #include <asm/cache.h> | 12 | #include <asm/cache.h> |
| 14 | #include <asm/errno.h> | 13 | #include <asm/errno.h> |
diff --git a/arch/ppc/mm/44x_mmu.c b/arch/ppc/mm/44x_mmu.c index e0152a9b26e6..0a0a0487b334 100644 --- a/arch/ppc/mm/44x_mmu.c +++ b/arch/ppc/mm/44x_mmu.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/signal.h> | 27 | #include <linux/signal.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
diff --git a/arch/ppc/mm/4xx_mmu.c b/arch/ppc/mm/4xx_mmu.c index 4d006aa1a0d1..838e09db71d9 100644 --- a/arch/ppc/mm/4xx_mmu.c +++ b/arch/ppc/mm/4xx_mmu.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/signal.h> | 24 | #include <linux/signal.h> |
| 26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c index 8e08ca32531a..5cdfb71fcb07 100644 --- a/arch/ppc/mm/fault.c +++ b/arch/ppc/mm/fault.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or (at your option) any later version. | 13 | * 2 of the License, or (at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/signal.h> | 16 | #include <linux/signal.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/arch/ppc/mm/fsl_booke_mmu.c b/arch/ppc/mm/fsl_booke_mmu.c index 5d581bb3aa12..123da03ab118 100644 --- a/arch/ppc/mm/fsl_booke_mmu.c +++ b/arch/ppc/mm/fsl_booke_mmu.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/signal.h> | 29 | #include <linux/signal.h> |
| 31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/hashtable.S index 31d0a924317c..e756942e65c4 100644 --- a/arch/ppc/mm/hashtable.S +++ b/arch/ppc/mm/hashtable.S | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
| 26 | #include <asm/page.h> | 25 | #include <asm/page.h> |
| 27 | #include <asm/pgtable.h> | 26 | #include <asm/pgtable.h> |
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index c9bd184a295a..523392d460fa 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/arch/ppc/mm/mem_pieces.c b/arch/ppc/mm/mem_pieces.c index 3d639052017e..6030a0ddfbb4 100644 --- a/arch/ppc/mm/mem_pieces.c +++ b/arch/ppc/mm/mem_pieces.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/stddef.h> | 18 | #include <linux/stddef.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
diff --git a/arch/ppc/mm/mmu_context.c b/arch/ppc/mm/mmu_context.c index 8784f3715032..85afa7f8aa78 100644 --- a/arch/ppc/mm/mmu_context.c +++ b/arch/ppc/mm/mmu_context.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | 28 | ||
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c index 706bca8eb144..354a9408f024 100644 --- a/arch/ppc/mm/pgtable.c +++ b/arch/ppc/mm/pgtable.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/arch/ppc/mm/ppc_mmu.c b/arch/ppc/mm/ppc_mmu.c index 25bb6f3347c1..973f1e6afa53 100644 --- a/arch/ppc/mm/ppc_mmu.c +++ b/arch/ppc/mm/ppc_mmu.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/arch/ppc/mm/tlb.c b/arch/ppc/mm/tlb.c index 606b023196a2..fa29740a28f5 100644 --- a/arch/ppc/mm/tlb.c +++ b/arch/ppc/mm/tlb.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c index b940cfd646c2..349660b84a02 100644 --- a/arch/ppc/platforms/4xx/bamboo.c +++ b/arch/ppc/platforms/4xx/bamboo.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/stddef.h> | 13 | #include <linux/stddef.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/4xx/bamboo.h b/arch/ppc/platforms/4xx/bamboo.h index 31c0dd6a26cb..dcd3d09a0a71 100644 --- a/arch/ppc/platforms/4xx/bamboo.h +++ b/arch/ppc/platforms/4xx/bamboo.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __ASM_BAMBOO_H__ | 15 | #ifndef __ASM_BAMBOO_H__ |
| 16 | #define __ASM_BAMBOO_H__ | 16 | #define __ASM_BAMBOO_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <platforms/4xx/ibm440ep.h> | 18 | #include <platforms/4xx/ibm440ep.h> |
| 20 | 19 | ||
| 21 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ | 20 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ |
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c index ce48a4f08cbb..4009f4983ca6 100644 --- a/arch/ppc/platforms/4xx/bubinga.c +++ b/arch/ppc/platforms/4xx/bubinga.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * or implied. | 10 | * or implied. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
| 16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
diff --git a/arch/ppc/platforms/4xx/bubinga.h b/arch/ppc/platforms/4xx/bubinga.h index 606aa9fa5caa..5c408060eb35 100644 --- a/arch/ppc/platforms/4xx/bubinga.h +++ b/arch/ppc/platforms/4xx/bubinga.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef __BUBINGA_H__ | 19 | #ifndef __BUBINGA_H__ |
| 20 | #define __BUBINGA_H__ | 20 | #define __BUBINGA_H__ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <platforms/4xx/ibm405ep.h> | 22 | #include <platforms/4xx/ibm405ep.h> |
| 24 | #include <asm/ppcboot.h> | 23 | #include <asm/ppcboot.h> |
| 25 | 24 | ||
diff --git a/arch/ppc/platforms/4xx/cpci405.c b/arch/ppc/platforms/4xx/cpci405.c index 970b69831e6f..367430998fc5 100644 --- a/arch/ppc/platforms/4xx/cpci405.c +++ b/arch/ppc/platforms/4xx/cpci405.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 21 | #include <asm/system.h> | 20 | #include <asm/system.h> |
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c index b4ecb9c79854..f0f9cc8480ca 100644 --- a/arch/ppc/platforms/4xx/ebony.c +++ b/arch/ppc/platforms/4xx/ebony.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/stddef.h> | 16 | #include <linux/stddef.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h index 27b2e77c7c83..f40e33d39d76 100644 --- a/arch/ppc/platforms/4xx/ebony.h +++ b/arch/ppc/platforms/4xx/ebony.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __ASM_EBONY_H__ | 15 | #ifndef __ASM_EBONY_H__ |
| 16 | #define __ASM_EBONY_H__ | 16 | #define __ASM_EBONY_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <platforms/4xx/ibm440gp.h> | 18 | #include <platforms/4xx/ibm440gp.h> |
| 20 | 19 | ||
| 21 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ | 20 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ |
diff --git a/arch/ppc/platforms/4xx/ep405.c b/arch/ppc/platforms/4xx/ep405.c index 6efa91ff9c07..ae5c82081c95 100644 --- a/arch/ppc/platforms/4xx/ep405.c +++ b/arch/ppc/platforms/4xx/ep405.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * is licensed "as is" without any warranty of any kind, whether express | 9 | * is licensed "as is" without any warranty of any kind, whether express |
| 10 | * or implied. | 10 | * or implied. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 15 | #include <asm/system.h> | 14 | #include <asm/system.h> |
diff --git a/arch/ppc/platforms/4xx/ibm405ep.c b/arch/ppc/platforms/4xx/ibm405ep.c index 55af769a6e70..fb3630a1608d 100644 --- a/arch/ppc/platforms/4xx/ibm405ep.c +++ b/arch/ppc/platforms/4xx/ibm405ep.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * or implied. | 10 | * or implied. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
| 16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
diff --git a/arch/ppc/platforms/4xx/ibm405ep.h b/arch/ppc/platforms/4xx/ibm405ep.h index fe46640de152..3ef20a547080 100644 --- a/arch/ppc/platforms/4xx/ibm405ep.h +++ b/arch/ppc/platforms/4xx/ibm405ep.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __ASM_IBM405EP_H__ | 14 | #ifndef __ASM_IBM405EP_H__ |
| 15 | #define __ASM_IBM405EP_H__ | 15 | #define __ASM_IBM405EP_H__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | /* ibm405.h at bottom of this file */ | 18 | /* ibm405.h at bottom of this file */ |
| 20 | 19 | ||
diff --git a/arch/ppc/platforms/4xx/ibm405gp.c b/arch/ppc/platforms/4xx/ibm405gp.c index e5700469a682..2ac67a2f0ba6 100644 --- a/arch/ppc/platforms/4xx/ibm405gp.c +++ b/arch/ppc/platforms/4xx/ibm405gp.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/smp.h> | 17 | #include <linux/smp.h> |
| 19 | #include <linux/threads.h> | 18 | #include <linux/threads.h> |
diff --git a/arch/ppc/platforms/4xx/ibm405gp.h b/arch/ppc/platforms/4xx/ibm405gp.h index eaf0ef57028d..9f15e5518719 100644 --- a/arch/ppc/platforms/4xx/ibm405gp.h +++ b/arch/ppc/platforms/4xx/ibm405gp.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_IBM405GP_H__ | 11 | #ifndef __ASM_IBM405GP_H__ |
| 12 | #define __ASM_IBM405GP_H__ | 12 | #define __ASM_IBM405GP_H__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* ibm405.h at bottom of this file */ | 15 | /* ibm405.h at bottom of this file */ |
| 17 | 16 | ||
diff --git a/arch/ppc/platforms/4xx/ibm405gpr.c b/arch/ppc/platforms/4xx/ibm405gpr.c index 49da61f6854a..9f4dacffdbb3 100644 --- a/arch/ppc/platforms/4xx/ibm405gpr.c +++ b/arch/ppc/platforms/4xx/ibm405gpr.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * or implied. | 7 | * or implied. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/smp.h> | 11 | #include <linux/smp.h> |
| 13 | #include <linux/threads.h> | 12 | #include <linux/threads.h> |
diff --git a/arch/ppc/platforms/4xx/ibm405gpr.h b/arch/ppc/platforms/4xx/ibm405gpr.h index e90c5dde01d3..9e01f1515de3 100644 --- a/arch/ppc/platforms/4xx/ibm405gpr.h +++ b/arch/ppc/platforms/4xx/ibm405gpr.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_IBM405GPR_H__ | 11 | #ifndef __ASM_IBM405GPR_H__ |
| 12 | #define __ASM_IBM405GPR_H__ | 12 | #define __ASM_IBM405GPR_H__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* ibm405.h at bottom of this file */ | 15 | /* ibm405.h at bottom of this file */ |
| 17 | 16 | ||
diff --git a/arch/ppc/platforms/4xx/ibm440ep.h b/arch/ppc/platforms/4xx/ibm440ep.h index 61717e8a799e..d92572727d20 100644 --- a/arch/ppc/platforms/4xx/ibm440ep.h +++ b/arch/ppc/platforms/4xx/ibm440ep.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __PPC_PLATFORMS_IBM440EP_H | 17 | #ifndef __PPC_PLATFORMS_IBM440EP_H |
| 18 | #define __PPC_PLATFORMS_IBM440EP_H | 18 | #define __PPC_PLATFORMS_IBM440EP_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <asm/ibm44x.h> | 20 | #include <asm/ibm44x.h> |
| 22 | 21 | ||
| 23 | /* UART */ | 22 | /* UART */ |
diff --git a/arch/ppc/platforms/4xx/ibm440gp.h b/arch/ppc/platforms/4xx/ibm440gp.h index 7b2763b6024f..391c90e1f5ea 100644 --- a/arch/ppc/platforms/4xx/ibm440gp.h +++ b/arch/ppc/platforms/4xx/ibm440gp.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __PPC_PLATFORMS_IBM440GP_H | 18 | #ifndef __PPC_PLATFORMS_IBM440GP_H |
| 19 | #define __PPC_PLATFORMS_IBM440GP_H | 19 | #define __PPC_PLATFORMS_IBM440GP_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | /* UART */ | 22 | /* UART */ |
| 24 | #define PPC440GP_UART0_ADDR 0x0000000140000200ULL | 23 | #define PPC440GP_UART0_ADDR 0x0000000140000200ULL |
diff --git a/arch/ppc/platforms/4xx/ibm440gx.h b/arch/ppc/platforms/4xx/ibm440gx.h index 070a34efe1c7..599c4289b9c2 100644 --- a/arch/ppc/platforms/4xx/ibm440gx.h +++ b/arch/ppc/platforms/4xx/ibm440gx.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __PPC_PLATFORMS_IBM440GX_H | 17 | #ifndef __PPC_PLATFORMS_IBM440GX_H |
| 18 | #define __PPC_PLATFORMS_IBM440GX_H | 18 | #define __PPC_PLATFORMS_IBM440GX_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #include <asm/ibm44x.h> | 21 | #include <asm/ibm44x.h> |
| 23 | 22 | ||
diff --git a/arch/ppc/platforms/4xx/ibm440sp.h b/arch/ppc/platforms/4xx/ibm440sp.h index 77e8bb22c527..2978682f1720 100644 --- a/arch/ppc/platforms/4xx/ibm440sp.h +++ b/arch/ppc/platforms/4xx/ibm440sp.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __PPC_PLATFORMS_IBM440SP_H | 15 | #ifndef __PPC_PLATFORMS_IBM440SP_H |
| 16 | #define __PPC_PLATFORMS_IBM440SP_H | 16 | #define __PPC_PLATFORMS_IBM440SP_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #include <asm/ibm44x.h> | 19 | #include <asm/ibm44x.h> |
| 21 | 20 | ||
diff --git a/arch/ppc/platforms/4xx/ibmnp405h.c b/arch/ppc/platforms/4xx/ibmnp405h.c index f1dcb0ac15b7..1afc3642e5b1 100644 --- a/arch/ppc/platforms/4xx/ibmnp405h.c +++ b/arch/ppc/platforms/4xx/ibmnp405h.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * or implied. | 7 | * or implied. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <asm/ocp.h> | 11 | #include <asm/ocp.h> |
| 13 | #include <platforms/4xx/ibmnp405h.h> | 12 | #include <platforms/4xx/ibmnp405h.h> |
diff --git a/arch/ppc/platforms/4xx/ibmnp405h.h b/arch/ppc/platforms/4xx/ibmnp405h.h index 2c683f6aaa66..4aa8821b478b 100644 --- a/arch/ppc/platforms/4xx/ibmnp405h.h +++ b/arch/ppc/platforms/4xx/ibmnp405h.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_IBMNP405H_H__ | 11 | #ifndef __ASM_IBMNP405H_H__ |
| 12 | #define __ASM_IBMNP405H_H__ | 12 | #define __ASM_IBMNP405H_H__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* ibm405.h at bottom of this file */ | 15 | /* ibm405.h at bottom of this file */ |
| 17 | 16 | ||
diff --git a/arch/ppc/platforms/4xx/ibmstb4.h b/arch/ppc/platforms/4xx/ibmstb4.h index 9de426597351..31a08abaa4a2 100644 --- a/arch/ppc/platforms/4xx/ibmstb4.h +++ b/arch/ppc/platforms/4xx/ibmstb4.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_IBMSTB4_H__ | 11 | #ifndef __ASM_IBMSTB4_H__ |
| 12 | #define __ASM_IBMSTB4_H__ | 12 | #define __ASM_IBMSTB4_H__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* serial port defines */ | 15 | /* serial port defines */ |
| 17 | #define STB04xxx_IO_BASE ((uint)0xe0000000) | 16 | #define STB04xxx_IO_BASE ((uint)0xe0000000) |
diff --git a/arch/ppc/platforms/4xx/ibmstbx25.h b/arch/ppc/platforms/4xx/ibmstbx25.h index 6884a49d3482..31b63343e641 100644 --- a/arch/ppc/platforms/4xx/ibmstbx25.h +++ b/arch/ppc/platforms/4xx/ibmstbx25.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_IBMSTBX25_H__ | 11 | #ifndef __ASM_IBMSTBX25_H__ |
| 12 | #define __ASM_IBMSTBX25_H__ | 12 | #define __ASM_IBMSTBX25_H__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | /* serial port defines */ | 15 | /* serial port defines */ |
| 17 | #define STBx25xx_IO_BASE ((uint)0xe0000000) | 16 | #define STBx25xx_IO_BASE ((uint)0xe0000000) |
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c index 5c37de28e135..61706ef37112 100644 --- a/arch/ppc/platforms/4xx/luan.c +++ b/arch/ppc/platforms/4xx/luan.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/4xx/luan.h b/arch/ppc/platforms/4xx/luan.h index e0db6a810feb..68dd46b0a5c4 100644 --- a/arch/ppc/platforms/4xx/luan.h +++ b/arch/ppc/platforms/4xx/luan.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef __ASM_LUAN_H__ | 16 | #ifndef __ASM_LUAN_H__ |
| 17 | #define __ASM_LUAN_H__ | 17 | #define __ASM_LUAN_H__ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <platforms/4xx/ibm440sp.h> | 19 | #include <platforms/4xx/ibm440sp.h> |
| 21 | 20 | ||
| 22 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ | 21 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ |
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c index 554776d4b8ac..84e999d9a7bb 100644 --- a/arch/ppc/platforms/4xx/ocotea.c +++ b/arch/ppc/platforms/4xx/ocotea.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h index 7c799a9ff82b..89730ce2322c 100644 --- a/arch/ppc/platforms/4xx/ocotea.h +++ b/arch/ppc/platforms/4xx/ocotea.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef __ASM_OCOTEA_H__ | 16 | #ifndef __ASM_OCOTEA_H__ |
| 17 | #define __ASM_OCOTEA_H__ | 17 | #define __ASM_OCOTEA_H__ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <platforms/4xx/ibm440gx.h> | 19 | #include <platforms/4xx/ibm440gx.h> |
| 21 | 20 | ||
| 22 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ | 21 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ |
diff --git a/arch/ppc/platforms/4xx/ppc440spe.h b/arch/ppc/platforms/4xx/ppc440spe.h index d3a620ddcdee..f1e867c4c9fc 100644 --- a/arch/ppc/platforms/4xx/ppc440spe.h +++ b/arch/ppc/platforms/4xx/ppc440spe.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __PPC_PLATFORMS_PPC440SPE_H | 17 | #ifndef __PPC_PLATFORMS_PPC440SPE_H |
| 18 | #define __PPC_PLATFORMS_PPC440SPE_H | 18 | #define __PPC_PLATFORMS_PPC440SPE_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #include <asm/ibm44x.h> | 21 | #include <asm/ibm44x.h> |
| 23 | 22 | ||
diff --git a/arch/ppc/platforms/4xx/redwood5.c b/arch/ppc/platforms/4xx/redwood5.c index 53da2b4f7c24..edf4d37d1a52 100644 --- a/arch/ppc/platforms/4xx/redwood5.c +++ b/arch/ppc/platforms/4xx/redwood5.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/pagemap.h> | 13 | #include <linux/pagemap.h> |
| 15 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
diff --git a/arch/ppc/platforms/4xx/redwood6.c b/arch/ppc/platforms/4xx/redwood6.c index 41b27d106fa3..006e29f83a1a 100644 --- a/arch/ppc/platforms/4xx/redwood6.c +++ b/arch/ppc/platforms/4xx/redwood6.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * or implied. | 7 | * or implied. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/pagemap.h> | 11 | #include <linux/pagemap.h> |
| 13 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c index bab31eb30687..c47493e344c2 100644 --- a/arch/ppc/platforms/4xx/sycamore.c +++ b/arch/ppc/platforms/4xx/sycamore.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * is licensed "as is" without any warranty of any kind, whether express | 9 | * is licensed "as is" without any warranty of any kind, whether express |
| 10 | * or implied. | 10 | * or implied. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 15 | #include <linux/threads.h> | 14 | #include <linux/threads.h> |
diff --git a/arch/ppc/platforms/4xx/sycamore.h b/arch/ppc/platforms/4xx/sycamore.h index dae01620227d..69b169eac053 100644 --- a/arch/ppc/platforms/4xx/sycamore.h +++ b/arch/ppc/platforms/4xx/sycamore.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef __ASM_SYCAMORE_H__ | 19 | #ifndef __ASM_SYCAMORE_H__ |
| 20 | #define __ASM_SYCAMORE_H__ | 20 | #define __ASM_SYCAMORE_H__ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <platforms/4xx/ibm405gpr.h> | 22 | #include <platforms/4xx/ibm405gpr.h> |
| 24 | #include <asm/ppcboot.h> | 23 | #include <asm/ppcboot.h> |
| 25 | 24 | ||
diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c index 6bd77902b9a4..f414d2d4c58e 100644 --- a/arch/ppc/platforms/4xx/walnut.c +++ b/arch/ppc/platforms/4xx/walnut.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * is licensed "as is" without any warranty of any kind, whether express | 11 | * is licensed "as is" without any warranty of any kind, whether express |
| 12 | * or implied. | 12 | * or implied. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
| 17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
diff --git a/arch/ppc/platforms/4xx/walnut.h b/arch/ppc/platforms/4xx/walnut.h index f13a577f0a41..d9c4eb788940 100644 --- a/arch/ppc/platforms/4xx/walnut.h +++ b/arch/ppc/platforms/4xx/walnut.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #ifndef __ASM_WALNUT_H__ | 21 | #ifndef __ASM_WALNUT_H__ |
| 22 | #define __ASM_WALNUT_H__ | 22 | #define __ASM_WALNUT_H__ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <platforms/4xx/ibm405gp.h> | 24 | #include <platforms/4xx/ibm405gp.h> |
| 26 | #include <asm/ppcboot.h> | 25 | #include <asm/ppcboot.h> |
| 27 | 26 | ||
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c index d97a7f269f97..fb5f0b5e13d1 100644 --- a/arch/ppc/platforms/4xx/xilinx_ml300.c +++ b/arch/ppc/platforms/4xx/xilinx_ml300.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * "as is" without any warranty of any kind, whether express or implied. | 9 | * "as is" without any warranty of any kind, whether express or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | #include <linux/tty.h> | 14 | #include <linux/tty.h> |
diff --git a/arch/ppc/platforms/4xx/xilinx_ml403.c b/arch/ppc/platforms/4xx/xilinx_ml403.c index 4c0c7e4c1114..cb3bf7a2bcbe 100644 --- a/arch/ppc/platforms/4xx/xilinx_ml403.c +++ b/arch/ppc/platforms/4xx/xilinx_ml403.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * kind, whether express or implied. | 13 | * kind, whether express or implied. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
| 19 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h index 4cf21f256356..cd7d0e7d9863 100644 --- a/arch/ppc/platforms/4xx/xparameters/xparameters.h +++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * "as is" without any warranty of any kind, whether express or implied. | 12 | * "as is" without any warranty of any kind, whether express or implied. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #if defined(CONFIG_XILINX_ML300) | 16 | #if defined(CONFIG_XILINX_ML300) |
| 18 | #include "xparameters_ml300.h" | 17 | #include "xparameters_ml300.h" |
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c index f287dcdbffce..346787df0ddb 100644 --- a/arch/ppc/platforms/4xx/yucca.c +++ b/arch/ppc/platforms/4xx/yucca.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/stddef.h> | 15 | #include <linux/stddef.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/4xx/yucca.h b/arch/ppc/platforms/4xx/yucca.h index 7ae23012237a..bc9684e66a84 100644 --- a/arch/ppc/platforms/4xx/yucca.h +++ b/arch/ppc/platforms/4xx/yucca.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __ASM_YUCCA_H__ | 17 | #ifndef __ASM_YUCCA_H__ |
| 18 | #define __ASM_YUCCA_H__ | 18 | #define __ASM_YUCCA_H__ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <platforms/4xx/ppc440spe.h> | 20 | #include <platforms/4xx/ppc440spe.h> |
| 22 | 21 | ||
| 23 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ | 22 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ |
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c index 11626dd9090f..3397f0de1592 100644 --- a/arch/ppc/platforms/83xx/mpc834x_sys.c +++ b/arch/ppc/platforms/83xx/mpc834x_sys.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.h b/arch/ppc/platforms/83xx/mpc834x_sys.h index 6727bbdc36ec..d2e06c95b083 100644 --- a/arch/ppc/platforms/83xx/mpc834x_sys.h +++ b/arch/ppc/platforms/83xx/mpc834x_sys.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __MACH_MPC83XX_SYS_H__ | 15 | #ifndef __MACH_MPC83XX_SYS_H__ |
| 16 | #define __MACH_MPC83XX_SYS_H__ | 16 | #define __MACH_MPC83XX_SYS_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <syslib/ppc83xx_setup.h> | 19 | #include <syslib/ppc83xx_setup.h> |
| 21 | #include <asm/ppcboot.h> | 20 | #include <asm/ppcboot.h> |
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c index 9b014df516b9..4f839da6782f 100644 --- a/arch/ppc/platforms/85xx/mpc8540_ads.c +++ b/arch/ppc/platforms/85xx/mpc8540_ads.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.h b/arch/ppc/platforms/85xx/mpc8540_ads.h index 0b5e7ff856f5..7559f9e6fc28 100644 --- a/arch/ppc/platforms/85xx/mpc8540_ads.h +++ b/arch/ppc/platforms/85xx/mpc8540_ads.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __MACH_MPC8540ADS_H__ | 15 | #ifndef __MACH_MPC8540ADS_H__ |
| 16 | #define __MACH_MPC8540ADS_H__ | 16 | #define __MACH_MPC8540ADS_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/initrd.h> | 18 | #include <linux/initrd.h> |
| 20 | #include <syslib/ppc85xx_setup.h> | 19 | #include <syslib/ppc85xx_setup.h> |
| 21 | #include <platforms/85xx/mpc85xx_ads_common.h> | 20 | #include <platforms/85xx/mpc85xx_ads_common.h> |
diff --git a/arch/ppc/platforms/85xx/mpc8555_cds.h b/arch/ppc/platforms/85xx/mpc8555_cds.h index 9754dbd5d18c..4f79c372c4e7 100644 --- a/arch/ppc/platforms/85xx/mpc8555_cds.h +++ b/arch/ppc/platforms/85xx/mpc8555_cds.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __MACH_MPC8555CDS_H__ | 15 | #ifndef __MACH_MPC8555CDS_H__ |
| 16 | #define __MACH_MPC8555CDS_H__ | 16 | #define __MACH_MPC8555CDS_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <syslib/ppc85xx_setup.h> | 18 | #include <syslib/ppc85xx_setup.h> |
| 20 | #include <platforms/85xx/mpc85xx_cds_common.h> | 19 | #include <platforms/85xx/mpc85xx_cds_common.h> |
| 21 | 20 | ||
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c index 0cb2e86470e2..026ace320729 100644 --- a/arch/ppc/platforms/85xx/mpc8560_ads.c +++ b/arch/ppc/platforms/85xx/mpc8560_ads.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.h b/arch/ppc/platforms/85xx/mpc8560_ads.h index c2247c21fc53..9f185ab2e019 100644 --- a/arch/ppc/platforms/85xx/mpc8560_ads.h +++ b/arch/ppc/platforms/85xx/mpc8560_ads.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __MACH_MPC8560ADS_H | 15 | #ifndef __MACH_MPC8560ADS_H |
| 16 | #define __MACH_MPC8560ADS_H | 16 | #define __MACH_MPC8560ADS_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <syslib/ppc85xx_setup.h> | 18 | #include <syslib/ppc85xx_setup.h> |
| 20 | #include <platforms/85xx/mpc85xx_ads_common.h> | 19 | #include <platforms/85xx/mpc85xx_ads_common.h> |
| 21 | 20 | ||
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c index 8fd9d763f58d..674806e001f6 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c +++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h index de8d41aafe11..abf32281655d 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h +++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __MACH_MPC85XX_ADS_H__ | 15 | #ifndef __MACH_MPC85XX_ADS_H__ |
| 16 | #define __MACH_MPC85XX_ADS_H__ | 16 | #define __MACH_MPC85XX_ADS_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <asm/ppcboot.h> | 19 | #include <asm/ppcboot.h> |
| 21 | 20 | ||
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c index 4368dc3f3c30..139cf0d00855 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h index 62df54f61ae3..32c5455c8b82 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __MACH_MPC85XX_CDS_H__ | 15 | #ifndef __MACH_MPC85XX_CDS_H__ |
| 16 | #define __MACH_MPC85XX_CDS_H__ | 16 | #define __MACH_MPC85XX_CDS_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/serial.h> | 18 | #include <linux/serial.h> |
| 20 | #include <asm/ppcboot.h> | 19 | #include <asm/ppcboot.h> |
| 21 | #include <linux/initrd.h> | 20 | #include <linux/initrd.h> |
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c index b73778ecf827..764d580ff535 100644 --- a/arch/ppc/platforms/85xx/sbc8560.c +++ b/arch/ppc/platforms/85xx/sbc8560.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/sbc8560.h b/arch/ppc/platforms/85xx/sbc8560.h index 44ffaa2d2c87..c7d61cf3a449 100644 --- a/arch/ppc/platforms/85xx/sbc8560.h +++ b/arch/ppc/platforms/85xx/sbc8560.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef __MACH_SBC8560_H__ | 13 | #ifndef __MACH_SBC8560_H__ |
| 14 | #define __MACH_SBC8560_H__ | 14 | #define __MACH_SBC8560_H__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <platforms/85xx/sbc85xx.h> | 16 | #include <platforms/85xx/sbc85xx.h> |
| 18 | 17 | ||
| 19 | #define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET) | 18 | #define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET) |
diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c index d3ff280510ff..2c587ca97bce 100644 --- a/arch/ppc/platforms/85xx/sbc85xx.c +++ b/arch/ppc/platforms/85xx/sbc85xx.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/stddef.h> | 13 | #include <linux/stddef.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/sbc85xx.h b/arch/ppc/platforms/85xx/sbc85xx.h index 5dd8b6a98c9b..21ea7a55639b 100644 --- a/arch/ppc/platforms/85xx/sbc85xx.h +++ b/arch/ppc/platforms/85xx/sbc85xx.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __PLATFORMS_85XX_SBC85XX_H__ | 14 | #ifndef __PLATFORMS_85XX_SBC85XX_H__ |
| 15 | #define __PLATFORMS_85XX_SBC85XX_H__ | 15 | #define __PLATFORMS_85XX_SBC85XX_H__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/seq_file.h> | 18 | #include <linux/seq_file.h> |
| 20 | #include <asm/ppcboot.h> | 19 | #include <asm/ppcboot.h> |
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c index 8d7baa9a397a..224612412cbe 100644 --- a/arch/ppc/platforms/85xx/stx_gp3.c +++ b/arch/ppc/platforms/85xx/stx_gp3.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * option) any later version. | 16 | * option) any later version. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/stddef.h> | 19 | #include <linux/stddef.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/stx_gp3.h b/arch/ppc/platforms/85xx/stx_gp3.h index 3f71f8f59370..c6e34c09e979 100644 --- a/arch/ppc/platforms/85xx/stx_gp3.h +++ b/arch/ppc/platforms/85xx/stx_gp3.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __MACH_STX_GP3_H | 17 | #ifndef __MACH_STX_GP3_H |
| 18 | #define __MACH_STX_GP3_H | 18 | #define __MACH_STX_GP3_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <asm/ppcboot.h> | 21 | #include <asm/ppcboot.h> |
| 23 | 22 | ||
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c index 00af132262b3..1c90f113cc8f 100644 --- a/arch/ppc/platforms/85xx/tqm85xx.c +++ b/arch/ppc/platforms/85xx/tqm85xx.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/85xx/tqm85xx.h b/arch/ppc/platforms/85xx/tqm85xx.h index 612d80504f9b..57284e68f676 100644 --- a/arch/ppc/platforms/85xx/tqm85xx.h +++ b/arch/ppc/platforms/85xx/tqm85xx.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __MACH_TQM85XX_H | 14 | #ifndef __MACH_TQM85XX_H |
| 15 | #define __MACH_TQM85XX_H | 15 | #define __MACH_TQM85XX_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <asm/ppcboot.h> | 18 | #include <asm/ppcboot.h> |
| 20 | 19 | ||
diff --git a/arch/ppc/platforms/apus_pci.c b/arch/ppc/platforms/apus_pci.c index 33dad6db8243..dc165f0c8908 100644 --- a/arch/ppc/platforms/apus_pci.c +++ b/arch/ppc/platforms/apus_pci.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #ifdef CONFIG_AMIGA | 13 | #ifdef CONFIG_AMIGA |
| 15 | 14 | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c index 5c4118a459f3..1d034ead2c9a 100644 --- a/arch/ppc/platforms/apus_setup.c +++ b/arch/ppc/platforms/apus_setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Amiga specific stuff into mach/amiga. | 11 | * Amiga specific stuff into mach/amiga. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/ccm.h b/arch/ppc/platforms/ccm.h index edb87b573831..69000b1c7a4c 100644 --- a/arch/ppc/platforms/ccm.h +++ b/arch/ppc/platforms/ccm.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __MACH_CCM_H | 7 | #ifndef __MACH_CCM_H |
| 8 | #define __MACH_CCM_H | 8 | #define __MACH_CCM_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
| 13 | 12 | ||
diff --git a/arch/ppc/platforms/chestnut.c b/arch/ppc/platforms/chestnut.c index f324f757cae1..a764ae71cbcb 100644 --- a/arch/ppc/platforms/chestnut.c +++ b/arch/ppc/platforms/chestnut.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/cpci690.c b/arch/ppc/platforms/cpci690.c index 790475c22fd7..e78bccf96c9d 100644 --- a/arch/ppc/platforms/cpci690.c +++ b/arch/ppc/platforms/cpci690.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * is licensed "as is" without any warranty of any kind, whether express | 8 | * is licensed "as is" without any warranty of any kind, whether express |
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <linux/ide.h> | 13 | #include <linux/ide.h> |
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c index 31e8e21e1d5c..4957a7bcde22 100644 --- a/arch/ppc/platforms/ev64260.c +++ b/arch/ppc/platforms/ev64260.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Note: The 750CXe and 7450 are not stable with a 125MHz or 133MHz TCLK/SYSCLK. | 20 | * Note: The 750CXe and 7450 are not stable with a 125MHz or 133MHz TCLK/SYSCLK. |
| 21 | * At 100MHz, they are solid. | 21 | * At 100MHz, they are solid. |
| 22 | */ | 22 | */ |
| 23 | #include <linux/config.h> | ||
| 24 | 23 | ||
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c index 104ac9b16e8b..90ed375c9b90 100644 --- a/arch/ppc/platforms/ev64360.c +++ b/arch/ppc/platforms/ev64360.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Free Software Foundation; either version 2 of the License, or (at your | 11 | * Free Software Foundation; either version 2 of the License, or (at your |
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 17 | #include <linux/kdev_t.h> | 16 | #include <linux/kdev_t.h> |
diff --git a/arch/ppc/platforms/fads.h b/arch/ppc/platforms/fads.h index e1c0b1b6dcb3..2f9f0f60e3f7 100644 --- a/arch/ppc/platforms/fads.h +++ b/arch/ppc/platforms/fads.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef __ASM_FADS_H__ | 19 | #ifndef __ASM_FADS_H__ |
| 20 | #define __ASM_FADS_H__ | 20 | #define __ASM_FADS_H__ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #include <asm/ppcboot.h> | 23 | #include <asm/ppcboot.h> |
| 25 | 24 | ||
diff --git a/arch/ppc/platforms/gemini_prom.S b/arch/ppc/platforms/gemini_prom.S index b181f2108001..e8c84d24f01f 100644 --- a/arch/ppc/platforms/gemini_prom.S +++ b/arch/ppc/platforms/gemini_prom.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * ---Dan | 6 | * ---Dan |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/reg.h> | 9 | #include <asm/reg.h> |
| 11 | #include <asm/page.h> | 10 | #include <asm/page.h> |
| 12 | #include <platforms/gemini.h> | 11 | #include <platforms/gemini.h> |
diff --git a/arch/ppc/platforms/gemini_serial.h b/arch/ppc/platforms/gemini_serial.h index 69855aeec888..b915eff79fdb 100644 --- a/arch/ppc/platforms/gemini_serial.h +++ b/arch/ppc/platforms/gemini_serial.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef __ASMPPC_GEMINI_SERIAL_H | 2 | #ifndef __ASMPPC_GEMINI_SERIAL_H |
| 3 | #define __ASMPPC_GEMINI_SERIAL_H | 3 | #define __ASMPPC_GEMINI_SERIAL_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <platforms/gemini.h> | 5 | #include <platforms/gemini.h> |
| 7 | 6 | ||
| 8 | #ifdef CONFIG_SERIAL_MANY_PORTS | 7 | #ifdef CONFIG_SERIAL_MANY_PORTS |
diff --git a/arch/ppc/platforms/gemini_setup.c b/arch/ppc/platforms/gemini_setup.c index 0090ff154608..f48048f362a8 100644 --- a/arch/ppc/platforms/gemini_setup.c +++ b/arch/ppc/platforms/gemini_setup.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/stddef.h> | 9 | #include <linux/stddef.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c index 75dc2ee87d2f..71af4b488621 100644 --- a/arch/ppc/platforms/hdpu.c +++ b/arch/ppc/platforms/hdpu.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
diff --git a/arch/ppc/platforms/hermes.h b/arch/ppc/platforms/hermes.h index 198fc590b9f5..de91afff8ca1 100644 --- a/arch/ppc/platforms/hermes.h +++ b/arch/ppc/platforms/hermes.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __MACH_HERMES_H | 7 | #ifndef __MACH_HERMES_H |
| 8 | #define __MACH_HERMES_H | 8 | #define __MACH_HERMES_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
| 13 | 12 | ||
diff --git a/arch/ppc/platforms/ip860.h b/arch/ppc/platforms/ip860.h index 8c3836c5f054..2f1f86ce1447 100644 --- a/arch/ppc/platforms/ip860.h +++ b/arch/ppc/platforms/ip860.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __MACH_IP860_H | 7 | #ifndef __MACH_IP860_H |
| 8 | #define __MACH_IP860_H | 8 | #define __MACH_IP860_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
| 13 | 12 | ||
diff --git a/arch/ppc/platforms/ivms8.h b/arch/ppc/platforms/ivms8.h index d4be310f8084..9109e684ad9b 100644 --- a/arch/ppc/platforms/ivms8.h +++ b/arch/ppc/platforms/ivms8.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef __ASM_IVMS8_H__ | 13 | #ifndef __ASM_IVMS8_H__ |
| 14 | #define __ASM_IVMS8_H__ | 14 | #define __ASM_IVMS8_H__ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #include <asm/ppcboot.h> | 17 | #include <asm/ppcboot.h> |
| 19 | 18 | ||
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c index ad21280e8920..720f8b3e2fbc 100644 --- a/arch/ppc/platforms/katana.c +++ b/arch/ppc/platforms/katana.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Supports the Artesyn 750i, 752i, and 3750. The 752i is virtually identical | 16 | * Supports the Artesyn 750i, 752i, and 3750. The 752i is virtually identical |
| 17 | * to the 750i except that it has an mv64460 bridge. | 17 | * to the 750i except that it has an mv64460 bridge. |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 22 | #include <linux/kdev_t.h> | 21 | #include <linux/kdev_t.h> |
diff --git a/arch/ppc/platforms/lantec.h b/arch/ppc/platforms/lantec.h index 8c87642c510f..5e5eb6d0f6aa 100644 --- a/arch/ppc/platforms/lantec.h +++ b/arch/ppc/platforms/lantec.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __MACH_LANTEC_H | 7 | #ifndef __MACH_LANTEC_H |
| 8 | #define __MACH_LANTEC_H | 8 | #define __MACH_LANTEC_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
| 13 | 12 | ||
diff --git a/arch/ppc/platforms/lite5200.c b/arch/ppc/platforms/lite5200.c index fecbe9adc9e0..b9e9db63f65b 100644 --- a/arch/ppc/platforms/lite5200.c +++ b/arch/ppc/platforms/lite5200.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * kind, whether express or implied. | 21 | * kind, whether express or implied. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/initrd.h> | 24 | #include <linux/initrd.h> |
| 26 | #include <linux/seq_file.h> | 25 | #include <linux/seq_file.h> |
| 27 | #include <linux/kdev_t.h> | 26 | #include <linux/kdev_t.h> |
diff --git a/arch/ppc/platforms/lopec.c b/arch/ppc/platforms/lopec.c index c6445a727ca3..18dc6e8dd4f4 100644 --- a/arch/ppc/platforms/lopec.c +++ b/arch/ppc/platforms/lopec.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * or implied. | 10 | * or implied. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/pci_ids.h> | 15 | #include <linux/pci_ids.h> |
diff --git a/arch/ppc/platforms/lwmon.h b/arch/ppc/platforms/lwmon.h index 995bf5112df0..e63f3b07a5db 100644 --- a/arch/ppc/platforms/lwmon.h +++ b/arch/ppc/platforms/lwmon.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __MACH_LWMON_H | 7 | #ifndef __MACH_LWMON_H |
| 8 | #define __MACH_LWMON_H | 8 | #define __MACH_LWMON_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
| 13 | 12 | ||
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c index d919dab61347..f19b6167c770 100644 --- a/arch/ppc/platforms/mpc866ads_setup.c +++ b/arch/ppc/platforms/mpc866ads_setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * kind, whether express or implied. | 11 | * kind, whether express or implied. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/param.h> | 16 | #include <linux/param.h> |
diff --git a/arch/ppc/platforms/mpc885ads.h b/arch/ppc/platforms/mpc885ads.h index a80b7d116b49..d3bbbb3c9a1f 100644 --- a/arch/ppc/platforms/mpc885ads.h +++ b/arch/ppc/platforms/mpc885ads.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __ASM_MPC885ADS_H__ | 15 | #ifndef __ASM_MPC885ADS_H__ |
| 16 | #define __ASM_MPC885ADS_H__ | 16 | #define __ASM_MPC885ADS_H__ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #include <asm/ppcboot.h> | 19 | #include <asm/ppcboot.h> |
| 21 | 20 | ||
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c index 4b88679cd31c..c1fc4a16fea9 100644 --- a/arch/ppc/platforms/mpc885ads_setup.c +++ b/arch/ppc/platforms/mpc885ads_setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * kind, whether express or implied. | 11 | * kind, whether express or implied. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/param.h> | 16 | #include <linux/param.h> |
diff --git a/arch/ppc/platforms/mvme5100.c b/arch/ppc/platforms/mvme5100.c index c717cd92c028..bb8d4a45437a 100644 --- a/arch/ppc/platforms/mvme5100.c +++ b/arch/ppc/platforms/mvme5100.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/pal4_setup.c b/arch/ppc/platforms/pal4_setup.c index 3c3d881df00d..3da47d9ec7a2 100644 --- a/arch/ppc/platforms/pal4_setup.c +++ b/arch/ppc/platforms/pal4_setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
diff --git a/arch/ppc/platforms/pcu_e.h b/arch/ppc/platforms/pcu_e.h index 91a820a6fbc4..a2c03a22875e 100644 --- a/arch/ppc/platforms/pcu_e.h +++ b/arch/ppc/platforms/pcu_e.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __MACH_PCU_E_H | 7 | #ifndef __MACH_PCU_E_H |
| 8 | #define __MACH_PCU_E_H | 8 | #define __MACH_PCU_E_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
| 13 | 12 | ||
diff --git a/arch/ppc/platforms/powerpmc250.c b/arch/ppc/platforms/powerpmc250.c index c3a86be11fb7..4d46650e07fd 100644 --- a/arch/ppc/platforms/powerpmc250.c +++ b/arch/ppc/platforms/powerpmc250.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * or implied. | 11 | * or implied. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index de2761ebe0d9..9778105d4dfe 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * or implied. | 13 | * or implied. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/pq2ads.h b/arch/ppc/platforms/pq2ads.h index 6b26dd36c640..2b287f4e0ca3 100644 --- a/arch/ppc/platforms/pq2ads.h +++ b/arch/ppc/platforms/pq2ads.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef __MACH_ADS8260_DEFS | 9 | #ifndef __MACH_ADS8260_DEFS |
| 10 | #define __MACH_ADS8260_DEFS | 10 | #define __MACH_ADS8260_DEFS |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <asm/ppcboot.h> | 13 | #include <asm/ppcboot.h> |
| 15 | 14 | ||
diff --git a/arch/ppc/platforms/prep_pci.c b/arch/ppc/platforms/prep_pci.c index e50b9996848c..c627ba41335f 100644 --- a/arch/ppc/platforms/prep_pci.c +++ b/arch/ppc/platforms/prep_pci.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * The motherboard routes/maps will disappear shortly. -- Cort | 6 | * The motherboard routes/maps will disappear shortly. -- Cort |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c index e86f6156d589..6436beffdc96 100644 --- a/arch/ppc/platforms/prep_setup.c +++ b/arch/ppc/platforms/prep_setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * bootup setup stuff.. | 11 | * bootup setup stuff.. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
diff --git a/arch/ppc/platforms/prpmc750.c b/arch/ppc/platforms/prpmc750.c index cdd9cfb13ee9..fcab513e206d 100644 --- a/arch/ppc/platforms/prpmc750.c +++ b/arch/ppc/platforms/prpmc750.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/prpmc800.c b/arch/ppc/platforms/prpmc800.c index e459a199fb1d..f4ade5cd7a88 100644 --- a/arch/ppc/platforms/prpmc800.c +++ b/arch/ppc/platforms/prpmc800.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * or implied. | 7 | * or implied. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/stddef.h> | 10 | #include <linux/stddef.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c index bc26b6d71c1d..97d6c21091e0 100644 --- a/arch/ppc/platforms/radstone_ppc7d.c +++ b/arch/ppc/platforms/radstone_ppc7d.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * SCSI / VGA. | 18 | * SCSI / VGA. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/stddef.h> | 21 | #include <linux/stddef.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/rpxclassic.h b/arch/ppc/platforms/rpxclassic.h index 6daa109491c4..57a2a55dab8c 100644 --- a/arch/ppc/platforms/rpxclassic.h +++ b/arch/ppc/platforms/rpxclassic.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __MACH_RPX_DEFS | 8 | #ifndef __MACH_RPX_DEFS |
| 9 | #define __MACH_RPX_DEFS | 9 | #define __MACH_RPX_DEFS |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #ifndef __ASSEMBLY__ | 12 | #ifndef __ASSEMBLY__ |
| 14 | /* A Board Information structure that is given to a program when | 13 | /* A Board Information structure that is given to a program when |
diff --git a/arch/ppc/platforms/rpxlite.h b/arch/ppc/platforms/rpxlite.h index deee5bd36aa8..719780646270 100644 --- a/arch/ppc/platforms/rpxlite.h +++ b/arch/ppc/platforms/rpxlite.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __MACH_RPX_DEFS | 8 | #ifndef __MACH_RPX_DEFS |
| 9 | #define __MACH_RPX_DEFS | 9 | #define __MACH_RPX_DEFS |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #ifndef __ASSEMBLY__ | 12 | #ifndef __ASSEMBLY__ |
| 14 | /* A Board Information structure that is given to a program when | 13 | /* A Board Information structure that is given to a program when |
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c index 6dc459decb2d..a76002af686f 100644 --- a/arch/ppc/platforms/sandpoint.c +++ b/arch/ppc/platforms/sandpoint.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | * found, we can hopefully stop hardcoding 32MB of RAM. | 60 | * found, we can hopefully stop hardcoding 32MB of RAM. |
| 61 | */ | 61 | */ |
| 62 | 62 | ||
| 63 | #include <linux/config.h> | ||
| 64 | #include <linux/stddef.h> | 63 | #include <linux/stddef.h> |
| 65 | #include <linux/kernel.h> | 64 | #include <linux/kernel.h> |
| 66 | #include <linux/init.h> | 65 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c index 41006d2b4b38..8cff1e303349 100644 --- a/arch/ppc/platforms/sbc82xx.c +++ b/arch/ppc/platforms/sbc82xx.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/stddef.h> | 16 | #include <linux/stddef.h> |
| 18 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 19 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c index 3783deccd9b2..3c7842784876 100644 --- a/arch/ppc/platforms/spruce.c +++ b/arch/ppc/platforms/spruce.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/ppc/platforms/tqm8260.h b/arch/ppc/platforms/tqm8260.h index c7a78a646c66..7f8c9a6928f8 100644 --- a/arch/ppc/platforms/tqm8260.h +++ b/arch/ppc/platforms/tqm8260.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __TQM8260_PLATFORM | 7 | #ifndef __TQM8260_PLATFORM |
| 8 | #define __TQM8260_PLATFORM | 8 | #define __TQM8260_PLATFORM |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/ppcboot.h> | 11 | #include <asm/ppcboot.h> |
| 13 | 12 | ||
diff --git a/arch/ppc/platforms/tqm8xx.h b/arch/ppc/platforms/tqm8xx.h index 43ac064ebe5a..662131d0eb39 100644 --- a/arch/ppc/platforms/tqm8xx.h +++ b/arch/ppc/platforms/tqm8xx.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __MACH_TQM8xx_H | 8 | #ifndef __MACH_TQM8xx_H |
| 9 | #define __MACH_TQM8xx_H | 9 | #define __MACH_TQM8xx_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <asm/ppcboot.h> | 12 | #include <asm/ppcboot.h> |
| 14 | 13 | ||
diff --git a/arch/ppc/syslib/btext.c b/arch/ppc/syslib/btext.c index 12fa83e6774a..51ab6e90fe25 100644 --- a/arch/ppc/syslib/btext.c +++ b/arch/ppc/syslib/btext.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Benjamin Herrenschmidt <benh@kernel.crashing.org> | 4 | * Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 8 | #include <linux/string.h> | 7 | #include <linux/string.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
diff --git a/arch/ppc/syslib/gen550_dbg.c b/arch/ppc/syslib/gen550_dbg.c index 9fcff74bfdd0..9293f5c59099 100644 --- a/arch/ppc/syslib/gen550_dbg.c +++ b/arch/ppc/syslib/gen550_dbg.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * or implied. | 14 | * or implied. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/serial.h> | 18 | #include <linux/serial.h> |
| 20 | #include <linux/tty.h> /* For linux/serial_core.h */ | 19 | #include <linux/tty.h> /* For linux/serial_core.h */ |
diff --git a/arch/ppc/syslib/gen550_kgdb.c b/arch/ppc/syslib/gen550_kgdb.c index 874078a7664d..987cc0414e6e 100644 --- a/arch/ppc/syslib/gen550_kgdb.c +++ b/arch/ppc/syslib/gen550_kgdb.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * or implied. | 15 | * or implied. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | 20 | ||
diff --git a/arch/ppc/syslib/ibm440gp_common.c b/arch/ppc/syslib/ibm440gp_common.c index fbaae5f6d834..a3927ec9b5d7 100644 --- a/arch/ppc/syslib/ibm440gp_common.c +++ b/arch/ppc/syslib/ibm440gp_common.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <asm/reg.h> | 17 | #include <asm/reg.h> |
| 19 | #include <asm/ibm44x.h> | 18 | #include <asm/ibm44x.h> |
diff --git a/arch/ppc/syslib/ibm440gp_common.h b/arch/ppc/syslib/ibm440gp_common.h index f48529f3c23d..94d7835038ad 100644 --- a/arch/ppc/syslib/ibm440gp_common.h +++ b/arch/ppc/syslib/ibm440gp_common.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <syslib/ibm44x_common.h> | 20 | #include <syslib/ibm44x_common.h> |
| 22 | 21 | ||
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c index f6cc16888527..0440d8f4ce16 100644 --- a/arch/ppc/syslib/ibm440gx_common.c +++ b/arch/ppc/syslib/ibm440gx_common.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 16 | #include <asm/ibm44x.h> | 15 | #include <asm/ibm44x.h> |
diff --git a/arch/ppc/syslib/ibm440gx_common.h b/arch/ppc/syslib/ibm440gx_common.h index a03ec6022e8f..8d6f203e7a1d 100644 --- a/arch/ppc/syslib/ibm440gx_common.h +++ b/arch/ppc/syslib/ibm440gx_common.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/seq_file.h> | 20 | #include <linux/seq_file.h> |
| 22 | #include <syslib/ibm44x_common.h> | 21 | #include <syslib/ibm44x_common.h> |
diff --git a/arch/ppc/syslib/ibm440sp_common.c b/arch/ppc/syslib/ibm440sp_common.c index 293e4138d172..571f8bcf78e6 100644 --- a/arch/ppc/syslib/ibm440sp_common.c +++ b/arch/ppc/syslib/ibm440sp_common.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/serial.h> | 17 | #include <linux/serial.h> |
| 19 | 18 | ||
diff --git a/arch/ppc/syslib/ibm44x_common.c b/arch/ppc/syslib/ibm44x_common.c index 14a981a5cea7..01f99b4a6649 100644 --- a/arch/ppc/syslib/ibm44x_common.c +++ b/arch/ppc/syslib/ibm44x_common.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/time.h> | 16 | #include <linux/time.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/serial.h> | 18 | #include <linux/serial.h> |
diff --git a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c index 99e4bc0e42af..974581ea4849 100644 --- a/arch/ppc/syslib/m8260_pci_erratum9.c +++ b/arch/ppc/syslib/m8260_pci_erratum9.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * or implied. | 15 | * or implied. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c index b7a6cb2d8d52..15f0d7323535 100644 --- a/arch/ppc/syslib/m8260_setup.c +++ b/arch/ppc/syslib/m8260_setup.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Further modified for generic 8xx and 8260 by Dan. | 6 | * Further modified for generic 8xx and 8260 by Dan. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index 0c4c0de7c59f..54303a7b4e69 100644 --- a/arch/ppc/syslib/m8xx_setup.c +++ b/arch/ppc/syslib/m8xx_setup.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * bootup setup stuff.. | 10 | * bootup setup stuff.. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/ppc/syslib/mpc52xx_pci.c b/arch/ppc/syslib/mpc52xx_pci.c index 5a5a7a9cd248..20a0eac0dc3a 100644 --- a/arch/ppc/syslib/mpc52xx_pci.c +++ b/arch/ppc/syslib/mpc52xx_pci.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * kind, whether express or implied. | 11 | * kind, whether express or implied. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #include <asm/pci.h> | 15 | #include <asm/pci.h> |
| 17 | 16 | ||
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c index ee6379bb415e..80c609019bda 100644 --- a/arch/ppc/syslib/mpc52xx_setup.c +++ b/arch/ppc/syslib/mpc52xx_setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * kind, whether express or implied. | 15 | * kind, whether express or implied. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 21 | #include <asm/time.h> | 20 | #include <asm/time.h> |
diff --git a/arch/ppc/syslib/mv64x60_dbg.c b/arch/ppc/syslib/mv64x60_dbg.c index 9cf18764a1a1..e1876261e5dc 100644 --- a/arch/ppc/syslib/mv64x60_dbg.c +++ b/arch/ppc/syslib/mv64x60_dbg.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
| 23 | #include <asm/delay.h> | 22 | #include <asm/delay.h> |
| 24 | #include <asm/mv64x60.h> | 23 | #include <asm/mv64x60.h> |
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index a4ecc2ee579f..50c55622ece9 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/list.h> | 39 | #include <linux/list.h> |
| 41 | #include <linux/miscdevice.h> | 40 | #include <linux/miscdevice.h> |
| 42 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c index 767a0bc95817..08973663fa24 100644 --- a/arch/ppc/syslib/open_pic.c +++ b/arch/ppc/syslib/open_pic.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * for more details. | 6 | * for more details. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c index b8154efff6ed..e1ff971539ea 100644 --- a/arch/ppc/syslib/open_pic2.c +++ b/arch/ppc/syslib/open_pic2.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * register accesses | 10 | * register accesses |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/arch/ppc/syslib/ppc440spe_pcie.c b/arch/ppc/syslib/ppc440spe_pcie.c index 1509fc1ddfb6..dd5d4b958c31 100644 --- a/arch/ppc/syslib/ppc440spe_pcie.c +++ b/arch/ppc/syslib/ppc440spe_pcie.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * option) any later version. | 8 | * option) any later version. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 14 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c index b40b96a8c609..1eef4ffed4fb 100644 --- a/arch/ppc/syslib/ppc4xx_dma.c +++ b/arch/ppc/syslib/ppc4xx_dma.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 25 | #include <linux/miscdevice.h> | 24 | #include <linux/miscdevice.h> |
diff --git a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c index e669c1335d47..745685df5984 100644 --- a/arch/ppc/syslib/ppc4xx_pic.c +++ b/arch/ppc/syslib/ppc4xx_pic.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Free Software Foundation; either version 2 of the License, or (at your | 13 | * Free Software Foundation; either version 2 of the License, or (at your |
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/signal.h> | 18 | #include <linux/signal.h> |
diff --git a/arch/ppc/syslib/ppc4xx_setup.c b/arch/ppc/syslib/ppc4xx_setup.c index e83a83fd95e1..debe14c083a1 100644 --- a/arch/ppc/syslib/ppc4xx_setup.c +++ b/arch/ppc/syslib/ppc4xx_setup.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/smp.h> | 17 | #include <linux/smp.h> |
| 19 | #include <linux/threads.h> | 18 | #include <linux/threads.h> |
diff --git a/arch/ppc/syslib/ppc4xx_sgdma.c b/arch/ppc/syslib/ppc4xx_sgdma.c index 280ea010a9c8..2f83e162971f 100644 --- a/arch/ppc/syslib/ppc4xx_sgdma.c +++ b/arch/ppc/syslib/ppc4xx_sgdma.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c index 26afd637dc81..ec466db52114 100644 --- a/arch/ppc/syslib/ppc83xx_setup.c +++ b/arch/ppc/syslib/ppc83xx_setup.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Added PCI support -- Tony Li <tony.li@freescale.com> | 22 | * Added PCI support -- Tony Li <tony.li@freescale.com> |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/arch/ppc/syslib/ppc83xx_setup.h b/arch/ppc/syslib/ppc83xx_setup.h index 478b011cd963..b918a2d245ea 100644 --- a/arch/ppc/syslib/ppc83xx_setup.h +++ b/arch/ppc/syslib/ppc83xx_setup.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #ifndef __PPC_SYSLIB_PPC83XX_SETUP_H | 23 | #ifndef __PPC_SYSLIB_PPC83XX_SETUP_H |
| 24 | #define __PPC_SYSLIB_PPC83XX_SETUP_H | 24 | #define __PPC_SYSLIB_PPC83XX_SETUP_H |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | 27 | ||
| 29 | extern unsigned long mpc83xx_find_end_of_memory(void) __init; | 28 | extern unsigned long mpc83xx_find_end_of_memory(void) __init; |
diff --git a/arch/ppc/syslib/ppc85xx_common.c b/arch/ppc/syslib/ppc85xx_common.c index 0145c968f9ad..e5ac699e7316 100644 --- a/arch/ppc/syslib/ppc85xx_common.c +++ b/arch/ppc/syslib/ppc85xx_common.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/syslib/ppc85xx_common.h b/arch/ppc/syslib/ppc85xx_common.h index 182744a1321c..4fc405425113 100644 --- a/arch/ppc/syslib/ppc85xx_common.h +++ b/arch/ppc/syslib/ppc85xx_common.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __PPC_SYSLIB_PPC85XX_COMMON_H | 14 | #ifndef __PPC_SYSLIB_PPC85XX_COMMON_H |
| 15 | #define __PPC_SYSLIB_PPC85XX_COMMON_H | 15 | #define __PPC_SYSLIB_PPC85XX_COMMON_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | 18 | ||
| 20 | /* Provide access to ccsrbar for any modules, etc */ | 19 | /* Provide access to ccsrbar for any modules, etc */ |
diff --git a/arch/ppc/syslib/ppc85xx_rio.c b/arch/ppc/syslib/ppc85xx_rio.c index 297f3b549177..d9b471b4d695 100644 --- a/arch/ppc/syslib/ppc85xx_rio.c +++ b/arch/ppc/syslib/ppc85xx_rio.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
diff --git a/arch/ppc/syslib/ppc85xx_rio.h b/arch/ppc/syslib/ppc85xx_rio.h index c0827a2c3eec..6d3ff30b1579 100644 --- a/arch/ppc/syslib/ppc85xx_rio.h +++ b/arch/ppc/syslib/ppc85xx_rio.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef __PPC_SYSLIB_PPC85XX_RIO_H | 13 | #ifndef __PPC_SYSLIB_PPC85XX_RIO_H |
| 14 | #define __PPC_SYSLIB_PPC85XX_RIO_H | 14 | #define __PPC_SYSLIB_PPC85XX_RIO_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | 17 | ||
| 19 | extern void mpc85xx_rio_setup(int law_start, int law_size); | 18 | extern void mpc85xx_rio_setup(int law_start, int law_size); |
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c index 79b7089d7500..2475ec6600fe 100644 --- a/arch/ppc/syslib/ppc85xx_setup.c +++ b/arch/ppc/syslib/ppc85xx_setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/ppc/syslib/ppc85xx_setup.h b/arch/ppc/syslib/ppc85xx_setup.h index f55b8032d3d9..6ff79995210b 100644 --- a/arch/ppc/syslib/ppc85xx_setup.h +++ b/arch/ppc/syslib/ppc85xx_setup.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __PPC_SYSLIB_PPC85XX_SETUP_H | 15 | #ifndef __PPC_SYSLIB_PPC85XX_SETUP_H |
| 16 | #define __PPC_SYSLIB_PPC85XX_SETUP_H | 16 | #define __PPC_SYSLIB_PPC85XX_SETUP_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <asm/ppcboot.h> | 19 | #include <asm/ppcboot.h> |
| 21 | 20 | ||
diff --git a/arch/ppc/syslib/ppc8xx_pic.c b/arch/ppc/syslib/ppc8xx_pic.c index 3e6f51a61d46..d6c25fe25011 100644 --- a/arch/ppc/syslib/ppc8xx_pic.c +++ b/arch/ppc/syslib/ppc8xx_pic.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/stddef.h> | 2 | #include <linux/stddef.h> |
| 4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
diff --git a/arch/ppc/syslib/ppc8xx_pic.h b/arch/ppc/syslib/ppc8xx_pic.h index 784935eac365..d7d9f651a91b 100644 --- a/arch/ppc/syslib/ppc8xx_pic.h +++ b/arch/ppc/syslib/ppc8xx_pic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _PPC_KERNEL_PPC8xx_H | 1 | #ifndef _PPC_KERNEL_PPC8xx_H |
| 2 | #define _PPC_KERNEL_PPC8xx_H | 2 | #define _PPC_KERNEL_PPC8xx_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/irq.h> | 4 | #include <linux/irq.h> |
| 6 | #include <linux/interrupt.h> | 5 | #include <linux/interrupt.h> |
| 7 | 6 | ||
diff --git a/arch/ppc/syslib/qspan_pci.c b/arch/ppc/syslib/qspan_pci.c index 0970b5d30391..85053b2816a9 100644 --- a/arch/ppc/syslib/qspan_pci.c +++ b/arch/ppc/syslib/qspan_pci.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * we have switched the chip select. | 15 | * we have switched the chip select. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
diff --git a/arch/ppc/xmon/privinst.h b/arch/ppc/xmon/privinst.h index 93978c027ca0..c492a35687bd 100644 --- a/arch/ppc/xmon/privinst.h +++ b/arch/ppc/xmon/privinst.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 1996 Paul Mackerras. | 2 | * Copyright (C) 1996 Paul Mackerras. |
| 3 | */ | 3 | */ |
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #define GETREG(reg) \ | 5 | #define GETREG(reg) \ |
| 7 | static inline int get_ ## reg (void) \ | 6 | static inline int get_ ## reg (void) \ |
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c index cfc2d6ad464d..f7e92986952a 100644 --- a/arch/ppc/xmon/start.c +++ b/arch/ppc/xmon/start.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 1996 Paul Mackerras. | 2 | * Copyright (C) 1996 Paul Mackerras. |
| 3 | */ | 3 | */ |
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/string.h> | 4 | #include <linux/string.h> |
| 6 | #include <asm/machdep.h> | 5 | #include <asm/machdep.h> |
| 7 | #include <asm/io.h> | 6 | #include <asm/io.h> |
diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c index 06fa44b5c647..37d234f93394 100644 --- a/arch/ppc/xmon/xmon.c +++ b/arch/ppc/xmon/xmon.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996 Paul Mackerras. | 4 | * Copyright (C) 1996 Paul Mackerras. |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/errno.h> | 6 | #include <linux/errno.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/smp.h> | 8 | #include <linux/smp.h> |
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index 61bc44626c04..d0f82c995af6 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> | 10 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| @@ -766,7 +765,6 @@ unsigned long nr_iowait(void) | |||
| 766 | #endif /* MODULE */ | 765 | #endif /* MODULE */ |
| 767 | EXPORT_SYMBOL_GPL(si_swapinfo); | 766 | EXPORT_SYMBOL_GPL(si_swapinfo); |
| 768 | EXPORT_SYMBOL_GPL(nr_threads); | 767 | EXPORT_SYMBOL_GPL(nr_threads); |
| 769 | EXPORT_SYMBOL_GPL(get_full_page_state); | ||
| 770 | EXPORT_SYMBOL_GPL(nr_running); | 768 | EXPORT_SYMBOL_GPL(nr_running); |
| 771 | EXPORT_SYMBOL_GPL(nr_iowait); | 769 | EXPORT_SYMBOL_GPL(nr_iowait); |
| 772 | //EXPORT_SYMBOL_GPL(nr_context_switches); | 770 | //EXPORT_SYMBOL_GPL(nr_context_switches); |
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c index 7915a197d96d..ab3b0765a64e 100644 --- a/arch/s390/appldata/appldata_mem.c +++ b/arch/s390/appldata/appldata_mem.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> | 9 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
| @@ -107,21 +106,21 @@ static void appldata_get_mem_data(void *data) | |||
| 107 | * serialized through the appldata_ops_lock and can use static | 106 | * serialized through the appldata_ops_lock and can use static |
| 108 | */ | 107 | */ |
| 109 | static struct sysinfo val; | 108 | static struct sysinfo val; |
| 110 | static struct page_state ps; | 109 | unsigned long ev[NR_VM_EVENT_ITEMS]; |
| 111 | struct appldata_mem_data *mem_data; | 110 | struct appldata_mem_data *mem_data; |
| 112 | 111 | ||
| 113 | mem_data = data; | 112 | mem_data = data; |
| 114 | mem_data->sync_count_1++; | 113 | mem_data->sync_count_1++; |
| 115 | 114 | ||
| 116 | get_full_page_state(&ps); | 115 | all_vm_events(ev); |
| 117 | mem_data->pgpgin = ps.pgpgin >> 1; | 116 | mem_data->pgpgin = ev[PGPGIN] >> 1; |
| 118 | mem_data->pgpgout = ps.pgpgout >> 1; | 117 | mem_data->pgpgout = ev[PGPGOUT] >> 1; |
| 119 | mem_data->pswpin = ps.pswpin; | 118 | mem_data->pswpin = ev[PSWPIN]; |
| 120 | mem_data->pswpout = ps.pswpout; | 119 | mem_data->pswpout = ev[PSWPOUT]; |
| 121 | mem_data->pgalloc = ps.pgalloc_high + ps.pgalloc_normal + | 120 | mem_data->pgalloc = ev[PGALLOC_HIGH] + ev[PGALLOC_NORMAL] + |
| 122 | ps.pgalloc_dma; | 121 | ev[PGALLOC_DMA]; |
| 123 | mem_data->pgfault = ps.pgfault; | 122 | mem_data->pgfault = ev[PGFAULT]; |
| 124 | mem_data->pgmajfault = ps.pgmajfault; | 123 | mem_data->pgmajfault = ev[PGMAJFAULT]; |
| 125 | 124 | ||
| 126 | si_meminfo(&val); | 125 | si_meminfo(&val); |
| 127 | mem_data->sharedram = val.sharedram; | 126 | mem_data->sharedram = val.sharedram; |
| @@ -130,7 +129,8 @@ static void appldata_get_mem_data(void *data) | |||
| 130 | mem_data->totalhigh = P2K(val.totalhigh); | 129 | mem_data->totalhigh = P2K(val.totalhigh); |
| 131 | mem_data->freehigh = P2K(val.freehigh); | 130 | mem_data->freehigh = P2K(val.freehigh); |
| 132 | mem_data->bufferram = P2K(val.bufferram); | 131 | mem_data->bufferram = P2K(val.bufferram); |
| 133 | mem_data->cached = P2K(atomic_read(&nr_pagecache) - val.bufferram); | 132 | mem_data->cached = P2K(global_page_state(NR_FILE_PAGES) |
| 133 | - val.bufferram); | ||
| 134 | 134 | ||
| 135 | si_swapinfo(&val); | 135 | si_swapinfo(&val); |
| 136 | mem_data->totalswap = P2K(val.totalswap); | 136 | mem_data->totalswap = P2K(val.totalswap); |
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c index 39b7bdecbf05..075e619bf37d 100644 --- a/arch/s390/appldata/appldata_net_sum.c +++ b/arch/s390/appldata/appldata_net_sum.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> | 10 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c index f2b44a2f1dec..161acc5c8a1b 100644 --- a/arch/s390/appldata/appldata_os.c +++ b/arch/s390/appldata/appldata_os.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> | 9 | * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c index 3f7018e9dbe4..ec514fe5ccd0 100644 --- a/arch/s390/kernel/asm-offsets.c +++ b/arch/s390/kernel/asm-offsets.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * and format the required data. | 4 | * and format the required data. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | 8 | ||
| 10 | /* Use marker if you need to separate the values later */ | 9 | /* Use marker if you need to separate the values later */ |
diff --git a/arch/s390/kernel/binfmt_elf32.c b/arch/s390/kernel/binfmt_elf32.c index 12a6311e9838..9565a2dcfadc 100644 --- a/arch/s390/kernel/binfmt_elf32.c +++ b/arch/s390/kernel/binfmt_elf32.c | |||
| @@ -135,7 +135,6 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs) | |||
| 135 | 135 | ||
| 136 | #include <asm/processor.h> | 136 | #include <asm/processor.h> |
| 137 | #include <linux/module.h> | 137 | #include <linux/module.h> |
| 138 | #include <linux/config.h> | ||
| 139 | #include <linux/elfcore.h> | 138 | #include <linux/elfcore.h> |
| 140 | #include <linux/binfmts.h> | 139 | #include <linux/binfmts.h> |
| 141 | #include <linux/compat.h> | 140 | #include <linux/compat.h> |
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index 5e14de37c17b..cabb4ff54cd7 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h index 3898f66d0b2f..1a18e29668ef 100644 --- a/arch/s390/kernel/compat_linux.h +++ b/arch/s390/kernel/compat_linux.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ASM_S390X_S390_H | 1 | #ifndef _ASM_S390X_S390_H |
| 2 | #define _ASM_S390X_S390_H | 2 | #define _ASM_S390X_S390_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/compat.h> | 4 | #include <linux/compat.h> |
| 6 | #include <linux/socket.h> | 5 | #include <linux/socket.h> |
| 7 | #include <linux/syscalls.h> | 6 | #include <linux/syscalls.h> |
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index b4c815d8ef75..d49b876a83bf 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson | 10 | * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/compat.h> | 13 | #include <linux/compat.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 06a3fbc12536..7ba20922a535 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Bugreports to: <Linux390@de.ibm.com> | 10 | * Bugreports to: <Linux390@de.ibm.com> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/stddef.h> | 13 | #include <linux/stddef.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index aa8b52c2140f..d8948c342caf 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/sys.h> | 12 | #include <linux/sys.h> |
| 13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/cache.h> | 14 | #include <asm/cache.h> |
| 16 | #include <asm/lowcore.h> | 15 | #include <asm/lowcore.h> |
| 17 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
| @@ -229,8 +228,9 @@ sysc_do_svc: | |||
| 229 | sysc_nr_ok: | 228 | sysc_nr_ok: |
| 230 | mvc SP_ARGS(4,%r15),SP_R7(%r15) | 229 | mvc SP_ARGS(4,%r15),SP_R7(%r15) |
| 231 | sysc_do_restart: | 230 | sysc_do_restart: |
| 231 | l %r8,BASED(.Lsysc_table) | ||
| 232 | tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT) | 232 | tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT) |
| 233 | l %r8,sys_call_table-system_call(%r7,%r13) # get system call addr. | 233 | l %r8,0(%r7,%r8) # get system call addr. |
| 234 | bnz BASED(sysc_tracesys) | 234 | bnz BASED(sysc_tracesys) |
| 235 | basr %r14,%r8 # call sys_xxxx | 235 | basr %r14,%r8 # call sys_xxxx |
| 236 | st %r2,SP_R2(%r15) # store return value (change R2 on stack) | 236 | st %r2,SP_R2(%r15) # store return value (change R2 on stack) |
| @@ -331,9 +331,10 @@ sysc_tracesys: | |||
| 331 | basr %r14,%r1 | 331 | basr %r14,%r1 |
| 332 | clc SP_R2(4,%r15),BASED(.Lnr_syscalls) | 332 | clc SP_R2(4,%r15),BASED(.Lnr_syscalls) |
| 333 | bnl BASED(sysc_tracenogo) | 333 | bnl BASED(sysc_tracenogo) |
| 334 | l %r8,BASED(.Lsysc_table) | ||
| 334 | l %r7,SP_R2(%r15) # strace might have changed the | 335 | l %r7,SP_R2(%r15) # strace might have changed the |
| 335 | sll %r7,2 # system call | 336 | sll %r7,2 # system call |
| 336 | l %r8,sys_call_table-system_call(%r7,%r13) | 337 | l %r8,0(%r7,%r8) |
| 337 | sysc_tracego: | 338 | sysc_tracego: |
| 338 | lm %r3,%r6,SP_R3(%r15) | 339 | lm %r3,%r6,SP_R3(%r15) |
| 339 | l %r2,SP_ORIG_R2(%r15) | 340 | l %r2,SP_ORIG_R2(%r15) |
| @@ -1010,6 +1011,7 @@ cleanup_io_leave_insn: | |||
| 1010 | .Ltrace: .long syscall_trace | 1011 | .Ltrace: .long syscall_trace |
| 1011 | .Lvfork: .long sys_vfork | 1012 | .Lvfork: .long sys_vfork |
| 1012 | .Lschedtail: .long schedule_tail | 1013 | .Lschedtail: .long schedule_tail |
| 1014 | .Lsysc_table: .long sys_call_table | ||
| 1013 | 1015 | ||
| 1014 | .Lcritical_start: | 1016 | .Lcritical_start: |
| 1015 | .long __critical_start + 0x80000000 | 1017 | .long __critical_start + 0x80000000 |
| @@ -1018,8 +1020,8 @@ cleanup_io_leave_insn: | |||
| 1018 | .Lcleanup_critical: | 1020 | .Lcleanup_critical: |
| 1019 | .long cleanup_critical | 1021 | .long cleanup_critical |
| 1020 | 1022 | ||
| 1023 | .section .rodata, "a" | ||
| 1021 | #define SYSCALL(esa,esame,emu) .long esa | 1024 | #define SYSCALL(esa,esame,emu) .long esa |
| 1022 | sys_call_table: | 1025 | sys_call_table: |
| 1023 | #include "syscalls.S" | 1026 | #include "syscalls.S" |
| 1024 | #undef SYSCALL | 1027 | #undef SYSCALL |
| 1025 | |||
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index f3222a1b2861..1ca499fa54b4 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/sys.h> | 12 | #include <linux/sys.h> |
| 13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/cache.h> | 14 | #include <asm/cache.h> |
| 16 | #include <asm/lowcore.h> | 15 | #include <asm/lowcore.h> |
| 17 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
| @@ -992,6 +991,7 @@ cleanup_io_leave_insn: | |||
| 992 | .Lcritical_end: | 991 | .Lcritical_end: |
| 993 | .quad __critical_end | 992 | .quad __critical_end |
| 994 | 993 | ||
| 994 | .section .rodata, "a" | ||
| 995 | #define SYSCALL(esa,esame,emu) .long esame | 995 | #define SYSCALL(esa,esame,emu) .long esame |
| 996 | sys_call_table: | 996 | sys_call_table: |
| 997 | #include "syscalls.S" | 997 | #include "syscalls.S" |
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 538c82da49b1..adad8863ee2f 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
| 28 | #include <asm/lowcore.h> | 27 | #include <asm/lowcore.h> |
| 29 | #include <asm/asm-offsets.h> | 28 | #include <asm/asm-offsets.h> |
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 4a0f5a1551ea..1f9399191794 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * This file handles the architecture-dependent parts of process handling.. | 15 | * This file handles the architecture-dependent parts of process handling.. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/compiler.h> | 18 | #include <linux/compiler.h> |
| 20 | #include <linux/cpu.h> | 19 | #include <linux/cpu.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c index 0886e739d122..c73a45467fa4 100644 --- a/arch/s390/kernel/s390_ksyms.c +++ b/arch/s390/kernel/s390_ksyms.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * S390 version | 4 | * S390 version |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/highuid.h> | 6 | #include <linux/highuid.h> |
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 2b2551e3510b..1ca34f54ea8a 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
| 29 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 33 | #include <linux/initrd.h> | 32 | #include <linux/initrd.h> |
| 34 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index d48cfc726b68..a887b686f279 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson | 11 | * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/smp.h> | 16 | #include <linux/smp.h> |
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 2a6c6efb6865..f7fe9bc43397 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 12 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index b7630436f693..12240c03a6dd 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 'Traps.c' handles hardware traps and faults after we have saved some | 14 | * 'Traps.c' handles hardware traps and faults after we have saved some |
| 15 | * state in 'asm.s'. | 15 | * state in 'asm.s'. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/string.h> | 19 | #include <linux/string.h> |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 9f34bb54c051..ff5f7bb34f75 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <asm-generic/vmlinux.lds.h> | 5 | #include <asm-generic/vmlinux.lds.h> |
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifndef CONFIG_64BIT | 7 | #ifndef CONFIG_64BIT |
| 9 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") | 8 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") |
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index 1f0439dc245a..2306cd83fca1 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Author(s): Jan Glauber <jan.glauber@de.ibm.com> | 7 | * Author(s): Jan Glauber <jan.glauber@de.ibm.com> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/time.h> | 12 | #include <linux/time.h> |
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c index 71f0a2fb3078..468f4ea33f99 100644 --- a/arch/s390/lib/delay.c +++ b/arch/s390/lib/delay.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (C) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz> | 11 | * Copyright (C) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | 16 | ||
diff --git a/arch/s390/math-emu/math.c b/arch/s390/math-emu/math.c index 648df7140335..b4957c84e4d6 100644 --- a/arch/s390/math-emu/math.c +++ b/arch/s390/math-emu/math.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * that does not have the IEEE fpu (all processors before G5). | 9 | * that does not have the IEEE fpu (all processors before G5). |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index 51596f429235..81be2fec7dc5 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Collaborative memory management interface. | 8 | * Collaborative memory management interface. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 81ade401b073..833d5941746a 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) 1995 Linus Torvalds | 10 | * Copyright (C) 1995 Linus Torvalds |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/signal.h> | 13 | #include <linux/signal.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index a055894f3bd8..eb6ebfef134a 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1995 Linus Torvalds | 9 | * Copyright (C) 1995 Linus Torvalds |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| @@ -24,6 +23,7 @@ | |||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/pagemap.h> | 24 | #include <linux/pagemap.h> |
| 26 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
| 26 | #include <linux/pfn.h> | ||
| 27 | 27 | ||
| 28 | #include <asm/processor.h> | 28 | #include <asm/processor.h> |
| 29 | #include <asm/system.h> | 29 | #include <asm/system.h> |
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <asm/lowcore.h> | 34 | #include <asm/lowcore.h> |
| 35 | #include <asm/tlb.h> | 35 | #include <asm/tlb.h> |
| 36 | #include <asm/tlbflush.h> | 36 | #include <asm/tlbflush.h> |
| 37 | #include <asm/sections.h> | ||
| 37 | 38 | ||
| 38 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | 39 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
| 39 | 40 | ||
| @@ -90,17 +91,6 @@ void show_mem(void) | |||
| 90 | printk("%d pages swap cached\n",cached); | 91 | printk("%d pages swap cached\n",cached); |
| 91 | } | 92 | } |
| 92 | 93 | ||
| 93 | /* References to section boundaries */ | ||
| 94 | |||
| 95 | extern unsigned long _text; | ||
| 96 | extern unsigned long _etext; | ||
| 97 | extern unsigned long _edata; | ||
| 98 | extern unsigned long __bss_start; | ||
| 99 | extern unsigned long _end; | ||
| 100 | |||
| 101 | extern unsigned long __init_begin; | ||
| 102 | extern unsigned long __init_end; | ||
| 103 | |||
| 104 | extern unsigned long __initdata zholes_size[]; | 94 | extern unsigned long __initdata zholes_size[]; |
| 105 | /* | 95 | /* |
| 106 | * paging_init() sets up the page tables | 96 | * paging_init() sets up the page tables |
| @@ -117,6 +107,10 @@ void __init paging_init(void) | |||
| 117 | unsigned long pfn = 0; | 107 | unsigned long pfn = 0; |
| 118 | unsigned long pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERNSEG_TABLE; | 108 | unsigned long pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERNSEG_TABLE; |
| 119 | static const int ssm_mask = 0x04000000L; | 109 | static const int ssm_mask = 0x04000000L; |
| 110 | unsigned long ro_start_pfn, ro_end_pfn; | ||
| 111 | |||
| 112 | ro_start_pfn = PFN_DOWN((unsigned long)&__start_rodata); | ||
| 113 | ro_end_pfn = PFN_UP((unsigned long)&__end_rodata); | ||
| 120 | 114 | ||
| 121 | /* unmap whole virtual address space */ | 115 | /* unmap whole virtual address space */ |
| 122 | 116 | ||
| @@ -144,7 +138,10 @@ void __init paging_init(void) | |||
| 144 | pg_dir++; | 138 | pg_dir++; |
| 145 | 139 | ||
| 146 | for (tmp = 0 ; tmp < PTRS_PER_PTE ; tmp++,pg_table++) { | 140 | for (tmp = 0 ; tmp < PTRS_PER_PTE ; tmp++,pg_table++) { |
| 147 | pte = pfn_pte(pfn, PAGE_KERNEL); | 141 | if (pfn >= ro_start_pfn && pfn < ro_end_pfn) |
| 142 | pte = pfn_pte(pfn, __pgprot(_PAGE_RO)); | ||
| 143 | else | ||
| 144 | pte = pfn_pte(pfn, PAGE_KERNEL); | ||
| 148 | if (pfn >= max_low_pfn) | 145 | if (pfn >= max_low_pfn) |
| 149 | pte_clear(&init_mm, 0, &pte); | 146 | pte_clear(&init_mm, 0, &pte); |
| 150 | set_pte(pg_table, pte); | 147 | set_pte(pg_table, pte); |
| @@ -176,6 +173,7 @@ void __init paging_init(void) | |||
| 176 | } | 173 | } |
| 177 | 174 | ||
| 178 | #else /* CONFIG_64BIT */ | 175 | #else /* CONFIG_64BIT */ |
| 176 | |||
| 179 | void __init paging_init(void) | 177 | void __init paging_init(void) |
| 180 | { | 178 | { |
| 181 | pgd_t * pg_dir; | 179 | pgd_t * pg_dir; |
| @@ -187,13 +185,15 @@ void __init paging_init(void) | |||
| 187 | unsigned long pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | | 185 | unsigned long pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | |
| 188 | _KERN_REGION_TABLE; | 186 | _KERN_REGION_TABLE; |
| 189 | static const int ssm_mask = 0x04000000L; | 187 | static const int ssm_mask = 0x04000000L; |
| 190 | |||
| 191 | unsigned long zones_size[MAX_NR_ZONES]; | 188 | unsigned long zones_size[MAX_NR_ZONES]; |
| 192 | unsigned long dma_pfn, high_pfn; | 189 | unsigned long dma_pfn, high_pfn; |
| 190 | unsigned long ro_start_pfn, ro_end_pfn; | ||
| 193 | 191 | ||
| 194 | memset(zones_size, 0, sizeof(zones_size)); | 192 | memset(zones_size, 0, sizeof(zones_size)); |
| 195 | dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT; | 193 | dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT; |
| 196 | high_pfn = max_low_pfn; | 194 | high_pfn = max_low_pfn; |
| 195 | ro_start_pfn = PFN_DOWN((unsigned long)&__start_rodata); | ||
| 196 | ro_end_pfn = PFN_UP((unsigned long)&__end_rodata); | ||
| 197 | 197 | ||
| 198 | if (dma_pfn > high_pfn) | 198 | if (dma_pfn > high_pfn) |
| 199 | zones_size[ZONE_DMA] = high_pfn; | 199 | zones_size[ZONE_DMA] = high_pfn; |
| @@ -232,7 +232,10 @@ void __init paging_init(void) | |||
| 232 | pmd_populate_kernel(&init_mm, pm_dir, pt_dir); | 232 | pmd_populate_kernel(&init_mm, pm_dir, pt_dir); |
| 233 | 233 | ||
| 234 | for (k = 0 ; k < PTRS_PER_PTE ; k++,pt_dir++) { | 234 | for (k = 0 ; k < PTRS_PER_PTE ; k++,pt_dir++) { |
| 235 | pte = pfn_pte(pfn, PAGE_KERNEL); | 235 | if (pfn >= ro_start_pfn && pfn < ro_end_pfn) |
| 236 | pte = pfn_pte(pfn, __pgprot(_PAGE_RO)); | ||
| 237 | else | ||
| 238 | pte = pfn_pte(pfn, PAGE_KERNEL); | ||
| 236 | if (pfn >= max_low_pfn) { | 239 | if (pfn >= max_low_pfn) { |
| 237 | pte_clear(&init_mm, 0, &pte); | 240 | pte_clear(&init_mm, 0, &pte); |
| 238 | continue; | 241 | continue; |
| @@ -283,6 +286,9 @@ void __init mem_init(void) | |||
| 283 | reservedpages << (PAGE_SHIFT-10), | 286 | reservedpages << (PAGE_SHIFT-10), |
| 284 | datasize >>10, | 287 | datasize >>10, |
| 285 | initsize >> 10); | 288 | initsize >> 10); |
| 289 | printk("Write protected kernel read-only data: %#lx - %#lx\n", | ||
| 290 | (unsigned long)&__start_rodata, | ||
| 291 | PFN_ALIGN((unsigned long)&__end_rodata) - 1); | ||
| 286 | } | 292 | } |
| 287 | 293 | ||
| 288 | void free_initmem(void) | 294 | void free_initmem(void) |
diff --git a/arch/sh/boards/adx/irq_maskreg.c b/arch/sh/boards/adx/irq_maskreg.c index 357fab1bac2b..4b2abe5eb165 100644 --- a/arch/sh/boards/adx/irq_maskreg.c +++ b/arch/sh/boards/adx/irq_maskreg.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Each bit of the register is for masking each interrupt. | 13 | * Each bit of the register is for masking each interrupt. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c index a9fde781b21a..6835381da5fd 100644 --- a/arch/sh/boards/bigsur/io.c +++ b/arch/sh/boards/bigsur/io.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * IO functions for a Hitachi Big Sur Evaluation Board. | 14 | * IO functions for a Hitachi Big Sur Evaluation Board. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <asm/machvec.h> | 19 | #include <asm/machvec.h> |
diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c index 1d32425782c0..ac946a2201c7 100644 --- a/arch/sh/boards/bigsur/irq.c +++ b/arch/sh/boards/bigsur/irq.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/arch/sh/boards/bigsur/led.c b/arch/sh/boards/bigsur/led.c index 0a2339c69440..6b08c0e1c453 100644 --- a/arch/sh/boards/bigsur/led.c +++ b/arch/sh/boards/bigsur/led.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * This file contains Big Sur specific LED code. | 11 | * This file contains Big Sur specific LED code. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
| 16 | #include <asm/bigsur/bigsur.h> | 15 | #include <asm/bigsur/bigsur.h> |
| 17 | 16 | ||
diff --git a/arch/sh/boards/bigsur/setup.c b/arch/sh/boards/bigsur/setup.c index e69be05195f5..dfeede9da50f 100644 --- a/arch/sh/boards/bigsur/setup.c +++ b/arch/sh/boards/bigsur/setup.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/arch/sh/boards/cat68701/setup.c b/arch/sh/boards/cat68701/setup.c index ae8a350ade53..90e5175df227 100644 --- a/arch/sh/boards/cat68701/setup.c +++ b/arch/sh/boards/cat68701/setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include <asm/machvec.h> | 16 | #include <asm/machvec.h> |
| 17 | #include <asm/mach/io.h> | 17 | #include <asm/mach/io.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/arch/sh/boards/cqreek/setup.c b/arch/sh/boards/cqreek/setup.c index 29b537cd6546..eff4ed93599f 100644 --- a/arch/sh/boards/cqreek/setup.c +++ b/arch/sh/boards/cqreek/setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
diff --git a/arch/sh/boards/harp/irq.c b/arch/sh/boards/harp/irq.c index 701fa55d5297..96bb41c9fc55 100644 --- a/arch/sh/boards/harp/irq.c +++ b/arch/sh/boards/harp/irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Bases on the IPR irq system | 9 | * Bases on the IPR irq system |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/harp/led.c b/arch/sh/boards/harp/led.c index 76ca4ccac703..aeb7b392b190 100644 --- a/arch/sh/boards/harp/led.c +++ b/arch/sh/boards/harp/led.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * This file contains ST40STB1 HARP and compatible code. | 9 | * This file contains ST40STB1 HARP and compatible code. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
| 14 | #include <asm/harp/harp.h> | 13 | #include <asm/harp/harp.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/harp/setup.c b/arch/sh/boards/harp/setup.c index 05b01b8f40aa..886e450ab63e 100644 --- a/arch/sh/boards/harp/setup.c +++ b/arch/sh/boards/harp/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * STMicroelectronics ST40STB1 HARP and compatible support. | 9 | * STMicroelectronics ST40STB1 HARP and compatible support. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c index 6d94a8e2e67a..71f315663cc9 100644 --- a/arch/sh/boards/hp6xx/setup.c +++ b/arch/sh/boards/hp6xx/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Setup code for an HP680 (internal peripherials only) | 9 | * Setup code for an HP680 (internal peripherials only) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <asm/hd64461.h> | 14 | #include <asm/hd64461.h> |
diff --git a/arch/sh/boards/mpc1211/led.c b/arch/sh/boards/mpc1211/led.c index 0a31beec3465..1fe36927f691 100644 --- a/arch/sh/boards/mpc1211/led.c +++ b/arch/sh/boards/mpc1211/led.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * This file contains Interface MPC-1211 specific LED code. | 6 | * This file contains Interface MPC-1211 specific LED code. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | static void mach_led(int position, int value) | 10 | static void mach_led(int position, int value) |
| 12 | { | 11 | { |
diff --git a/arch/sh/boards/mpc1211/pci.c b/arch/sh/boards/mpc1211/pci.c index 9f7ccd33ffb6..4ed1a95c6d56 100644 --- a/arch/sh/boards/mpc1211/pci.c +++ b/arch/sh/boards/mpc1211/pci.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * License. See linux/COPYING for more information. | 11 | * License. See linux/COPYING for more information. |
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c index b72f009c52c2..2bfb221cc35c 100644 --- a/arch/sh/boards/mpc1211/setup.c +++ b/arch/sh/boards/mpc1211/setup.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/irq.h> | 9 | #include <linux/irq.h> |
| 11 | #include <linux/hdreg.h> | 10 | #include <linux/hdreg.h> |
diff --git a/arch/sh/boards/overdrive/fpga.c b/arch/sh/boards/overdrive/fpga.c index 3a1ec9403441..956c23901228 100644 --- a/arch/sh/boards/overdrive/fpga.c +++ b/arch/sh/boards/overdrive/fpga.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
| 16 | #include <linux/smp_lock.h> | 15 | #include <linux/smp_lock.h> |
diff --git a/arch/sh/boards/overdrive/galileo.c b/arch/sh/boards/overdrive/galileo.c index b055809d2ac1..29e48971bba0 100644 --- a/arch/sh/boards/overdrive/galileo.c +++ b/arch/sh/boards/overdrive/galileo.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 15 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
diff --git a/arch/sh/boards/overdrive/io.c b/arch/sh/boards/overdrive/io.c index 65f3fd0563d3..4671b6b047bb 100644 --- a/arch/sh/boards/overdrive/io.c +++ b/arch/sh/boards/overdrive/io.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 14 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
diff --git a/arch/sh/boards/overdrive/irq.c b/arch/sh/boards/overdrive/irq.c index 2c13a7de6b22..5d730c70389e 100644 --- a/arch/sh/boards/overdrive/irq.c +++ b/arch/sh/boards/overdrive/irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Bases on the IPR irq system | 9 | * Bases on the IPR irq system |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/overdrive/led.c b/arch/sh/boards/overdrive/led.c index 734742e92279..860d7f204a4e 100644 --- a/arch/sh/boards/overdrive/led.c +++ b/arch/sh/boards/overdrive/led.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * This file contains an Overdrive specific LED feature. | 9 | * This file contains an Overdrive specific LED feature. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/system.h> | 12 | #include <asm/system.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <asm/overdrive/overdrive.h> | 14 | #include <asm/overdrive/overdrive.h> |
diff --git a/arch/sh/boards/overdrive/setup.c b/arch/sh/boards/overdrive/setup.c index 94f6165d33b8..a3a7744c2047 100644 --- a/arch/sh/boards/overdrive/setup.c +++ b/arch/sh/boards/overdrive/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * STMicroelectronics Overdrive Support. | 9 | * STMicroelectronics Overdrive Support. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
diff --git a/arch/sh/boards/renesas/edosk7705/setup.c b/arch/sh/boards/renesas/edosk7705/setup.c index 8b6f0c2af092..ba143fa4afaa 100644 --- a/arch/sh/boards/renesas/edosk7705/setup.c +++ b/arch/sh/boards/renesas/edosk7705/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * board by S. Dunn, 2003. | 9 | * board by S. Dunn, 2003. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <asm/machvec.h> | 13 | #include <asm/machvec.h> |
| 15 | #include <asm/machvec_init.h> | 14 | #include <asm/machvec_init.h> |
diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c index 456753d2649c..3a1abfa2fefb 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/io.c +++ b/arch/sh/boards/renesas/hs7751rvoip/io.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * expectation of later SuperIO and PCMCIA access. | 11 | * expectation of later SuperIO and PCMCIA access. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <asm/io.h> | 16 | #include <asm/io.h> |
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c index 52a98b524e1f..705b7ddcb0d2 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/irq.c +++ b/arch/sh/boards/renesas/hs7751rvoip/irq.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Lineo uSolutions, Inc. 2003. | 10 | * Lineo uSolutions, Inc. 2003. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
| 16 | #include <asm/io.h> | 15 | #include <asm/io.h> |
diff --git a/arch/sh/boards/renesas/hs7751rvoip/led.c b/arch/sh/boards/renesas/hs7751rvoip/led.c index 18a13c8da8a4..b6608fff9f38 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/led.c +++ b/arch/sh/boards/renesas/hs7751rvoip/led.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Lineo uSolutions, Inc. 2003. | 10 | * Lineo uSolutions, Inc. 2003. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <asm/hs7751rvoip/hs7751rvoip.h> | 14 | #include <asm/hs7751rvoip/hs7751rvoip.h> |
| 16 | 15 | ||
diff --git a/arch/sh/boards/renesas/hs7751rvoip/mach.c b/arch/sh/boards/renesas/hs7751rvoip/mach.c index 8bbed60220ca..caf967f77c61 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/mach.c +++ b/arch/sh/boards/renesas/hs7751rvoip/mach.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Machine vector for the Renesas Technology sales HS7751RVoIP | 9 | * Machine vector for the Renesas Technology sales HS7751RVoIP |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | 13 | ||
| 15 | #include <asm/machvec.h> | 14 | #include <asm/machvec.h> |
diff --git a/arch/sh/boards/renesas/hs7751rvoip/pci.c b/arch/sh/boards/renesas/hs7751rvoip/pci.c index 7a442d1eca46..7e5786b58110 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/pci.c +++ b/arch/sh/boards/renesas/hs7751rvoip/pci.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * PCI initialization for the Renesas SH7751R HS7751RVoIP board | 11 | * PCI initialization for the Renesas SH7751R HS7751RVoIP board |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/sh/boards/renesas/hs7751rvoip/setup.c b/arch/sh/boards/renesas/hs7751rvoip/setup.c index f1a78b6c714c..29fb5ff70fb5 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/setup.c +++ b/arch/sh/boards/renesas/hs7751rvoip/setup.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Lineo uSolutions, Inc. 2003. | 10 | * Lineo uSolutions, Inc. 2003. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
| 16 | 15 | ||
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c index e16915d9cda4..154535440bbf 100644 --- a/arch/sh/boards/renesas/rts7751r2d/irq.c +++ b/arch/sh/boards/renesas/rts7751r2d/irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Atom Create Engineering Co., Ltd. 2002. | 9 | * Atom Create Engineering Co., Ltd. 2002. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
diff --git a/arch/sh/boards/renesas/rts7751r2d/led.c b/arch/sh/boards/renesas/rts7751r2d/led.c index 9993259a894f..4d16de71fac1 100644 --- a/arch/sh/boards/renesas/rts7751r2d/led.c +++ b/arch/sh/boards/renesas/rts7751r2d/led.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * This file contains Renesas Technology Sales RTS7751R2D specific LED code. | 9 | * This file contains Renesas Technology Sales RTS7751R2D specific LED code. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
| 14 | #include <asm/rts7751r2d/rts7751r2d.h> | 13 | #include <asm/rts7751r2d/rts7751r2d.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c index 610740512d56..5ed9e97ea197 100644 --- a/arch/sh/boards/renesas/rts7751r2d/mach.c +++ b/arch/sh/boards/renesas/rts7751r2d/mach.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Machine vector for the Renesas Technology sales RTS7751R2D | 9 | * Machine vector for the Renesas Technology sales RTS7751R2D |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c index 845979181059..8372d967f601 100644 --- a/arch/sh/boards/renesas/systemh/irq.c +++ b/arch/sh/boards/renesas/systemh/irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Jonathan Short. | 9 | * Jonathan Short. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/se/7300/io.c b/arch/sh/boards/se/7300/io.c index 3c89def46480..f449a94ddffd 100644 --- a/arch/sh/boards/se/7300/io.c +++ b/arch/sh/boards/se/7300/io.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <asm/mach/se7300.h> | 12 | #include <asm/mach/se7300.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
diff --git a/arch/sh/boards/se/7300/irq.c b/arch/sh/boards/se/7300/irq.c index 96c8c23d6c93..216a78d1a108 100644 --- a/arch/sh/boards/se/7300/irq.c +++ b/arch/sh/boards/se/7300/irq.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| 13 | #include <asm/irq.h> | 12 | #include <asm/irq.h> |
diff --git a/arch/sh/boards/se/7300/led.c b/arch/sh/boards/se/7300/led.c index 02c7f846c84c..ad51f0a9c1e3 100644 --- a/arch/sh/boards/se/7300/led.c +++ b/arch/sh/boards/se/7300/led.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * This file contains Solution Engine specific LED code. | 11 | * This file contains Solution Engine specific LED code. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <asm/mach/se7300.h> | 15 | #include <asm/mach/se7300.h> |
| 17 | 16 | ||
diff --git a/arch/sh/boards/se/7300/setup.c b/arch/sh/boards/se/7300/setup.c index 08536bc224dc..ebcd98d4c081 100644 --- a/arch/sh/boards/se/7300/setup.c +++ b/arch/sh/boards/se/7300/setup.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <asm/machvec.h> | 11 | #include <asm/machvec.h> |
| 13 | #include <asm/machvec_init.h> | 12 | #include <asm/machvec_init.h> |
diff --git a/arch/sh/boards/se/73180/io.c b/arch/sh/boards/se/73180/io.c index 73648cbe3678..755df5ac4a4e 100644 --- a/arch/sh/boards/se/73180/io.c +++ b/arch/sh/boards/se/73180/io.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <asm/mach/se73180.h> | 12 | #include <asm/mach/se73180.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
diff --git a/arch/sh/boards/se/73180/irq.c b/arch/sh/boards/se/73180/irq.c index 402735c7c898..4344d0ef24aa 100644 --- a/arch/sh/boards/se/73180/irq.c +++ b/arch/sh/boards/se/73180/irq.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
| 16 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
diff --git a/arch/sh/boards/se/73180/led.c b/arch/sh/boards/se/73180/led.c index 1e8f1cf3e10f..610439fde6ee 100644 --- a/arch/sh/boards/se/73180/led.c +++ b/arch/sh/boards/se/73180/led.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * This file contains Solution Engine specific LED code. | 11 | * This file contains Solution Engine specific LED code. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <asm/mach/se73180.h> | 15 | #include <asm/mach/se73180.h> |
| 17 | 16 | ||
diff --git a/arch/sh/boards/se/73180/setup.c b/arch/sh/boards/se/73180/setup.c index 07fa90c38a06..cdb7b5f8d942 100644 --- a/arch/sh/boards/se/73180/setup.c +++ b/arch/sh/boards/se/73180/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <asm/machvec.h> | 13 | #include <asm/machvec.h> |
| 15 | #include <asm/machvec_init.h> | 14 | #include <asm/machvec_init.h> |
diff --git a/arch/sh/boards/se/770x/irq.c b/arch/sh/boards/se/770x/irq.c index 210897b315f4..3e558716ce10 100644 --- a/arch/sh/boards/se/770x/irq.c +++ b/arch/sh/boards/se/770x/irq.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| 13 | #include <asm/irq.h> | 12 | #include <asm/irq.h> |
diff --git a/arch/sh/boards/se/770x/led.c b/arch/sh/boards/se/770x/led.c index 5c64e8ab2cfb..3cddbda025fc 100644 --- a/arch/sh/boards/se/770x/led.c +++ b/arch/sh/boards/se/770x/led.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * This file contains Solution Engine specific LED code. | 9 | * This file contains Solution Engine specific LED code. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/se/se.h> | 12 | #include <asm/se/se.h> |
| 14 | 13 | ||
| 15 | static void mach_led(int position, int value) | 14 | static void mach_led(int position, int value) |
diff --git a/arch/sh/boards/se/770x/mach.c b/arch/sh/boards/se/770x/mach.c index f9b4c56cc47e..6ec07bd3dcf1 100644 --- a/arch/sh/boards/se/770x/mach.c +++ b/arch/sh/boards/se/770x/mach.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Machine vector for the Hitachi SolutionEngine | 9 | * Machine vector for the Hitachi SolutionEngine |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | 13 | ||
| 15 | #include <asm/machvec.h> | 14 | #include <asm/machvec.h> |
diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c index 2bed46fb607d..7d1a071727cc 100644 --- a/arch/sh/boards/se/770x/setup.c +++ b/arch/sh/boards/se/770x/setup.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 12 | #include <linux/irq.h> |
| 14 | 13 | ||
diff --git a/arch/sh/boards/se/7751/irq.c b/arch/sh/boards/se/7751/irq.c index ad71f3e66c11..bf6c023615df 100644 --- a/arch/sh/boards/se/7751/irq.c +++ b/arch/sh/boards/se/7751/irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Ian da Silva and Jeremy Siegel, 2001. | 9 | * Ian da Silva and Jeremy Siegel, 2001. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | #include <asm/irq.h> | 14 | #include <asm/irq.h> |
diff --git a/arch/sh/boards/se/7751/led.c b/arch/sh/boards/se/7751/led.c index 0c788230cf8f..a878726d3c7c 100644 --- a/arch/sh/boards/se/7751/led.c +++ b/arch/sh/boards/se/7751/led.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * This file contains Solution Engine specific LED code. | 9 | * This file contains Solution Engine specific LED code. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/se7751/se7751.h> | 12 | #include <asm/se7751/se7751.h> |
| 14 | 13 | ||
| 15 | static void mach_led(int position, int value) | 14 | static void mach_led(int position, int value) |
diff --git a/arch/sh/boards/se/7751/mach.c b/arch/sh/boards/se/7751/mach.c index 16d386b7e3bf..62d8d3e62590 100644 --- a/arch/sh/boards/se/7751/mach.c +++ b/arch/sh/boards/se/7751/mach.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Machine vector for the Hitachi 7751 SolutionEngine | 9 | * Machine vector for the Hitachi 7751 SolutionEngine |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | 13 | ||
| 15 | #include <asm/machvec.h> | 14 | #include <asm/machvec.h> |
diff --git a/arch/sh/boards/se/7751/pci.c b/arch/sh/boards/se/7751/pci.c index 1f273efd2cf5..3ee03014dea3 100644 --- a/arch/sh/boards/se/7751/pci.c +++ b/arch/sh/boards/se/7751/pci.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * PCI initialization for the Hitachi SH7751 Solution Engine board (MS7751SE01) | 11 | * PCI initialization for the Hitachi SH7751 Solution Engine board (MS7751SE01) |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c index 9d111bb884f9..48dc5aee67d4 100644 --- a/arch/sh/boards/se/7751/setup.c +++ b/arch/sh/boards/se/7751/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Ian da Silva and Jeremy Siegel, 2001. | 9 | * Ian da Silva and Jeremy Siegel, 2001. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/sh03/led.c b/arch/sh/boards/sh03/led.c index c851b0bec80f..d38562ad6be8 100644 --- a/arch/sh/boards/sh03/led.c +++ b/arch/sh/boards/sh03/led.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * This file contains Interface CTP/PCI-SH03 specific LED code. | 6 | * This file contains Interface CTP/PCI-SH03 specific LED code. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | 10 | ||
| 12 | /* Cycle the LED's in the clasic Knightrider/Sun pattern */ | 11 | /* Cycle the LED's in the clasic Knightrider/Sun pattern */ |
diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index d2a08ca5eb85..60290f8f289c 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/irq.h> | 9 | #include <linux/irq.h> |
| 11 | #include <linux/hdreg.h> | 10 | #include <linux/hdreg.h> |
diff --git a/arch/sh/boards/sh2000/setup.c b/arch/sh/boards/sh2000/setup.c index a290b1d09fb2..2fe6a11765e9 100644 --- a/arch/sh/boards/sh2000/setup.c +++ b/arch/sh/boards/sh2000/setup.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| 13 | 12 | ||
diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c index 08fc98342a0b..046b896d04f9 100644 --- a/arch/sh/boards/snapgear/setup.c +++ b/arch/sh/boards/snapgear/setup.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | /****************************************************************************/ | 15 | /****************************************************************************/ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
| 20 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/superh/microdev/io.c index 1ed7f880b8c7..4836b9422e27 100644 --- a/arch/sh/boards/superh/microdev/io.c +++ b/arch/sh/boards/superh/microdev/io.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * License. See linux/COPYING for more information. | 11 | * License. See linux/COPYING for more information. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 17 | #include <linux/wait.h> | 16 | #include <linux/wait.h> |
diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c index cb5999425d16..236398fbc083 100644 --- a/arch/sh/boards/superh/microdev/irq.c +++ b/arch/sh/boards/superh/microdev/irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * License. See linux/COPYING for more information. | 9 | * License. See linux/COPYING for more information. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 15 | 14 | ||
diff --git a/arch/sh/boards/superh/microdev/led.c b/arch/sh/boards/superh/microdev/led.c index 52a98e69d3f0..a38f5351bd16 100644 --- a/arch/sh/boards/superh/microdev/led.c +++ b/arch/sh/boards/superh/microdev/led.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
| 14 | 13 | ||
| 15 | #define LED_REGISTER 0xa6104d20 | 14 | #define LED_REGISTER 0xa6104d20 |
diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/superh/microdev/setup.c index 892b14d31405..61b402a3f5d7 100644 --- a/arch/sh/boards/superh/microdev/setup.c +++ b/arch/sh/boards/superh/microdev/setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * License. See linux/COPYING for more information. | 11 | * License. See linux/COPYING for more information. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 17 | #include <linux/ioport.h> | 16 | #include <linux/ioport.h> |
diff --git a/arch/sh/boards/unknown/setup.c b/arch/sh/boards/unknown/setup.c index 02e84f03f45c..c5e4ed10876b 100644 --- a/arch/sh/boards/unknown/setup.c +++ b/arch/sh/boards/unknown/setup.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * method to start debugging a new board during bring-up until proper board | 12 | * method to start debugging a new board during bring-up until proper board |
| 13 | * setup code is written. | 13 | * setup code is written. |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <asm/machvec.h> | 16 | #include <asm/machvec.h> |
| 18 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
diff --git a/arch/sh/boot/compressed/head.S b/arch/sh/boot/compressed/head.S index 88db04d325fb..4c26a192277d 100644 --- a/arch/sh/boot/compressed/head.S +++ b/arch/sh/boot/compressed/head.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | .text | 8 | .text |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | 11 | ||
| 13 | .global startup | 12 | .global startup |
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index 211e9110074f..f2fed5ce5cc3 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000 | 11 | * Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000 |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
| 16 | #ifdef CONFIG_SH_STANDARD_BIOS | 15 | #ifdef CONFIG_SH_STANDARD_BIOS |
| 17 | #include <asm/sh_bios.h> | 16 | #include <asm/sh_bios.h> |
diff --git a/arch/sh/cchips/hd6446x/hd64461/io.c b/arch/sh/cchips/hd6446x/hd64461/io.c index 4c062d6b7a97..ac3062671db7 100644 --- a/arch/sh/cchips/hd6446x/hd64461/io.c +++ b/arch/sh/cchips/hd6446x/hd64461/io.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Typical I/O routines for HD64461 system. | 4 | * Typical I/O routines for HD64461 system. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/io.h> | 7 | #include <asm/io.h> |
| 9 | #include <asm/hd64461/hd64461.h> | 8 | #include <asm/hd64461/hd64461.h> |
| 10 | 9 | ||
diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c index 724db04cb392..9b361a91a1a6 100644 --- a/arch/sh/cchips/hd6446x/hd64461/setup.c +++ b/arch/sh/cchips/hd6446x/hd64461/setup.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Hitachi HD64461 companion chip support | 4 | * Hitachi HD64461 companion chip support |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
diff --git a/arch/sh/cchips/hd6446x/hd64465/io.c b/arch/sh/cchips/hd6446x/hd64465/io.c index 84cb142def0b..58704d066ae2 100644 --- a/arch/sh/cchips/hd6446x/hd64465/io.c +++ b/arch/sh/cchips/hd6446x/hd64465/io.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Typical I/O routines for HD64465 system. | 9 | * Typical I/O routines for HD64465 system. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c index cf9142c620b7..b2b0aa48a3a7 100644 --- a/arch/sh/cchips/hd6446x/hd64465/setup.c +++ b/arch/sh/cchips/hd6446x/hd64465/setup.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 2000 YAEGASHI Takeshi | 9 | * Copyright (C) 2000 YAEGASHI Takeshi |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c index 892214bade19..6a74464dab2d 100644 --- a/arch/sh/cchips/voyagergx/irq.c +++ b/arch/sh/cchips/voyagergx/irq.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #undef DEBUG | 22 | #undef DEBUG |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index cca26c4c9d1b..fecd8f8d0466 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * for more details. | 12 | * for more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
| 18 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c index e12418bb1fa5..6acf02b9375b 100644 --- a/arch/sh/drivers/pci/dma-dreamcast.c +++ b/arch/sh/drivers/pci/dma-dreamcast.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * for more details. | 15 | * for more details. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/param.h> | 20 | #include <linux/param.h> |
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index cf30e2fa51be..63b1c6f4b8d2 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * for more details. | 15 | * for more details. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/param.h> | 20 | #include <linux/param.h> |
diff --git a/arch/sh/drivers/pci/ops-bigsur.c b/arch/sh/drivers/pci/ops-bigsur.c index 9b43da67804b..ae82c6ca05e5 100644 --- a/arch/sh/drivers/pci/ops-bigsur.c +++ b/arch/sh/drivers/pci/ops-bigsur.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * PCI initialization for the Hitachi Big Sur Evaluation Board | 11 | * PCI initialization for the Hitachi Big Sur Evaluation Board |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c index 69af80b93e3f..23d52791917e 100644 --- a/arch/sh/drivers/pci/ops-dreamcast.c +++ b/arch/sh/drivers/pci/ops-dreamcast.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * for more details. | 15 | * for more details. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/param.h> | 20 | #include <linux/param.h> |
diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c index beafa11f4d0c..83171d10141a 100644 --- a/arch/sh/drivers/pci/ops-rts7751r2d.c +++ b/arch/sh/drivers/pci/ops-rts7751r2d.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * PCI initialization for the Renesas SH7751R RTS7751R2D board | 11 | * PCI initialization for the Renesas SH7751R RTS7751R2D board |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/sh/drivers/pci/ops-sh03.c b/arch/sh/drivers/pci/ops-sh03.c index df2199732348..e58d556e5f94 100644 --- a/arch/sh/drivers/pci/ops-sh03.c +++ b/arch/sh/drivers/pci/ops-sh03.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * PCI initialization for the Interface CTP/PCI-SH03 board | 4 | * PCI initialization for the Interface CTP/PCI-SH03 board |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
diff --git a/arch/sh/drivers/pci/ops-snapgear.c b/arch/sh/drivers/pci/ops-snapgear.c index 6fdb9765c99a..3cbd14dd28fe 100644 --- a/arch/sh/drivers/pci/ops-snapgear.c +++ b/arch/sh/drivers/pci/ops-snapgear.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * PCI initialization for the SnapGear boards | 13 | * PCI initialization for the SnapGear boards |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c index 30b14ac7ae5a..682f3dae305d 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #undef DEBUG | 16 | #undef DEBUG |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/arch/sh/drivers/pci/pci-st40.c b/arch/sh/drivers/pci/pci-st40.c index cb6752131156..21f3017e5c28 100644 --- a/arch/sh/drivers/pci/pci-st40.c +++ b/arch/sh/drivers/pci/pci-st40.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Support functions for the ST40 PCI hardware. | 7 | * Support functions for the ST40 PCI hardware. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/smp.h> | 11 | #include <linux/smp.h> |
| 13 | #include <linux/smp_lock.h> | 12 | #include <linux/smp_lock.h> |
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c index 7a3b18faa277..f1f9ab87f0b0 100644 --- a/arch/sh/kernel/cf-enabler.c +++ b/arch/sh/kernel/cf-enabler.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Enable the CF configuration. | 9 | * Enable the CF configuration. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | 13 | ||
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c index 0373b65c77f9..0f545941fb4f 100644 --- a/arch/sh/kernel/cpu/irq/ipr.c +++ b/arch/sh/kernel/cpu/irq/ipr.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
diff --git a/arch/sh/kernel/cpu/irq/pint.c b/arch/sh/kernel/cpu/irq/pint.c index 714963a25bba..80cd8108d36a 100644 --- a/arch/sh/kernel/cpu/irq/pint.c +++ b/arch/sh/kernel/cpu/irq/pint.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * for more details. | 10 | * for more details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
diff --git a/arch/sh/kernel/cpu/sh3/ex.S b/arch/sh/kernel/cpu/sh3/ex.S index 966c0858b714..cc04e9e239ff 100644 --- a/arch/sh/kernel/cpu/sh3/ex.S +++ b/arch/sh/kernel/cpu/sh3/ex.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | .align 2 | 16 | .align 2 |
| 18 | .data | 17 | .data |
diff --git a/arch/sh/kernel/cpu/sh4/ex.S b/arch/sh/kernel/cpu/sh4/ex.S index 8221e9d15515..26a27df06505 100644 --- a/arch/sh/kernel/cpu/sh4/ex.S +++ b/arch/sh/kernel/cpu/sh4/ex.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | .align 2 | 16 | .align 2 |
| 18 | .data | 17 | .data |
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c index 83a4f91bce5a..781dbb11c038 100644 --- a/arch/sh/kernel/cpu/sh4/sq.c +++ b/arch/sh/kernel/cpu/sh4/sq.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/list.h> | 23 | #include <linux/list.h> |
| 25 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S index a440d36ee618..7dfd2ba75f7f 100644 --- a/arch/sh/kernel/entry.S +++ b/arch/sh/kernel/entry.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/sys.h> | 14 | #include <linux/sys.h> |
| 15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/asm-offsets.h> | 16 | #include <asm/asm-offsets.h> |
| 18 | #include <asm/thread_info.h> | 17 | #include <asm/thread_info.h> |
| 19 | #include <asm/cpu/mmu_context.h> | 18 | #include <asm/cpu/mmu_context.h> |
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index 3887b4f6feb2..f7eebbde3291 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/arch/sh/kernel/relocate_kernel.S b/arch/sh/kernel/relocate_kernel.S index b0695cffec6e..8221b37c9773 100644 --- a/arch/sh/kernel/relocate_kernel.S +++ b/arch/sh/kernel/relocate_kernel.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Version 2. See the file COPYING for more details. | 8 | * Version 2. See the file COPYING for more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
| 13 | 12 | ||
| 14 | #define PAGE_SIZE 4096 /* must be same value as in <asm/page.h> */ | 13 | #define PAGE_SIZE 4096 /* must be same value as in <asm/page.h> */ |
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index d5d032533a8b..245ed8f945e8 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/smp.h> | 2 | #include <linux/smp.h> |
| 4 | #include <linux/user.h> | 3 | #include <linux/user.h> |
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index 62c7d1c0ad7b..6c0fb7c4af11 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Free Software Foundation; either version 2 of the License, or (at your | 10 | * Free Software Foundation; either version 2 of the License, or (at your |
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/cache.h> | 13 | #include <linux/cache.h> |
| 15 | #include <linux/cpumask.h> | 14 | #include <linux/cpumask.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 314a275c04e0..a1589f85499d 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 10 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index 7eb06719d844..d9db1180f770 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 'Traps.c' handles hardware traps and faults after we have saved some | 12 | * 'Traps.c' handles hardware traps and faults after we have saved some |
| 13 | * state in 'entry.S'. | 13 | * state in 'entry.S'. |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/string.h> | 17 | #include <linux/string.h> |
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index 51bdc1cf7838..95fdd9135fcf 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * ld script to make SuperH Linux kernel | 2 | * ld script to make SuperH Linux kernel |
| 3 | * Written by Niibe Yutaka | 3 | * Written by Niibe Yutaka |
| 4 | */ | 4 | */ |
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm-generic/vmlinux.lds.h> | 5 | #include <asm-generic/vmlinux.lds.h> |
| 7 | 6 | ||
| 8 | #ifdef CONFIG_CPU_LITTLE_ENDIAN | 7 | #ifdef CONFIG_CPU_LITTLE_ENDIAN |
diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S index 55f227441f9e..db6b736537ad 100644 --- a/arch/sh/lib/memcpy-sh4.S +++ b/arch/sh/lib/memcpy-sh4.S | |||
| @@ -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 | /* | 12 | /* |
| 14 | * void *memcpy(void *dst, const void *src, size_t n); | 13 | * void *memcpy(void *dst, const void *src, size_t n); |
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c index ab833adf28c3..524cea5b47f9 100644 --- a/arch/sh/mm/cache-sh4.c +++ b/arch/sh/mm/cache-sh4.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * for more details. | 10 | * for more details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/mman.h> | 14 | #include <linux/mman.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/sh/mm/clear_page.S b/arch/sh/mm/clear_page.S index ae58a61f0e66..08acead7b2a1 100644 --- a/arch/sh/mm/clear_page.S +++ b/arch/sh/mm/clear_page.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 2001, 2002 Niibe Yutaka | 6 | * Copyright (C) 2001, 2002 Niibe Yutaka |
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/linkage.h> | 9 | #include <linux/linkage.h> |
| 11 | 10 | ||
| 12 | /* | 11 | /* |
diff --git a/arch/sh/mm/extable.c b/arch/sh/mm/extable.c index 505ede7c21bf..c1cf4463d09d 100644 --- a/arch/sh/mm/extable.c +++ b/arch/sh/mm/extable.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * linux/arch/i386/mm/extable.c | 4 | * linux/arch/i386/mm/extable.c |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <asm/uaccess.h> | 8 | #include <asm/uaccess.h> |
| 10 | 9 | ||
diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c index a3568fd51508..2a85bc15a412 100644 --- a/arch/sh/mm/hugetlbpage.c +++ b/arch/sh/mm/hugetlbpage.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com) | 8 | * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 77b4a838fe10..8ea27ca4b700 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1995 Linus Torvalds | 9 | * Copyright (C) 1995 Linus Torvalds |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c index e5907c7330e5..c776b60fc250 100644 --- a/arch/sh/mm/pg-sh4.c +++ b/arch/sh/mm/pg-sh4.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Released under the terms of the GNU GPL v2.0. | 7 | * Released under the terms of the GNU GPL v2.0. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/mman.h> | 10 | #include <linux/mman.h> |
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
diff --git a/arch/sh64/boot/compressed/misc.c b/arch/sh64/boot/compressed/misc.c index 89dbf45df3c8..ee7a1b6acb83 100644 --- a/arch/sh64/boot/compressed/misc.c +++ b/arch/sh64/boot/compressed/misc.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Adapted for SHmedia from sh by Stuart Menefy, May 2002 | 9 | * Adapted for SHmedia from sh by Stuart Menefy, May 2002 |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
| 14 | 13 | ||
| 15 | /* cache.c */ | 14 | /* cache.c */ |
diff --git a/arch/sh64/boot/compressed/vmlinux.lds.S b/arch/sh64/boot/compressed/vmlinux.lds.S index 15a737d9bba8..59c2ef4aeda5 100644 --- a/arch/sh64/boot/compressed/vmlinux.lds.S +++ b/arch/sh64/boot/compressed/vmlinux.lds.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Modified by Stuart Menefy from arch/sh/vmlinux.lds.S written by Niibe Yutaka | 4 | * Modified by Stuart Menefy from arch/sh/vmlinux.lds.S written by Niibe Yutaka |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #ifdef CONFIG_LITTLE_ENDIAN | 8 | #ifdef CONFIG_LITTLE_ENDIAN |
| 10 | /* OUTPUT_FORMAT("elf32-sh64l-linux", "elf32-sh64l-linux", "elf32-sh64l-linux") */ | 9 | /* OUTPUT_FORMAT("elf32-sh64l-linux", "elf32-sh64l-linux", "elf32-sh64l-linux") */ |
diff --git a/arch/sh64/kernel/alphanum.c b/arch/sh64/kernel/alphanum.c index 56d6f9f71524..9079d1e94f2b 100644 --- a/arch/sh64/kernel/alphanum.c +++ b/arch/sh64/kernel/alphanum.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Machine-independent functions for handling 8-digit alphanumeric display | 9 | * Machine-independent functions for handling 8-digit alphanumeric display |
| 10 | * (e.g. Agilent HDSP-253x) | 10 | * (e.g. Agilent HDSP-253x) |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | 14 | ||
diff --git a/arch/sh64/kernel/entry.S b/arch/sh64/kernel/entry.S index 2e2cfe20b426..40d45346248d 100644 --- a/arch/sh64/kernel/entry.S +++ b/arch/sh64/kernel/entry.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 16 | #include <linux/sys.h> | 15 | #include <linux/sys.h> |
| 17 | 16 | ||
diff --git a/arch/sh64/kernel/head.S b/arch/sh64/kernel/head.S index cc0b628a9ea7..f3740ddbc471 100644 --- a/arch/sh64/kernel/head.S +++ b/arch/sh64/kernel/head.S | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Add early SCIF console DTLB mapping. | 20 | * Add early SCIF console DTLB mapping. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | 23 | ||
| 25 | #include <asm/page.h> | 24 | #include <asm/page.h> |
| 26 | #include <asm/mmu_context.h> | 25 | #include <asm/mmu_context.h> |
diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c index 675776a5477e..e7e07f8749c9 100644 --- a/arch/sh64/kernel/irq.c +++ b/arch/sh64/kernel/irq.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Naturally it's not a 1:1 relation, but there are similarities. | 15 | * Naturally it's not a 1:1 relation, but there are similarities. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/kernel_stat.h> | 19 | #include <linux/kernel_stat.h> |
| 21 | #include <linux/signal.h> | 20 | #include <linux/signal.h> |
diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh64/kernel/irq_intc.c index fa730f5fe2e6..42c07d2e71d9 100644 --- a/arch/sh64/kernel/irq_intc.c +++ b/arch/sh64/kernel/irq_intc.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/arch/sh64/kernel/led.c b/arch/sh64/kernel/led.c index cf993c4a9fdc..e35d3f667fb4 100644 --- a/arch/sh64/kernel/led.c +++ b/arch/sh64/kernel/led.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | * Flash the LEDs | 9 | * Flash the LEDs |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/stddef.h> | 11 | #include <linux/stddef.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | 13 | ||
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c index 6197879e8578..3c04951ff736 100644 --- a/arch/sh64/kernel/pci_sh5.c +++ b/arch/sh64/kernel/pci_sh5.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Support functions for the SH5 PCI hardware. | 9 | * Support functions for the SH5 PCI hardware. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/rwsem.h> | 13 | #include <linux/rwsem.h> |
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c index 1da9c61d6823..dba8e14013b6 100644 --- a/arch/sh64/kernel/process.c +++ b/arch/sh64/kernel/process.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #define __KERNEL_SYSCALLS__ | 35 | #define __KERNEL_SYSCALLS__ |
| 36 | #include <stdarg.h> | 36 | #include <stdarg.h> |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | #include <linux/rwsem.h> | 39 | #include <linux/rwsem.h> |
| 41 | #include <linux/mm.h> | 40 | #include <linux/mm.h> |
diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh64/kernel/ptrace.c index cd22e9471316..4e95e18b46d9 100644 --- a/arch/sh64/kernel/ptrace.c +++ b/arch/sh64/kernel/ptrace.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/rwsem.h> | 21 | #include <linux/rwsem.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c index da98d8dbcf95..0359fa647bbc 100644 --- a/arch/sh64/kernel/setup.c +++ b/arch/sh64/kernel/setup.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/tty.h> | 39 | #include <linux/tty.h> |
| 40 | #include <linux/ioport.h> | 40 | #include <linux/ioport.h> |
| 41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 44 | #include <linux/seq_file.h> | 43 | #include <linux/seq_file.h> |
| 45 | #include <linux/blkdev.h> | 44 | #include <linux/blkdev.h> |
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c index 6f3a1c946339..6efdfa2c3994 100644 --- a/arch/sh64/kernel/sh_ksyms.c +++ b/arch/sh64/kernel/sh_ksyms.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/rwsem.h> | 12 | #include <linux/rwsem.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index 6b8f4d22abc6..ba9eb992f4a5 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 15 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/rwsem.h> | 19 | #include <linux/rwsem.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/arch/sh64/kernel/vmlinux.lds.S b/arch/sh64/kernel/vmlinux.lds.S index 7d9f7a6339a0..a8fcc3a71585 100644 --- a/arch/sh64/kernel/vmlinux.lds.S +++ b/arch/sh64/kernel/vmlinux.lds.S | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Remove support for ancient toolchains. | 22 | * Remove support for ancient toolchains. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <asm/page.h> | 25 | #include <asm/page.h> |
| 27 | #include <asm/cache.h> | 26 | #include <asm/cache.h> |
| 28 | #include <asm/processor.h> | 27 | #include <asm/processor.h> |
diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c index a82d8f1a7a64..53c1cabb3428 100644 --- a/arch/sh64/lib/c-checksum.c +++ b/arch/sh64/lib/c-checksum.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #undef DEBUG | 8 | #undef DEBUG |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c index 58087331b8a6..1326f45f31eb 100644 --- a/arch/sh64/lib/dbg.c +++ b/arch/sh64/lib/dbg.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | -- Copyright 2004 Richard Curnow (evt_debug etc) | 8 | -- Copyright 2004 Richard Curnow (evt_debug etc) |
| 9 | -- | 9 | -- |
| 10 | --------------------------------------------------------------------------*/ | 10 | --------------------------------------------------------------------------*/ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/arch/sh64/lib/io.c b/arch/sh64/lib/io.c index 277e11b10c2b..587baa3dffb9 100644 --- a/arch/sh64/lib/io.c +++ b/arch/sh64/lib/io.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
diff --git a/arch/sh64/lib/iomap.c b/arch/sh64/lib/iomap.c index 83c5f0c04958..5cd3d5e9c762 100644 --- a/arch/sh64/lib/iomap.c +++ b/arch/sh64/lib/iomap.c | |||
| @@ -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/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | 14 | ||
diff --git a/arch/sh64/lib/memcpy.c b/arch/sh64/lib/memcpy.c index c785d0aa194d..fba436a92bfa 100644 --- a/arch/sh64/lib/memcpy.c +++ b/arch/sh64/lib/memcpy.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <asm/string.h> | 10 | #include <asm/string.h> |
| 12 | 11 | ||
diff --git a/arch/sh64/lib/udelay.c b/arch/sh64/lib/udelay.c index dad2f254efee..327653914007 100644 --- a/arch/sh64/lib/udelay.c +++ b/arch/sh64/lib/udelay.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * License. See the file "COPYING" in the main directory of this archive | 10 | * License. See the file "COPYING" in the main directory of this archive |
| 11 | * for more details. | 11 | * for more details. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 15 | #include <asm/param.h> | 14 | #include <asm/param.h> |
| 16 | 15 | ||
diff --git a/arch/sh64/mach-cayman/iomap.c b/arch/sh64/mach-cayman/iomap.c index d6a538c70709..2d06e9a55137 100644 --- a/arch/sh64/mach-cayman/iomap.c +++ b/arch/sh64/mach-cayman/iomap.c | |||
| @@ -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/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <asm/cayman.h> | 14 | #include <asm/cayman.h> |
diff --git a/arch/sh64/mach-cayman/irq.c b/arch/sh64/mach-cayman/irq.c index 05eb7cdc26f0..cac94219dd5f 100644 --- a/arch/sh64/mach-cayman/irq.c +++ b/arch/sh64/mach-cayman/irq.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 2002 Stuart Menefy | 12 | * Copyright (C) 2002 Stuart Menefy |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
| 18 | #include <asm/io.h> | 17 | #include <asm/io.h> |
diff --git a/arch/sh64/mach-cayman/setup.c b/arch/sh64/mach-cayman/setup.c index c793245629ad..d84895dda3cd 100644 --- a/arch/sh64/mach-cayman/setup.c +++ b/arch/sh64/mach-cayman/setup.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/stddef.h> | 22 | #include <linux/stddef.h> |
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 26 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/arch/sh64/mach-harp/setup.c b/arch/sh64/mach-harp/setup.c index 3938a65c4b25..fcd90afac297 100644 --- a/arch/sh64/mach-harp/setup.c +++ b/arch/sh64/mach-harp/setup.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/stddef.h> | 21 | #include <linux/stddef.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 25 | #include <linux/bootmem.h> | 24 | #include <linux/bootmem.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
diff --git a/arch/sh64/mach-romram/setup.c b/arch/sh64/mach-romram/setup.c index a9ba03fc5bed..eb98a1640cc1 100644 --- a/arch/sh64/mach-romram/setup.c +++ b/arch/sh64/mach-romram/setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/stddef.h> | 24 | #include <linux/stddef.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 28 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
diff --git a/arch/sh64/mach-sim/setup.c b/arch/sh64/mach-sim/setup.c index a68639cb4e5a..f09400c1ad1b 100644 --- a/arch/sh64/mach-sim/setup.c +++ b/arch/sh64/mach-sim/setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/stddef.h> | 18 | #include <linux/stddef.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 22 | #include <linux/bootmem.h> | 21 | #include <linux/bootmem.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/arch/sh64/mm/cache.c b/arch/sh64/mm/cache.c index c0c1b21350d8..421487cfff4c 100644 --- a/arch/sh64/mm/cache.c +++ b/arch/sh64/mm/cache.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | /****************************************************************************/ | 14 | /****************************************************************************/ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/mman.h> | 17 | #include <linux/mman.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
diff --git a/arch/sh64/mm/extable.c b/arch/sh64/mm/extable.c index 9da50e28b3fa..a2e6e0563772 100644 --- a/arch/sh64/mm/extable.c +++ b/arch/sh64/mm/extable.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | * Cloned from the 2.5 SH version.. | 11 | * Cloned from the 2.5 SH version.. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/rwsem.h> | 13 | #include <linux/rwsem.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
diff --git a/arch/sh64/mm/hugetlbpage.c b/arch/sh64/mm/hugetlbpage.c index 3d89f2a6c785..187cf01750b8 100644 --- a/arch/sh64/mm/hugetlbpage.c +++ b/arch/sh64/mm/hugetlbpage.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com) | 8 | * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/sparc/kernel/asm-offsets.c b/arch/sparc/kernel/asm-offsets.c index 1f55231f07de..29d7cfd1c970 100644 --- a/arch/sparc/kernel/asm-offsets.c +++ b/arch/sparc/kernel/asm-offsets.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * On sparc, thread_info data is static and TI_XXX offsets are computed by hand. | 10 | * On sparc, thread_info data is static and TI_XXX offsets are computed by hand. |
| 11 | */ | 11 | */ |
| 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/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c index d3b3648362c0..118f3eca373e 100644 --- a/arch/sparc/kernel/auxio.c +++ b/arch/sparc/kernel/auxio.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/stddef.h> | 6 | #include <linux/stddef.h> |
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/spinlock.h> | 8 | #include <linux/spinlock.h> |
| 10 | #include <asm/oplib.h> | 9 | #include <asm/oplib.h> |
| 11 | #include <asm/io.h> | 10 | #include <asm/io.h> |
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index d7bfc61d2879..259a559d4cea 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c | |||
| @@ -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 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/smp.h> | 9 | #include <linux/smp.h> |
diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c index fcb0c049c3fe..adba9dfee35e 100644 --- a/arch/sparc/kernel/devices.c +++ b/arch/sparc/kernel/devices.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 7 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/threads.h> | 11 | #include <linux/threads.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index a7a4892956c8..81c0cbd96ff0 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Fixes for different platforms by Pete Zaitcev. | 7 | * Fixes for different platforms by Pete Zaitcev. |
| 8 | */ | 8 | */ |
| 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/init.h> | 12 | #include <linux/init.h> |
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index 887f6a160c58..a4edff4c3be3 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au) | 8 | * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | 12 | ||
| 14 | #include <asm/head.h> | 13 | #include <asm/head.h> |
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S index 42d3de59d19b..9a219e8b5ddb 100644 --- a/arch/sparc/kernel/head.S +++ b/arch/sparc/kernel/head.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/version.h> | 13 | #include <linux/version.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | 15 | ||
| 17 | #include <asm/head.h> | 16 | #include <asm/head.h> |
diff --git a/arch/sparc/kernel/idprom.c b/arch/sparc/kernel/idprom.c index 2e1b0f6e99d4..3a5bad525394 100644 --- a/arch/sparc/kernel/idprom.c +++ b/arch/sparc/kernel/idprom.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 79d177149fdb..8654b446ac9e 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | 28 | #include <linux/config.h> |
| 29 | #include <linux/module.h> | ||
| 29 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 30 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 31 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| @@ -40,6 +41,7 @@ | |||
| 40 | #include <asm/vaddrs.h> | 41 | #include <asm/vaddrs.h> |
| 41 | #include <asm/oplib.h> | 42 | #include <asm/oplib.h> |
| 42 | #include <asm/prom.h> | 43 | #include <asm/prom.h> |
| 44 | #include <asm/of_device.h> | ||
| 43 | #include <asm/sbus.h> | 45 | #include <asm/sbus.h> |
| 44 | #include <asm/page.h> | 46 | #include <asm/page.h> |
| 45 | #include <asm/pgalloc.h> | 47 | #include <asm/pgalloc.h> |
| @@ -143,6 +145,21 @@ void __iomem *sbus_ioremap(struct resource *phyres, unsigned long offset, | |||
| 143 | phyres->start + offset, size, name); | 145 | phyres->start + offset, size, name); |
| 144 | } | 146 | } |
| 145 | 147 | ||
| 148 | void __iomem *of_ioremap(struct resource *res, unsigned long offset, | ||
| 149 | unsigned long size, char *name) | ||
| 150 | { | ||
| 151 | return _sparc_alloc_io(res->flags & 0xF, | ||
| 152 | res->start + offset, | ||
| 153 | size, name); | ||
| 154 | } | ||
| 155 | EXPORT_SYMBOL(of_ioremap); | ||
| 156 | |||
| 157 | void of_iounmap(void __iomem *base, unsigned long size) | ||
| 158 | { | ||
| 159 | iounmap(base); | ||
| 160 | } | ||
| 161 | EXPORT_SYMBOL(of_iounmap); | ||
| 162 | |||
| 146 | /* | 163 | /* |
| 147 | */ | 164 | */ |
| 148 | void sbus_iounmap(volatile void __iomem *addr, unsigned long size) | 165 | void sbus_iounmap(volatile void __iomem *addr, unsigned long size) |
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c index aac8af5aae51..b81af076ef48 100644 --- a/arch/sparc/kernel/irq.c +++ b/arch/sparc/kernel/irq.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (C) 1998-2000 Anton Blanchard (anton@samba.org) | 11 | * Copyright (C) 1998-2000 Anton Blanchard (anton@samba.org) |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/ptrace.h> | 16 | #include <linux/ptrace.h> |
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 80a809478781..bc956c530376 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
| @@ -129,6 +129,26 @@ static int of_device_resume(struct device * dev) | |||
| 129 | return error; | 129 | return error; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | static int node_match(struct device *dev, void *data) | ||
| 133 | { | ||
| 134 | struct of_device *op = to_of_device(dev); | ||
| 135 | struct device_node *dp = data; | ||
| 136 | |||
| 137 | return (op->node == dp); | ||
| 138 | } | ||
| 139 | |||
| 140 | struct of_device *of_find_device_by_node(struct device_node *dp) | ||
| 141 | { | ||
| 142 | struct device *dev = bus_find_device(&of_bus_type, NULL, | ||
| 143 | dp, node_match); | ||
| 144 | |||
| 145 | if (dev) | ||
| 146 | return to_of_device(dev); | ||
| 147 | |||
| 148 | return NULL; | ||
| 149 | } | ||
| 150 | EXPORT_SYMBOL(of_find_device_by_node); | ||
| 151 | |||
| 132 | #ifdef CONFIG_PCI | 152 | #ifdef CONFIG_PCI |
| 133 | struct bus_type ebus_bus_type = { | 153 | struct bus_type ebus_bus_type = { |
| 134 | .name = "ebus", | 154 | .name = "ebus", |
| @@ -153,10 +173,459 @@ struct bus_type sbus_bus_type = { | |||
| 153 | EXPORT_SYMBOL(sbus_bus_type); | 173 | EXPORT_SYMBOL(sbus_bus_type); |
| 154 | #endif | 174 | #endif |
| 155 | 175 | ||
| 176 | struct bus_type of_bus_type = { | ||
| 177 | .name = "of", | ||
| 178 | .match = of_platform_bus_match, | ||
| 179 | .probe = of_device_probe, | ||
| 180 | .remove = of_device_remove, | ||
| 181 | .suspend = of_device_suspend, | ||
| 182 | .resume = of_device_resume, | ||
| 183 | }; | ||
| 184 | EXPORT_SYMBOL(of_bus_type); | ||
| 185 | |||
| 186 | static inline u64 of_read_addr(u32 *cell, int size) | ||
| 187 | { | ||
| 188 | u64 r = 0; | ||
| 189 | while (size--) | ||
| 190 | r = (r << 32) | *(cell++); | ||
| 191 | return r; | ||
| 192 | } | ||
| 193 | |||
| 194 | static void __init get_cells(struct device_node *dp, | ||
| 195 | int *addrc, int *sizec) | ||
| 196 | { | ||
| 197 | if (addrc) | ||
| 198 | *addrc = of_n_addr_cells(dp); | ||
| 199 | if (sizec) | ||
| 200 | *sizec = of_n_size_cells(dp); | ||
| 201 | } | ||
| 202 | |||
| 203 | /* Max address size we deal with */ | ||
| 204 | #define OF_MAX_ADDR_CELLS 4 | ||
| 205 | |||
| 206 | struct of_bus { | ||
| 207 | const char *name; | ||
| 208 | const char *addr_prop_name; | ||
| 209 | int (*match)(struct device_node *parent); | ||
| 210 | void (*count_cells)(struct device_node *child, | ||
| 211 | int *addrc, int *sizec); | ||
| 212 | u64 (*map)(u32 *addr, u32 *range, int na, int ns, int pna); | ||
| 213 | int (*translate)(u32 *addr, u64 offset, int na); | ||
| 214 | unsigned int (*get_flags)(u32 *addr); | ||
| 215 | }; | ||
| 216 | |||
| 217 | /* | ||
| 218 | * Default translator (generic bus) | ||
| 219 | */ | ||
| 220 | |||
| 221 | static void of_bus_default_count_cells(struct device_node *dev, | ||
| 222 | int *addrc, int *sizec) | ||
| 223 | { | ||
| 224 | get_cells(dev, addrc, sizec); | ||
| 225 | } | ||
| 226 | |||
| 227 | static u64 of_bus_default_map(u32 *addr, u32 *range, int na, int ns, int pna) | ||
| 228 | { | ||
| 229 | u64 cp, s, da; | ||
| 230 | |||
| 231 | cp = of_read_addr(range, na); | ||
| 232 | s = of_read_addr(range + na + pna, ns); | ||
| 233 | da = of_read_addr(addr, na); | ||
| 234 | |||
| 235 | if (da < cp || da >= (cp + s)) | ||
| 236 | return OF_BAD_ADDR; | ||
| 237 | return da - cp; | ||
| 238 | } | ||
| 239 | |||
| 240 | static int of_bus_default_translate(u32 *addr, u64 offset, int na) | ||
| 241 | { | ||
| 242 | u64 a = of_read_addr(addr, na); | ||
| 243 | memset(addr, 0, na * 4); | ||
| 244 | a += offset; | ||
| 245 | if (na > 1) | ||
| 246 | addr[na - 2] = a >> 32; | ||
| 247 | addr[na - 1] = a & 0xffffffffu; | ||
| 248 | |||
| 249 | return 0; | ||
| 250 | } | ||
| 251 | |||
| 252 | static unsigned int of_bus_default_get_flags(u32 *addr) | ||
| 253 | { | ||
| 254 | return IORESOURCE_MEM; | ||
| 255 | } | ||
| 256 | |||
| 257 | |||
| 258 | /* | ||
| 259 | * PCI bus specific translator | ||
| 260 | */ | ||
| 261 | |||
| 262 | static int of_bus_pci_match(struct device_node *np) | ||
| 263 | { | ||
| 264 | return !strcmp(np->type, "pci") || !strcmp(np->type, "pciex"); | ||
| 265 | } | ||
| 266 | |||
| 267 | static void of_bus_pci_count_cells(struct device_node *np, | ||
| 268 | int *addrc, int *sizec) | ||
| 269 | { | ||
| 270 | if (addrc) | ||
| 271 | *addrc = 3; | ||
| 272 | if (sizec) | ||
| 273 | *sizec = 2; | ||
| 274 | } | ||
| 275 | |||
| 276 | static u64 of_bus_pci_map(u32 *addr, u32 *range, int na, int ns, int pna) | ||
| 277 | { | ||
| 278 | u64 cp, s, da; | ||
| 279 | |||
| 280 | /* Check address type match */ | ||
| 281 | if ((addr[0] ^ range[0]) & 0x03000000) | ||
| 282 | return OF_BAD_ADDR; | ||
| 283 | |||
| 284 | /* Read address values, skipping high cell */ | ||
| 285 | cp = of_read_addr(range + 1, na - 1); | ||
| 286 | s = of_read_addr(range + na + pna, ns); | ||
| 287 | da = of_read_addr(addr + 1, na - 1); | ||
| 288 | |||
| 289 | if (da < cp || da >= (cp + s)) | ||
| 290 | return OF_BAD_ADDR; | ||
| 291 | return da - cp; | ||
| 292 | } | ||
| 293 | |||
| 294 | static int of_bus_pci_translate(u32 *addr, u64 offset, int na) | ||
| 295 | { | ||
| 296 | return of_bus_default_translate(addr + 1, offset, na - 1); | ||
| 297 | } | ||
| 298 | |||
| 299 | static unsigned int of_bus_pci_get_flags(u32 *addr) | ||
| 300 | { | ||
| 301 | unsigned int flags = 0; | ||
| 302 | u32 w = addr[0]; | ||
| 303 | |||
| 304 | switch((w >> 24) & 0x03) { | ||
| 305 | case 0x01: | ||
| 306 | flags |= IORESOURCE_IO; | ||
| 307 | case 0x02: /* 32 bits */ | ||
| 308 | case 0x03: /* 64 bits */ | ||
| 309 | flags |= IORESOURCE_MEM; | ||
| 310 | } | ||
| 311 | if (w & 0x40000000) | ||
| 312 | flags |= IORESOURCE_PREFETCH; | ||
| 313 | return flags; | ||
| 314 | } | ||
| 315 | |||
| 316 | /* | ||
| 317 | * SBUS bus specific translator | ||
| 318 | */ | ||
| 319 | |||
| 320 | static int of_bus_sbus_match(struct device_node *np) | ||
| 321 | { | ||
| 322 | return !strcmp(np->name, "sbus") || | ||
| 323 | !strcmp(np->name, "sbi"); | ||
| 324 | } | ||
| 325 | |||
| 326 | static void of_bus_sbus_count_cells(struct device_node *child, | ||
| 327 | int *addrc, int *sizec) | ||
| 328 | { | ||
| 329 | if (addrc) | ||
| 330 | *addrc = 2; | ||
| 331 | if (sizec) | ||
| 332 | *sizec = 1; | ||
| 333 | } | ||
| 334 | |||
| 335 | static u64 of_bus_sbus_map(u32 *addr, u32 *range, int na, int ns, int pna) | ||
| 336 | { | ||
| 337 | return of_bus_default_map(addr, range, na, ns, pna); | ||
| 338 | } | ||
| 339 | |||
| 340 | static int of_bus_sbus_translate(u32 *addr, u64 offset, int na) | ||
| 341 | { | ||
| 342 | return of_bus_default_translate(addr, offset, na); | ||
| 343 | } | ||
| 344 | |||
| 345 | static unsigned int of_bus_sbus_get_flags(u32 *addr) | ||
| 346 | { | ||
| 347 | return IORESOURCE_MEM; | ||
| 348 | } | ||
| 349 | |||
| 350 | |||
| 351 | /* | ||
| 352 | * Array of bus specific translators | ||
| 353 | */ | ||
| 354 | |||
| 355 | static struct of_bus of_busses[] = { | ||
| 356 | /* PCI */ | ||
| 357 | { | ||
| 358 | .name = "pci", | ||
| 359 | .addr_prop_name = "assigned-addresses", | ||
| 360 | .match = of_bus_pci_match, | ||
| 361 | .count_cells = of_bus_pci_count_cells, | ||
| 362 | .map = of_bus_pci_map, | ||
| 363 | .translate = of_bus_pci_translate, | ||
| 364 | .get_flags = of_bus_pci_get_flags, | ||
| 365 | }, | ||
| 366 | /* SBUS */ | ||
| 367 | { | ||
| 368 | .name = "sbus", | ||
| 369 | .addr_prop_name = "reg", | ||
| 370 | .match = of_bus_sbus_match, | ||
| 371 | .count_cells = of_bus_sbus_count_cells, | ||
| 372 | .map = of_bus_sbus_map, | ||
| 373 | .translate = of_bus_sbus_translate, | ||
| 374 | .get_flags = of_bus_sbus_get_flags, | ||
| 375 | }, | ||
| 376 | /* Default */ | ||
| 377 | { | ||
| 378 | .name = "default", | ||
| 379 | .addr_prop_name = "reg", | ||
| 380 | .match = NULL, | ||
| 381 | .count_cells = of_bus_default_count_cells, | ||
| 382 | .map = of_bus_default_map, | ||
| 383 | .translate = of_bus_default_translate, | ||
| 384 | .get_flags = of_bus_default_get_flags, | ||
| 385 | }, | ||
| 386 | }; | ||
| 387 | |||
| 388 | static struct of_bus *of_match_bus(struct device_node *np) | ||
| 389 | { | ||
| 390 | int i; | ||
| 391 | |||
| 392 | for (i = 0; i < ARRAY_SIZE(of_busses); i ++) | ||
| 393 | if (!of_busses[i].match || of_busses[i].match(np)) | ||
| 394 | return &of_busses[i]; | ||
| 395 | BUG(); | ||
| 396 | return NULL; | ||
| 397 | } | ||
| 398 | |||
| 399 | static int __init build_one_resource(struct device_node *parent, | ||
| 400 | struct of_bus *bus, | ||
| 401 | struct of_bus *pbus, | ||
| 402 | u32 *addr, | ||
| 403 | int na, int ns, int pna) | ||
| 404 | { | ||
| 405 | u32 *ranges; | ||
| 406 | unsigned int rlen; | ||
| 407 | int rone; | ||
| 408 | u64 offset = OF_BAD_ADDR; | ||
| 409 | |||
| 410 | ranges = of_get_property(parent, "ranges", &rlen); | ||
| 411 | if (ranges == NULL || rlen == 0) { | ||
| 412 | offset = of_read_addr(addr, na); | ||
| 413 | memset(addr, 0, pna * 4); | ||
| 414 | goto finish; | ||
| 415 | } | ||
| 416 | |||
| 417 | /* Now walk through the ranges */ | ||
| 418 | rlen /= 4; | ||
| 419 | rone = na + pna + ns; | ||
| 420 | for (; rlen >= rone; rlen -= rone, ranges += rone) { | ||
| 421 | offset = bus->map(addr, ranges, na, ns, pna); | ||
| 422 | if (offset != OF_BAD_ADDR) | ||
| 423 | break; | ||
| 424 | } | ||
| 425 | if (offset == OF_BAD_ADDR) | ||
| 426 | return 1; | ||
| 427 | |||
| 428 | memcpy(addr, ranges + na, 4 * pna); | ||
| 429 | |||
| 430 | finish: | ||
| 431 | /* Translate it into parent bus space */ | ||
| 432 | return pbus->translate(addr, offset, pna); | ||
| 433 | } | ||
| 434 | |||
| 435 | static void __init build_device_resources(struct of_device *op, | ||
| 436 | struct device *parent) | ||
| 437 | { | ||
| 438 | struct of_device *p_op; | ||
| 439 | struct of_bus *bus; | ||
| 440 | int na, ns; | ||
| 441 | int index, num_reg; | ||
| 442 | void *preg; | ||
| 443 | |||
| 444 | if (!parent) | ||
| 445 | return; | ||
| 446 | |||
| 447 | p_op = to_of_device(parent); | ||
| 448 | bus = of_match_bus(p_op->node); | ||
| 449 | bus->count_cells(op->node, &na, &ns); | ||
| 450 | |||
| 451 | preg = of_get_property(op->node, bus->addr_prop_name, &num_reg); | ||
| 452 | if (!preg || num_reg == 0) | ||
| 453 | return; | ||
| 454 | |||
| 455 | /* Convert to num-cells. */ | ||
| 456 | num_reg /= 4; | ||
| 457 | |||
| 458 | /* Conver to num-entries. */ | ||
| 459 | num_reg /= na + ns; | ||
| 460 | |||
| 461 | for (index = 0; index < num_reg; index++) { | ||
| 462 | struct resource *r = &op->resource[index]; | ||
| 463 | u32 addr[OF_MAX_ADDR_CELLS]; | ||
| 464 | u32 *reg = (preg + (index * ((na + ns) * 4))); | ||
| 465 | struct device_node *dp = op->node; | ||
| 466 | struct device_node *pp = p_op->node; | ||
| 467 | struct of_bus *pbus; | ||
| 468 | u64 size, result = OF_BAD_ADDR; | ||
| 469 | unsigned long flags; | ||
| 470 | int dna, dns; | ||
| 471 | int pna, pns; | ||
| 472 | |||
| 473 | size = of_read_addr(reg + na, ns); | ||
| 474 | flags = bus->get_flags(reg); | ||
| 475 | |||
| 476 | memcpy(addr, reg, na * 4); | ||
| 477 | |||
| 478 | /* If the immediate parent has no ranges property to apply, | ||
| 479 | * just use a 1<->1 mapping. | ||
| 480 | */ | ||
| 481 | if (of_find_property(pp, "ranges", NULL) == NULL) { | ||
| 482 | result = of_read_addr(addr, na); | ||
| 483 | goto build_res; | ||
| 484 | } | ||
| 485 | |||
| 486 | dna = na; | ||
| 487 | dns = ns; | ||
| 488 | |||
| 489 | while (1) { | ||
| 490 | dp = pp; | ||
| 491 | pp = dp->parent; | ||
| 492 | if (!pp) { | ||
| 493 | result = of_read_addr(addr, dna); | ||
| 494 | break; | ||
| 495 | } | ||
| 496 | |||
| 497 | pbus = of_match_bus(pp); | ||
| 498 | pbus->count_cells(dp, &pna, &pns); | ||
| 499 | |||
| 500 | if (build_one_resource(dp, bus, pbus, addr, dna, dns, pna)) | ||
| 501 | break; | ||
| 502 | |||
| 503 | dna = pna; | ||
| 504 | dns = pns; | ||
| 505 | bus = pbus; | ||
| 506 | } | ||
| 507 | |||
| 508 | build_res: | ||
| 509 | memset(r, 0, sizeof(*r)); | ||
| 510 | if (result != OF_BAD_ADDR) { | ||
| 511 | r->start = result & 0xffffffff; | ||
| 512 | r->end = result + size - 1; | ||
| 513 | r->flags = flags | ((result >> 32ULL) & 0xffUL); | ||
| 514 | } else { | ||
| 515 | r->start = ~0UL; | ||
| 516 | r->end = ~0UL; | ||
| 517 | } | ||
| 518 | r->name = op->node->name; | ||
| 519 | } | ||
| 520 | } | ||
| 521 | |||
| 522 | static struct of_device * __init scan_one_device(struct device_node *dp, | ||
| 523 | struct device *parent) | ||
| 524 | { | ||
| 525 | struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL); | ||
| 526 | struct linux_prom_irqs *intr; | ||
| 527 | int len, i; | ||
| 528 | |||
| 529 | if (!op) | ||
| 530 | return NULL; | ||
| 531 | |||
| 532 | op->node = dp; | ||
| 533 | |||
| 534 | op->clock_freq = of_getintprop_default(dp, "clock-frequency", | ||
| 535 | (25*1000*1000)); | ||
| 536 | op->portid = of_getintprop_default(dp, "upa-portid", -1); | ||
| 537 | if (op->portid == -1) | ||
| 538 | op->portid = of_getintprop_default(dp, "portid", -1); | ||
| 539 | |||
| 540 | intr = of_get_property(dp, "intr", &len); | ||
| 541 | if (intr) { | ||
| 542 | op->num_irqs = len / sizeof(struct linux_prom_irqs); | ||
| 543 | for (i = 0; i < op->num_irqs; i++) | ||
| 544 | op->irqs[i] = intr[i].pri; | ||
| 545 | } else { | ||
| 546 | unsigned int *irq = of_get_property(dp, "interrupts", &len); | ||
| 547 | |||
| 548 | if (irq) { | ||
| 549 | op->num_irqs = len / sizeof(unsigned int); | ||
| 550 | for (i = 0; i < op->num_irqs; i++) | ||
| 551 | op->irqs[i] = irq[i]; | ||
| 552 | } else { | ||
| 553 | op->num_irqs = 0; | ||
| 554 | } | ||
| 555 | } | ||
| 556 | if (sparc_cpu_model == sun4d) { | ||
| 557 | static int pil_to_sbus[] = { | ||
| 558 | 0, 0, 1, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 0, | ||
| 559 | }; | ||
| 560 | struct device_node *busp = dp->parent; | ||
| 561 | struct linux_prom_registers *regs; | ||
| 562 | int board = of_getintprop_default(busp, "board#", 0); | ||
| 563 | int slot; | ||
| 564 | |||
| 565 | regs = of_get_property(dp, "reg", NULL); | ||
| 566 | slot = regs->which_io; | ||
| 567 | |||
| 568 | for (i = 0; i < op->num_irqs; i++) { | ||
| 569 | int this_irq = op->irqs[i]; | ||
| 570 | int sbusl = pil_to_sbus[this_irq]; | ||
| 571 | |||
| 572 | if (sbusl) | ||
| 573 | this_irq = (((board + 1) << 5) + | ||
| 574 | (sbusl << 2) + | ||
| 575 | slot); | ||
| 576 | |||
| 577 | op->irqs[i] = this_irq; | ||
| 578 | } | ||
| 579 | } | ||
| 580 | |||
| 581 | build_device_resources(op, parent); | ||
| 582 | |||
| 583 | op->dev.parent = parent; | ||
| 584 | op->dev.bus = &of_bus_type; | ||
| 585 | if (!parent) | ||
| 586 | strcpy(op->dev.bus_id, "root"); | ||
| 587 | else | ||
| 588 | strcpy(op->dev.bus_id, dp->path_component_name); | ||
| 589 | |||
| 590 | if (of_device_register(op)) { | ||
| 591 | printk("%s: Could not register of device.\n", | ||
| 592 | dp->full_name); | ||
| 593 | kfree(op); | ||
| 594 | op = NULL; | ||
| 595 | } | ||
| 596 | |||
| 597 | return op; | ||
| 598 | } | ||
| 599 | |||
| 600 | static void __init scan_tree(struct device_node *dp, struct device *parent) | ||
| 601 | { | ||
| 602 | while (dp) { | ||
| 603 | struct of_device *op = scan_one_device(dp, parent); | ||
| 604 | |||
| 605 | if (op) | ||
| 606 | scan_tree(dp->child, &op->dev); | ||
| 607 | |||
| 608 | dp = dp->sibling; | ||
| 609 | } | ||
| 610 | } | ||
| 611 | |||
| 612 | static void __init scan_of_devices(void) | ||
| 613 | { | ||
| 614 | struct device_node *root = of_find_node_by_path("/"); | ||
| 615 | struct of_device *parent; | ||
| 616 | |||
| 617 | parent = scan_one_device(root, NULL); | ||
| 618 | if (!parent) | ||
| 619 | return; | ||
| 620 | |||
| 621 | scan_tree(root->child, &parent->dev); | ||
| 622 | } | ||
| 623 | |||
| 156 | static int __init of_bus_driver_init(void) | 624 | static int __init of_bus_driver_init(void) |
| 157 | { | 625 | { |
| 158 | int err = 0; | 626 | int err; |
| 159 | 627 | ||
| 628 | err = bus_register(&of_bus_type); | ||
| 160 | #ifdef CONFIG_PCI | 629 | #ifdef CONFIG_PCI |
| 161 | if (!err) | 630 | if (!err) |
| 162 | err = bus_register(&ebus_bus_type); | 631 | err = bus_register(&ebus_bus_type); |
| @@ -165,7 +634,11 @@ static int __init of_bus_driver_init(void) | |||
| 165 | if (!err) | 634 | if (!err) |
| 166 | err = bus_register(&sbus_bus_type); | 635 | err = bus_register(&sbus_bus_type); |
| 167 | #endif | 636 | #endif |
| 168 | return 0; | 637 | |
| 638 | if (!err) | ||
| 639 | scan_of_devices(); | ||
| 640 | |||
| 641 | return err; | ||
| 169 | } | 642 | } |
| 170 | 643 | ||
| 171 | postcore_initcall(of_bus_driver_init); | 644 | postcore_initcall(of_bus_driver_init); |
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 5df3ebdc0ab1..22422ff10602 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * CP-1200 by Eric Brower. | 10 | * CP-1200 by Eric Brower. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 118cac84a0f5..89a28cc018c9 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 23 | #include <linux/user.h> | 23 | #include <linux/user.h> |
| 24 | #include <linux/a.out.h> | 24 | #include <linux/a.out.h> |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/smp.h> | 25 | #include <linux/smp.h> |
| 27 | #include <linux/smp_lock.h> | 26 | #include <linux/smp_lock.h> |
| 28 | #include <linux/reboot.h> | 27 | #include <linux/reboot.h> |
diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c index 946ce6d15819..4b06dcb00ebd 100644 --- a/arch/sparc/kernel/prom.c +++ b/arch/sparc/kernel/prom.c | |||
| @@ -190,6 +190,36 @@ int of_getintprop_default(struct device_node *np, const char *name, int def) | |||
| 190 | } | 190 | } |
| 191 | EXPORT_SYMBOL(of_getintprop_default); | 191 | EXPORT_SYMBOL(of_getintprop_default); |
| 192 | 192 | ||
| 193 | int of_n_addr_cells(struct device_node *np) | ||
| 194 | { | ||
| 195 | int* ip; | ||
| 196 | do { | ||
| 197 | if (np->parent) | ||
| 198 | np = np->parent; | ||
| 199 | ip = of_get_property(np, "#address-cells", NULL); | ||
| 200 | if (ip != NULL) | ||
| 201 | return *ip; | ||
| 202 | } while (np->parent); | ||
| 203 | /* No #address-cells property for the root node, default to 2 */ | ||
| 204 | return 2; | ||
| 205 | } | ||
| 206 | EXPORT_SYMBOL(of_n_addr_cells); | ||
| 207 | |||
| 208 | int of_n_size_cells(struct device_node *np) | ||
| 209 | { | ||
| 210 | int* ip; | ||
| 211 | do { | ||
| 212 | if (np->parent) | ||
| 213 | np = np->parent; | ||
| 214 | ip = of_get_property(np, "#size-cells", NULL); | ||
| 215 | if (ip != NULL) | ||
| 216 | return *ip; | ||
| 217 | } while (np->parent); | ||
| 218 | /* No #size-cells property for the root node, default to 1 */ | ||
| 219 | return 1; | ||
| 220 | } | ||
| 221 | EXPORT_SYMBOL(of_n_size_cells); | ||
| 222 | |||
| 193 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) | 223 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) |
| 194 | { | 224 | { |
| 195 | struct property **prevp; | 225 | struct property **prevp; |
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 2e5d08ce217b..8606ef4e52e9 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/a.out.h> | 19 | #include <linux/a.out.h> |
| 20 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
| 24 | #include <linux/seq_file.h> | 23 | #include <linux/seq_file.h> |
| 25 | #include <linux/syscalls.h> | 24 | #include <linux/syscalls.h> |
diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c index 0748d8147bbf..c9301b9143ca 100644 --- a/arch/sparc/kernel/signal.c +++ b/arch/sparc/kernel/signal.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 7 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index fd7deabf9982..5fb987fc3d63 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #define EXPORT_SYMTAB_STROPS | 9 | #define EXPORT_SYMTAB_STROPS |
| 10 | #define PROMLIB_INTERNAL | 10 | #define PROMLIB_INTERNAL |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c index 0f2d8d9cbdba..50e988b9c8c3 100644 --- a/arch/sparc/kernel/sun4c_irq.c +++ b/arch/sparc/kernel/sun4c_irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk) | 9 | * Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index 9c30e35c88f7..cbf8ee81cf5b 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Heavily based on arch/sparc/kernel/irq.c. | 6 | * Heavily based on arch/sparc/kernel/irq.c. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 12 | #include <linux/kernel_stat.h> | 11 | #include <linux/kernel_stat.h> |
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index a296c13ac18f..38ac672b1149 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk) | 9 | * Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 15 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
diff --git a/arch/sparc/kernel/sys_solaris.c b/arch/sparc/kernel/sys_solaris.c index fb7578554c78..c09afd96dd9c 100644 --- a/arch/sparc/kernel/sys_solaris.c +++ b/arch/sparc/kernel/sys_solaris.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) | 4 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c index 288de276d9ff..aa0fb2efb615 100644 --- a/arch/sparc/kernel/sys_sunos.c +++ b/arch/sparc/kernel/sys_sunos.c | |||
| @@ -196,7 +196,7 @@ asmlinkage int sunos_brk(unsigned long brk) | |||
| 196 | * simple, it hopefully works in most obvious cases.. Easy to | 196 | * simple, it hopefully works in most obvious cases.. Easy to |
| 197 | * fool it, but this should catch most mistakes. | 197 | * fool it, but this should catch most mistakes. |
| 198 | */ | 198 | */ |
| 199 | freepages = get_page_cache_size(); | 199 | freepages = global_page_state(NR_FILE_PAGES); |
| 200 | freepages >>= 1; | 200 | freepages >>= 1; |
| 201 | freepages += nr_free_pages(); | 201 | freepages += nr_free_pages(); |
| 202 | freepages += nr_swap_pages; | 202 | freepages += nr_swap_pages; |
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S index 2856551bddf1..10df38eeae08 100644 --- a/arch/sparc/kernel/systbls.S +++ b/arch/sparc/kernel/systbls.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) | 9 | * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | .data | 13 | .data |
| 15 | .align 4 | 14 | .align 4 |
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 7dadcdb4ca42..04eb1eab6e3e 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * 1997-09-10 Updated NTP code according to technical memorandum Jan '96 | 15 | * 1997-09-10 Updated NTP code according to technical memorandum Jan '96 |
| 16 | * "A Kernel Model for Precision Timekeeping" by Dave Mills | 16 | * "A Kernel Model for Precision Timekeeping" by Dave Mills |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| @@ -42,6 +41,7 @@ | |||
| 42 | #include <asm/sun4paddr.h> | 41 | #include <asm/sun4paddr.h> |
| 43 | #include <asm/page.h> | 42 | #include <asm/page.h> |
| 44 | #include <asm/pcic.h> | 43 | #include <asm/pcic.h> |
| 44 | #include <asm/of_device.h> | ||
| 45 | 45 | ||
| 46 | extern unsigned long wall_jiffies; | 46 | extern unsigned long wall_jiffies; |
| 47 | 47 | ||
| @@ -273,83 +273,31 @@ static __inline__ void sun4_clock_probe(void) | |||
| 273 | #endif | 273 | #endif |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | /* Probe for the mostek real time clock chip. */ | 276 | static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match) |
| 277 | static __inline__ void clock_probe(void) | ||
| 278 | { | 277 | { |
| 279 | struct linux_prom_registers clk_reg[2]; | 278 | struct device_node *dp = op->node; |
| 280 | char model[128]; | 279 | char *model = of_get_property(dp, "model", NULL); |
| 281 | register int node, cpuunit, bootbus; | ||
| 282 | struct resource r; | ||
| 283 | |||
| 284 | cpuunit = bootbus = 0; | ||
| 285 | memset(&r, 0, sizeof(r)); | ||
| 286 | |||
| 287 | /* Determine the correct starting PROM node for the probe. */ | ||
| 288 | node = prom_getchild(prom_root_node); | ||
| 289 | switch (sparc_cpu_model) { | ||
| 290 | case sun4c: | ||
| 291 | break; | ||
| 292 | case sun4m: | ||
| 293 | node = prom_getchild(prom_searchsiblings(node, "obio")); | ||
| 294 | break; | ||
| 295 | case sun4d: | ||
| 296 | node = prom_getchild(bootbus = prom_searchsiblings(prom_getchild(cpuunit = prom_searchsiblings(node, "cpu-unit")), "bootbus")); | ||
| 297 | break; | ||
| 298 | default: | ||
| 299 | prom_printf("CLOCK: Unsupported architecture!\n"); | ||
| 300 | prom_halt(); | ||
| 301 | } | ||
| 302 | 280 | ||
| 303 | /* Find the PROM node describing the real time clock. */ | 281 | if (!model) |
| 304 | sp_clock_typ = MSTK_INVALID; | 282 | return -ENODEV; |
| 305 | node = prom_searchsiblings(node,"eeprom"); | ||
| 306 | if (!node) { | ||
| 307 | prom_printf("CLOCK: No clock found!\n"); | ||
| 308 | prom_halt(); | ||
| 309 | } | ||
| 310 | 283 | ||
| 311 | /* Get the model name and setup everything up. */ | 284 | if (!strcmp(model, "mk48t02")) { |
| 312 | model[0] = '\0'; | ||
| 313 | prom_getstring(node, "model", model, sizeof(model)); | ||
| 314 | if (strcmp(model, "mk48t02") == 0) { | ||
| 315 | sp_clock_typ = MSTK48T02; | 285 | sp_clock_typ = MSTK48T02; |
| 316 | if (prom_getproperty(node, "reg", (char *) clk_reg, sizeof(clk_reg)) == -1) { | 286 | |
| 317 | prom_printf("clock_probe: FAILED!\n"); | ||
| 318 | prom_halt(); | ||
| 319 | } | ||
| 320 | if (sparc_cpu_model == sun4d) | ||
| 321 | prom_apply_generic_ranges (bootbus, cpuunit, clk_reg, 1); | ||
| 322 | else | ||
| 323 | prom_apply_obio_ranges(clk_reg, 1); | ||
| 324 | /* Map the clock register io area read-only */ | 287 | /* Map the clock register io area read-only */ |
| 325 | r.flags = clk_reg[0].which_io; | 288 | mstk48t02_regs = of_ioremap(&op->resource[0], 0, |
| 326 | r.start = clk_reg[0].phys_addr; | 289 | sizeof(struct mostek48t02), |
| 327 | mstk48t02_regs = sbus_ioremap(&r, 0, | 290 | "mk48t02"); |
| 328 | sizeof(struct mostek48t02), "mk48t02"); | ||
| 329 | mstk48t08_regs = NULL; /* To catch weirdness */ | 291 | mstk48t08_regs = NULL; /* To catch weirdness */ |
| 330 | } else if (strcmp(model, "mk48t08") == 0) { | 292 | } else if (!strcmp(model, "mk48t08")) { |
| 331 | sp_clock_typ = MSTK48T08; | 293 | sp_clock_typ = MSTK48T08; |
| 332 | if(prom_getproperty(node, "reg", (char *) clk_reg, | 294 | mstk48t08_regs = of_ioremap(&op->resource[0], 0, |
| 333 | sizeof(clk_reg)) == -1) { | 295 | sizeof(struct mostek48t08), |
| 334 | prom_printf("clock_probe: FAILED!\n"); | 296 | "mk48t08"); |
| 335 | prom_halt(); | ||
| 336 | } | ||
| 337 | if (sparc_cpu_model == sun4d) | ||
| 338 | prom_apply_generic_ranges (bootbus, cpuunit, clk_reg, 1); | ||
| 339 | else | ||
| 340 | prom_apply_obio_ranges(clk_reg, 1); | ||
| 341 | /* Map the clock register io area read-only */ | ||
| 342 | /* XXX r/o attribute is somewhere in r.flags */ | ||
| 343 | r.flags = clk_reg[0].which_io; | ||
| 344 | r.start = clk_reg[0].phys_addr; | ||
| 345 | mstk48t08_regs = sbus_ioremap(&r, 0, | ||
| 346 | sizeof(struct mostek48t08), "mk48t08"); | ||
| 347 | 297 | ||
| 348 | mstk48t02_regs = &mstk48t08_regs->regs; | 298 | mstk48t02_regs = &mstk48t08_regs->regs; |
| 349 | } else { | 299 | } else |
| 350 | prom_printf("CLOCK: Unknown model name '%s'\n",model); | 300 | return -ENODEV; |
| 351 | prom_halt(); | ||
| 352 | } | ||
| 353 | 301 | ||
| 354 | /* Report a low battery voltage condition. */ | 302 | /* Report a low battery voltage condition. */ |
| 355 | if (has_low_battery()) | 303 | if (has_low_battery()) |
| @@ -358,6 +306,28 @@ static __inline__ void clock_probe(void) | |||
| 358 | /* Kick start the clock if it is completely stopped. */ | 306 | /* Kick start the clock if it is completely stopped. */ |
| 359 | if (mostek_read(mstk48t02_regs + MOSTEK_SEC) & MSTK_STOP) | 307 | if (mostek_read(mstk48t02_regs + MOSTEK_SEC) & MSTK_STOP) |
| 360 | kick_start_clock(); | 308 | kick_start_clock(); |
| 309 | |||
| 310 | return 0; | ||
| 311 | } | ||
| 312 | |||
| 313 | static struct of_device_id clock_match[] = { | ||
| 314 | { | ||
| 315 | .name = "eeprom", | ||
| 316 | }, | ||
| 317 | {}, | ||
| 318 | }; | ||
| 319 | |||
| 320 | static struct of_platform_driver clock_driver = { | ||
| 321 | .name = "clock", | ||
| 322 | .match_table = clock_match, | ||
| 323 | .probe = clock_probe, | ||
| 324 | }; | ||
| 325 | |||
| 326 | |||
| 327 | /* Probe for the mostek real time clock chip. */ | ||
| 328 | static void clock_init(void) | ||
| 329 | { | ||
| 330 | of_register_driver(&clock_driver, &of_bus_type); | ||
| 361 | } | 331 | } |
| 362 | 332 | ||
| 363 | void __init sbus_time_init(void) | 333 | void __init sbus_time_init(void) |
| @@ -376,7 +346,7 @@ void __init sbus_time_init(void) | |||
| 376 | if (ARCH_SUN4) | 346 | if (ARCH_SUN4) |
| 377 | sun4_clock_probe(); | 347 | sun4_clock_probe(); |
| 378 | else | 348 | else |
| 379 | clock_probe(); | 349 | clock_init(); |
| 380 | 350 | ||
| 381 | sparc_init_timers(timer_interrupt); | 351 | sparc_init_timers(timer_interrupt); |
| 382 | 352 | ||
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c index 41d45c298fb2..6a70d215fd04 100644 --- a/arch/sparc/kernel/traps.c +++ b/arch/sparc/kernel/traps.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * I hate traps on the sparc, grrr... | 9 | * I hate traps on the sparc, grrr... |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/sched.h> /* for jiffies */ | 12 | #include <linux/sched.h> /* for jiffies */ |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/kallsyms.h> | 14 | #include <linux/kallsyms.h> |
diff --git a/arch/sparc/lib/atomic.S b/arch/sparc/lib/atomic.S index f48ad0c4dadb..178cbb8ae1b9 100644 --- a/arch/sparc/lib/atomic.S +++ b/arch/sparc/lib/atomic.S | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu) | 3 | * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu) |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/ptrace.h> | 6 | #include <asm/ptrace.h> |
| 8 | #include <asm/psr.h> | 7 | #include <asm/psr.h> |
| 9 | 8 | ||
diff --git a/arch/sparc/lib/bitops.S b/arch/sparc/lib/bitops.S index 3e9399769075..cb7fb66a40c8 100644 --- a/arch/sparc/lib/bitops.S +++ b/arch/sparc/lib/bitops.S | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <asm/ptrace.h> | 6 | #include <asm/ptrace.h> |
| 8 | #include <asm/psr.h> | 7 | #include <asm/psr.h> |
| 9 | 8 | ||
diff --git a/arch/sparc/lib/rwsem.S b/arch/sparc/lib/rwsem.S index e7578dc600b8..20657744c864 100644 --- a/arch/sparc/lib/rwsem.S +++ b/arch/sparc/lib/rwsem.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) | 4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/ptrace.h> | 7 | #include <asm/ptrace.h> |
| 9 | #include <asm/psr.h> | 8 | #include <asm/psr.h> |
| 10 | 9 | ||
diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c index f147a44c9780..ec4231c2855a 100644 --- a/arch/sparc/mm/btfixup.c +++ b/arch/sparc/mm/btfixup.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 6 | * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <asm/btfixup.h> | 11 | #include <asm/btfixup.h> |
diff --git a/arch/sparc/mm/extable.c b/arch/sparc/mm/extable.c index c9845c71f426..16cc28935e39 100644 --- a/arch/sparc/mm/extable.c +++ b/arch/sparc/mm/extable.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/sparc/mm/extable.c | 2 | * linux/arch/sparc/mm/extable.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <asm/uaccess.h> | 6 | #include <asm/uaccess.h> |
| 8 | 7 | ||
diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S index a231cca37216..d29cc24c5bba 100644 --- a/arch/sparc/mm/hypersparc.S +++ b/arch/sparc/mm/hypersparc.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <asm/asi.h> | 10 | #include <asm/asi.h> |
| 11 | #include <asm/page.h> | 11 | #include <asm/page.h> |
| 12 | #include <asm/pgtsrmmu.h> | 12 | #include <asm/pgtsrmmu.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
| 16 | .text | 15 | .text |
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index cfa7d3456634..c85ddf312747 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 2000 Anton Blanchard (anton@samba.org) | 7 | * Copyright (C) 2000 Anton Blanchard (anton@samba.org) |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index eefffa1dc5de..42c1c700c0a7 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index 7215849db392..be042efd1ba4 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 7 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 58c65cc8d0d3..16e13f663ab0 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1999,2000 Anton Blanchard (anton@samba.org) | 8 | * Copyright (C) 1999,2000 Anton Blanchard (anton@samba.org) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 49f28c1bdc6d..7fdddf3c7e16 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #define NR_TASK_BUCKETS 512 | 11 | #define NR_TASK_BUCKETS 512 |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index cd90f3fdc4e7..9f4cd396a0fa 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/psr.h> | 7 | #include <asm/psr.h> |
| 9 | #include <asm/asi.h> | 8 | #include <asm/asi.h> |
| 10 | #include <asm/page.h> | 9 | #include <asm/page.h> |
diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S index 697af617594a..4988e6a310bb 100644 --- a/arch/sparc/mm/tsunami.S +++ b/arch/sparc/mm/tsunami.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/ptrace.h> | 7 | #include <asm/ptrace.h> |
| 9 | #include <asm/asm-offsets.h> | 8 | #include <asm/asm-offsets.h> |
| 10 | #include <asm/psr.h> | 9 | #include <asm/psr.h> |
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index 3cbd6de18dde..754c622548a5 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1999 Pavel Semerad (semerad@ss1000.ms.mff.cuni.cz) | 6 | * Copyright (C) 1999 Pavel Semerad (semerad@ss1000.ms.mff.cuni.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
| 11 | #include <asm/psr.h> | 10 | #include <asm/psr.h> |
| 12 | #include <asm/asm-offsets.h> | 11 | #include <asm/asm-offsets.h> |
diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c index b83409c81916..50abfb1b880e 100644 --- a/arch/sparc/prom/init.c +++ b/arch/sparc/prom/init.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 6 | * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | 11 | ||
diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c index c20e5309f8aa..b0c0f9c4fc14 100644 --- a/arch/sparc/prom/memory.c +++ b/arch/sparc/prom/memory.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1997 Michael A. Griffith (grif@acm.org) | 6 | * Copyright (C) 1997 Michael A. Griffith (grif@acm.org) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | 11 | ||
diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc.c index c840c2062342..1942c7c05cb1 100644 --- a/arch/sparc/prom/misc.c +++ b/arch/sparc/prom/misc.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c index c2c69c167d18..718350aba1ec 100644 --- a/arch/sparc64/kernel/auxio.c +++ b/arch/sparc64/kernel/auxio.c | |||
| @@ -11,10 +11,9 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | 13 | ||
| 14 | #include <asm/oplib.h> | 14 | #include <asm/prom.h> |
| 15 | #include <asm/of_device.h> | ||
| 15 | #include <asm/io.h> | 16 | #include <asm/io.h> |
| 16 | #include <asm/sbus.h> | ||
| 17 | #include <asm/ebus.h> | ||
| 18 | #include <asm/auxio.h> | 17 | #include <asm/auxio.h> |
| 19 | 18 | ||
| 20 | void __iomem *auxio_register = NULL; | 19 | void __iomem *auxio_register = NULL; |
| @@ -111,12 +110,6 @@ void auxio_set_lte(int on) | |||
| 111 | } | 110 | } |
| 112 | } | 111 | } |
| 113 | 112 | ||
| 114 | static void __devinit auxio_report_dev(struct device_node *dp) | ||
| 115 | { | ||
| 116 | printk(KERN_INFO "AUXIO: Found device at %s\n", | ||
| 117 | dp->full_name); | ||
| 118 | } | ||
| 119 | |||
| 120 | static struct of_device_id auxio_match[] = { | 113 | static struct of_device_id auxio_match[] = { |
| 121 | { | 114 | { |
| 122 | .name = "auxio", | 115 | .name = "auxio", |
| @@ -126,67 +119,48 @@ static struct of_device_id auxio_match[] = { | |||
| 126 | 119 | ||
| 127 | MODULE_DEVICE_TABLE(of, auxio_match); | 120 | MODULE_DEVICE_TABLE(of, auxio_match); |
| 128 | 121 | ||
| 129 | #ifdef CONFIG_SBUS | 122 | static int __devinit auxio_probe(struct of_device *dev, const struct of_device_id *match) |
| 130 | static int __devinit auxio_sbus_probe(struct of_device *dev, const struct of_device_id *match) | ||
| 131 | { | 123 | { |
| 132 | struct sbus_dev *sdev = to_sbus_device(&dev->dev); | 124 | struct device_node *dp = dev->node; |
| 133 | 125 | unsigned long size; | |
| 134 | auxio_devtype = AUXIO_TYPE_SBUS; | 126 | |
| 135 | auxio_register = sbus_ioremap(&sdev->resource[0], 0, | 127 | if (!strcmp(dp->parent->name, "ebus")) { |
| 136 | sdev->reg_addrs[0].reg_size, | 128 | auxio_devtype = AUXIO_TYPE_EBUS; |
| 137 | "auxiliaryIO"); | 129 | size = sizeof(u32); |
| 138 | if (!auxio_register) | 130 | } else if (!strcmp(dp->parent->name, "sbus")) { |
| 131 | auxio_devtype = AUXIO_TYPE_SBUS; | ||
| 132 | size = 1; | ||
| 133 | } else { | ||
| 134 | printk("auxio: Unknown parent bus type [%s]\n", | ||
| 135 | dp->parent->name); | ||
| 139 | return -ENODEV; | 136 | return -ENODEV; |
| 140 | 137 | } | |
| 141 | auxio_report_dev(dev->node); | 138 | auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio"); |
| 142 | return 0; | ||
| 143 | } | ||
| 144 | |||
| 145 | static struct of_platform_driver auxio_sbus_driver = { | ||
| 146 | .name = "auxio", | ||
| 147 | .match_table = auxio_match, | ||
| 148 | .probe = auxio_sbus_probe, | ||
| 149 | }; | ||
| 150 | #endif | ||
| 151 | |||
| 152 | #ifdef CONFIG_PCI | ||
| 153 | static int __devinit auxio_ebus_probe(struct of_device *dev, const struct of_device_id *match) | ||
| 154 | { | ||
| 155 | struct linux_ebus_device *edev = to_ebus_device(&dev->dev); | ||
| 156 | |||
| 157 | auxio_devtype = AUXIO_TYPE_EBUS; | ||
| 158 | auxio_register = ioremap(edev->resource[0].start, sizeof(u32)); | ||
| 159 | if (!auxio_register) | 139 | if (!auxio_register) |
| 160 | return -ENODEV; | 140 | return -ENODEV; |
| 161 | 141 | ||
| 162 | auxio_report_dev(dev->node); | 142 | printk(KERN_INFO "AUXIO: Found device at %s\n", |
| 143 | dp->full_name); | ||
| 163 | 144 | ||
| 164 | auxio_set_led(AUXIO_LED_ON); | 145 | if (auxio_devtype == AUXIO_TYPE_EBUS) |
| 146 | auxio_set_led(AUXIO_LED_ON); | ||
| 165 | 147 | ||
| 166 | return 0; | 148 | return 0; |
| 167 | } | 149 | } |
| 168 | 150 | ||
| 169 | static struct of_platform_driver auxio_ebus_driver = { | 151 | static struct of_platform_driver auxio_driver = { |
| 170 | .name = "auxio", | 152 | .name = "auxio", |
| 171 | .match_table = auxio_match, | 153 | .match_table = auxio_match, |
| 172 | .probe = auxio_ebus_probe, | 154 | .probe = auxio_probe, |
| 173 | }; | 155 | }; |
| 174 | #endif | ||
| 175 | 156 | ||
| 176 | static int __init auxio_probe(void) | 157 | static int __init auxio_init(void) |
| 177 | { | 158 | { |
| 178 | #ifdef CONFIG_SBUS | 159 | return of_register_driver(&auxio_driver, &of_bus_type); |
| 179 | of_register_driver(&auxio_sbus_driver, &sbus_bus_type); | ||
| 180 | #endif | ||
| 181 | #ifdef CONFIG_PCI | ||
| 182 | of_register_driver(&auxio_ebus_driver, &ebus_bus_type); | ||
| 183 | #endif | ||
| 184 | |||
| 185 | return 0; | ||
| 186 | } | 160 | } |
| 187 | 161 | ||
| 188 | /* Must be after subsys_initcall() so that busses are probed. Must | 162 | /* Must be after subsys_initcall() so that busses are probed. Must |
| 189 | * be before device_initcall() because things like the floppy driver | 163 | * be before device_initcall() because things like the floppy driver |
| 190 | * need to use the AUXIO register. | 164 | * need to use the AUXIO register. |
| 191 | */ | 165 | */ |
| 192 | fs_initcall(auxio_probe); | 166 | fs_initcall(auxio_init); |
diff --git a/arch/sparc64/kernel/binfmt_elf32.c b/arch/sparc64/kernel/binfmt_elf32.c index 8a2abcce2737..a98f3ae175a3 100644 --- a/arch/sparc64/kernel/binfmt_elf32.c +++ b/arch/sparc64/kernel/binfmt_elf32.c | |||
| @@ -84,7 +84,6 @@ typedef struct { | |||
| 84 | 84 | ||
| 85 | #include <asm/processor.h> | 85 | #include <asm/processor.h> |
| 86 | #include <linux/module.h> | 86 | #include <linux/module.h> |
| 87 | #include <linux/config.h> | ||
| 88 | #include <linux/elfcore.h> | 87 | #include <linux/elfcore.h> |
| 89 | #include <linux/compat.h> | 88 | #include <linux/compat.h> |
| 90 | 89 | ||
diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c index 11cc0caef592..7eb81d3954d9 100644 --- a/arch/sparc64/kernel/cpu.c +++ b/arch/sparc64/kernel/cpu.c | |||
| @@ -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 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c index 389301c95cb2..f8ef2f2b9b37 100644 --- a/arch/sparc64/kernel/devices.c +++ b/arch/sparc64/kernel/devices.c | |||
| @@ -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 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/threads.h> | 8 | #include <linux/threads.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| @@ -21,8 +20,6 @@ | |||
| 21 | #include <asm/spitfire.h> | 20 | #include <asm/spitfire.h> |
| 22 | #include <asm/timer.h> | 21 | #include <asm/timer.h> |
| 23 | #include <asm/cpudata.h> | 22 | #include <asm/cpudata.h> |
| 24 | #include <asm/vdev.h> | ||
| 25 | #include <asm/irq.h> | ||
| 26 | 23 | ||
| 27 | /* Used to synchronize acceses to NatSemi SUPER I/O chip configure | 24 | /* Used to synchronize acceses to NatSemi SUPER I/O chip configure |
| 28 | * operations in asm/ns87303.h | 25 | * operations in asm/ns87303.h |
| @@ -32,100 +29,6 @@ DEFINE_SPINLOCK(ns87303_lock); | |||
| 32 | extern void cpu_probe(void); | 29 | extern void cpu_probe(void); |
| 33 | extern void central_probe(void); | 30 | extern void central_probe(void); |
| 34 | 31 | ||
| 35 | u32 sun4v_vdev_devhandle; | ||
| 36 | struct device_node *sun4v_vdev_root; | ||
| 37 | |||
| 38 | struct vdev_intmap { | ||
| 39 | unsigned int phys; | ||
| 40 | unsigned int irq; | ||
| 41 | unsigned int cnode; | ||
| 42 | unsigned int cinterrupt; | ||
| 43 | }; | ||
| 44 | |||
| 45 | struct vdev_intmask { | ||
| 46 | unsigned int phys; | ||
| 47 | unsigned int interrupt; | ||
| 48 | unsigned int __unused; | ||
| 49 | }; | ||
| 50 | |||
| 51 | static struct vdev_intmap *vdev_intmap; | ||
| 52 | static int vdev_num_intmap; | ||
| 53 | static struct vdev_intmask *vdev_intmask; | ||
| 54 | |||
| 55 | static void __init sun4v_virtual_device_probe(void) | ||
| 56 | { | ||
| 57 | struct linux_prom64_registers *regs; | ||
| 58 | struct property *prop; | ||
| 59 | struct device_node *dp; | ||
| 60 | int sz; | ||
| 61 | |||
| 62 | if (tlb_type != hypervisor) | ||
| 63 | return; | ||
| 64 | |||
| 65 | dp = of_find_node_by_name(NULL, "virtual-devices"); | ||
| 66 | if (!dp) { | ||
| 67 | prom_printf("SUN4V: Fatal error, no virtual-devices node.\n"); | ||
| 68 | prom_halt(); | ||
| 69 | } | ||
| 70 | |||
| 71 | sun4v_vdev_root = dp; | ||
| 72 | |||
| 73 | prop = of_find_property(dp, "reg", NULL); | ||
| 74 | regs = prop->value; | ||
| 75 | sun4v_vdev_devhandle = (regs[0].phys_addr >> 32UL) & 0x0fffffff; | ||
| 76 | |||
| 77 | prop = of_find_property(dp, "interrupt-map", &sz); | ||
| 78 | vdev_intmap = prop->value; | ||
| 79 | vdev_num_intmap = sz / sizeof(struct vdev_intmap); | ||
| 80 | |||
| 81 | prop = of_find_property(dp, "interrupt-map-mask", NULL); | ||
| 82 | vdev_intmask = prop->value; | ||
| 83 | |||
| 84 | printk("%s: Virtual Device Bus devhandle[%x]\n", | ||
| 85 | dp->full_name, sun4v_vdev_devhandle); | ||
| 86 | } | ||
| 87 | |||
| 88 | unsigned int sun4v_vdev_device_interrupt(struct device_node *dev_node) | ||
| 89 | { | ||
| 90 | struct property *prop; | ||
| 91 | unsigned int irq, reg; | ||
| 92 | int i; | ||
| 93 | |||
| 94 | prop = of_find_property(dev_node, "interrupts", NULL); | ||
| 95 | if (!prop) { | ||
| 96 | printk("VDEV: Cannot get \"interrupts\" " | ||
| 97 | "property for OBP node %s\n", | ||
| 98 | dev_node->full_name); | ||
| 99 | return 0; | ||
| 100 | } | ||
| 101 | irq = *(unsigned int *) prop->value; | ||
| 102 | |||
| 103 | prop = of_find_property(dev_node, "reg", NULL); | ||
| 104 | if (!prop) { | ||
| 105 | printk("VDEV: Cannot get \"reg\" " | ||
| 106 | "property for OBP node %s\n", | ||
| 107 | dev_node->full_name); | ||
| 108 | return 0; | ||
| 109 | } | ||
| 110 | reg = *(unsigned int *) prop->value; | ||
| 111 | |||
| 112 | for (i = 0; i < vdev_num_intmap; i++) { | ||
| 113 | if (vdev_intmap[i].phys == (reg & vdev_intmask->phys) && | ||
| 114 | vdev_intmap[i].irq == (irq & vdev_intmask->interrupt)) { | ||
| 115 | irq = vdev_intmap[i].cinterrupt; | ||
| 116 | break; | ||
| 117 | } | ||
| 118 | } | ||
| 119 | |||
| 120 | if (i == vdev_num_intmap) { | ||
| 121 | printk("VDEV: No matching interrupt map entry " | ||
| 122 | "for OBP node %s\n", dev_node->full_name); | ||
| 123 | return 0; | ||
| 124 | } | ||
| 125 | |||
| 126 | return sun4v_build_irq(sun4v_vdev_devhandle, irq); | ||
| 127 | } | ||
| 128 | |||
| 129 | static const char *cpu_mid_prop(void) | 32 | static const char *cpu_mid_prop(void) |
| 130 | { | 33 | { |
| 131 | if (tlb_type == spitfire) | 34 | if (tlb_type == spitfire) |
| @@ -290,7 +193,6 @@ void __init device_scan(void) | |||
| 290 | } | 193 | } |
| 291 | #endif | 194 | #endif |
| 292 | 195 | ||
| 293 | sun4v_virtual_device_probe(); | ||
| 294 | central_probe(); | 196 | central_probe(); |
| 295 | 197 | ||
| 296 | cpu_probe(); | 198 | cpu_probe(); |
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index 98e0a8cbeecd..a1023bb1a217 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 5 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| @@ -20,6 +19,8 @@ | |||
| 20 | #include <asm/pbm.h> | 19 | #include <asm/pbm.h> |
| 21 | #include <asm/ebus.h> | 20 | #include <asm/ebus.h> |
| 22 | #include <asm/oplib.h> | 21 | #include <asm/oplib.h> |
| 22 | #include <asm/prom.h> | ||
| 23 | #include <asm/of_device.h> | ||
| 23 | #include <asm/bpp.h> | 24 | #include <asm/bpp.h> |
| 24 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
| 25 | 26 | ||
| @@ -279,45 +280,12 @@ static inline void *ebus_alloc(size_t size) | |||
| 279 | return mem; | 280 | return mem; |
| 280 | } | 281 | } |
| 281 | 282 | ||
| 282 | int __init ebus_intmap_match(struct linux_ebus *ebus, | 283 | static void __init fill_ebus_child(struct device_node *dp, |
| 283 | struct linux_prom_registers *reg, | 284 | struct linux_ebus_child *dev, |
| 284 | int *interrupt) | 285 | int non_standard_regs) |
| 285 | { | ||
| 286 | struct linux_prom_ebus_intmap *imap; | ||
| 287 | struct linux_prom_ebus_intmask *imask; | ||
| 288 | unsigned int hi, lo, irq; | ||
| 289 | int i, len, n_imap; | ||
| 290 | |||
| 291 | imap = of_get_property(ebus->prom_node, "interrupt-map", &len); | ||
| 292 | if (!imap) | ||
| 293 | return 0; | ||
| 294 | n_imap = len / sizeof(imap[0]); | ||
| 295 | |||
| 296 | imask = of_get_property(ebus->prom_node, "interrupt-map-mask", NULL); | ||
| 297 | if (!imask) | ||
| 298 | return 0; | ||
| 299 | |||
| 300 | hi = reg->which_io & imask->phys_hi; | ||
| 301 | lo = reg->phys_addr & imask->phys_lo; | ||
| 302 | irq = *interrupt & imask->interrupt; | ||
| 303 | for (i = 0; i < n_imap; i++) { | ||
| 304 | if ((imap[i].phys_hi == hi) && | ||
| 305 | (imap[i].phys_lo == lo) && | ||
| 306 | (imap[i].interrupt == irq)) { | ||
| 307 | *interrupt = imap[i].cinterrupt; | ||
| 308 | return 0; | ||
| 309 | } | ||
| 310 | } | ||
| 311 | return -1; | ||
| 312 | } | ||
| 313 | |||
| 314 | void __init fill_ebus_child(struct device_node *dp, | ||
| 315 | struct linux_prom_registers *preg, | ||
| 316 | struct linux_ebus_child *dev, | ||
| 317 | int non_standard_regs) | ||
| 318 | { | 286 | { |
| 287 | struct of_device *op; | ||
| 319 | int *regs; | 288 | int *regs; |
| 320 | int *irqs; | ||
| 321 | int i, len; | 289 | int i, len; |
| 322 | 290 | ||
| 323 | dev->prom_node = dp; | 291 | dev->prom_node = dp; |
| @@ -354,12 +322,16 @@ void __init fill_ebus_child(struct device_node *dp, | |||
| 354 | } | 322 | } |
| 355 | } | 323 | } |
| 356 | 324 | ||
| 357 | for (i = 0; i < PROMINTR_MAX; i++) | 325 | op = of_find_device_by_node(dp); |
| 358 | dev->irqs[i] = PCI_IRQ_NONE; | 326 | if (!op) { |
| 359 | |||
| 360 | irqs = of_get_property(dp, "interrupts", &len); | ||
| 361 | if (!irqs) { | ||
| 362 | dev->num_irqs = 0; | 327 | dev->num_irqs = 0; |
| 328 | } else { | ||
| 329 | dev->num_irqs = op->num_irqs; | ||
| 330 | for (i = 0; i < dev->num_irqs; i++) | ||
| 331 | dev->irqs[i] = op->irqs[i]; | ||
| 332 | } | ||
| 333 | |||
| 334 | if (!dev->num_irqs) { | ||
| 363 | /* | 335 | /* |
| 364 | * Oh, well, some PROMs don't export interrupts | 336 | * Oh, well, some PROMs don't export interrupts |
| 365 | * property to children of EBus devices... | 337 | * property to children of EBus devices... |
| @@ -375,23 +347,6 @@ void __init fill_ebus_child(struct device_node *dp, | |||
| 375 | dev->irqs[0] = dev->parent->irqs[1]; | 347 | dev->irqs[0] = dev->parent->irqs[1]; |
| 376 | } | 348 | } |
| 377 | } | 349 | } |
| 378 | } else { | ||
| 379 | dev->num_irqs = len / sizeof(irqs[0]); | ||
| 380 | for (i = 0; i < dev->num_irqs; i++) { | ||
| 381 | struct pci_pbm_info *pbm = dev->bus->parent; | ||
| 382 | struct pci_controller_info *p = pbm->parent; | ||
| 383 | |||
| 384 | if (ebus_intmap_match(dev->bus, preg, &irqs[i]) != -1) { | ||
| 385 | dev->irqs[i] = p->irq_build(pbm, | ||
| 386 | dev->bus->self, | ||
| 387 | irqs[i]); | ||
| 388 | } else { | ||
| 389 | /* If we get a bogus interrupt property, just | ||
| 390 | * record the raw value instead of punting. | ||
| 391 | */ | ||
| 392 | dev->irqs[i] = irqs[i]; | ||
| 393 | } | ||
| 394 | } | ||
| 395 | } | 350 | } |
| 396 | } | 351 | } |
| 397 | 352 | ||
| @@ -403,72 +358,32 @@ static int __init child_regs_nonstandard(struct linux_ebus_device *dev) | |||
| 403 | return 0; | 358 | return 0; |
| 404 | } | 359 | } |
| 405 | 360 | ||
| 406 | void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev) | 361 | static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev) |
| 407 | { | 362 | { |
| 408 | struct linux_prom_registers *regs; | ||
| 409 | struct linux_ebus_child *child; | 363 | struct linux_ebus_child *child; |
| 410 | int *irqs; | 364 | struct of_device *op; |
| 411 | int i, n, len; | 365 | int i, len; |
| 412 | 366 | ||
| 413 | dev->prom_node = dp; | 367 | dev->prom_node = dp; |
| 414 | 368 | ||
| 415 | printk(" [%s", dp->name); | 369 | printk(" [%s", dp->name); |
| 416 | 370 | ||
| 417 | regs = of_get_property(dp, "reg", &len); | 371 | op = of_find_device_by_node(dp); |
| 418 | if (!regs) { | 372 | if (!op) { |
| 419 | dev->num_addrs = 0; | 373 | dev->num_addrs = 0; |
| 420 | goto probe_interrupts; | ||
| 421 | } | ||
| 422 | |||
| 423 | if (len % sizeof(struct linux_prom_registers)) { | ||
| 424 | prom_printf("UGH: proplen for %s was %d, need multiple of %d\n", | ||
| 425 | dev->prom_node->name, len, | ||
| 426 | (int)sizeof(struct linux_prom_registers)); | ||
| 427 | prom_halt(); | ||
| 428 | } | ||
| 429 | dev->num_addrs = len / sizeof(struct linux_prom_registers); | ||
| 430 | |||
| 431 | for (i = 0; i < dev->num_addrs; i++) { | ||
| 432 | /* XXX Learn how to interpret ebus ranges... -DaveM */ | ||
| 433 | if (regs[i].which_io >= 0x10) | ||
| 434 | n = (regs[i].which_io - 0x10) >> 2; | ||
| 435 | else | ||
| 436 | n = regs[i].which_io; | ||
| 437 | |||
| 438 | dev->resource[i].start = dev->bus->self->resource[n].start; | ||
| 439 | dev->resource[i].start += (unsigned long)regs[i].phys_addr; | ||
| 440 | dev->resource[i].end = | ||
| 441 | (dev->resource[i].start + (unsigned long)regs[i].reg_size - 1UL); | ||
| 442 | dev->resource[i].flags = IORESOURCE_MEM; | ||
| 443 | dev->resource[i].name = dev->prom_node->name; | ||
| 444 | request_resource(&dev->bus->self->resource[n], | ||
| 445 | &dev->resource[i]); | ||
| 446 | } | ||
| 447 | |||
| 448 | probe_interrupts: | ||
| 449 | for (i = 0; i < PROMINTR_MAX; i++) | ||
| 450 | dev->irqs[i] = PCI_IRQ_NONE; | ||
| 451 | |||
| 452 | irqs = of_get_property(dp, "interrupts", &len); | ||
| 453 | if (!irqs) { | ||
| 454 | dev->num_irqs = 0; | 374 | dev->num_irqs = 0; |
| 455 | } else { | 375 | } else { |
| 456 | dev->num_irqs = len / sizeof(irqs[0]); | 376 | (void) of_get_property(dp, "reg", &len); |
| 457 | for (i = 0; i < dev->num_irqs; i++) { | 377 | dev->num_addrs = len / sizeof(struct linux_prom_registers); |
| 458 | struct pci_pbm_info *pbm = dev->bus->parent; | 378 | |
| 459 | struct pci_controller_info *p = pbm->parent; | 379 | for (i = 0; i < dev->num_addrs; i++) |
| 460 | 380 | memcpy(&dev->resource[i], | |
| 461 | if (ebus_intmap_match(dev->bus, ®s[0], &irqs[i]) != -1) { | 381 | &op->resource[i], |
| 462 | dev->irqs[i] = p->irq_build(pbm, | 382 | sizeof(struct resource)); |
| 463 | dev->bus->self, | 383 | |
| 464 | irqs[i]); | 384 | dev->num_irqs = op->num_irqs; |
| 465 | } else { | 385 | for (i = 0; i < dev->num_irqs; i++) |
| 466 | /* If we get a bogus interrupt property, just | 386 | dev->irqs[i] = op->irqs[i]; |
| 467 | * record the raw value instead of punting. | ||
| 468 | */ | ||
| 469 | dev->irqs[i] = irqs[i]; | ||
| 470 | } | ||
| 471 | } | ||
| 472 | } | 387 | } |
| 473 | 388 | ||
| 474 | dev->ofdev.node = dp; | 389 | dev->ofdev.node = dp; |
| @@ -490,7 +405,7 @@ probe_interrupts: | |||
| 490 | child->next = NULL; | 405 | child->next = NULL; |
| 491 | child->parent = dev; | 406 | child->parent = dev; |
| 492 | child->bus = dev->bus; | 407 | child->bus = dev->bus; |
| 493 | fill_ebus_child(dp, regs, child, | 408 | fill_ebus_child(dp, child, |
| 494 | child_regs_nonstandard(dev)); | 409 | child_regs_nonstandard(dev)); |
| 495 | 410 | ||
| 496 | while ((dp = dp->sibling) != NULL) { | 411 | while ((dp = dp->sibling) != NULL) { |
| @@ -500,7 +415,7 @@ probe_interrupts: | |||
| 500 | child->next = NULL; | 415 | child->next = NULL; |
| 501 | child->parent = dev; | 416 | child->parent = dev; |
| 502 | child->bus = dev->bus; | 417 | child->bus = dev->bus; |
| 503 | fill_ebus_child(dp, regs, child, | 418 | fill_ebus_child(dp, child, |
| 504 | child_regs_nonstandard(dev)); | 419 | child_regs_nonstandard(dev)); |
| 505 | } | 420 | } |
| 506 | } | 421 | } |
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S index be85ce2a4ad9..0aaa35fc5a9c 100644 --- a/arch/sparc64/kernel/entry.S +++ b/arch/sparc64/kernel/entry.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 7 | * Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | 11 | ||
| 13 | #include <asm/head.h> | 12 | #include <asm/head.h> |
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S index 149383835c25..4b2bf9eb447a 100644 --- a/arch/sparc64/kernel/etrap.S +++ b/arch/sparc64/kernel/etrap.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz) | 5 | * Copyright (C) 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #include <asm/asi.h> | 9 | #include <asm/asi.h> |
| 11 | #include <asm/pstate.h> | 10 | #include <asm/pstate.h> |
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S index 31c5892f5acc..75684b56767e 100644 --- a/arch/sparc64/kernel/head.S +++ b/arch/sparc64/kernel/head.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) | 7 | * Copyright (C) 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/version.h> | 10 | #include <linux/version.h> |
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/threads.h> | 12 | #include <linux/threads.h> |
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index ab9e640df228..4e64724cb9ae 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) | 6 | * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 12 | #include <linux/ptrace.h> | 11 | #include <linux/ptrace.h> |
| @@ -414,6 +413,10 @@ void irq_install_pre_handler(int virt_irq, | |||
| 414 | data->pre_handler_arg1 = arg1; | 413 | data->pre_handler_arg1 = arg1; |
| 415 | data->pre_handler_arg2 = arg2; | 414 | data->pre_handler_arg2 = arg2; |
| 416 | 415 | ||
| 416 | if (desc->chip == &sun4u_irq_ack || | ||
| 417 | desc->chip == &sun4v_irq_ack) | ||
| 418 | return; | ||
| 419 | |||
| 417 | desc->chip = (desc->chip == &sun4u_irq ? | 420 | desc->chip = (desc->chip == &sun4u_irq ? |
| 418 | &sun4u_irq_ack : &sun4v_irq_ack); | 421 | &sun4u_irq_ack : &sun4v_irq_ack); |
| 419 | } | 422 | } |
diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c index 6f16dee280a8..0f3aec72ef5f 100644 --- a/arch/sparc64/kernel/isa.c +++ b/arch/sparc64/kernel/isa.c | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | #include <linux/pci.h> | 3 | #include <linux/pci.h> |
| 4 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
| 5 | #include <asm/oplib.h> | 5 | #include <asm/oplib.h> |
| 6 | #include <asm/prom.h> | ||
| 7 | #include <asm/of_device.h> | ||
| 6 | #include <asm/isa.h> | 8 | #include <asm/isa.h> |
| 7 | 9 | ||
| 8 | struct sparc_isa_bridge *isa_chain; | 10 | struct sparc_isa_bridge *isa_chain; |
| @@ -46,107 +48,16 @@ isa_dev_get_resource(struct sparc_isa_device *isa_dev) | |||
| 46 | return pregs; | 48 | return pregs; |
| 47 | } | 49 | } |
| 48 | 50 | ||
| 49 | /* I can't believe they didn't put a real INO in the isa device | ||
| 50 | * interrupts property. The whole point of the OBP properties | ||
| 51 | * is to shield the kernel from IRQ routing details. | ||
| 52 | * | ||
| 53 | * The P1275 standard for ISA devices seems to also have been | ||
| 54 | * totally ignored. | ||
| 55 | * | ||
| 56 | * On later systems, an interrupt-map and interrupt-map-mask scheme | ||
| 57 | * akin to EBUS is used. | ||
| 58 | */ | ||
| 59 | static struct { | ||
| 60 | int obp_irq; | ||
| 61 | int pci_ino; | ||
| 62 | } grover_irq_table[] = { | ||
| 63 | { 1, 0x00 }, /* dma, unknown ino at this point */ | ||
| 64 | { 2, 0x27 }, /* floppy */ | ||
| 65 | { 3, 0x22 }, /* parallel */ | ||
| 66 | { 4, 0x2b }, /* serial */ | ||
| 67 | { 5, 0x25 }, /* acpi power management */ | ||
| 68 | |||
| 69 | { 0, 0x00 } /* end of table */ | ||
| 70 | }; | ||
| 71 | |||
| 72 | static int __init isa_dev_get_irq_using_imap(struct sparc_isa_device *isa_dev, | ||
| 73 | struct sparc_isa_bridge *isa_br, | ||
| 74 | int *interrupt, | ||
| 75 | struct linux_prom_registers *reg) | ||
| 76 | { | ||
| 77 | struct linux_prom_ebus_intmap *imap; | ||
| 78 | struct linux_prom_ebus_intmap *imask; | ||
| 79 | unsigned int hi, lo, irq; | ||
| 80 | int i, len, n_imap; | ||
| 81 | |||
| 82 | imap = of_get_property(isa_br->prom_node, "interrupt-map", &len); | ||
| 83 | if (!imap) | ||
| 84 | return 0; | ||
| 85 | n_imap = len / sizeof(imap[0]); | ||
| 86 | |||
| 87 | imask = of_get_property(isa_br->prom_node, "interrupt-map-mask", NULL); | ||
| 88 | if (!imask) | ||
| 89 | return 0; | ||
| 90 | |||
| 91 | hi = reg->which_io & imask->phys_hi; | ||
| 92 | lo = reg->phys_addr & imask->phys_lo; | ||
| 93 | irq = *interrupt & imask->interrupt; | ||
| 94 | for (i = 0; i < n_imap; i++) { | ||
| 95 | if ((imap[i].phys_hi == hi) && | ||
| 96 | (imap[i].phys_lo == lo) && | ||
| 97 | (imap[i].interrupt == irq)) { | ||
| 98 | *interrupt = imap[i].cinterrupt; | ||
| 99 | return 0; | ||
| 100 | } | ||
| 101 | } | ||
| 102 | return -1; | ||
| 103 | } | ||
| 104 | |||
| 105 | static void __init isa_dev_get_irq(struct sparc_isa_device *isa_dev, | 51 | static void __init isa_dev_get_irq(struct sparc_isa_device *isa_dev, |
| 106 | struct linux_prom_registers *pregs) | 52 | struct linux_prom_registers *pregs) |
| 107 | { | 53 | { |
| 108 | int irq_prop; | 54 | struct of_device *op = of_find_device_by_node(isa_dev->prom_node); |
| 109 | 55 | ||
| 110 | irq_prop = of_getintprop_default(isa_dev->prom_node, | 56 | if (!op || !op->num_irqs) { |
| 111 | "interrupts", -1); | 57 | isa_dev->irq = PCI_IRQ_NONE; |
| 112 | if (irq_prop <= 0) { | ||
| 113 | goto no_irq; | ||
| 114 | } else { | 58 | } else { |
| 115 | struct pci_controller_info *pcic; | 59 | isa_dev->irq = op->irqs[0]; |
| 116 | struct pci_pbm_info *pbm; | ||
| 117 | int i; | ||
| 118 | |||
| 119 | if (of_find_property(isa_dev->bus->prom_node, | ||
| 120 | "interrupt-map", NULL)) { | ||
| 121 | if (!isa_dev_get_irq_using_imap(isa_dev, | ||
| 122 | isa_dev->bus, | ||
| 123 | &irq_prop, | ||
| 124 | pregs)) | ||
| 125 | goto route_irq; | ||
| 126 | } | ||
| 127 | |||
| 128 | for (i = 0; grover_irq_table[i].obp_irq != 0; i++) { | ||
| 129 | if (grover_irq_table[i].obp_irq == irq_prop) { | ||
| 130 | int ino = grover_irq_table[i].pci_ino; | ||
| 131 | |||
| 132 | if (ino == 0) | ||
| 133 | goto no_irq; | ||
| 134 | |||
| 135 | irq_prop = ino; | ||
| 136 | goto route_irq; | ||
| 137 | } | ||
| 138 | } | ||
| 139 | goto no_irq; | ||
| 140 | |||
| 141 | route_irq: | ||
| 142 | pbm = isa_dev->bus->parent; | ||
| 143 | pcic = pbm->parent; | ||
| 144 | isa_dev->irq = pcic->irq_build(pbm, NULL, irq_prop); | ||
| 145 | return; | ||
| 146 | } | 60 | } |
| 147 | |||
| 148 | no_irq: | ||
| 149 | isa_dev->irq = PCI_IRQ_NONE; | ||
| 150 | } | 61 | } |
| 151 | 62 | ||
| 152 | static void __init isa_fill_children(struct sparc_isa_device *parent_isa_dev) | 63 | static void __init isa_fill_children(struct sparc_isa_device *parent_isa_dev) |
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c index 2e1c824c1cc9..8e75ed762fd8 100644 --- a/arch/sparc64/kernel/kprobes.c +++ b/arch/sparc64/kernel/kprobes.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright (C) 2004 David S. Miller <davem@davemloft.net> | 3 | * Copyright (C) 2004 David S. Miller <davem@davemloft.net> |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 8 | #include <linux/kprobes.h> | 7 | #include <linux/kprobes.h> |
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
diff --git a/arch/sparc64/kernel/ktlb.S b/arch/sparc64/kernel/ktlb.S index 31da1e564c95..e492db845ea3 100644 --- a/arch/sparc64/kernel/ktlb.S +++ b/arch/sparc64/kernel/ktlb.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 6 | * Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/head.h> | 9 | #include <asm/head.h> |
| 11 | #include <asm/asi.h> | 10 | #include <asm/asi.h> |
| 12 | #include <asm/page.h> | 11 | #include <asm/page.h> |
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index 768475bbce82..169b017eec0b 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c | |||
| @@ -129,6 +129,43 @@ static int of_device_resume(struct device * dev) | |||
| 129 | return error; | 129 | return error; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name) | ||
| 133 | { | ||
| 134 | unsigned long ret = res->start + offset; | ||
| 135 | |||
| 136 | if (!request_region(ret, size, name)) | ||
| 137 | ret = 0; | ||
| 138 | |||
| 139 | return (void __iomem *) ret; | ||
| 140 | } | ||
| 141 | EXPORT_SYMBOL(of_ioremap); | ||
| 142 | |||
| 143 | void of_iounmap(void __iomem *base, unsigned long size) | ||
| 144 | { | ||
| 145 | release_region((unsigned long) base, size); | ||
| 146 | } | ||
| 147 | EXPORT_SYMBOL(of_iounmap); | ||
| 148 | |||
| 149 | static int node_match(struct device *dev, void *data) | ||
| 150 | { | ||
| 151 | struct of_device *op = to_of_device(dev); | ||
| 152 | struct device_node *dp = data; | ||
| 153 | |||
| 154 | return (op->node == dp); | ||
| 155 | } | ||
| 156 | |||
| 157 | struct of_device *of_find_device_by_node(struct device_node *dp) | ||
| 158 | { | ||
| 159 | struct device *dev = bus_find_device(&of_bus_type, NULL, | ||
| 160 | dp, node_match); | ||
| 161 | |||
| 162 | if (dev) | ||
| 163 | return to_of_device(dev); | ||
| 164 | |||
| 165 | return NULL; | ||
| 166 | } | ||
| 167 | EXPORT_SYMBOL(of_find_device_by_node); | ||
| 168 | |||
| 132 | #ifdef CONFIG_PCI | 169 | #ifdef CONFIG_PCI |
| 133 | struct bus_type isa_bus_type = { | 170 | struct bus_type isa_bus_type = { |
| 134 | .name = "isa", | 171 | .name = "isa", |
| @@ -163,10 +200,657 @@ struct bus_type sbus_bus_type = { | |||
| 163 | EXPORT_SYMBOL(sbus_bus_type); | 200 | EXPORT_SYMBOL(sbus_bus_type); |
| 164 | #endif | 201 | #endif |
| 165 | 202 | ||
| 203 | struct bus_type of_bus_type = { | ||
| 204 | .name = "of", | ||
| 205 | .match = of_platform_bus_match, | ||
| 206 | .probe = of_device_probe, | ||
| 207 | .remove = of_device_remove, | ||
| 208 | .suspend = of_device_suspend, | ||
| 209 | .resume = of_device_resume, | ||
| 210 | }; | ||
| 211 | EXPORT_SYMBOL(of_bus_type); | ||
| 212 | |||
| 213 | static inline u64 of_read_addr(u32 *cell, int size) | ||
| 214 | { | ||
| 215 | u64 r = 0; | ||
| 216 | while (size--) | ||
| 217 | r = (r << 32) | *(cell++); | ||
| 218 | return r; | ||
| 219 | } | ||
| 220 | |||
| 221 | static void __init get_cells(struct device_node *dp, | ||
| 222 | int *addrc, int *sizec) | ||
| 223 | { | ||
| 224 | if (addrc) | ||
| 225 | *addrc = of_n_addr_cells(dp); | ||
| 226 | if (sizec) | ||
| 227 | *sizec = of_n_size_cells(dp); | ||
| 228 | } | ||
| 229 | |||
| 230 | /* Max address size we deal with */ | ||
| 231 | #define OF_MAX_ADDR_CELLS 4 | ||
| 232 | |||
| 233 | struct of_bus { | ||
| 234 | const char *name; | ||
| 235 | const char *addr_prop_name; | ||
| 236 | int (*match)(struct device_node *parent); | ||
| 237 | void (*count_cells)(struct device_node *child, | ||
| 238 | int *addrc, int *sizec); | ||
| 239 | u64 (*map)(u32 *addr, u32 *range, int na, int ns, int pna); | ||
| 240 | int (*translate)(u32 *addr, u64 offset, int na); | ||
| 241 | unsigned int (*get_flags)(u32 *addr); | ||
| 242 | }; | ||
| 243 | |||
| 244 | /* | ||
| 245 | * Default translator (generic bus) | ||
| 246 | */ | ||
| 247 | |||
| 248 | static void of_bus_default_count_cells(struct device_node *dev, | ||
| 249 | int *addrc, int *sizec) | ||
| 250 | { | ||
| 251 | get_cells(dev, addrc, sizec); | ||
| 252 | } | ||
| 253 | |||
| 254 | static u64 of_bus_default_map(u32 *addr, u32 *range, int na, int ns, int pna) | ||
| 255 | { | ||
| 256 | u64 cp, s, da; | ||
| 257 | |||
| 258 | cp = of_read_addr(range, na); | ||
| 259 | s = of_read_addr(range + na + pna, ns); | ||
| 260 | da = of_read_addr(addr, na); | ||
| 261 | |||
| 262 | if (da < cp || da >= (cp + s)) | ||
| 263 | return OF_BAD_ADDR; | ||
| 264 | return da - cp; | ||
| 265 | } | ||
| 266 | |||
| 267 | static int of_bus_default_translate(u32 *addr, u64 offset, int na) | ||
| 268 | { | ||
| 269 | u64 a = of_read_addr(addr, na); | ||
| 270 | memset(addr, 0, na * 4); | ||
| 271 | a += offset; | ||
| 272 | if (na > 1) | ||
| 273 | addr[na - 2] = a >> 32; | ||
| 274 | addr[na - 1] = a & 0xffffffffu; | ||
| 275 | |||
| 276 | return 0; | ||
| 277 | } | ||
| 278 | |||
| 279 | static unsigned int of_bus_default_get_flags(u32 *addr) | ||
| 280 | { | ||
| 281 | return IORESOURCE_MEM; | ||
| 282 | } | ||
| 283 | |||
| 284 | /* | ||
| 285 | * PCI bus specific translator | ||
| 286 | */ | ||
| 287 | |||
| 288 | static int of_bus_pci_match(struct device_node *np) | ||
| 289 | { | ||
| 290 | return !strcmp(np->type, "pci") || !strcmp(np->type, "pciex"); | ||
| 291 | } | ||
| 292 | |||
| 293 | static void of_bus_pci_count_cells(struct device_node *np, | ||
| 294 | int *addrc, int *sizec) | ||
| 295 | { | ||
| 296 | if (addrc) | ||
| 297 | *addrc = 3; | ||
| 298 | if (sizec) | ||
| 299 | *sizec = 2; | ||
| 300 | } | ||
| 301 | |||
| 302 | static u64 of_bus_pci_map(u32 *addr, u32 *range, int na, int ns, int pna) | ||
| 303 | { | ||
| 304 | u64 cp, s, da; | ||
| 305 | |||
| 306 | /* Check address type match */ | ||
| 307 | if ((addr[0] ^ range[0]) & 0x03000000) | ||
| 308 | return OF_BAD_ADDR; | ||
| 309 | |||
| 310 | /* Read address values, skipping high cell */ | ||
| 311 | cp = of_read_addr(range + 1, na - 1); | ||
| 312 | s = of_read_addr(range + na + pna, ns); | ||
| 313 | da = of_read_addr(addr + 1, na - 1); | ||
| 314 | |||
| 315 | if (da < cp || da >= (cp + s)) | ||
| 316 | return OF_BAD_ADDR; | ||
| 317 | return da - cp; | ||
| 318 | } | ||
| 319 | |||
| 320 | static int of_bus_pci_translate(u32 *addr, u64 offset, int na) | ||
| 321 | { | ||
| 322 | return of_bus_default_translate(addr + 1, offset, na - 1); | ||
| 323 | } | ||
| 324 | |||
| 325 | static unsigned int of_bus_pci_get_flags(u32 *addr) | ||
| 326 | { | ||
| 327 | unsigned int flags = 0; | ||
| 328 | u32 w = addr[0]; | ||
| 329 | |||
| 330 | switch((w >> 24) & 0x03) { | ||
| 331 | case 0x01: | ||
| 332 | flags |= IORESOURCE_IO; | ||
| 333 | case 0x02: /* 32 bits */ | ||
| 334 | case 0x03: /* 64 bits */ | ||
| 335 | flags |= IORESOURCE_MEM; | ||
| 336 | } | ||
| 337 | if (w & 0x40000000) | ||
| 338 | flags |= IORESOURCE_PREFETCH; | ||
| 339 | return flags; | ||
| 340 | } | ||
| 341 | |||
| 342 | /* | ||
| 343 | * ISA bus specific translator | ||
| 344 | */ | ||
| 345 | |||
| 346 | static int of_bus_isa_match(struct device_node *np) | ||
| 347 | { | ||
| 348 | return !strcmp(np->name, "isa"); | ||
| 349 | } | ||
| 350 | |||
| 351 | static void of_bus_isa_count_cells(struct device_node *child, | ||
| 352 | int *addrc, int *sizec) | ||
| 353 | { | ||
| 354 | if (addrc) | ||
| 355 | *addrc = 2; | ||
| 356 | if (sizec) | ||
| 357 | *sizec = 1; | ||
| 358 | } | ||
| 359 | |||
| 360 | static u64 of_bus_isa_map(u32 *addr, u32 *range, int na, int ns, int pna) | ||
| 361 | { | ||
| 362 | u64 cp, s, da; | ||
| 363 | |||
| 364 | /* Check address type match */ | ||
| 365 | if ((addr[0] ^ range[0]) & 0x00000001) | ||
| 366 | return OF_BAD_ADDR; | ||
| 367 | |||
| 368 | /* Read address values, skipping high cell */ | ||
| 369 | cp = of_read_addr(range + 1, na - 1); | ||
| 370 | s = of_read_addr(range + na + pna, ns); | ||
| 371 | da = of_read_addr(addr + 1, na - 1); | ||
| 372 | |||
| 373 | if (da < cp || da >= (cp + s)) | ||
| 374 | return OF_BAD_ADDR; | ||
| 375 | return da - cp; | ||
| 376 | } | ||
| 377 | |||
| 378 | static int of_bus_isa_translate(u32 *addr, u64 offset, int na) | ||
| 379 | { | ||
| 380 | return of_bus_default_translate(addr + 1, offset, na - 1); | ||
| 381 | } | ||
| 382 | |||
| 383 | static unsigned int of_bus_isa_get_flags(u32 *addr) | ||
| 384 | { | ||
| 385 | unsigned int flags = 0; | ||
| 386 | u32 w = addr[0]; | ||
| 387 | |||
| 388 | if (w & 1) | ||
| 389 | flags |= IORESOURCE_IO; | ||
| 390 | else | ||
| 391 | flags |= IORESOURCE_MEM; | ||
| 392 | return flags; | ||
| 393 | } | ||
| 394 | |||
| 395 | /* | ||
| 396 | * SBUS bus specific translator | ||
| 397 | */ | ||
| 398 | |||
| 399 | static int of_bus_sbus_match(struct device_node *np) | ||
| 400 | { | ||
| 401 | return !strcmp(np->name, "sbus") || | ||
| 402 | !strcmp(np->name, "sbi"); | ||
| 403 | } | ||
| 404 | |||
| 405 | static void of_bus_sbus_count_cells(struct device_node *child, | ||
| 406 | int *addrc, int *sizec) | ||
| 407 | { | ||
| 408 | if (addrc) | ||
| 409 | *addrc = 2; | ||
| 410 | if (sizec) | ||
| 411 | *sizec = 1; | ||
| 412 | } | ||
| 413 | |||
| 414 | static u64 of_bus_sbus_map(u32 *addr, u32 *range, int na, int ns, int pna) | ||
| 415 | { | ||
| 416 | return of_bus_default_map(addr, range, na, ns, pna); | ||
| 417 | } | ||
| 418 | |||
| 419 | static int of_bus_sbus_translate(u32 *addr, u64 offset, int na) | ||
| 420 | { | ||
| 421 | return of_bus_default_translate(addr, offset, na); | ||
| 422 | } | ||
| 423 | |||
| 424 | static unsigned int of_bus_sbus_get_flags(u32 *addr) | ||
| 425 | { | ||
| 426 | return IORESOURCE_MEM; | ||
| 427 | } | ||
| 428 | |||
| 429 | |||
| 430 | /* | ||
| 431 | * Array of bus specific translators | ||
| 432 | */ | ||
| 433 | |||
| 434 | static struct of_bus of_busses[] = { | ||
| 435 | /* PCI */ | ||
| 436 | { | ||
| 437 | .name = "pci", | ||
| 438 | .addr_prop_name = "assigned-addresses", | ||
| 439 | .match = of_bus_pci_match, | ||
| 440 | .count_cells = of_bus_pci_count_cells, | ||
| 441 | .map = of_bus_pci_map, | ||
| 442 | .translate = of_bus_pci_translate, | ||
| 443 | .get_flags = of_bus_pci_get_flags, | ||
| 444 | }, | ||
| 445 | /* ISA */ | ||
| 446 | { | ||
| 447 | .name = "isa", | ||
| 448 | .addr_prop_name = "reg", | ||
| 449 | .match = of_bus_isa_match, | ||
| 450 | .count_cells = of_bus_isa_count_cells, | ||
| 451 | .map = of_bus_isa_map, | ||
| 452 | .translate = of_bus_isa_translate, | ||
| 453 | .get_flags = of_bus_isa_get_flags, | ||
| 454 | }, | ||
| 455 | /* SBUS */ | ||
| 456 | { | ||
| 457 | .name = "sbus", | ||
| 458 | .addr_prop_name = "reg", | ||
| 459 | .match = of_bus_sbus_match, | ||
| 460 | .count_cells = of_bus_sbus_count_cells, | ||
| 461 | .map = of_bus_sbus_map, | ||
| 462 | .translate = of_bus_sbus_translate, | ||
| 463 | .get_flags = of_bus_sbus_get_flags, | ||
| 464 | }, | ||
| 465 | /* Default */ | ||
| 466 | { | ||
| 467 | .name = "default", | ||
| 468 | .addr_prop_name = "reg", | ||
| 469 | .match = NULL, | ||
| 470 | .count_cells = of_bus_default_count_cells, | ||
| 471 | .map = of_bus_default_map, | ||
| 472 | .translate = of_bus_default_translate, | ||
| 473 | .get_flags = of_bus_default_get_flags, | ||
| 474 | }, | ||
| 475 | }; | ||
| 476 | |||
| 477 | static struct of_bus *of_match_bus(struct device_node *np) | ||
| 478 | { | ||
| 479 | int i; | ||
| 480 | |||
| 481 | for (i = 0; i < ARRAY_SIZE(of_busses); i ++) | ||
| 482 | if (!of_busses[i].match || of_busses[i].match(np)) | ||
| 483 | return &of_busses[i]; | ||
| 484 | BUG(); | ||
| 485 | return NULL; | ||
| 486 | } | ||
| 487 | |||
| 488 | static int __init build_one_resource(struct device_node *parent, | ||
| 489 | struct of_bus *bus, | ||
| 490 | struct of_bus *pbus, | ||
| 491 | u32 *addr, | ||
| 492 | int na, int ns, int pna) | ||
| 493 | { | ||
| 494 | u32 *ranges; | ||
| 495 | unsigned int rlen; | ||
| 496 | int rone; | ||
| 497 | u64 offset = OF_BAD_ADDR; | ||
| 498 | |||
| 499 | ranges = of_get_property(parent, "ranges", &rlen); | ||
| 500 | if (ranges == NULL || rlen == 0) { | ||
| 501 | offset = of_read_addr(addr, na); | ||
| 502 | memset(addr, 0, pna * 4); | ||
| 503 | goto finish; | ||
| 504 | } | ||
| 505 | |||
| 506 | /* Now walk through the ranges */ | ||
| 507 | rlen /= 4; | ||
| 508 | rone = na + pna + ns; | ||
| 509 | for (; rlen >= rone; rlen -= rone, ranges += rone) { | ||
| 510 | offset = bus->map(addr, ranges, na, ns, pna); | ||
| 511 | if (offset != OF_BAD_ADDR) | ||
| 512 | break; | ||
| 513 | } | ||
| 514 | if (offset == OF_BAD_ADDR) | ||
| 515 | return 1; | ||
| 516 | |||
| 517 | memcpy(addr, ranges + na, 4 * pna); | ||
| 518 | |||
| 519 | finish: | ||
| 520 | /* Translate it into parent bus space */ | ||
| 521 | return pbus->translate(addr, offset, pna); | ||
| 522 | } | ||
| 523 | |||
| 524 | static void __init build_device_resources(struct of_device *op, | ||
| 525 | struct device *parent) | ||
| 526 | { | ||
| 527 | struct of_device *p_op; | ||
| 528 | struct of_bus *bus; | ||
| 529 | int na, ns; | ||
| 530 | int index, num_reg; | ||
| 531 | void *preg; | ||
| 532 | |||
| 533 | if (!parent) | ||
| 534 | return; | ||
| 535 | |||
| 536 | p_op = to_of_device(parent); | ||
| 537 | bus = of_match_bus(p_op->node); | ||
| 538 | bus->count_cells(op->node, &na, &ns); | ||
| 539 | |||
| 540 | preg = of_get_property(op->node, bus->addr_prop_name, &num_reg); | ||
| 541 | if (!preg || num_reg == 0) | ||
| 542 | return; | ||
| 543 | |||
| 544 | /* Convert to num-cells. */ | ||
| 545 | num_reg /= 4; | ||
| 546 | |||
| 547 | /* Conver to num-entries. */ | ||
| 548 | num_reg /= na + ns; | ||
| 549 | |||
| 550 | for (index = 0; index < num_reg; index++) { | ||
| 551 | struct resource *r = &op->resource[index]; | ||
| 552 | u32 addr[OF_MAX_ADDR_CELLS]; | ||
| 553 | u32 *reg = (preg + (index * ((na + ns) * 4))); | ||
| 554 | struct device_node *dp = op->node; | ||
| 555 | struct device_node *pp = p_op->node; | ||
| 556 | struct of_bus *pbus; | ||
| 557 | u64 size, result = OF_BAD_ADDR; | ||
| 558 | unsigned long flags; | ||
| 559 | int dna, dns; | ||
| 560 | int pna, pns; | ||
| 561 | |||
| 562 | size = of_read_addr(reg + na, ns); | ||
| 563 | flags = bus->get_flags(reg); | ||
| 564 | |||
| 565 | memcpy(addr, reg, na * 4); | ||
| 566 | |||
| 567 | /* If the immediate parent has no ranges property to apply, | ||
| 568 | * just use a 1<->1 mapping. Unless it is the 'dma' child | ||
| 569 | * of an isa bus, which must be passed up towards the root. | ||
| 570 | * | ||
| 571 | * Also, don't try to translate PMU bus device registers. | ||
| 572 | */ | ||
| 573 | if ((of_find_property(pp, "ranges", NULL) == NULL && | ||
| 574 | strcmp(pp->name, "dma") != 0) || | ||
| 575 | !strcmp(pp->name, "pmu")) { | ||
| 576 | result = of_read_addr(addr, na); | ||
| 577 | goto build_res; | ||
| 578 | } | ||
| 579 | |||
| 580 | dna = na; | ||
| 581 | dns = ns; | ||
| 582 | |||
| 583 | while (1) { | ||
| 584 | dp = pp; | ||
| 585 | pp = dp->parent; | ||
| 586 | if (!pp) { | ||
| 587 | result = of_read_addr(addr, dna); | ||
| 588 | break; | ||
| 589 | } | ||
| 590 | |||
| 591 | pbus = of_match_bus(pp); | ||
| 592 | pbus->count_cells(dp, &pna, &pns); | ||
| 593 | |||
| 594 | if (build_one_resource(dp, bus, pbus, addr, dna, dns, pna)) | ||
| 595 | break; | ||
| 596 | |||
| 597 | dna = pna; | ||
| 598 | dns = pns; | ||
| 599 | bus = pbus; | ||
| 600 | } | ||
| 601 | |||
| 602 | build_res: | ||
| 603 | memset(r, 0, sizeof(*r)); | ||
| 604 | if (result != OF_BAD_ADDR) { | ||
| 605 | if (tlb_type == hypervisor) | ||
| 606 | result &= 0x0fffffffffffffffUL; | ||
| 607 | |||
| 608 | r->start = result; | ||
| 609 | r->end = result + size - 1; | ||
| 610 | r->flags = flags; | ||
| 611 | } else { | ||
| 612 | r->start = ~0UL; | ||
| 613 | r->end = ~0UL; | ||
| 614 | } | ||
| 615 | r->name = op->node->name; | ||
| 616 | } | ||
| 617 | } | ||
| 618 | |||
| 619 | static struct device_node * __init | ||
| 620 | apply_interrupt_map(struct device_node *dp, struct device_node *pp, | ||
| 621 | u32 *imap, int imlen, u32 *imask, | ||
| 622 | unsigned int *irq_p) | ||
| 623 | { | ||
| 624 | struct device_node *cp; | ||
| 625 | unsigned int irq = *irq_p; | ||
| 626 | struct of_bus *bus; | ||
| 627 | phandle handle; | ||
| 628 | u32 *reg; | ||
| 629 | int na, num_reg, i; | ||
| 630 | |||
| 631 | bus = of_match_bus(pp); | ||
| 632 | bus->count_cells(dp, &na, NULL); | ||
| 633 | |||
| 634 | reg = of_get_property(dp, "reg", &num_reg); | ||
| 635 | if (!reg || !num_reg) | ||
| 636 | return NULL; | ||
| 637 | |||
| 638 | imlen /= ((na + 3) * 4); | ||
| 639 | handle = 0; | ||
| 640 | for (i = 0; i < imlen; i++) { | ||
| 641 | int j; | ||
| 642 | |||
| 643 | for (j = 0; j < na; j++) { | ||
| 644 | if ((reg[j] & imask[j]) != imap[j]) | ||
| 645 | goto next; | ||
| 646 | } | ||
| 647 | if (imap[na] == irq) { | ||
| 648 | handle = imap[na + 1]; | ||
| 649 | irq = imap[na + 2]; | ||
| 650 | break; | ||
| 651 | } | ||
| 652 | |||
| 653 | next: | ||
| 654 | imap += (na + 3); | ||
| 655 | } | ||
| 656 | if (i == imlen) | ||
| 657 | return NULL; | ||
| 658 | |||
| 659 | *irq_p = irq; | ||
| 660 | cp = of_find_node_by_phandle(handle); | ||
| 661 | |||
| 662 | return cp; | ||
| 663 | } | ||
| 664 | |||
| 665 | static unsigned int __init pci_irq_swizzle(struct device_node *dp, | ||
| 666 | struct device_node *pp, | ||
| 667 | unsigned int irq) | ||
| 668 | { | ||
| 669 | struct linux_prom_pci_registers *regs; | ||
| 670 | unsigned int devfn, slot, ret; | ||
| 671 | |||
| 672 | if (irq < 1 || irq > 4) | ||
| 673 | return irq; | ||
| 674 | |||
| 675 | regs = of_get_property(dp, "reg", NULL); | ||
| 676 | if (!regs) | ||
| 677 | return irq; | ||
| 678 | |||
| 679 | devfn = (regs->phys_hi >> 8) & 0xff; | ||
| 680 | slot = (devfn >> 3) & 0x1f; | ||
| 681 | |||
| 682 | ret = ((irq - 1 + (slot & 3)) & 3) + 1; | ||
| 683 | |||
| 684 | return ret; | ||
| 685 | } | ||
| 686 | |||
| 687 | static unsigned int __init build_one_device_irq(struct of_device *op, | ||
| 688 | struct device *parent, | ||
| 689 | unsigned int irq) | ||
| 690 | { | ||
| 691 | struct device_node *dp = op->node; | ||
| 692 | struct device_node *pp, *ip; | ||
| 693 | unsigned int orig_irq = irq; | ||
| 694 | |||
| 695 | if (irq == 0xffffffff) | ||
| 696 | return irq; | ||
| 697 | |||
| 698 | if (dp->irq_trans) { | ||
| 699 | irq = dp->irq_trans->irq_build(dp, irq, | ||
| 700 | dp->irq_trans->data); | ||
| 701 | #if 1 | ||
| 702 | printk("%s: direct translate %x --> %x\n", | ||
| 703 | dp->full_name, orig_irq, irq); | ||
| 704 | #endif | ||
| 705 | return irq; | ||
| 706 | } | ||
| 707 | |||
| 708 | /* Something more complicated. Walk up to the root, applying | ||
| 709 | * interrupt-map or bus specific translations, until we hit | ||
| 710 | * an IRQ translator. | ||
| 711 | * | ||
| 712 | * If we hit a bus type or situation we cannot handle, we | ||
| 713 | * stop and assume that the original IRQ number was in a | ||
| 714 | * format which has special meaning to it's immediate parent. | ||
| 715 | */ | ||
| 716 | pp = dp->parent; | ||
| 717 | ip = NULL; | ||
| 718 | while (pp) { | ||
| 719 | void *imap, *imsk; | ||
| 720 | int imlen; | ||
| 721 | |||
| 722 | imap = of_get_property(pp, "interrupt-map", &imlen); | ||
| 723 | imsk = of_get_property(pp, "interrupt-map-mask", NULL); | ||
| 724 | if (imap && imsk) { | ||
| 725 | struct device_node *iret; | ||
| 726 | int this_orig_irq = irq; | ||
| 727 | |||
| 728 | iret = apply_interrupt_map(dp, pp, | ||
| 729 | imap, imlen, imsk, | ||
| 730 | &irq); | ||
| 731 | #if 1 | ||
| 732 | printk("%s: Apply [%s:%x] imap --> [%s:%x]\n", | ||
| 733 | op->node->full_name, | ||
| 734 | pp->full_name, this_orig_irq, | ||
| 735 | (iret ? iret->full_name : "NULL"), irq); | ||
| 736 | #endif | ||
| 737 | if (!iret) | ||
| 738 | break; | ||
| 739 | |||
| 740 | if (iret->irq_trans) { | ||
| 741 | ip = iret; | ||
| 742 | break; | ||
| 743 | } | ||
| 744 | } else { | ||
| 745 | if (!strcmp(pp->type, "pci") || | ||
| 746 | !strcmp(pp->type, "pciex")) { | ||
| 747 | unsigned int this_orig_irq = irq; | ||
| 748 | |||
| 749 | irq = pci_irq_swizzle(dp, pp, irq); | ||
| 750 | #if 1 | ||
| 751 | printk("%s: PCI swizzle [%s] %x --> %x\n", | ||
| 752 | op->node->full_name, | ||
| 753 | pp->full_name, this_orig_irq, irq); | ||
| 754 | #endif | ||
| 755 | } | ||
| 756 | |||
| 757 | if (pp->irq_trans) { | ||
| 758 | ip = pp; | ||
| 759 | break; | ||
| 760 | } | ||
| 761 | } | ||
| 762 | dp = pp; | ||
| 763 | pp = pp->parent; | ||
| 764 | } | ||
| 765 | if (!ip) | ||
| 766 | return orig_irq; | ||
| 767 | |||
| 768 | irq = ip->irq_trans->irq_build(op->node, irq, | ||
| 769 | ip->irq_trans->data); | ||
| 770 | #if 1 | ||
| 771 | printk("%s: Apply IRQ trans [%s] %x --> %x\n", | ||
| 772 | op->node->full_name, ip->full_name, orig_irq, irq); | ||
| 773 | #endif | ||
| 774 | |||
| 775 | return irq; | ||
| 776 | } | ||
| 777 | |||
| 778 | static struct of_device * __init scan_one_device(struct device_node *dp, | ||
| 779 | struct device *parent) | ||
| 780 | { | ||
| 781 | struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL); | ||
| 782 | unsigned int *irq; | ||
| 783 | int len, i; | ||
| 784 | |||
| 785 | if (!op) | ||
| 786 | return NULL; | ||
| 787 | |||
| 788 | op->node = dp; | ||
| 789 | |||
| 790 | op->clock_freq = of_getintprop_default(dp, "clock-frequency", | ||
| 791 | (25*1000*1000)); | ||
| 792 | op->portid = of_getintprop_default(dp, "upa-portid", -1); | ||
| 793 | if (op->portid == -1) | ||
| 794 | op->portid = of_getintprop_default(dp, "portid", -1); | ||
| 795 | |||
| 796 | irq = of_get_property(dp, "interrupts", &len); | ||
| 797 | if (irq) { | ||
| 798 | memcpy(op->irqs, irq, len); | ||
| 799 | op->num_irqs = len / 4; | ||
| 800 | } else { | ||
| 801 | op->num_irqs = 0; | ||
| 802 | } | ||
| 803 | |||
| 804 | build_device_resources(op, parent); | ||
| 805 | for (i = 0; i < op->num_irqs; i++) | ||
| 806 | op->irqs[i] = build_one_device_irq(op, parent, op->irqs[i]); | ||
| 807 | |||
| 808 | op->dev.parent = parent; | ||
| 809 | op->dev.bus = &of_bus_type; | ||
| 810 | if (!parent) | ||
| 811 | strcpy(op->dev.bus_id, "root"); | ||
| 812 | else | ||
| 813 | strcpy(op->dev.bus_id, dp->path_component_name); | ||
| 814 | |||
| 815 | if (of_device_register(op)) { | ||
| 816 | printk("%s: Could not register of device.\n", | ||
| 817 | dp->full_name); | ||
| 818 | kfree(op); | ||
| 819 | op = NULL; | ||
| 820 | } | ||
| 821 | |||
| 822 | return op; | ||
| 823 | } | ||
| 824 | |||
| 825 | static void __init scan_tree(struct device_node *dp, struct device *parent) | ||
| 826 | { | ||
| 827 | while (dp) { | ||
| 828 | struct of_device *op = scan_one_device(dp, parent); | ||
| 829 | |||
| 830 | if (op) | ||
| 831 | scan_tree(dp->child, &op->dev); | ||
| 832 | |||
| 833 | dp = dp->sibling; | ||
| 834 | } | ||
| 835 | } | ||
| 836 | |||
| 837 | static void __init scan_of_devices(void) | ||
| 838 | { | ||
| 839 | struct device_node *root = of_find_node_by_path("/"); | ||
| 840 | struct of_device *parent; | ||
| 841 | |||
| 842 | parent = scan_one_device(root, NULL); | ||
| 843 | if (!parent) | ||
| 844 | return; | ||
| 845 | |||
| 846 | scan_tree(root->child, &parent->dev); | ||
| 847 | } | ||
| 848 | |||
| 166 | static int __init of_bus_driver_init(void) | 849 | static int __init of_bus_driver_init(void) |
| 167 | { | 850 | { |
| 168 | int err = 0; | 851 | int err; |
| 169 | 852 | ||
| 853 | err = bus_register(&of_bus_type); | ||
| 170 | #ifdef CONFIG_PCI | 854 | #ifdef CONFIG_PCI |
| 171 | if (!err) | 855 | if (!err) |
| 172 | err = bus_register(&isa_bus_type); | 856 | err = bus_register(&isa_bus_type); |
| @@ -177,7 +861,11 @@ static int __init of_bus_driver_init(void) | |||
| 177 | if (!err) | 861 | if (!err) |
| 178 | err = bus_register(&sbus_bus_type); | 862 | err = bus_register(&sbus_bus_type); |
| 179 | #endif | 863 | #endif |
| 180 | return 0; | 864 | |
| 865 | if (!err) | ||
| 866 | scan_of_devices(); | ||
| 867 | |||
| 868 | return err; | ||
| 181 | } | 869 | } |
| 182 | 870 | ||
| 183 | postcore_initcall(of_bus_driver_init); | 871 | postcore_initcall(of_bus_driver_init); |
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index 20ca9ec8fd3b..e02f01b644af 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) | 6 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/string.h> | 11 | #include <linux/string.h> |
| @@ -307,7 +306,6 @@ static void __init pci_scan_each_controller_bus(void) | |||
| 307 | p->scan_bus(p); | 306 | p->scan_bus(p); |
| 308 | } | 307 | } |
| 309 | 308 | ||
| 310 | extern void clock_probe(void); | ||
| 311 | extern void power_init(void); | 309 | extern void power_init(void); |
| 312 | 310 | ||
| 313 | static int __init pcibios_init(void) | 311 | static int __init pcibios_init(void) |
| @@ -320,7 +318,6 @@ static int __init pcibios_init(void) | |||
| 320 | 318 | ||
| 321 | isa_init(); | 319 | isa_init(); |
| 322 | ebus_init(); | 320 | ebus_init(); |
| 323 | clock_probe(); | ||
| 324 | power_init(); | 321 | power_init(); |
| 325 | 322 | ||
| 326 | return 0; | 323 | return 0; |
| @@ -406,14 +403,8 @@ void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res, | |||
| 406 | } | 403 | } |
| 407 | EXPORT_SYMBOL(pcibios_bus_to_resource); | 404 | EXPORT_SYMBOL(pcibios_bus_to_resource); |
| 408 | 405 | ||
| 409 | extern int pci_irq_verbose; | ||
| 410 | |||
| 411 | char * __init pcibios_setup(char *str) | 406 | char * __init pcibios_setup(char *str) |
| 412 | { | 407 | { |
| 413 | if (!strcmp(str, "irq_verbose")) { | ||
| 414 | pci_irq_verbose = 1; | ||
| 415 | return NULL; | ||
| 416 | } | ||
| 417 | return str; | 408 | return str; |
| 418 | } | 409 | } |
| 419 | 410 | ||
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c index b06a2955bf5f..7a59cc72c844 100644 --- a/arch/sparc64/kernel/pci_common.c +++ b/arch/sparc64/kernel/pci_common.c | |||
| @@ -10,12 +10,10 @@ | |||
| 10 | 10 | ||
| 11 | #include <asm/pbm.h> | 11 | #include <asm/pbm.h> |
| 12 | #include <asm/prom.h> | 12 | #include <asm/prom.h> |
| 13 | #include <asm/of_device.h> | ||
| 13 | 14 | ||
| 14 | #include "pci_impl.h" | 15 | #include "pci_impl.h" |
| 15 | 16 | ||
| 16 | /* Pass "pci=irq_verbose" on the kernel command line to enable this. */ | ||
| 17 | int pci_irq_verbose; | ||
| 18 | |||
| 19 | /* Fix self device of BUS and hook it into BUS->self. | 17 | /* Fix self device of BUS and hook it into BUS->self. |
| 20 | * The pci_scan_bus does not do this for the host bridge. | 18 | * The pci_scan_bus does not do this for the host bridge. |
| 21 | */ | 19 | */ |
| @@ -169,6 +167,7 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm, | |||
| 169 | } | 167 | } |
| 170 | pcp->pbm = pbm; | 168 | pcp->pbm = pbm; |
| 171 | pcp->prom_node = dp; | 169 | pcp->prom_node = dp; |
| 170 | pcp->op = of_find_device_by_node(dp); | ||
| 172 | memcpy(pcp->prom_regs, pregs, | 171 | memcpy(pcp->prom_regs, pregs, |
| 173 | nregs * sizeof(struct linux_prom_pci_registers)); | 172 | nregs * sizeof(struct linux_prom_pci_registers)); |
| 174 | pcp->num_prom_regs = nregs; | 173 | pcp->num_prom_regs = nregs; |
| @@ -549,296 +548,18 @@ void __init pci_assign_unassigned(struct pci_pbm_info *pbm, | |||
| 549 | pci_assign_unassigned(pbm, bus); | 548 | pci_assign_unassigned(pbm, bus); |
| 550 | } | 549 | } |
| 551 | 550 | ||
| 552 | static inline unsigned int pci_slot_swivel(struct pci_pbm_info *pbm, | ||
| 553 | struct pci_dev *toplevel_pdev, | ||
| 554 | struct pci_dev *pdev, | ||
| 555 | unsigned int interrupt) | ||
| 556 | { | ||
| 557 | unsigned int ret; | ||
| 558 | |||
| 559 | if (unlikely(interrupt < 1 || interrupt > 4)) { | ||
| 560 | printk("%s: Device %s interrupt value of %u is strange.\n", | ||
| 561 | pbm->name, pci_name(pdev), interrupt); | ||
| 562 | return interrupt; | ||
| 563 | } | ||
| 564 | |||
| 565 | ret = ((interrupt - 1 + (PCI_SLOT(pdev->devfn) & 3)) & 3) + 1; | ||
| 566 | |||
| 567 | if (pci_irq_verbose) | ||
| 568 | printk("%s: %s IRQ Swivel %s [%x:%x] -> [%x]\n", | ||
| 569 | pbm->name, pci_name(toplevel_pdev), pci_name(pdev), | ||
| 570 | interrupt, PCI_SLOT(pdev->devfn), ret); | ||
| 571 | |||
| 572 | return ret; | ||
| 573 | } | ||
| 574 | |||
| 575 | static inline unsigned int pci_apply_intmap(struct pci_pbm_info *pbm, | ||
| 576 | struct pci_dev *toplevel_pdev, | ||
| 577 | struct pci_dev *pbus, | ||
| 578 | struct pci_dev *pdev, | ||
| 579 | unsigned int interrupt, | ||
| 580 | struct device_node **cnode) | ||
| 581 | { | ||
| 582 | struct linux_prom_pci_intmap *imap; | ||
| 583 | struct linux_prom_pci_intmask *imask; | ||
| 584 | struct pcidev_cookie *pbus_pcp = pbus->sysdata; | ||
| 585 | struct pcidev_cookie *pdev_pcp = pdev->sysdata; | ||
| 586 | struct linux_prom_pci_registers *pregs = pdev_pcp->prom_regs; | ||
| 587 | struct property *prop; | ||
| 588 | int plen, num_imap, i; | ||
| 589 | unsigned int hi, mid, lo, irq, orig_interrupt; | ||
| 590 | |||
| 591 | *cnode = pbus_pcp->prom_node; | ||
| 592 | |||
| 593 | prop = of_find_property(pbus_pcp->prom_node, "interrupt-map", &plen); | ||
| 594 | if (!prop || | ||
| 595 | (plen % sizeof(struct linux_prom_pci_intmap)) != 0) { | ||
| 596 | printk("%s: Device %s interrupt-map has bad len %d\n", | ||
| 597 | pbm->name, pci_name(pbus), plen); | ||
| 598 | goto no_intmap; | ||
| 599 | } | ||
| 600 | imap = prop->value; | ||
| 601 | num_imap = plen / sizeof(struct linux_prom_pci_intmap); | ||
| 602 | |||
| 603 | prop = of_find_property(pbus_pcp->prom_node, "interrupt-map-mask", &plen); | ||
| 604 | if (!prop || | ||
| 605 | (plen % sizeof(struct linux_prom_pci_intmask)) != 0) { | ||
| 606 | printk("%s: Device %s interrupt-map-mask has bad len %d\n", | ||
| 607 | pbm->name, pci_name(pbus), plen); | ||
| 608 | goto no_intmap; | ||
| 609 | } | ||
| 610 | imask = prop->value; | ||
| 611 | |||
| 612 | orig_interrupt = interrupt; | ||
| 613 | |||
| 614 | hi = pregs->phys_hi & imask->phys_hi; | ||
| 615 | mid = pregs->phys_mid & imask->phys_mid; | ||
| 616 | lo = pregs->phys_lo & imask->phys_lo; | ||
| 617 | irq = interrupt & imask->interrupt; | ||
| 618 | |||
| 619 | for (i = 0; i < num_imap; i++) { | ||
| 620 | if (imap[i].phys_hi == hi && | ||
| 621 | imap[i].phys_mid == mid && | ||
| 622 | imap[i].phys_lo == lo && | ||
| 623 | imap[i].interrupt == irq) { | ||
| 624 | *cnode = of_find_node_by_phandle(imap[i].cnode); | ||
| 625 | interrupt = imap[i].cinterrupt; | ||
| 626 | } | ||
| 627 | } | ||
| 628 | |||
| 629 | if (pci_irq_verbose) | ||
| 630 | printk("%s: %s MAP BUS %s DEV %s [%x] -> [%x]\n", | ||
| 631 | pbm->name, pci_name(toplevel_pdev), | ||
| 632 | pci_name(pbus), pci_name(pdev), | ||
| 633 | orig_interrupt, interrupt); | ||
| 634 | |||
| 635 | no_intmap: | ||
| 636 | return interrupt; | ||
| 637 | } | ||
| 638 | |||
| 639 | /* For each PCI bus on the way to the root: | ||
| 640 | * 1) If it has an interrupt-map property, apply it. | ||
| 641 | * 2) Else, swivel the interrupt number based upon the PCI device number. | ||
| 642 | * | ||
| 643 | * Return the "IRQ controller" node. If this is the PBM's device node, | ||
| 644 | * all interrupt translations are complete, else we should use that node's | ||
| 645 | * "reg" property to apply the PBM's "interrupt-{map,mask}" to the interrupt. | ||
| 646 | */ | ||
| 647 | static struct device_node * __init | ||
| 648 | pci_intmap_match_to_root(struct pci_pbm_info *pbm, | ||
| 649 | struct pci_dev *pdev, | ||
| 650 | unsigned int *interrupt) | ||
| 651 | { | ||
| 652 | struct pci_dev *toplevel_pdev = pdev; | ||
| 653 | struct pcidev_cookie *toplevel_pcp = toplevel_pdev->sysdata; | ||
| 654 | struct device_node *cnode = toplevel_pcp->prom_node; | ||
| 655 | |||
| 656 | while (pdev->bus->number != pbm->pci_first_busno) { | ||
| 657 | struct pci_dev *pbus = pdev->bus->self; | ||
| 658 | struct pcidev_cookie *pcp = pbus->sysdata; | ||
| 659 | struct property *prop; | ||
| 660 | |||
| 661 | prop = of_find_property(pcp->prom_node, "interrupt-map", NULL); | ||
| 662 | if (!prop) { | ||
| 663 | *interrupt = pci_slot_swivel(pbm, toplevel_pdev, | ||
| 664 | pdev, *interrupt); | ||
| 665 | cnode = pcp->prom_node; | ||
| 666 | } else { | ||
| 667 | *interrupt = pci_apply_intmap(pbm, toplevel_pdev, | ||
| 668 | pbus, pdev, | ||
| 669 | *interrupt, &cnode); | ||
| 670 | |||
| 671 | while (pcp->prom_node != cnode && | ||
| 672 | pbus->bus->number != pbm->pci_first_busno) { | ||
| 673 | pbus = pbus->bus->self; | ||
| 674 | pcp = pbus->sysdata; | ||
| 675 | } | ||
| 676 | } | ||
| 677 | pdev = pbus; | ||
| 678 | |||
| 679 | if (cnode == pbm->prom_node) | ||
| 680 | break; | ||
| 681 | } | ||
| 682 | |||
| 683 | return cnode; | ||
| 684 | } | ||
| 685 | |||
| 686 | static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt) | ||
| 687 | { | ||
| 688 | struct pcidev_cookie *dev_pcp = pdev->sysdata; | ||
| 689 | struct pci_pbm_info *pbm = dev_pcp->pbm; | ||
| 690 | struct linux_prom_pci_registers *reg; | ||
| 691 | struct device_node *cnode; | ||
| 692 | struct property *prop; | ||
| 693 | unsigned int hi, mid, lo, irq; | ||
| 694 | int i, plen; | ||
| 695 | |||
| 696 | cnode = pci_intmap_match_to_root(pbm, pdev, interrupt); | ||
| 697 | if (cnode == pbm->prom_node) | ||
| 698 | goto success; | ||
| 699 | |||
| 700 | prop = of_find_property(cnode, "reg", &plen); | ||
| 701 | if (!prop || | ||
| 702 | (plen % sizeof(struct linux_prom_pci_registers)) != 0) { | ||
| 703 | printk("%s: OBP node %s reg property has bad len %d\n", | ||
| 704 | pbm->name, cnode->full_name, plen); | ||
| 705 | goto fail; | ||
| 706 | } | ||
| 707 | reg = prop->value; | ||
| 708 | |||
| 709 | hi = reg[0].phys_hi & pbm->pbm_intmask->phys_hi; | ||
| 710 | mid = reg[0].phys_mid & pbm->pbm_intmask->phys_mid; | ||
| 711 | lo = reg[0].phys_lo & pbm->pbm_intmask->phys_lo; | ||
| 712 | irq = *interrupt & pbm->pbm_intmask->interrupt; | ||
| 713 | |||
| 714 | for (i = 0; i < pbm->num_pbm_intmap; i++) { | ||
| 715 | struct linux_prom_pci_intmap *intmap; | ||
| 716 | |||
| 717 | intmap = &pbm->pbm_intmap[i]; | ||
| 718 | |||
| 719 | if (intmap->phys_hi == hi && | ||
| 720 | intmap->phys_mid == mid && | ||
| 721 | intmap->phys_lo == lo && | ||
| 722 | intmap->interrupt == irq) { | ||
| 723 | *interrupt = intmap->cinterrupt; | ||
| 724 | goto success; | ||
| 725 | } | ||
| 726 | } | ||
| 727 | |||
| 728 | fail: | ||
| 729 | return 0; | ||
| 730 | |||
| 731 | success: | ||
| 732 | if (pci_irq_verbose) | ||
| 733 | printk("%s: Routing bus[%2x] slot[%2x] to INO[%02x]\n", | ||
| 734 | pbm->name, | ||
| 735 | pdev->bus->number, PCI_SLOT(pdev->devfn), | ||
| 736 | *interrupt); | ||
| 737 | return 1; | ||
| 738 | } | ||
| 739 | |||
| 740 | static void __init pdev_fixup_irq(struct pci_dev *pdev) | 551 | static void __init pdev_fixup_irq(struct pci_dev *pdev) |
| 741 | { | 552 | { |
| 742 | struct pcidev_cookie *pcp = pdev->sysdata; | 553 | struct pcidev_cookie *pcp = pdev->sysdata; |
| 743 | struct pci_pbm_info *pbm = pcp->pbm; | 554 | struct of_device *op = pcp->op; |
| 744 | struct pci_controller_info *p = pbm->parent; | ||
| 745 | unsigned int portid = pbm->portid; | ||
| 746 | unsigned int prom_irq; | ||
| 747 | struct device_node *dp = pcp->prom_node; | ||
| 748 | struct property *prop; | ||
| 749 | |||
| 750 | /* If this is an empty EBUS device, sometimes OBP fails to | ||
| 751 | * give it a valid fully specified interrupts property. | ||
| 752 | * The EBUS hooked up to SunHME on PCI I/O boards of | ||
| 753 | * Ex000 systems is one such case. | ||
| 754 | * | ||
| 755 | * The interrupt is not important so just ignore it. | ||
| 756 | */ | ||
| 757 | if (pdev->vendor == PCI_VENDOR_ID_SUN && | ||
| 758 | pdev->device == PCI_DEVICE_ID_SUN_EBUS && | ||
| 759 | !dp->child) { | ||
| 760 | pdev->irq = 0; | ||
| 761 | return; | ||
| 762 | } | ||
| 763 | 555 | ||
| 764 | prop = of_find_property(dp, "interrupts", NULL); | 556 | if (op->irqs[0] == 0xffffffff) { |
| 765 | if (!prop) { | 557 | pdev->irq = PCI_IRQ_NONE; |
| 766 | pdev->irq = 0; | ||
| 767 | return; | 558 | return; |
| 768 | } | 559 | } |
| 769 | prom_irq = *(unsigned int *) prop->value; | ||
| 770 | |||
| 771 | if (tlb_type != hypervisor) { | ||
| 772 | /* Fully specified already? */ | ||
| 773 | if (((prom_irq & PCI_IRQ_IGN) >> 6) == portid) { | ||
| 774 | pdev->irq = p->irq_build(pbm, pdev, prom_irq); | ||
| 775 | goto have_irq; | ||
| 776 | } | ||
| 777 | |||
| 778 | /* An onboard device? (bit 5 set) */ | ||
| 779 | if ((prom_irq & PCI_IRQ_INO) & 0x20) { | ||
| 780 | pdev->irq = p->irq_build(pbm, pdev, (portid << 6 | prom_irq)); | ||
| 781 | goto have_irq; | ||
| 782 | } | ||
| 783 | } | ||
| 784 | |||
| 785 | /* Can we find a matching entry in the interrupt-map? */ | ||
| 786 | if (pci_intmap_match(pdev, &prom_irq)) { | ||
| 787 | pdev->irq = p->irq_build(pbm, pdev, (portid << 6) | prom_irq); | ||
| 788 | goto have_irq; | ||
| 789 | } | ||
| 790 | |||
| 791 | /* Ok, we have to do it the hard way. */ | ||
| 792 | { | ||
| 793 | unsigned int bus, slot, line; | ||
| 794 | |||
| 795 | bus = (pbm == &pbm->parent->pbm_B) ? (1 << 4) : 0; | ||
| 796 | |||
| 797 | /* If we have a legal interrupt property, use it as | ||
| 798 | * the IRQ line. | ||
| 799 | */ | ||
| 800 | if (prom_irq > 0 && prom_irq < 5) { | ||
| 801 | line = ((prom_irq - 1) & 3); | ||
| 802 | } else { | ||
| 803 | u8 pci_irq_line; | ||
| 804 | 560 | ||
| 805 | /* Else just directly consult PCI config space. */ | 561 | pdev->irq = op->irqs[0]; |
| 806 | pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pci_irq_line); | ||
| 807 | line = ((pci_irq_line - 1) & 3); | ||
| 808 | } | ||
| 809 | |||
| 810 | /* Now figure out the slot. | ||
| 811 | * | ||
| 812 | * Basically, device number zero on the top-level bus is | ||
| 813 | * always the PCI host controller. Slot 0 is then device 1. | ||
| 814 | * PBM A supports two external slots (0 and 1), and PBM B | ||
| 815 | * supports 4 external slots (0, 1, 2, and 3). On-board PCI | ||
| 816 | * devices are wired to device numbers outside of these | ||
| 817 | * ranges. -DaveM | ||
| 818 | */ | ||
| 819 | if (pdev->bus->number == pbm->pci_first_busno) { | ||
| 820 | slot = PCI_SLOT(pdev->devfn) - pbm->pci_first_slot; | ||
| 821 | } else { | ||
| 822 | struct pci_dev *bus_dev; | ||
| 823 | |||
| 824 | /* Underneath a bridge, use slot number of parent | ||
| 825 | * bridge which is closest to the PBM. | ||
| 826 | */ | ||
| 827 | bus_dev = pdev->bus->self; | ||
| 828 | while (bus_dev->bus && | ||
| 829 | bus_dev->bus->number != pbm->pci_first_busno) | ||
| 830 | bus_dev = bus_dev->bus->self; | ||
| 831 | |||
| 832 | slot = PCI_SLOT(bus_dev->devfn) - pbm->pci_first_slot; | ||
| 833 | } | ||
| 834 | slot = slot << 2; | ||
| 835 | |||
| 836 | pdev->irq = p->irq_build(pbm, pdev, | ||
| 837 | ((portid << 6) & PCI_IRQ_IGN) | | ||
| 838 | (bus | slot | line)); | ||
| 839 | } | ||
| 840 | 562 | ||
| 841 | have_irq: | ||
| 842 | pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, | 563 | pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, |
| 843 | pdev->irq & PCI_IRQ_INO); | 564 | pdev->irq & PCI_IRQ_INO); |
| 844 | } | 565 | } |
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 5b2261ebda6f..bf7b32b36705 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
| 19 | #include <asm/starfire.h> | 19 | #include <asm/starfire.h> |
| 20 | #include <asm/prom.h> | 20 | #include <asm/prom.h> |
| 21 | #include <asm/of_device.h> | ||
| 21 | 22 | ||
| 22 | #include "pci_impl.h" | 23 | #include "pci_impl.h" |
| 23 | #include "iommu_common.h" | 24 | #include "iommu_common.h" |
| @@ -208,110 +209,6 @@ static struct pci_ops psycho_ops = { | |||
| 208 | .write = psycho_write_pci_cfg, | 209 | .write = psycho_write_pci_cfg, |
| 209 | }; | 210 | }; |
| 210 | 211 | ||
| 211 | /* PSYCHO interrupt mapping support. */ | ||
| 212 | #define PSYCHO_IMAP_A_SLOT0 0x0c00UL | ||
| 213 | #define PSYCHO_IMAP_B_SLOT0 0x0c20UL | ||
| 214 | static unsigned long psycho_pcislot_imap_offset(unsigned long ino) | ||
| 215 | { | ||
| 216 | unsigned int bus = (ino & 0x10) >> 4; | ||
| 217 | unsigned int slot = (ino & 0x0c) >> 2; | ||
| 218 | |||
| 219 | if (bus == 0) | ||
| 220 | return PSYCHO_IMAP_A_SLOT0 + (slot * 8); | ||
| 221 | else | ||
| 222 | return PSYCHO_IMAP_B_SLOT0 + (slot * 8); | ||
| 223 | } | ||
| 224 | |||
| 225 | #define PSYCHO_IMAP_SCSI 0x1000UL | ||
| 226 | #define PSYCHO_IMAP_ETH 0x1008UL | ||
| 227 | #define PSYCHO_IMAP_BPP 0x1010UL | ||
| 228 | #define PSYCHO_IMAP_AU_REC 0x1018UL | ||
| 229 | #define PSYCHO_IMAP_AU_PLAY 0x1020UL | ||
| 230 | #define PSYCHO_IMAP_PFAIL 0x1028UL | ||
| 231 | #define PSYCHO_IMAP_KMS 0x1030UL | ||
| 232 | #define PSYCHO_IMAP_FLPY 0x1038UL | ||
| 233 | #define PSYCHO_IMAP_SHW 0x1040UL | ||
| 234 | #define PSYCHO_IMAP_KBD 0x1048UL | ||
| 235 | #define PSYCHO_IMAP_MS 0x1050UL | ||
| 236 | #define PSYCHO_IMAP_SER 0x1058UL | ||
| 237 | #define PSYCHO_IMAP_TIM0 0x1060UL | ||
| 238 | #define PSYCHO_IMAP_TIM1 0x1068UL | ||
| 239 | #define PSYCHO_IMAP_UE 0x1070UL | ||
| 240 | #define PSYCHO_IMAP_CE 0x1078UL | ||
| 241 | #define PSYCHO_IMAP_A_ERR 0x1080UL | ||
| 242 | #define PSYCHO_IMAP_B_ERR 0x1088UL | ||
| 243 | #define PSYCHO_IMAP_PMGMT 0x1090UL | ||
| 244 | #define PSYCHO_IMAP_GFX 0x1098UL | ||
| 245 | #define PSYCHO_IMAP_EUPA 0x10a0UL | ||
| 246 | |||
| 247 | static unsigned long __onboard_imap_off[] = { | ||
| 248 | /*0x20*/ PSYCHO_IMAP_SCSI, | ||
| 249 | /*0x21*/ PSYCHO_IMAP_ETH, | ||
| 250 | /*0x22*/ PSYCHO_IMAP_BPP, | ||
| 251 | /*0x23*/ PSYCHO_IMAP_AU_REC, | ||
| 252 | /*0x24*/ PSYCHO_IMAP_AU_PLAY, | ||
| 253 | /*0x25*/ PSYCHO_IMAP_PFAIL, | ||
| 254 | /*0x26*/ PSYCHO_IMAP_KMS, | ||
| 255 | /*0x27*/ PSYCHO_IMAP_FLPY, | ||
| 256 | /*0x28*/ PSYCHO_IMAP_SHW, | ||
| 257 | /*0x29*/ PSYCHO_IMAP_KBD, | ||
| 258 | /*0x2a*/ PSYCHO_IMAP_MS, | ||
| 259 | /*0x2b*/ PSYCHO_IMAP_SER, | ||
| 260 | /*0x2c*/ PSYCHO_IMAP_TIM0, | ||
| 261 | /*0x2d*/ PSYCHO_IMAP_TIM1, | ||
| 262 | /*0x2e*/ PSYCHO_IMAP_UE, | ||
| 263 | /*0x2f*/ PSYCHO_IMAP_CE, | ||
| 264 | /*0x30*/ PSYCHO_IMAP_A_ERR, | ||
| 265 | /*0x31*/ PSYCHO_IMAP_B_ERR, | ||
| 266 | /*0x32*/ PSYCHO_IMAP_PMGMT | ||
| 267 | }; | ||
| 268 | #define PSYCHO_ONBOARD_IRQ_BASE 0x20 | ||
| 269 | #define PSYCHO_ONBOARD_IRQ_LAST 0x32 | ||
| 270 | #define psycho_onboard_imap_offset(__ino) \ | ||
| 271 | __onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE] | ||
| 272 | |||
| 273 | #define PSYCHO_ICLR_A_SLOT0 0x1400UL | ||
| 274 | #define PSYCHO_ICLR_SCSI 0x1800UL | ||
| 275 | |||
| 276 | #define psycho_iclr_offset(ino) \ | ||
| 277 | ((ino & 0x20) ? (PSYCHO_ICLR_SCSI + (((ino) & 0x1f) << 3)) : \ | ||
| 278 | (PSYCHO_ICLR_A_SLOT0 + (((ino) & 0x1f)<<3))) | ||
| 279 | |||
| 280 | static unsigned int psycho_irq_build(struct pci_pbm_info *pbm, | ||
| 281 | struct pci_dev *pdev, | ||
| 282 | unsigned int ino) | ||
| 283 | { | ||
| 284 | unsigned long imap, iclr; | ||
| 285 | unsigned long imap_off, iclr_off; | ||
| 286 | int inofixup = 0; | ||
| 287 | |||
| 288 | ino &= PCI_IRQ_INO; | ||
| 289 | if (ino < PSYCHO_ONBOARD_IRQ_BASE) { | ||
| 290 | /* PCI slot */ | ||
| 291 | imap_off = psycho_pcislot_imap_offset(ino); | ||
| 292 | } else { | ||
| 293 | /* Onboard device */ | ||
| 294 | if (ino > PSYCHO_ONBOARD_IRQ_LAST) { | ||
| 295 | prom_printf("psycho_irq_build: Wacky INO [%x]\n", ino); | ||
| 296 | prom_halt(); | ||
| 297 | } | ||
| 298 | imap_off = psycho_onboard_imap_offset(ino); | ||
| 299 | } | ||
| 300 | |||
| 301 | /* Now build the IRQ bucket. */ | ||
| 302 | imap = pbm->controller_regs + imap_off; | ||
| 303 | imap += 4; | ||
| 304 | |||
| 305 | iclr_off = psycho_iclr_offset(ino); | ||
| 306 | iclr = pbm->controller_regs + iclr_off; | ||
| 307 | iclr += 4; | ||
| 308 | |||
| 309 | if ((ino & 0x20) == 0) | ||
| 310 | inofixup = ino & 0x03; | ||
| 311 | |||
| 312 | return build_irq(inofixup, iclr, imap); | ||
| 313 | } | ||
| 314 | |||
| 315 | /* PSYCHO error handling support. */ | 212 | /* PSYCHO error handling support. */ |
| 316 | enum psycho_error_type { | 213 | enum psycho_error_type { |
| 317 | UE_ERR, CE_ERR, PCI_ERR | 214 | UE_ERR, CE_ERR, PCI_ERR |
| @@ -944,51 +841,34 @@ static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id, struct pt_regs *reg | |||
| 944 | #define PSYCHO_ECCCTRL_EE 0x8000000000000000UL /* Enable ECC Checking */ | 841 | #define PSYCHO_ECCCTRL_EE 0x8000000000000000UL /* Enable ECC Checking */ |
| 945 | #define PSYCHO_ECCCTRL_UE 0x4000000000000000UL /* Enable UE Interrupts */ | 842 | #define PSYCHO_ECCCTRL_UE 0x4000000000000000UL /* Enable UE Interrupts */ |
| 946 | #define PSYCHO_ECCCTRL_CE 0x2000000000000000UL /* Enable CE INterrupts */ | 843 | #define PSYCHO_ECCCTRL_CE 0x2000000000000000UL /* Enable CE INterrupts */ |
| 947 | #define PSYCHO_UE_INO 0x2e | ||
| 948 | #define PSYCHO_CE_INO 0x2f | ||
| 949 | #define PSYCHO_PCIERR_A_INO 0x30 | ||
| 950 | #define PSYCHO_PCIERR_B_INO 0x31 | ||
| 951 | static void psycho_register_error_handlers(struct pci_controller_info *p) | 844 | static void psycho_register_error_handlers(struct pci_controller_info *p) |
| 952 | { | 845 | { |
| 953 | struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */ | 846 | struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */ |
| 847 | struct of_device *op = of_find_device_by_node(pbm->prom_node); | ||
| 954 | unsigned long base = p->pbm_A.controller_regs; | 848 | unsigned long base = p->pbm_A.controller_regs; |
| 955 | unsigned int irq, portid = pbm->portid; | ||
| 956 | u64 tmp; | 849 | u64 tmp; |
| 957 | 850 | ||
| 958 | /* Build IRQs and register handlers. */ | 851 | if (!op) |
| 959 | irq = psycho_irq_build(pbm, NULL, (portid << 6) | PSYCHO_UE_INO); | 852 | return; |
| 960 | if (request_irq(irq, psycho_ue_intr, | ||
| 961 | SA_SHIRQ, "PSYCHO UE", p) < 0) { | ||
| 962 | prom_printf("PSYCHO%d: Cannot register UE interrupt.\n", | ||
| 963 | p->index); | ||
| 964 | prom_halt(); | ||
| 965 | } | ||
| 966 | 853 | ||
| 967 | irq = psycho_irq_build(pbm, NULL, (portid << 6) | PSYCHO_CE_INO); | 854 | /* Psycho interrupt property order is: |
| 968 | if (request_irq(irq, psycho_ce_intr, | 855 | * 0: PCIERR PBM B INO |
| 969 | SA_SHIRQ, "PSYCHO CE", p) < 0) { | 856 | * 1: UE ERR |
| 970 | prom_printf("PSYCHO%d: Cannot register CE interrupt.\n", | 857 | * 2: CE ERR |
| 971 | p->index); | 858 | * 3: POWER FAIL |
| 972 | prom_halt(); | 859 | * 4: SPARE HARDWARE |
| 973 | } | 860 | * 5: PCIERR PBM A INO |
| 861 | */ | ||
| 974 | 862 | ||
| 975 | pbm = &p->pbm_A; | 863 | if (op->num_irqs < 6) |
| 976 | irq = psycho_irq_build(pbm, NULL, (portid << 6) | PSYCHO_PCIERR_A_INO); | 864 | return; |
| 977 | if (request_irq(irq, psycho_pcierr_intr, | ||
| 978 | SA_SHIRQ, "PSYCHO PCIERR", &p->pbm_A) < 0) { | ||
| 979 | prom_printf("PSYCHO%d(PBMA): Cannot register PciERR interrupt.\n", | ||
| 980 | p->index); | ||
| 981 | prom_halt(); | ||
| 982 | } | ||
| 983 | 865 | ||
| 984 | pbm = &p->pbm_B; | 866 | request_irq(op->irqs[1], psycho_ue_intr, SA_SHIRQ, "PSYCHO UE", p); |
| 985 | irq = psycho_irq_build(pbm, NULL, (portid << 6) | PSYCHO_PCIERR_B_INO); | 867 | request_irq(op->irqs[2], psycho_ce_intr, SA_SHIRQ, "PSYCHO CE", p); |
| 986 | if (request_irq(irq, psycho_pcierr_intr, | 868 | request_irq(op->irqs[5], psycho_pcierr_intr, SA_SHIRQ, |
| 987 | SA_SHIRQ, "PSYCHO PCIERR", &p->pbm_B) < 0) { | 869 | "PSYCHO PCIERR-A", &p->pbm_A); |
| 988 | prom_printf("PSYCHO%d(PBMB): Cannot register PciERR interrupt.\n", | 870 | request_irq(op->irqs[0], psycho_pcierr_intr, SA_SHIRQ, |
| 989 | p->index); | 871 | "PSYCHO PCIERR-B", &p->pbm_B); |
| 990 | prom_halt(); | ||
| 991 | } | ||
| 992 | 872 | ||
| 993 | /* Enable UE and CE interrupts for controller. */ | 873 | /* Enable UE and CE interrupts for controller. */ |
| 994 | psycho_write(base + PSYCHO_ECC_CTRL, | 874 | psycho_write(base + PSYCHO_ECC_CTRL, |
| @@ -1171,9 +1051,7 @@ static void psycho_iommu_init(struct pci_controller_info *p) | |||
| 1171 | 1051 | ||
| 1172 | /* If necessary, hook us up for starfire IRQ translations. */ | 1052 | /* If necessary, hook us up for starfire IRQ translations. */ |
| 1173 | if (this_is_starfire) | 1053 | if (this_is_starfire) |
| 1174 | p->starfire_cookie = starfire_hookup(p->pbm_A.portid); | 1054 | starfire_hookup(p->pbm_A.portid); |
| 1175 | else | ||
| 1176 | p->starfire_cookie = NULL; | ||
| 1177 | } | 1055 | } |
| 1178 | 1056 | ||
| 1179 | #define PSYCHO_IRQ_RETRY 0x1a00UL | 1057 | #define PSYCHO_IRQ_RETRY 0x1a00UL |
| @@ -1408,7 +1286,6 @@ void psycho_init(struct device_node *dp, char *model_name) | |||
| 1408 | p->index = pci_num_controllers++; | 1286 | p->index = pci_num_controllers++; |
| 1409 | p->pbms_same_domain = 0; | 1287 | p->pbms_same_domain = 0; |
| 1410 | p->scan_bus = psycho_scan_bus; | 1288 | p->scan_bus = psycho_scan_bus; |
| 1411 | p->irq_build = psycho_irq_build; | ||
| 1412 | p->base_address_update = psycho_base_address_update; | 1289 | p->base_address_update = psycho_base_address_update; |
| 1413 | p->resource_adjust = psycho_resource_adjust; | 1290 | p->resource_adjust = psycho_resource_adjust; |
| 1414 | p->pci_ops = &psycho_ops; | 1291 | p->pci_ops = &psycho_ops; |
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c index 26f194ce4400..5e087b0fb4c9 100644 --- a/arch/sparc64/kernel/pci_sabre.c +++ b/arch/sparc64/kernel/pci_sabre.c | |||
| @@ -485,114 +485,6 @@ static struct pci_ops sabre_ops = { | |||
| 485 | .write = sabre_write_pci_cfg, | 485 | .write = sabre_write_pci_cfg, |
| 486 | }; | 486 | }; |
| 487 | 487 | ||
| 488 | static unsigned long sabre_pcislot_imap_offset(unsigned long ino) | ||
| 489 | { | ||
| 490 | unsigned int bus = (ino & 0x10) >> 4; | ||
| 491 | unsigned int slot = (ino & 0x0c) >> 2; | ||
| 492 | |||
| 493 | if (bus == 0) | ||
| 494 | return SABRE_IMAP_A_SLOT0 + (slot * 8); | ||
| 495 | else | ||
| 496 | return SABRE_IMAP_B_SLOT0 + (slot * 8); | ||
| 497 | } | ||
| 498 | |||
| 499 | static unsigned long __onboard_imap_off[] = { | ||
| 500 | /*0x20*/ SABRE_IMAP_SCSI, | ||
| 501 | /*0x21*/ SABRE_IMAP_ETH, | ||
| 502 | /*0x22*/ SABRE_IMAP_BPP, | ||
| 503 | /*0x23*/ SABRE_IMAP_AU_REC, | ||
| 504 | /*0x24*/ SABRE_IMAP_AU_PLAY, | ||
| 505 | /*0x25*/ SABRE_IMAP_PFAIL, | ||
| 506 | /*0x26*/ SABRE_IMAP_KMS, | ||
| 507 | /*0x27*/ SABRE_IMAP_FLPY, | ||
| 508 | /*0x28*/ SABRE_IMAP_SHW, | ||
| 509 | /*0x29*/ SABRE_IMAP_KBD, | ||
| 510 | /*0x2a*/ SABRE_IMAP_MS, | ||
| 511 | /*0x2b*/ SABRE_IMAP_SER, | ||
| 512 | /*0x2c*/ 0 /* reserved */, | ||
| 513 | /*0x2d*/ 0 /* reserved */, | ||
| 514 | /*0x2e*/ SABRE_IMAP_UE, | ||
| 515 | /*0x2f*/ SABRE_IMAP_CE, | ||
| 516 | /*0x30*/ SABRE_IMAP_PCIERR, | ||
| 517 | }; | ||
| 518 | #define SABRE_ONBOARD_IRQ_BASE 0x20 | ||
| 519 | #define SABRE_ONBOARD_IRQ_LAST 0x30 | ||
| 520 | #define sabre_onboard_imap_offset(__ino) \ | ||
| 521 | __onboard_imap_off[(__ino) - SABRE_ONBOARD_IRQ_BASE] | ||
| 522 | |||
| 523 | #define sabre_iclr_offset(ino) \ | ||
| 524 | ((ino & 0x20) ? (SABRE_ICLR_SCSI + (((ino) & 0x1f) << 3)) : \ | ||
| 525 | (SABRE_ICLR_A_SLOT0 + (((ino) & 0x1f)<<3))) | ||
| 526 | |||
| 527 | /* When a device lives behind a bridge deeper in the PCI bus topology | ||
| 528 | * than APB, a special sequence must run to make sure all pending DMA | ||
| 529 | * transfers at the time of IRQ delivery are visible in the coherency | ||
| 530 | * domain by the cpu. This sequence is to perform a read on the far | ||
| 531 | * side of the non-APB bridge, then perform a read of Sabre's DMA | ||
| 532 | * write-sync register. | ||
| 533 | */ | ||
| 534 | static void sabre_wsync_handler(unsigned int ino, void *_arg1, void *_arg2) | ||
| 535 | { | ||
| 536 | struct pci_dev *pdev = _arg1; | ||
| 537 | unsigned long sync_reg = (unsigned long) _arg2; | ||
| 538 | u16 _unused; | ||
| 539 | |||
| 540 | pci_read_config_word(pdev, PCI_VENDOR_ID, &_unused); | ||
| 541 | sabre_read(sync_reg); | ||
| 542 | } | ||
| 543 | |||
| 544 | static unsigned int sabre_irq_build(struct pci_pbm_info *pbm, | ||
| 545 | struct pci_dev *pdev, | ||
| 546 | unsigned int ino) | ||
| 547 | { | ||
| 548 | unsigned long imap, iclr; | ||
| 549 | unsigned long imap_off, iclr_off; | ||
| 550 | int inofixup = 0; | ||
| 551 | int virt_irq; | ||
| 552 | |||
| 553 | ino &= PCI_IRQ_INO; | ||
| 554 | if (ino < SABRE_ONBOARD_IRQ_BASE) { | ||
| 555 | /* PCI slot */ | ||
| 556 | imap_off = sabre_pcislot_imap_offset(ino); | ||
| 557 | } else { | ||
| 558 | /* onboard device */ | ||
| 559 | if (ino > SABRE_ONBOARD_IRQ_LAST) { | ||
| 560 | prom_printf("sabre_irq_build: Wacky INO [%x]\n", ino); | ||
| 561 | prom_halt(); | ||
| 562 | } | ||
| 563 | imap_off = sabre_onboard_imap_offset(ino); | ||
| 564 | } | ||
| 565 | |||
| 566 | /* Now build the IRQ bucket. */ | ||
| 567 | imap = pbm->controller_regs + imap_off; | ||
| 568 | imap += 4; | ||
| 569 | |||
| 570 | iclr_off = sabre_iclr_offset(ino); | ||
| 571 | iclr = pbm->controller_regs + iclr_off; | ||
| 572 | iclr += 4; | ||
| 573 | |||
| 574 | if ((ino & 0x20) == 0) | ||
| 575 | inofixup = ino & 0x03; | ||
| 576 | |||
| 577 | virt_irq = build_irq(inofixup, iclr, imap); | ||
| 578 | |||
| 579 | if (pdev) { | ||
| 580 | struct pcidev_cookie *pcp = pdev->sysdata; | ||
| 581 | |||
| 582 | if (pdev->bus->number != pcp->pbm->pci_first_busno) { | ||
| 583 | struct pci_controller_info *p = pcp->pbm->parent; | ||
| 584 | |||
| 585 | irq_install_pre_handler(virt_irq, | ||
| 586 | sabre_wsync_handler, | ||
| 587 | pdev, | ||
| 588 | (void *) | ||
| 589 | p->pbm_A.controller_regs + | ||
| 590 | SABRE_WRSYNC); | ||
| 591 | } | ||
| 592 | } | ||
| 593 | return virt_irq; | ||
| 594 | } | ||
| 595 | |||
| 596 | /* SABRE error handling support. */ | 488 | /* SABRE error handling support. */ |
| 597 | static void sabre_check_iommu_error(struct pci_controller_info *p, | 489 | static void sabre_check_iommu_error(struct pci_controller_info *p, |
| 598 | unsigned long afsr, | 490 | unsigned long afsr, |
| @@ -929,17 +821,30 @@ static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id, struct pt_regs *regs | |||
| 929 | return IRQ_HANDLED; | 821 | return IRQ_HANDLED; |
| 930 | } | 822 | } |
| 931 | 823 | ||
| 932 | /* XXX What about PowerFail/PowerManagement??? -DaveM */ | ||
| 933 | #define SABRE_UE_INO 0x2e | ||
| 934 | #define SABRE_CE_INO 0x2f | ||
| 935 | #define SABRE_PCIERR_INO 0x30 | ||
| 936 | static void sabre_register_error_handlers(struct pci_controller_info *p) | 824 | static void sabre_register_error_handlers(struct pci_controller_info *p) |
| 937 | { | 825 | { |
| 938 | struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */ | 826 | struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */ |
| 827 | struct device_node *dp = pbm->prom_node; | ||
| 828 | struct of_device *op; | ||
| 939 | unsigned long base = pbm->controller_regs; | 829 | unsigned long base = pbm->controller_regs; |
| 940 | unsigned long irq, portid = pbm->portid; | ||
| 941 | u64 tmp; | 830 | u64 tmp; |
| 942 | 831 | ||
| 832 | if (pbm->chip_type == PBM_CHIP_TYPE_SABRE) | ||
| 833 | dp = dp->parent; | ||
| 834 | |||
| 835 | op = of_find_device_by_node(dp); | ||
| 836 | if (!op) | ||
| 837 | return; | ||
| 838 | |||
| 839 | /* Sabre/Hummingbird IRQ property layout is: | ||
| 840 | * 0: PCI ERR | ||
| 841 | * 1: UE ERR | ||
| 842 | * 2: CE ERR | ||
| 843 | * 3: POWER FAIL | ||
| 844 | */ | ||
| 845 | if (op->num_irqs < 4) | ||
| 846 | return; | ||
| 847 | |||
| 943 | /* We clear the error bits in the appropriate AFSR before | 848 | /* We clear the error bits in the appropriate AFSR before |
| 944 | * registering the handler so that we don't get spurious | 849 | * registering the handler so that we don't get spurious |
| 945 | * interrupts. | 850 | * interrupts. |
| @@ -948,32 +853,16 @@ static void sabre_register_error_handlers(struct pci_controller_info *p) | |||
| 948 | (SABRE_UEAFSR_PDRD | SABRE_UEAFSR_PDWR | | 853 | (SABRE_UEAFSR_PDRD | SABRE_UEAFSR_PDWR | |
| 949 | SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR | | 854 | SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR | |
| 950 | SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE)); | 855 | SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE)); |
| 951 | irq = sabre_irq_build(pbm, NULL, (portid << 6) | SABRE_UE_INO); | 856 | |
| 952 | if (request_irq(irq, sabre_ue_intr, | 857 | request_irq(op->irqs[1], sabre_ue_intr, SA_SHIRQ, "SABRE UE", p); |
| 953 | SA_SHIRQ, "SABRE UE", p) < 0) { | ||
| 954 | prom_printf("SABRE%d: Cannot register UE interrupt.\n", | ||
| 955 | p->index); | ||
| 956 | prom_halt(); | ||
| 957 | } | ||
| 958 | 858 | ||
| 959 | sabre_write(base + SABRE_CE_AFSR, | 859 | sabre_write(base + SABRE_CE_AFSR, |
| 960 | (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR | | 860 | (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR | |
| 961 | SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR)); | 861 | SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR)); |
| 962 | irq = sabre_irq_build(pbm, NULL, (portid << 6) | SABRE_CE_INO); | ||
| 963 | if (request_irq(irq, sabre_ce_intr, | ||
| 964 | SA_SHIRQ, "SABRE CE", p) < 0) { | ||
| 965 | prom_printf("SABRE%d: Cannot register CE interrupt.\n", | ||
| 966 | p->index); | ||
| 967 | prom_halt(); | ||
| 968 | } | ||
| 969 | 862 | ||
| 970 | irq = sabre_irq_build(pbm, NULL, (portid << 6) | SABRE_PCIERR_INO); | 863 | request_irq(op->irqs[2], sabre_ce_intr, SA_SHIRQ, "SABRE CE", p); |
| 971 | if (request_irq(irq, sabre_pcierr_intr, | 864 | request_irq(op->irqs[0], sabre_pcierr_intr, SA_SHIRQ, |
| 972 | SA_SHIRQ, "SABRE PCIERR", p) < 0) { | 865 | "SABRE PCIERR", p); |
| 973 | prom_printf("SABRE%d: Cannot register PciERR interrupt.\n", | ||
| 974 | p->index); | ||
| 975 | prom_halt(); | ||
| 976 | } | ||
| 977 | 866 | ||
| 978 | tmp = sabre_read(base + SABRE_PCICTRL); | 867 | tmp = sabre_read(base + SABRE_PCICTRL); |
| 979 | tmp |= SABRE_PCICTRL_ERREN; | 868 | tmp |= SABRE_PCICTRL_ERREN; |
| @@ -1492,7 +1381,6 @@ void sabre_init(struct device_node *dp, char *model_name) | |||
| 1492 | p->index = pci_num_controllers++; | 1381 | p->index = pci_num_controllers++; |
| 1493 | p->pbms_same_domain = 1; | 1382 | p->pbms_same_domain = 1; |
| 1494 | p->scan_bus = sabre_scan_bus; | 1383 | p->scan_bus = sabre_scan_bus; |
| 1495 | p->irq_build = sabre_irq_build; | ||
| 1496 | p->base_address_update = sabre_base_address_update; | 1384 | p->base_address_update = sabre_base_address_update; |
| 1497 | p->resource_adjust = sabre_resource_adjust; | 1385 | p->resource_adjust = sabre_resource_adjust; |
| 1498 | p->pci_ops = &sabre_ops; | 1386 | p->pci_ops = &sabre_ops; |
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c index f16449ccd7bc..5c6e2a9b91f8 100644 --- a/arch/sparc64/kernel/pci_schizo.c +++ b/arch/sparc64/kernel/pci_schizo.c | |||
| @@ -217,116 +217,6 @@ static struct pci_ops schizo_ops = { | |||
| 217 | .write = schizo_write_pci_cfg, | 217 | .write = schizo_write_pci_cfg, |
| 218 | }; | 218 | }; |
| 219 | 219 | ||
| 220 | /* SCHIZO interrupt mapping support. Unlike Psycho, for this controller the | ||
| 221 | * imap/iclr registers are per-PBM. | ||
| 222 | */ | ||
| 223 | #define SCHIZO_IMAP_BASE 0x1000UL | ||
| 224 | #define SCHIZO_ICLR_BASE 0x1400UL | ||
| 225 | |||
| 226 | static unsigned long schizo_imap_offset(unsigned long ino) | ||
| 227 | { | ||
| 228 | return SCHIZO_IMAP_BASE + (ino * 8UL); | ||
| 229 | } | ||
| 230 | |||
| 231 | static unsigned long schizo_iclr_offset(unsigned long ino) | ||
| 232 | { | ||
| 233 | return SCHIZO_ICLR_BASE + (ino * 8UL); | ||
| 234 | } | ||
| 235 | |||
| 236 | static void tomatillo_wsync_handler(unsigned int ino, void *_arg1, void *_arg2) | ||
| 237 | { | ||
| 238 | unsigned long sync_reg = (unsigned long) _arg2; | ||
| 239 | u64 mask = 1UL << (ino & IMAP_INO); | ||
| 240 | u64 val; | ||
| 241 | int limit; | ||
| 242 | |||
| 243 | schizo_write(sync_reg, mask); | ||
| 244 | |||
| 245 | limit = 100000; | ||
| 246 | val = 0; | ||
| 247 | while (--limit) { | ||
| 248 | val = schizo_read(sync_reg); | ||
| 249 | if (!(val & mask)) | ||
| 250 | break; | ||
| 251 | } | ||
| 252 | if (limit <= 0) { | ||
| 253 | printk("tomatillo_wsync_handler: DMA won't sync [%lx:%lx]\n", | ||
| 254 | val, mask); | ||
| 255 | } | ||
| 256 | |||
| 257 | if (_arg1) { | ||
| 258 | static unsigned char cacheline[64] | ||
| 259 | __attribute__ ((aligned (64))); | ||
| 260 | |||
| 261 | __asm__ __volatile__("rd %%fprs, %0\n\t" | ||
| 262 | "or %0, %4, %1\n\t" | ||
| 263 | "wr %1, 0x0, %%fprs\n\t" | ||
| 264 | "stda %%f0, [%5] %6\n\t" | ||
| 265 | "wr %0, 0x0, %%fprs\n\t" | ||
| 266 | "membar #Sync" | ||
| 267 | : "=&r" (mask), "=&r" (val) | ||
| 268 | : "0" (mask), "1" (val), | ||
| 269 | "i" (FPRS_FEF), "r" (&cacheline[0]), | ||
| 270 | "i" (ASI_BLK_COMMIT_P)); | ||
| 271 | } | ||
| 272 | } | ||
| 273 | |||
| 274 | static unsigned long schizo_ino_to_iclr(struct pci_pbm_info *pbm, | ||
| 275 | unsigned int ino) | ||
| 276 | { | ||
| 277 | ino &= PCI_IRQ_INO; | ||
| 278 | return pbm->pbm_regs + schizo_iclr_offset(ino) + 4; | ||
| 279 | } | ||
| 280 | |||
| 281 | static unsigned long schizo_ino_to_imap(struct pci_pbm_info *pbm, | ||
| 282 | unsigned int ino) | ||
| 283 | { | ||
| 284 | ino &= PCI_IRQ_INO; | ||
| 285 | return pbm->pbm_regs + schizo_imap_offset(ino) + 4; | ||
| 286 | } | ||
| 287 | |||
| 288 | static unsigned int schizo_irq_build(struct pci_pbm_info *pbm, | ||
| 289 | struct pci_dev *pdev, | ||
| 290 | unsigned int ino) | ||
| 291 | { | ||
| 292 | unsigned long imap, iclr; | ||
| 293 | int ign_fixup; | ||
| 294 | int virt_irq; | ||
| 295 | |||
| 296 | ino &= PCI_IRQ_INO; | ||
| 297 | |||
| 298 | /* Now build the IRQ bucket. */ | ||
| 299 | imap = schizo_ino_to_imap(pbm, ino); | ||
| 300 | iclr = schizo_ino_to_iclr(pbm, ino); | ||
| 301 | |||
| 302 | /* On Schizo, no inofixup occurs. This is because each | ||
| 303 | * INO has it's own IMAP register. On Psycho and Sabre | ||
| 304 | * there is only one IMAP register for each PCI slot even | ||
| 305 | * though four different INOs can be generated by each | ||
| 306 | * PCI slot. | ||
| 307 | * | ||
| 308 | * But, for JBUS variants (essentially, Tomatillo), we have | ||
| 309 | * to fixup the lowest bit of the interrupt group number. | ||
| 310 | */ | ||
| 311 | ign_fixup = 0; | ||
| 312 | if (pbm->chip_type == PBM_CHIP_TYPE_TOMATILLO) { | ||
| 313 | if (pbm->portid & 1) | ||
| 314 | ign_fixup = (1 << 6); | ||
| 315 | } | ||
| 316 | |||
| 317 | virt_irq = build_irq(ign_fixup, iclr, imap); | ||
| 318 | |||
| 319 | if (pdev && pbm->chip_type == PBM_CHIP_TYPE_TOMATILLO) { | ||
| 320 | irq_install_pre_handler(virt_irq, | ||
| 321 | tomatillo_wsync_handler, | ||
| 322 | ((pbm->chip_version <= 4) ? | ||
| 323 | (void *) 1 : (void *) 0), | ||
| 324 | (void *) pbm->sync_reg); | ||
| 325 | } | ||
| 326 | |||
| 327 | return virt_irq; | ||
| 328 | } | ||
| 329 | |||
| 330 | /* SCHIZO error handling support. */ | 220 | /* SCHIZO error handling support. */ |
| 331 | enum schizo_error_type { | 221 | enum schizo_error_type { |
| 332 | UE_ERR, CE_ERR, PCI_ERR, SAFARI_ERR | 222 | UE_ERR, CE_ERR, PCI_ERR, SAFARI_ERR |
| @@ -362,34 +252,6 @@ struct pci_pbm_info *pbm_for_ino(struct pci_controller_info *p, u32 ino) | |||
| 362 | return &p->pbm_A; | 252 | return &p->pbm_A; |
| 363 | } | 253 | } |
| 364 | 254 | ||
| 365 | static void schizo_clear_other_err_intr(struct pci_controller_info *p, int irq) | ||
| 366 | { | ||
| 367 | struct pci_pbm_info *pbm; | ||
| 368 | unsigned long iclr; | ||
| 369 | |||
| 370 | /* Do not clear the interrupt for the other PCI bus. | ||
| 371 | * | ||
| 372 | * This "ACK both PBM IRQs" only needs to be performed | ||
| 373 | * for chip-wide error interrupts. | ||
| 374 | */ | ||
| 375 | if ((irq & IMAP_INO) == SCHIZO_PCIERR_A_INO || | ||
| 376 | (irq & IMAP_INO) == SCHIZO_PCIERR_B_INO) | ||
| 377 | return; | ||
| 378 | |||
| 379 | pbm = pbm_for_ino(p, irq); | ||
| 380 | if (pbm == &p->pbm_A) | ||
| 381 | pbm = &p->pbm_B; | ||
| 382 | else | ||
| 383 | pbm = &p->pbm_A; | ||
| 384 | |||
| 385 | schizo_irq_build(pbm, NULL, | ||
| 386 | (pbm->portid << 6) | (irq & IMAP_INO)); | ||
| 387 | |||
| 388 | iclr = schizo_ino_to_iclr(pbm, | ||
| 389 | (pbm->portid << 6) | (irq & IMAP_INO)); | ||
| 390 | upa_writel(ICLR_IDLE, iclr); | ||
| 391 | } | ||
| 392 | |||
| 393 | #define SCHIZO_STC_ERR 0xb800UL /* --> 0xba00 */ | 255 | #define SCHIZO_STC_ERR 0xb800UL /* --> 0xba00 */ |
| 394 | #define SCHIZO_STC_TAG 0xba00UL /* --> 0xba80 */ | 256 | #define SCHIZO_STC_TAG 0xba00UL /* --> 0xba80 */ |
| 395 | #define SCHIZO_STC_LINE 0xbb00UL /* --> 0xbb80 */ | 257 | #define SCHIZO_STC_LINE 0xbb00UL /* --> 0xbb80 */ |
| @@ -720,8 +582,6 @@ static irqreturn_t schizo_ue_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 720 | /* Interrogate IOMMU for error status. */ | 582 | /* Interrogate IOMMU for error status. */ |
| 721 | schizo_check_iommu_error(p, UE_ERR); | 583 | schizo_check_iommu_error(p, UE_ERR); |
| 722 | 584 | ||
| 723 | schizo_clear_other_err_intr(p, irq); | ||
| 724 | |||
| 725 | return IRQ_HANDLED; | 585 | return IRQ_HANDLED; |
| 726 | } | 586 | } |
| 727 | 587 | ||
| @@ -811,8 +671,6 @@ static irqreturn_t schizo_ce_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 811 | printk("(none)"); | 671 | printk("(none)"); |
| 812 | printk("]\n"); | 672 | printk("]\n"); |
| 813 | 673 | ||
| 814 | schizo_clear_other_err_intr(p, irq); | ||
| 815 | |||
| 816 | return IRQ_HANDLED; | 674 | return IRQ_HANDLED; |
| 817 | } | 675 | } |
| 818 | 676 | ||
| @@ -1033,8 +891,6 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id, struct pt_regs *reg | |||
| 1033 | if (error_bits & (SCHIZO_PCIAFSR_PPERR | SCHIZO_PCIAFSR_SPERR)) | 891 | if (error_bits & (SCHIZO_PCIAFSR_PPERR | SCHIZO_PCIAFSR_SPERR)) |
| 1034 | pci_scan_for_parity_error(p, pbm, pbm->pci_bus); | 892 | pci_scan_for_parity_error(p, pbm, pbm->pci_bus); |
| 1035 | 893 | ||
| 1036 | schizo_clear_other_err_intr(p, irq); | ||
| 1037 | |||
| 1038 | return IRQ_HANDLED; | 894 | return IRQ_HANDLED; |
| 1039 | } | 895 | } |
| 1040 | 896 | ||
| @@ -1090,7 +946,6 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs * | |||
| 1090 | printk("PCI%d: Unexpected Safari/JBUS error interrupt, errlog[%016lx]\n", | 946 | printk("PCI%d: Unexpected Safari/JBUS error interrupt, errlog[%016lx]\n", |
| 1091 | p->index, errlog); | 947 | p->index, errlog); |
| 1092 | 948 | ||
| 1093 | schizo_clear_other_err_intr(p, irq); | ||
| 1094 | return IRQ_HANDLED; | 949 | return IRQ_HANDLED; |
| 1095 | } | 950 | } |
| 1096 | 951 | ||
| @@ -1098,7 +953,6 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs * | |||
| 1098 | p->index); | 953 | p->index); |
| 1099 | schizo_check_iommu_error(p, SAFARI_ERR); | 954 | schizo_check_iommu_error(p, SAFARI_ERR); |
| 1100 | 955 | ||
| 1101 | schizo_clear_other_err_intr(p, irq); | ||
| 1102 | return IRQ_HANDLED; | 956 | return IRQ_HANDLED; |
| 1103 | } | 957 | } |
| 1104 | 958 | ||
| @@ -1130,74 +984,47 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs * | |||
| 1130 | static void tomatillo_register_error_handlers(struct pci_controller_info *p) | 984 | static void tomatillo_register_error_handlers(struct pci_controller_info *p) |
| 1131 | { | 985 | { |
| 1132 | struct pci_pbm_info *pbm; | 986 | struct pci_pbm_info *pbm; |
| 1133 | unsigned int irq; | 987 | struct of_device *op; |
| 1134 | u64 tmp, err_mask, err_no_mask; | 988 | u64 tmp, err_mask, err_no_mask; |
| 1135 | 989 | ||
| 1136 | /* Build IRQs and register handlers. */ | 990 | /* Tomatillo IRQ property layout is: |
| 991 | * 0: PCIERR | ||
| 992 | * 1: UE ERR | ||
| 993 | * 2: CE ERR | ||
| 994 | * 3: SERR | ||
| 995 | * 4: POWER FAIL? | ||
| 996 | */ | ||
| 997 | |||
| 1137 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); | 998 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); |
| 1138 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_UE_INO); | 999 | op = of_find_device_by_node(pbm->prom_node); |
| 1139 | if (request_irq(irq, schizo_ue_intr, | 1000 | if (op) |
| 1140 | SA_SHIRQ, "TOMATILLO UE", p) < 0) { | 1001 | request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ, |
| 1141 | prom_printf("%s: Cannot register UE interrupt.\n", | 1002 | "TOMATILLO_UE", p); |
| 1142 | pbm->name); | ||
| 1143 | prom_halt(); | ||
| 1144 | } | ||
| 1145 | tmp = upa_readl(schizo_ino_to_imap(pbm, (pbm->portid << 6) | SCHIZO_UE_INO)); | ||
| 1146 | upa_writel(tmp, (pbm->pbm_regs + | ||
| 1147 | schizo_imap_offset(SCHIZO_UE_INO) + 4)); | ||
| 1148 | 1003 | ||
| 1149 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); | 1004 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); |
| 1150 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_CE_INO); | 1005 | op = of_find_device_by_node(pbm->prom_node); |
| 1151 | if (request_irq(irq, schizo_ce_intr, | 1006 | if (op) |
| 1152 | SA_SHIRQ, "TOMATILLO CE", p) < 0) { | 1007 | request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ, |
| 1153 | prom_printf("%s: Cannot register CE interrupt.\n", | 1008 | "TOMATILLO CE", p); |
| 1154 | pbm->name); | ||
| 1155 | prom_halt(); | ||
| 1156 | } | ||
| 1157 | tmp = upa_readl(schizo_ino_to_imap(pbm, (pbm->portid << 6) | SCHIZO_CE_INO)); | ||
| 1158 | upa_writel(tmp, (pbm->pbm_regs + | ||
| 1159 | schizo_imap_offset(SCHIZO_CE_INO) + 4)); | ||
| 1160 | 1009 | ||
| 1161 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); | 1010 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); |
| 1162 | irq = schizo_irq_build(pbm, NULL, ((pbm->portid << 6) | | 1011 | op = of_find_device_by_node(pbm->prom_node); |
| 1163 | SCHIZO_PCIERR_A_INO)); | 1012 | if (op) |
| 1164 | if (request_irq(irq, schizo_pcierr_intr, | 1013 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, |
| 1165 | SA_SHIRQ, "TOMATILLO PCIERR", pbm) < 0) { | 1014 | "TOMATILLO PCIERR-A", pbm); |
| 1166 | prom_printf("%s: Cannot register PBM A PciERR interrupt.\n", | 1015 | |
| 1167 | pbm->name); | ||
| 1168 | prom_halt(); | ||
| 1169 | } | ||
| 1170 | tmp = upa_readl(schizo_ino_to_imap(pbm, ((pbm->portid << 6) | | ||
| 1171 | SCHIZO_PCIERR_A_INO))); | ||
| 1172 | upa_writel(tmp, (pbm->pbm_regs + | ||
| 1173 | schizo_imap_offset(SCHIZO_PCIERR_A_INO) + 4)); | ||
| 1174 | 1016 | ||
| 1175 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); | 1017 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); |
| 1176 | irq = schizo_irq_build(pbm, NULL, ((pbm->portid << 6) | | 1018 | op = of_find_device_by_node(pbm->prom_node); |
| 1177 | SCHIZO_PCIERR_B_INO)); | 1019 | if (op) |
| 1178 | if (request_irq(irq, schizo_pcierr_intr, | 1020 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, |
| 1179 | SA_SHIRQ, "TOMATILLO PCIERR", pbm) < 0) { | 1021 | "TOMATILLO PCIERR-B", pbm); |
| 1180 | prom_printf("%s: Cannot register PBM B PciERR interrupt.\n", | ||
| 1181 | pbm->name); | ||
| 1182 | prom_halt(); | ||
| 1183 | } | ||
| 1184 | tmp = upa_readl(schizo_ino_to_imap(pbm, ((pbm->portid << 6) | | ||
| 1185 | SCHIZO_PCIERR_B_INO))); | ||
| 1186 | upa_writel(tmp, (pbm->pbm_regs + | ||
| 1187 | schizo_imap_offset(SCHIZO_PCIERR_B_INO) + 4)); | ||
| 1188 | 1022 | ||
| 1189 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); | 1023 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); |
| 1190 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_SERR_INO); | 1024 | op = of_find_device_by_node(pbm->prom_node); |
| 1191 | if (request_irq(irq, schizo_safarierr_intr, | 1025 | if (op) |
| 1192 | SA_SHIRQ, "TOMATILLO SERR", p) < 0) { | 1026 | request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ, |
| 1193 | prom_printf("%s: Cannot register SafariERR interrupt.\n", | 1027 | "TOMATILLO SERR", p); |
| 1194 | pbm->name); | ||
| 1195 | prom_halt(); | ||
| 1196 | } | ||
| 1197 | tmp = upa_readl(schizo_ino_to_imap(pbm, ((pbm->portid << 6) | | ||
| 1198 | SCHIZO_SERR_INO))); | ||
| 1199 | upa_writel(tmp, (pbm->pbm_regs + | ||
| 1200 | schizo_imap_offset(SCHIZO_SERR_INO) + 4)); | ||
| 1201 | 1028 | ||
| 1202 | /* Enable UE and CE interrupts for controller. */ | 1029 | /* Enable UE and CE interrupts for controller. */ |
| 1203 | schizo_write(p->pbm_A.controller_regs + SCHIZO_ECC_CTRL, | 1030 | schizo_write(p->pbm_A.controller_regs + SCHIZO_ECC_CTRL, |
| @@ -1265,64 +1092,47 @@ static void tomatillo_register_error_handlers(struct pci_controller_info *p) | |||
| 1265 | static void schizo_register_error_handlers(struct pci_controller_info *p) | 1092 | static void schizo_register_error_handlers(struct pci_controller_info *p) |
| 1266 | { | 1093 | { |
| 1267 | struct pci_pbm_info *pbm; | 1094 | struct pci_pbm_info *pbm; |
| 1268 | unsigned int irq; | 1095 | struct of_device *op; |
| 1269 | u64 tmp, err_mask, err_no_mask; | 1096 | u64 tmp, err_mask, err_no_mask; |
| 1270 | 1097 | ||
| 1271 | /* Build IRQs and register handlers. */ | 1098 | /* Schizo IRQ property layout is: |
| 1099 | * 0: PCIERR | ||
| 1100 | * 1: UE ERR | ||
| 1101 | * 2: CE ERR | ||
| 1102 | * 3: SERR | ||
| 1103 | * 4: POWER FAIL? | ||
| 1104 | */ | ||
| 1105 | |||
| 1272 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); | 1106 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); |
| 1273 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_UE_INO); | 1107 | op = of_find_device_by_node(pbm->prom_node); |
| 1274 | if (request_irq(irq, schizo_ue_intr, | 1108 | if (op) |
| 1275 | SA_SHIRQ, "SCHIZO UE", p) < 0) { | 1109 | request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ, |
| 1276 | prom_printf("%s: Cannot register UE interrupt.\n", | 1110 | "SCHIZO_UE", p); |
| 1277 | pbm->name); | ||
| 1278 | prom_halt(); | ||
| 1279 | } | ||
| 1280 | tmp = upa_readl(schizo_ino_to_imap(pbm, (pbm->portid << 6) | SCHIZO_UE_INO)); | ||
| 1281 | upa_writel(tmp, (pbm->pbm_regs + schizo_imap_offset(SCHIZO_UE_INO) + 4)); | ||
| 1282 | 1111 | ||
| 1283 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); | 1112 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); |
| 1284 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_CE_INO); | 1113 | op = of_find_device_by_node(pbm->prom_node); |
| 1285 | if (request_irq(irq, schizo_ce_intr, | 1114 | if (op) |
| 1286 | SA_SHIRQ, "SCHIZO CE", p) < 0) { | 1115 | request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ, |
| 1287 | prom_printf("%s: Cannot register CE interrupt.\n", | 1116 | "SCHIZO CE", p); |
| 1288 | pbm->name); | ||
| 1289 | prom_halt(); | ||
| 1290 | } | ||
| 1291 | tmp = upa_readl(schizo_ino_to_imap(pbm, (pbm->portid << 6) | SCHIZO_CE_INO)); | ||
| 1292 | upa_writel(tmp, (pbm->pbm_regs + schizo_imap_offset(SCHIZO_CE_INO) + 4)); | ||
| 1293 | 1117 | ||
| 1294 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); | 1118 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); |
| 1295 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_PCIERR_A_INO); | 1119 | op = of_find_device_by_node(pbm->prom_node); |
| 1296 | if (request_irq(irq, schizo_pcierr_intr, | 1120 | if (op) |
| 1297 | SA_SHIRQ, "SCHIZO PCIERR", pbm) < 0) { | 1121 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, |
| 1298 | prom_printf("%s: Cannot register PBM A PciERR interrupt.\n", | 1122 | "SCHIZO PCIERR-A", pbm); |
| 1299 | pbm->name); | 1123 | |
| 1300 | prom_halt(); | ||
| 1301 | } | ||
| 1302 | tmp = upa_readl(schizo_ino_to_imap(pbm, (pbm->portid << 6) | SCHIZO_PCIERR_A_INO)); | ||
| 1303 | upa_writel(tmp, (pbm->pbm_regs + schizo_imap_offset(SCHIZO_PCIERR_A_INO) + 4)); | ||
| 1304 | 1124 | ||
| 1305 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); | 1125 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); |
| 1306 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_PCIERR_B_INO); | 1126 | op = of_find_device_by_node(pbm->prom_node); |
| 1307 | if (request_irq(irq, schizo_pcierr_intr, | 1127 | if (op) |
| 1308 | SA_SHIRQ, "SCHIZO PCIERR", &p->pbm_B) < 0) { | 1128 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, |
| 1309 | prom_printf("%s: Cannot register PBM B PciERR interrupt.\n", | 1129 | "SCHIZO PCIERR-B", pbm); |
| 1310 | pbm->name); | ||
| 1311 | prom_halt(); | ||
| 1312 | } | ||
| 1313 | tmp = upa_readl(schizo_ino_to_imap(pbm, (pbm->portid << 6) | SCHIZO_PCIERR_B_INO)); | ||
| 1314 | upa_writel(tmp, (pbm->pbm_regs + schizo_imap_offset(SCHIZO_PCIERR_B_INO) + 4)); | ||
| 1315 | 1130 | ||
| 1316 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); | 1131 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); |
| 1317 | irq = schizo_irq_build(pbm, NULL, (pbm->portid << 6) | SCHIZO_SERR_INO); | 1132 | op = of_find_device_by_node(pbm->prom_node); |
| 1318 | if (request_irq(irq, schizo_safarierr_intr, | 1133 | if (op) |
| 1319 | SA_SHIRQ, "SCHIZO SERR", p) < 0) { | 1134 | request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ, |
| 1320 | prom_printf("%s: Cannot register SafariERR interrupt.\n", | 1135 | "SCHIZO SERR", p); |
| 1321 | pbm->name); | ||
| 1322 | prom_halt(); | ||
| 1323 | } | ||
| 1324 | tmp = upa_readl(schizo_ino_to_imap(pbm, (pbm->portid << 6) | SCHIZO_SERR_INO)); | ||
| 1325 | upa_writel(tmp, (pbm->pbm_regs + schizo_imap_offset(SCHIZO_SERR_INO) + 4)); | ||
| 1326 | 1136 | ||
| 1327 | /* Enable UE and CE interrupts for controller. */ | 1137 | /* Enable UE and CE interrupts for controller. */ |
| 1328 | schizo_write(p->pbm_A.controller_regs + SCHIZO_ECC_CTRL, | 1138 | schizo_write(p->pbm_A.controller_regs + SCHIZO_ECC_CTRL, |
| @@ -2022,7 +1832,6 @@ static void __schizo_init(struct device_node *dp, char *model_name, int chip_typ | |||
| 2022 | p->scan_bus = (chip_type == PBM_CHIP_TYPE_TOMATILLO ? | 1832 | p->scan_bus = (chip_type == PBM_CHIP_TYPE_TOMATILLO ? |
| 2023 | tomatillo_scan_bus : | 1833 | tomatillo_scan_bus : |
| 2024 | schizo_scan_bus); | 1834 | schizo_scan_bus); |
| 2025 | p->irq_build = schizo_irq_build; | ||
| 2026 | p->base_address_update = schizo_base_address_update; | 1835 | p->base_address_update = schizo_base_address_update; |
| 2027 | p->resource_adjust = schizo_resource_adjust; | 1836 | p->resource_adjust = schizo_resource_adjust; |
| 2028 | p->pci_ops = &schizo_ops; | 1837 | p->pci_ops = &schizo_ops; |
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index b69e2270a721..03ad4c06758e 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c | |||
| @@ -843,15 +843,6 @@ static void pci_sun4v_scan_bus(struct pci_controller_info *p) | |||
| 843 | /* XXX register error interrupt handlers XXX */ | 843 | /* XXX register error interrupt handlers XXX */ |
| 844 | } | 844 | } |
| 845 | 845 | ||
| 846 | static unsigned int pci_sun4v_irq_build(struct pci_pbm_info *pbm, | ||
| 847 | struct pci_dev *pdev, | ||
| 848 | unsigned int devino) | ||
| 849 | { | ||
| 850 | u32 devhandle = pbm->devhandle; | ||
| 851 | |||
| 852 | return sun4v_build_irq(devhandle, devino); | ||
| 853 | } | ||
| 854 | |||
| 855 | static void pci_sun4v_base_address_update(struct pci_dev *pdev, int resource) | 846 | static void pci_sun4v_base_address_update(struct pci_dev *pdev, int resource) |
| 856 | { | 847 | { |
| 857 | struct pcidev_cookie *pcp = pdev->sysdata; | 848 | struct pcidev_cookie *pcp = pdev->sysdata; |
| @@ -1200,7 +1191,6 @@ void sun4v_pci_init(struct device_node *dp, char *model_name) | |||
| 1200 | p->pbms_same_domain = 0; | 1191 | p->pbms_same_domain = 0; |
| 1201 | 1192 | ||
| 1202 | p->scan_bus = pci_sun4v_scan_bus; | 1193 | p->scan_bus = pci_sun4v_scan_bus; |
| 1203 | p->irq_build = pci_sun4v_irq_build; | ||
| 1204 | p->base_address_update = pci_sun4v_base_address_update; | 1194 | p->base_address_update = pci_sun4v_base_address_update; |
| 1205 | p->resource_adjust = pci_sun4v_resource_adjust; | 1195 | p->resource_adjust = pci_sun4v_resource_adjust; |
| 1206 | p->pci_ops = &pci_sun4v_ops; | 1196 | p->pci_ops = &pci_sun4v_ops; |
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c index 9496c7734014..e55466c77b61 100644 --- a/arch/sparc64/kernel/power.c +++ b/arch/sparc64/kernel/power.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #define __KERNEL_SYSCALLS__ | 7 | #define __KERNEL_SYSCALLS__ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| @@ -17,9 +16,10 @@ | |||
| 17 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
| 18 | 17 | ||
| 19 | #include <asm/system.h> | 18 | #include <asm/system.h> |
| 20 | #include <asm/ebus.h> | ||
| 21 | #include <asm/isa.h> | ||
| 22 | #include <asm/auxio.h> | 19 | #include <asm/auxio.h> |
| 20 | #include <asm/prom.h> | ||
| 21 | #include <asm/of_device.h> | ||
| 22 | #include <asm/io.h> | ||
| 23 | 23 | ||
| 24 | #include <linux/unistd.h> | 24 | #include <linux/unistd.h> |
| 25 | 25 | ||
| @@ -30,6 +30,7 @@ | |||
| 30 | int scons_pwroff = 1; | 30 | int scons_pwroff = 1; |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_PCI | 32 | #ifdef CONFIG_PCI |
| 33 | #include <linux/pci.h> | ||
| 33 | static void __iomem *power_reg; | 34 | static void __iomem *power_reg; |
| 34 | 35 | ||
| 35 | static DECLARE_WAIT_QUEUE_HEAD(powerd_wait); | 36 | static DECLARE_WAIT_QUEUE_HEAD(powerd_wait); |
| @@ -115,27 +116,33 @@ static int __init has_button_interrupt(unsigned int irq, struct device_node *dp) | |||
| 115 | return 1; | 116 | return 1; |
| 116 | } | 117 | } |
| 117 | 118 | ||
| 118 | static void __devinit power_probe_common(struct of_device *dev, struct resource *res, unsigned int irq) | 119 | static int __devinit power_probe(struct of_device *op, const struct of_device_id *match) |
| 119 | { | 120 | { |
| 120 | power_reg = ioremap(res->start, 0x4); | 121 | struct resource *res = &op->resource[0]; |
| 122 | unsigned int irq= op->irqs[0]; | ||
| 121 | 123 | ||
| 122 | printk("power: Control reg at %p ... ", power_reg); | 124 | power_reg = of_ioremap(res, 0, 0x4, "power"); |
| 125 | |||
| 126 | printk("%s: Control reg at %lx ... ", | ||
| 127 | op->node->name, res->start); | ||
| 123 | 128 | ||
| 124 | poweroff_method = machine_halt; /* able to use the standard halt */ | 129 | poweroff_method = machine_halt; /* able to use the standard halt */ |
| 125 | 130 | ||
| 126 | if (has_button_interrupt(irq, dev->node)) { | 131 | if (has_button_interrupt(irq, op->node)) { |
| 127 | if (kernel_thread(powerd, NULL, CLONE_FS) < 0) { | 132 | if (kernel_thread(powerd, NULL, CLONE_FS) < 0) { |
| 128 | printk("Failed to start power daemon.\n"); | 133 | printk("Failed to start power daemon.\n"); |
| 129 | return; | 134 | return 0; |
| 130 | } | 135 | } |
| 131 | printk("powerd running.\n"); | 136 | printk("powerd running.\n"); |
| 132 | 137 | ||
| 133 | if (request_irq(irq, | 138 | if (request_irq(irq, |
| 134 | power_handler, SA_SHIRQ, "power", NULL) < 0) | 139 | power_handler, 0, "power", NULL) < 0) |
| 135 | printk("power: Error, cannot register IRQ handler.\n"); | 140 | printk("power: Error, cannot register IRQ handler.\n"); |
| 136 | } else { | 141 | } else { |
| 137 | printk("not using powerd.\n"); | 142 | printk("not using powerd.\n"); |
| 138 | } | 143 | } |
| 144 | |||
| 145 | return 0; | ||
| 139 | } | 146 | } |
| 140 | 147 | ||
| 141 | static struct of_device_id power_match[] = { | 148 | static struct of_device_id power_match[] = { |
| @@ -145,44 +152,15 @@ static struct of_device_id power_match[] = { | |||
| 145 | {}, | 152 | {}, |
| 146 | }; | 153 | }; |
| 147 | 154 | ||
| 148 | static int __devinit ebus_power_probe(struct of_device *dev, const struct of_device_id *match) | 155 | static struct of_platform_driver power_driver = { |
| 149 | { | ||
| 150 | struct linux_ebus_device *edev = to_ebus_device(&dev->dev); | ||
| 151 | struct resource *res = &edev->resource[0]; | ||
| 152 | unsigned int irq = edev->irqs[0]; | ||
| 153 | |||
| 154 | power_probe_common(dev, res,irq); | ||
| 155 | |||
| 156 | return 0; | ||
| 157 | } | ||
| 158 | |||
| 159 | static struct of_platform_driver ebus_power_driver = { | ||
| 160 | .name = "power", | ||
| 161 | .match_table = power_match, | ||
| 162 | .probe = ebus_power_probe, | ||
| 163 | }; | ||
| 164 | |||
| 165 | static int __devinit isa_power_probe(struct of_device *dev, const struct of_device_id *match) | ||
| 166 | { | ||
| 167 | struct sparc_isa_device *idev = to_isa_device(&dev->dev); | ||
| 168 | struct resource *res = &idev->resource; | ||
| 169 | unsigned int irq = idev->irq; | ||
| 170 | |||
| 171 | power_probe_common(dev, res,irq); | ||
| 172 | |||
| 173 | return 0; | ||
| 174 | } | ||
| 175 | |||
| 176 | static struct of_platform_driver isa_power_driver = { | ||
| 177 | .name = "power", | 156 | .name = "power", |
| 178 | .match_table = power_match, | 157 | .match_table = power_match, |
| 179 | .probe = isa_power_probe, | 158 | .probe = power_probe, |
| 180 | }; | 159 | }; |
| 181 | 160 | ||
| 182 | void __init power_init(void) | 161 | void __init power_init(void) |
| 183 | { | 162 | { |
| 184 | of_register_driver(&ebus_power_driver, &ebus_bus_type); | 163 | of_register_driver(&power_driver, &of_bus_type); |
| 185 | of_register_driver(&isa_power_driver, &isa_bus_type); | ||
| 186 | return; | 164 | return; |
| 187 | } | 165 | } |
| 188 | #endif /* CONFIG_PCI */ | 166 | #endif /* CONFIG_PCI */ |
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 1c7ca2f712d9..7d75cd4eb297 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #include <stdarg.h> | 13 | #include <stdarg.h> |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| @@ -26,7 +25,6 @@ | |||
| 26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 27 | #include <linux/user.h> | 26 | #include <linux/user.h> |
| 28 | #include <linux/a.out.h> | 27 | #include <linux/a.out.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/reboot.h> | 28 | #include <linux/reboot.h> |
| 31 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 32 | #include <linux/compat.h> | 30 | #include <linux/compat.h> |
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index 8e87e7ea0325..fa484d4f241e 100644 --- a/arch/sparc64/kernel/prom.c +++ b/arch/sparc64/kernel/prom.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * 2 of the License, or (at your option) any later version. | 15 | * 2 of the License, or (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 19 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 20 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| @@ -23,7 +24,11 @@ | |||
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | 25 | ||
| 25 | #include <asm/prom.h> | 26 | #include <asm/prom.h> |
| 27 | #include <asm/of_device.h> | ||
| 26 | #include <asm/oplib.h> | 28 | #include <asm/oplib.h> |
| 29 | #include <asm/irq.h> | ||
| 30 | #include <asm/asi.h> | ||
| 31 | #include <asm/upa.h> | ||
| 27 | 32 | ||
| 28 | static struct device_node *allnodes; | 33 | static struct device_node *allnodes; |
| 29 | 34 | ||
| @@ -190,6 +195,36 @@ int of_getintprop_default(struct device_node *np, const char *name, int def) | |||
| 190 | } | 195 | } |
| 191 | EXPORT_SYMBOL(of_getintprop_default); | 196 | EXPORT_SYMBOL(of_getintprop_default); |
| 192 | 197 | ||
| 198 | int of_n_addr_cells(struct device_node *np) | ||
| 199 | { | ||
| 200 | int* ip; | ||
| 201 | do { | ||
| 202 | if (np->parent) | ||
| 203 | np = np->parent; | ||
| 204 | ip = of_get_property(np, "#address-cells", NULL); | ||
| 205 | if (ip != NULL) | ||
| 206 | return *ip; | ||
| 207 | } while (np->parent); | ||
| 208 | /* No #address-cells property for the root node, default to 2 */ | ||
| 209 | return 2; | ||
| 210 | } | ||
| 211 | EXPORT_SYMBOL(of_n_addr_cells); | ||
| 212 | |||
| 213 | int of_n_size_cells(struct device_node *np) | ||
| 214 | { | ||
| 215 | int* ip; | ||
| 216 | do { | ||
| 217 | if (np->parent) | ||
| 218 | np = np->parent; | ||
| 219 | ip = of_get_property(np, "#size-cells", NULL); | ||
| 220 | if (ip != NULL) | ||
| 221 | return *ip; | ||
| 222 | } while (np->parent); | ||
| 223 | /* No #size-cells property for the root node, default to 1 */ | ||
| 224 | return 1; | ||
| 225 | } | ||
| 226 | EXPORT_SYMBOL(of_n_size_cells); | ||
| 227 | |||
| 193 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) | 228 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) |
| 194 | { | 229 | { |
| 195 | struct property **prevp; | 230 | struct property **prevp; |
| @@ -253,6 +288,777 @@ static void * __init prom_early_alloc(unsigned long size) | |||
| 253 | return ret; | 288 | return ret; |
| 254 | } | 289 | } |
| 255 | 290 | ||
| 291 | #ifdef CONFIG_PCI | ||
| 292 | /* PSYCHO interrupt mapping support. */ | ||
| 293 | #define PSYCHO_IMAP_A_SLOT0 0x0c00UL | ||
| 294 | #define PSYCHO_IMAP_B_SLOT0 0x0c20UL | ||
| 295 | static unsigned long psycho_pcislot_imap_offset(unsigned long ino) | ||
| 296 | { | ||
| 297 | unsigned int bus = (ino & 0x10) >> 4; | ||
| 298 | unsigned int slot = (ino & 0x0c) >> 2; | ||
| 299 | |||
| 300 | if (bus == 0) | ||
| 301 | return PSYCHO_IMAP_A_SLOT0 + (slot * 8); | ||
| 302 | else | ||
| 303 | return PSYCHO_IMAP_B_SLOT0 + (slot * 8); | ||
| 304 | } | ||
| 305 | |||
| 306 | #define PSYCHO_IMAP_SCSI 0x1000UL | ||
| 307 | #define PSYCHO_IMAP_ETH 0x1008UL | ||
| 308 | #define PSYCHO_IMAP_BPP 0x1010UL | ||
| 309 | #define PSYCHO_IMAP_AU_REC 0x1018UL | ||
| 310 | #define PSYCHO_IMAP_AU_PLAY 0x1020UL | ||
| 311 | #define PSYCHO_IMAP_PFAIL 0x1028UL | ||
| 312 | #define PSYCHO_IMAP_KMS 0x1030UL | ||
| 313 | #define PSYCHO_IMAP_FLPY 0x1038UL | ||
| 314 | #define PSYCHO_IMAP_SHW 0x1040UL | ||
| 315 | #define PSYCHO_IMAP_KBD 0x1048UL | ||
| 316 | #define PSYCHO_IMAP_MS 0x1050UL | ||
| 317 | #define PSYCHO_IMAP_SER 0x1058UL | ||
| 318 | #define PSYCHO_IMAP_TIM0 0x1060UL | ||
| 319 | #define PSYCHO_IMAP_TIM1 0x1068UL | ||
| 320 | #define PSYCHO_IMAP_UE 0x1070UL | ||
| 321 | #define PSYCHO_IMAP_CE 0x1078UL | ||
| 322 | #define PSYCHO_IMAP_A_ERR 0x1080UL | ||
| 323 | #define PSYCHO_IMAP_B_ERR 0x1088UL | ||
| 324 | #define PSYCHO_IMAP_PMGMT 0x1090UL | ||
| 325 | #define PSYCHO_IMAP_GFX 0x1098UL | ||
| 326 | #define PSYCHO_IMAP_EUPA 0x10a0UL | ||
| 327 | |||
| 328 | static unsigned long __psycho_onboard_imap_off[] = { | ||
| 329 | /*0x20*/ PSYCHO_IMAP_SCSI, | ||
| 330 | /*0x21*/ PSYCHO_IMAP_ETH, | ||
| 331 | /*0x22*/ PSYCHO_IMAP_BPP, | ||
| 332 | /*0x23*/ PSYCHO_IMAP_AU_REC, | ||
| 333 | /*0x24*/ PSYCHO_IMAP_AU_PLAY, | ||
| 334 | /*0x25*/ PSYCHO_IMAP_PFAIL, | ||
| 335 | /*0x26*/ PSYCHO_IMAP_KMS, | ||
| 336 | /*0x27*/ PSYCHO_IMAP_FLPY, | ||
| 337 | /*0x28*/ PSYCHO_IMAP_SHW, | ||
| 338 | /*0x29*/ PSYCHO_IMAP_KBD, | ||
| 339 | /*0x2a*/ PSYCHO_IMAP_MS, | ||
| 340 | /*0x2b*/ PSYCHO_IMAP_SER, | ||
| 341 | /*0x2c*/ PSYCHO_IMAP_TIM0, | ||
| 342 | /*0x2d*/ PSYCHO_IMAP_TIM1, | ||
| 343 | /*0x2e*/ PSYCHO_IMAP_UE, | ||
| 344 | /*0x2f*/ PSYCHO_IMAP_CE, | ||
| 345 | /*0x30*/ PSYCHO_IMAP_A_ERR, | ||
| 346 | /*0x31*/ PSYCHO_IMAP_B_ERR, | ||
| 347 | /*0x32*/ PSYCHO_IMAP_PMGMT | ||
| 348 | }; | ||
| 349 | #define PSYCHO_ONBOARD_IRQ_BASE 0x20 | ||
| 350 | #define PSYCHO_ONBOARD_IRQ_LAST 0x32 | ||
| 351 | #define psycho_onboard_imap_offset(__ino) \ | ||
| 352 | __psycho_onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE] | ||
| 353 | |||
| 354 | #define PSYCHO_ICLR_A_SLOT0 0x1400UL | ||
| 355 | #define PSYCHO_ICLR_SCSI 0x1800UL | ||
| 356 | |||
| 357 | #define psycho_iclr_offset(ino) \ | ||
| 358 | ((ino & 0x20) ? (PSYCHO_ICLR_SCSI + (((ino) & 0x1f) << 3)) : \ | ||
| 359 | (PSYCHO_ICLR_A_SLOT0 + (((ino) & 0x1f)<<3))) | ||
| 360 | |||
| 361 | static unsigned int psycho_irq_build(struct device_node *dp, | ||
| 362 | unsigned int ino, | ||
| 363 | void *_data) | ||
| 364 | { | ||
| 365 | unsigned long controller_regs = (unsigned long) _data; | ||
| 366 | unsigned long imap, iclr; | ||
| 367 | unsigned long imap_off, iclr_off; | ||
| 368 | int inofixup = 0; | ||
| 369 | |||
| 370 | ino &= 0x3f; | ||
| 371 | if (ino < PSYCHO_ONBOARD_IRQ_BASE) { | ||
| 372 | /* PCI slot */ | ||
| 373 | imap_off = psycho_pcislot_imap_offset(ino); | ||
| 374 | } else { | ||
| 375 | /* Onboard device */ | ||
| 376 | if (ino > PSYCHO_ONBOARD_IRQ_LAST) { | ||
| 377 | prom_printf("psycho_irq_build: Wacky INO [%x]\n", ino); | ||
| 378 | prom_halt(); | ||
| 379 | } | ||
| 380 | imap_off = psycho_onboard_imap_offset(ino); | ||
| 381 | } | ||
| 382 | |||
| 383 | /* Now build the IRQ bucket. */ | ||
| 384 | imap = controller_regs + imap_off; | ||
| 385 | imap += 4; | ||
| 386 | |||
| 387 | iclr_off = psycho_iclr_offset(ino); | ||
| 388 | iclr = controller_regs + iclr_off; | ||
| 389 | iclr += 4; | ||
| 390 | |||
| 391 | if ((ino & 0x20) == 0) | ||
| 392 | inofixup = ino & 0x03; | ||
| 393 | |||
| 394 | return build_irq(inofixup, iclr, imap); | ||
| 395 | } | ||
| 396 | |||
| 397 | static void psycho_irq_trans_init(struct device_node *dp) | ||
| 398 | { | ||
| 399 | struct linux_prom64_registers *regs; | ||
| 400 | |||
| 401 | dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller)); | ||
| 402 | dp->irq_trans->irq_build = psycho_irq_build; | ||
| 403 | |||
| 404 | regs = of_get_property(dp, "reg", NULL); | ||
| 405 | dp->irq_trans->data = (void *) regs[2].phys_addr; | ||
| 406 | } | ||
| 407 | |||
| 408 | #define sabre_read(__reg) \ | ||
| 409 | ({ u64 __ret; \ | ||
| 410 | __asm__ __volatile__("ldxa [%1] %2, %0" \ | ||
| 411 | : "=r" (__ret) \ | ||
| 412 | : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \ | ||
| 413 | : "memory"); \ | ||
| 414 | __ret; \ | ||
| 415 | }) | ||
| 416 | |||
| 417 | struct sabre_irq_data { | ||
| 418 | unsigned long controller_regs; | ||
| 419 | unsigned int pci_first_busno; | ||
| 420 | }; | ||
| 421 | #define SABRE_CONFIGSPACE 0x001000000UL | ||
| 422 | #define SABRE_WRSYNC 0x1c20UL | ||
| 423 | |||
| 424 | #define SABRE_CONFIG_BASE(CONFIG_SPACE) \ | ||
| 425 | (CONFIG_SPACE | (1UL << 24)) | ||
| 426 | #define SABRE_CONFIG_ENCODE(BUS, DEVFN, REG) \ | ||
| 427 | (((unsigned long)(BUS) << 16) | \ | ||
| 428 | ((unsigned long)(DEVFN) << 8) | \ | ||
| 429 | ((unsigned long)(REG))) | ||
| 430 | |||
| 431 | /* When a device lives behind a bridge deeper in the PCI bus topology | ||
| 432 | * than APB, a special sequence must run to make sure all pending DMA | ||
| 433 | * transfers at the time of IRQ delivery are visible in the coherency | ||
| 434 | * domain by the cpu. This sequence is to perform a read on the far | ||
| 435 | * side of the non-APB bridge, then perform a read of Sabre's DMA | ||
| 436 | * write-sync register. | ||
| 437 | */ | ||
| 438 | static void sabre_wsync_handler(unsigned int ino, void *_arg1, void *_arg2) | ||
| 439 | { | ||
| 440 | unsigned int phys_hi = (unsigned int) (unsigned long) _arg1; | ||
| 441 | struct sabre_irq_data *irq_data = _arg2; | ||
| 442 | unsigned long controller_regs = irq_data->controller_regs; | ||
| 443 | unsigned long sync_reg = controller_regs + SABRE_WRSYNC; | ||
| 444 | unsigned long config_space = controller_regs + SABRE_CONFIGSPACE; | ||
| 445 | unsigned int bus, devfn; | ||
| 446 | u16 _unused; | ||
| 447 | |||
| 448 | config_space = SABRE_CONFIG_BASE(config_space); | ||
| 449 | |||
| 450 | bus = (phys_hi >> 16) & 0xff; | ||
| 451 | devfn = (phys_hi >> 8) & 0xff; | ||
| 452 | |||
| 453 | config_space |= SABRE_CONFIG_ENCODE(bus, devfn, 0x00); | ||
| 454 | |||
| 455 | __asm__ __volatile__("membar #Sync\n\t" | ||
| 456 | "lduha [%1] %2, %0\n\t" | ||
| 457 | "membar #Sync" | ||
| 458 | : "=r" (_unused) | ||
| 459 | : "r" ((u16 *) config_space), | ||
| 460 | "i" (ASI_PHYS_BYPASS_EC_E_L) | ||
| 461 | : "memory"); | ||
| 462 | |||
| 463 | sabre_read(sync_reg); | ||
| 464 | } | ||
| 465 | |||
| 466 | #define SABRE_IMAP_A_SLOT0 0x0c00UL | ||
| 467 | #define SABRE_IMAP_B_SLOT0 0x0c20UL | ||
| 468 | #define SABRE_IMAP_SCSI 0x1000UL | ||
| 469 | #define SABRE_IMAP_ETH 0x1008UL | ||
| 470 | #define SABRE_IMAP_BPP 0x1010UL | ||
| 471 | #define SABRE_IMAP_AU_REC 0x1018UL | ||
| 472 | #define SABRE_IMAP_AU_PLAY 0x1020UL | ||
| 473 | #define SABRE_IMAP_PFAIL 0x1028UL | ||
| 474 | #define SABRE_IMAP_KMS 0x1030UL | ||
| 475 | #define SABRE_IMAP_FLPY 0x1038UL | ||
| 476 | #define SABRE_IMAP_SHW 0x1040UL | ||
| 477 | #define SABRE_IMAP_KBD 0x1048UL | ||
| 478 | #define SABRE_IMAP_MS 0x1050UL | ||
| 479 | #define SABRE_IMAP_SER 0x1058UL | ||
| 480 | #define SABRE_IMAP_UE 0x1070UL | ||
| 481 | #define SABRE_IMAP_CE 0x1078UL | ||
| 482 | #define SABRE_IMAP_PCIERR 0x1080UL | ||
| 483 | #define SABRE_IMAP_GFX 0x1098UL | ||
| 484 | #define SABRE_IMAP_EUPA 0x10a0UL | ||
| 485 | #define SABRE_ICLR_A_SLOT0 0x1400UL | ||
| 486 | #define SABRE_ICLR_B_SLOT0 0x1480UL | ||
| 487 | #define SABRE_ICLR_SCSI 0x1800UL | ||
| 488 | #define SABRE_ICLR_ETH 0x1808UL | ||
| 489 | #define SABRE_ICLR_BPP 0x1810UL | ||
| 490 | #define SABRE_ICLR_AU_REC 0x1818UL | ||
| 491 | #define SABRE_ICLR_AU_PLAY 0x1820UL | ||
| 492 | #define SABRE_ICLR_PFAIL 0x1828UL | ||
| 493 | #define SABRE_ICLR_KMS 0x1830UL | ||
| 494 | #define SABRE_ICLR_FLPY 0x1838UL | ||
| 495 | #define SABRE_ICLR_SHW 0x1840UL | ||
| 496 | #define SABRE_ICLR_KBD 0x1848UL | ||
| 497 | #define SABRE_ICLR_MS 0x1850UL | ||
| 498 | #define SABRE_ICLR_SER 0x1858UL | ||
| 499 | #define SABRE_ICLR_UE 0x1870UL | ||
| 500 | #define SABRE_ICLR_CE 0x1878UL | ||
| 501 | #define SABRE_ICLR_PCIERR 0x1880UL | ||
| 502 | |||
| 503 | static unsigned long sabre_pcislot_imap_offset(unsigned long ino) | ||
| 504 | { | ||
| 505 | unsigned int bus = (ino & 0x10) >> 4; | ||
| 506 | unsigned int slot = (ino & 0x0c) >> 2; | ||
| 507 | |||
| 508 | if (bus == 0) | ||
| 509 | return SABRE_IMAP_A_SLOT0 + (slot * 8); | ||
| 510 | else | ||
| 511 | return SABRE_IMAP_B_SLOT0 + (slot * 8); | ||
| 512 | } | ||
| 513 | |||
| 514 | static unsigned long __sabre_onboard_imap_off[] = { | ||
| 515 | /*0x20*/ SABRE_IMAP_SCSI, | ||
| 516 | /*0x21*/ SABRE_IMAP_ETH, | ||
| 517 | /*0x22*/ SABRE_IMAP_BPP, | ||
| 518 | /*0x23*/ SABRE_IMAP_AU_REC, | ||
| 519 | /*0x24*/ SABRE_IMAP_AU_PLAY, | ||
| 520 | /*0x25*/ SABRE_IMAP_PFAIL, | ||
| 521 | /*0x26*/ SABRE_IMAP_KMS, | ||
| 522 | /*0x27*/ SABRE_IMAP_FLPY, | ||
| 523 | /*0x28*/ SABRE_IMAP_SHW, | ||
| 524 | /*0x29*/ SABRE_IMAP_KBD, | ||
| 525 | /*0x2a*/ SABRE_IMAP_MS, | ||
| 526 | /*0x2b*/ SABRE_IMAP_SER, | ||
| 527 | /*0x2c*/ 0 /* reserved */, | ||
| 528 | /*0x2d*/ 0 /* reserved */, | ||
| 529 | /*0x2e*/ SABRE_IMAP_UE, | ||
| 530 | /*0x2f*/ SABRE_IMAP_CE, | ||
| 531 | /*0x30*/ SABRE_IMAP_PCIERR, | ||
| 532 | }; | ||
| 533 | #define SABRE_ONBOARD_IRQ_BASE 0x20 | ||
| 534 | #define SABRE_ONBOARD_IRQ_LAST 0x30 | ||
| 535 | #define sabre_onboard_imap_offset(__ino) \ | ||
| 536 | __sabre_onboard_imap_off[(__ino) - SABRE_ONBOARD_IRQ_BASE] | ||
| 537 | |||
| 538 | #define sabre_iclr_offset(ino) \ | ||
| 539 | ((ino & 0x20) ? (SABRE_ICLR_SCSI + (((ino) & 0x1f) << 3)) : \ | ||
| 540 | (SABRE_ICLR_A_SLOT0 + (((ino) & 0x1f)<<3))) | ||
| 541 | |||
| 542 | static unsigned int sabre_irq_build(struct device_node *dp, | ||
| 543 | unsigned int ino, | ||
| 544 | void *_data) | ||
| 545 | { | ||
| 546 | struct sabre_irq_data *irq_data = _data; | ||
| 547 | unsigned long controller_regs = irq_data->controller_regs; | ||
| 548 | struct linux_prom_pci_registers *regs; | ||
| 549 | unsigned long imap, iclr; | ||
| 550 | unsigned long imap_off, iclr_off; | ||
| 551 | int inofixup = 0; | ||
| 552 | int virt_irq; | ||
| 553 | |||
| 554 | ino &= 0x3f; | ||
| 555 | if (ino < SABRE_ONBOARD_IRQ_BASE) { | ||
| 556 | /* PCI slot */ | ||
| 557 | imap_off = sabre_pcislot_imap_offset(ino); | ||
| 558 | } else { | ||
| 559 | /* onboard device */ | ||
| 560 | if (ino > SABRE_ONBOARD_IRQ_LAST) { | ||
| 561 | prom_printf("sabre_irq_build: Wacky INO [%x]\n", ino); | ||
| 562 | prom_halt(); | ||
| 563 | } | ||
| 564 | imap_off = sabre_onboard_imap_offset(ino); | ||
| 565 | } | ||
| 566 | |||
| 567 | /* Now build the IRQ bucket. */ | ||
| 568 | imap = controller_regs + imap_off; | ||
| 569 | imap += 4; | ||
| 570 | |||
| 571 | iclr_off = sabre_iclr_offset(ino); | ||
| 572 | iclr = controller_regs + iclr_off; | ||
| 573 | iclr += 4; | ||
| 574 | |||
| 575 | if ((ino & 0x20) == 0) | ||
| 576 | inofixup = ino & 0x03; | ||
| 577 | |||
| 578 | virt_irq = build_irq(inofixup, iclr, imap); | ||
| 579 | |||
| 580 | regs = of_get_property(dp, "reg", NULL); | ||
| 581 | if (regs && | ||
| 582 | ((regs->phys_hi >> 16) & 0xff) != irq_data->pci_first_busno) { | ||
| 583 | irq_install_pre_handler(virt_irq, | ||
| 584 | sabre_wsync_handler, | ||
| 585 | (void *) (long) regs->phys_hi, | ||
| 586 | (void *) | ||
| 587 | controller_regs + | ||
| 588 | SABRE_WRSYNC); | ||
| 589 | } | ||
| 590 | |||
| 591 | return virt_irq; | ||
| 592 | } | ||
| 593 | |||
| 594 | static void sabre_irq_trans_init(struct device_node *dp) | ||
| 595 | { | ||
| 596 | struct linux_prom64_registers *regs; | ||
| 597 | struct sabre_irq_data *irq_data; | ||
| 598 | u32 *busrange; | ||
| 599 | |||
| 600 | dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller)); | ||
| 601 | dp->irq_trans->irq_build = sabre_irq_build; | ||
| 602 | |||
| 603 | irq_data = prom_early_alloc(sizeof(struct sabre_irq_data)); | ||
| 604 | |||
| 605 | regs = of_get_property(dp, "reg", NULL); | ||
| 606 | irq_data->controller_regs = regs[0].phys_addr; | ||
| 607 | |||
| 608 | busrange = of_get_property(dp, "bus-range", NULL); | ||
| 609 | irq_data->pci_first_busno = busrange[0]; | ||
| 610 | |||
| 611 | dp->irq_trans->data = irq_data; | ||
| 612 | } | ||
| 613 | |||
| 614 | /* SCHIZO interrupt mapping support. Unlike Psycho, for this controller the | ||
| 615 | * imap/iclr registers are per-PBM. | ||
| 616 | */ | ||
| 617 | #define SCHIZO_IMAP_BASE 0x1000UL | ||
| 618 | #define SCHIZO_ICLR_BASE 0x1400UL | ||
| 619 | |||
| 620 | static unsigned long schizo_imap_offset(unsigned long ino) | ||
| 621 | { | ||
| 622 | return SCHIZO_IMAP_BASE + (ino * 8UL); | ||
| 623 | } | ||
| 624 | |||
| 625 | static unsigned long schizo_iclr_offset(unsigned long ino) | ||
| 626 | { | ||
| 627 | return SCHIZO_ICLR_BASE + (ino * 8UL); | ||
| 628 | } | ||
| 629 | |||
| 630 | static unsigned long schizo_ino_to_iclr(unsigned long pbm_regs, | ||
| 631 | unsigned int ino) | ||
| 632 | { | ||
| 633 | return pbm_regs + schizo_iclr_offset(ino) + 4; | ||
| 634 | } | ||
| 635 | |||
| 636 | static unsigned long schizo_ino_to_imap(unsigned long pbm_regs, | ||
| 637 | unsigned int ino) | ||
| 638 | { | ||
| 639 | return pbm_regs + schizo_imap_offset(ino) + 4; | ||
| 640 | } | ||
| 641 | |||
| 642 | #define schizo_read(__reg) \ | ||
| 643 | ({ u64 __ret; \ | ||
| 644 | __asm__ __volatile__("ldxa [%1] %2, %0" \ | ||
| 645 | : "=r" (__ret) \ | ||
| 646 | : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \ | ||
| 647 | : "memory"); \ | ||
| 648 | __ret; \ | ||
| 649 | }) | ||
| 650 | #define schizo_write(__reg, __val) \ | ||
| 651 | __asm__ __volatile__("stxa %0, [%1] %2" \ | ||
| 652 | : /* no outputs */ \ | ||
| 653 | : "r" (__val), "r" (__reg), \ | ||
| 654 | "i" (ASI_PHYS_BYPASS_EC_E) \ | ||
| 655 | : "memory") | ||
| 656 | |||
| 657 | static void tomatillo_wsync_handler(unsigned int ino, void *_arg1, void *_arg2) | ||
| 658 | { | ||
| 659 | unsigned long sync_reg = (unsigned long) _arg2; | ||
| 660 | u64 mask = 1UL << (ino & IMAP_INO); | ||
| 661 | u64 val; | ||
| 662 | int limit; | ||
| 663 | |||
| 664 | schizo_write(sync_reg, mask); | ||
| 665 | |||
| 666 | limit = 100000; | ||
| 667 | val = 0; | ||
| 668 | while (--limit) { | ||
| 669 | val = schizo_read(sync_reg); | ||
| 670 | if (!(val & mask)) | ||
| 671 | break; | ||
| 672 | } | ||
| 673 | if (limit <= 0) { | ||
| 674 | printk("tomatillo_wsync_handler: DMA won't sync [%lx:%lx]\n", | ||
| 675 | val, mask); | ||
| 676 | } | ||
| 677 | |||
| 678 | if (_arg1) { | ||
| 679 | static unsigned char cacheline[64] | ||
| 680 | __attribute__ ((aligned (64))); | ||
| 681 | |||
| 682 | __asm__ __volatile__("rd %%fprs, %0\n\t" | ||
| 683 | "or %0, %4, %1\n\t" | ||
| 684 | "wr %1, 0x0, %%fprs\n\t" | ||
| 685 | "stda %%f0, [%5] %6\n\t" | ||
| 686 | "wr %0, 0x0, %%fprs\n\t" | ||
| 687 | "membar #Sync" | ||
| 688 | : "=&r" (mask), "=&r" (val) | ||
| 689 | : "0" (mask), "1" (val), | ||
| 690 | "i" (FPRS_FEF), "r" (&cacheline[0]), | ||
| 691 | "i" (ASI_BLK_COMMIT_P)); | ||
| 692 | } | ||
| 693 | } | ||
| 694 | |||
| 695 | struct schizo_irq_data { | ||
| 696 | unsigned long pbm_regs; | ||
| 697 | unsigned long sync_reg; | ||
| 698 | u32 portid; | ||
| 699 | int chip_version; | ||
| 700 | }; | ||
| 701 | |||
| 702 | static unsigned int schizo_irq_build(struct device_node *dp, | ||
| 703 | unsigned int ino, | ||
| 704 | void *_data) | ||
| 705 | { | ||
| 706 | struct schizo_irq_data *irq_data = _data; | ||
| 707 | unsigned long pbm_regs = irq_data->pbm_regs; | ||
| 708 | unsigned long imap, iclr; | ||
| 709 | int ign_fixup; | ||
| 710 | int virt_irq; | ||
| 711 | int is_tomatillo; | ||
| 712 | |||
| 713 | ino &= 0x3f; | ||
| 714 | |||
| 715 | /* Now build the IRQ bucket. */ | ||
| 716 | imap = schizo_ino_to_imap(pbm_regs, ino); | ||
| 717 | iclr = schizo_ino_to_iclr(pbm_regs, ino); | ||
| 718 | |||
| 719 | /* On Schizo, no inofixup occurs. This is because each | ||
| 720 | * INO has it's own IMAP register. On Psycho and Sabre | ||
| 721 | * there is only one IMAP register for each PCI slot even | ||
| 722 | * though four different INOs can be generated by each | ||
| 723 | * PCI slot. | ||
| 724 | * | ||
| 725 | * But, for JBUS variants (essentially, Tomatillo), we have | ||
| 726 | * to fixup the lowest bit of the interrupt group number. | ||
| 727 | */ | ||
| 728 | ign_fixup = 0; | ||
| 729 | |||
| 730 | is_tomatillo = (irq_data->sync_reg != 0UL); | ||
| 731 | |||
| 732 | if (is_tomatillo) { | ||
| 733 | if (irq_data->portid & 1) | ||
| 734 | ign_fixup = (1 << 6); | ||
| 735 | } | ||
| 736 | |||
| 737 | virt_irq = build_irq(ign_fixup, iclr, imap); | ||
| 738 | |||
| 739 | if (is_tomatillo) { | ||
| 740 | irq_install_pre_handler(virt_irq, | ||
| 741 | tomatillo_wsync_handler, | ||
| 742 | ((irq_data->chip_version <= 4) ? | ||
| 743 | (void *) 1 : (void *) 0), | ||
| 744 | (void *) irq_data->sync_reg); | ||
| 745 | } | ||
| 746 | |||
| 747 | return virt_irq; | ||
| 748 | } | ||
| 749 | |||
| 750 | static void schizo_irq_trans_init(struct device_node *dp) | ||
| 751 | { | ||
| 752 | struct linux_prom64_registers *regs; | ||
| 753 | struct schizo_irq_data *irq_data; | ||
| 754 | |||
| 755 | dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller)); | ||
| 756 | dp->irq_trans->irq_build = schizo_irq_build; | ||
| 757 | |||
| 758 | irq_data = prom_early_alloc(sizeof(struct schizo_irq_data)); | ||
| 759 | |||
| 760 | regs = of_get_property(dp, "reg", NULL); | ||
| 761 | dp->irq_trans->data = irq_data; | ||
| 762 | |||
| 763 | irq_data->pbm_regs = regs[0].phys_addr; | ||
| 764 | irq_data->sync_reg = regs[3].phys_addr + 0x1a18UL; | ||
| 765 | irq_data->portid = of_getintprop_default(dp, "portid", 0); | ||
| 766 | irq_data->chip_version = of_getintprop_default(dp, "version#", 0); | ||
| 767 | } | ||
| 768 | |||
| 769 | static unsigned int pci_sun4v_irq_build(struct device_node *dp, | ||
| 770 | unsigned int devino, | ||
| 771 | void *_data) | ||
| 772 | { | ||
| 773 | u32 devhandle = (u32) (unsigned long) _data; | ||
| 774 | |||
| 775 | return sun4v_build_irq(devhandle, devino); | ||
| 776 | } | ||
| 777 | |||
| 778 | static void pci_sun4v_irq_trans_init(struct device_node *dp) | ||
| 779 | { | ||
| 780 | struct linux_prom64_registers *regs; | ||
| 781 | |||
| 782 | dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller)); | ||
| 783 | dp->irq_trans->irq_build = pci_sun4v_irq_build; | ||
| 784 | |||
| 785 | regs = of_get_property(dp, "reg", NULL); | ||
| 786 | dp->irq_trans->data = (void *) (unsigned long) | ||
| 787 | ((regs->phys_addr >> 32UL) & 0x0fffffff); | ||
| 788 | } | ||
| 789 | #endif /* CONFIG_PCI */ | ||
| 790 | |||
| 791 | #ifdef CONFIG_SBUS | ||
| 792 | /* INO number to IMAP register offset for SYSIO external IRQ's. | ||
| 793 | * This should conform to both Sunfire/Wildfire server and Fusion | ||
| 794 | * desktop designs. | ||
| 795 | */ | ||
| 796 | #define SYSIO_IMAP_SLOT0 0x2c04UL | ||
| 797 | #define SYSIO_IMAP_SLOT1 0x2c0cUL | ||
| 798 | #define SYSIO_IMAP_SLOT2 0x2c14UL | ||
| 799 | #define SYSIO_IMAP_SLOT3 0x2c1cUL | ||
| 800 | #define SYSIO_IMAP_SCSI 0x3004UL | ||
| 801 | #define SYSIO_IMAP_ETH 0x300cUL | ||
| 802 | #define SYSIO_IMAP_BPP 0x3014UL | ||
| 803 | #define SYSIO_IMAP_AUDIO 0x301cUL | ||
| 804 | #define SYSIO_IMAP_PFAIL 0x3024UL | ||
| 805 | #define SYSIO_IMAP_KMS 0x302cUL | ||
| 806 | #define SYSIO_IMAP_FLPY 0x3034UL | ||
| 807 | #define SYSIO_IMAP_SHW 0x303cUL | ||
| 808 | #define SYSIO_IMAP_KBD 0x3044UL | ||
| 809 | #define SYSIO_IMAP_MS 0x304cUL | ||
| 810 | #define SYSIO_IMAP_SER 0x3054UL | ||
| 811 | #define SYSIO_IMAP_TIM0 0x3064UL | ||
| 812 | #define SYSIO_IMAP_TIM1 0x306cUL | ||
| 813 | #define SYSIO_IMAP_UE 0x3074UL | ||
| 814 | #define SYSIO_IMAP_CE 0x307cUL | ||
| 815 | #define SYSIO_IMAP_SBERR 0x3084UL | ||
| 816 | #define SYSIO_IMAP_PMGMT 0x308cUL | ||
| 817 | #define SYSIO_IMAP_GFX 0x3094UL | ||
| 818 | #define SYSIO_IMAP_EUPA 0x309cUL | ||
| 819 | |||
| 820 | #define bogon ((unsigned long) -1) | ||
| 821 | static unsigned long sysio_irq_offsets[] = { | ||
| 822 | /* SBUS Slot 0 --> 3, level 1 --> 7 */ | ||
| 823 | SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, | ||
| 824 | SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, | ||
| 825 | SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, | ||
| 826 | SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, | ||
| 827 | SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, | ||
| 828 | SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, | ||
| 829 | SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, | ||
| 830 | SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, | ||
| 831 | |||
| 832 | /* Onboard devices (not relevant/used on SunFire). */ | ||
| 833 | SYSIO_IMAP_SCSI, | ||
| 834 | SYSIO_IMAP_ETH, | ||
| 835 | SYSIO_IMAP_BPP, | ||
| 836 | bogon, | ||
| 837 | SYSIO_IMAP_AUDIO, | ||
| 838 | SYSIO_IMAP_PFAIL, | ||
| 839 | bogon, | ||
| 840 | bogon, | ||
| 841 | SYSIO_IMAP_KMS, | ||
| 842 | SYSIO_IMAP_FLPY, | ||
| 843 | SYSIO_IMAP_SHW, | ||
| 844 | SYSIO_IMAP_KBD, | ||
| 845 | SYSIO_IMAP_MS, | ||
| 846 | SYSIO_IMAP_SER, | ||
| 847 | bogon, | ||
| 848 | bogon, | ||
| 849 | SYSIO_IMAP_TIM0, | ||
| 850 | SYSIO_IMAP_TIM1, | ||
| 851 | bogon, | ||
| 852 | bogon, | ||
| 853 | SYSIO_IMAP_UE, | ||
| 854 | SYSIO_IMAP_CE, | ||
| 855 | SYSIO_IMAP_SBERR, | ||
| 856 | SYSIO_IMAP_PMGMT, | ||
| 857 | }; | ||
| 858 | |||
| 859 | #undef bogon | ||
| 860 | |||
| 861 | #define NUM_SYSIO_OFFSETS ARRAY_SIZE(sysio_irq_offsets) | ||
| 862 | |||
| 863 | /* Convert Interrupt Mapping register pointer to associated | ||
| 864 | * Interrupt Clear register pointer, SYSIO specific version. | ||
| 865 | */ | ||
| 866 | #define SYSIO_ICLR_UNUSED0 0x3400UL | ||
| 867 | #define SYSIO_ICLR_SLOT0 0x340cUL | ||
| 868 | #define SYSIO_ICLR_SLOT1 0x344cUL | ||
| 869 | #define SYSIO_ICLR_SLOT2 0x348cUL | ||
| 870 | #define SYSIO_ICLR_SLOT3 0x34ccUL | ||
| 871 | static unsigned long sysio_imap_to_iclr(unsigned long imap) | ||
| 872 | { | ||
| 873 | unsigned long diff = SYSIO_ICLR_UNUSED0 - SYSIO_IMAP_SLOT0; | ||
| 874 | return imap + diff; | ||
| 875 | } | ||
| 876 | |||
| 877 | static unsigned int sbus_of_build_irq(struct device_node *dp, | ||
| 878 | unsigned int ino, | ||
| 879 | void *_data) | ||
| 880 | { | ||
| 881 | unsigned long reg_base = (unsigned long) _data; | ||
| 882 | struct linux_prom_registers *regs; | ||
| 883 | unsigned long imap, iclr; | ||
| 884 | int sbus_slot = 0; | ||
| 885 | int sbus_level = 0; | ||
| 886 | |||
| 887 | ino &= 0x3f; | ||
| 888 | |||
| 889 | regs = of_get_property(dp, "reg", NULL); | ||
| 890 | if (regs) | ||
| 891 | sbus_slot = regs->which_io; | ||
| 892 | |||
| 893 | if (ino < 0x20) | ||
| 894 | ino += (sbus_slot * 8); | ||
| 895 | |||
| 896 | imap = sysio_irq_offsets[ino]; | ||
| 897 | if (imap == ((unsigned long)-1)) { | ||
| 898 | prom_printf("get_irq_translations: Bad SYSIO INO[%x]\n", | ||
| 899 | ino); | ||
| 900 | prom_halt(); | ||
| 901 | } | ||
| 902 | imap += reg_base; | ||
| 903 | |||
| 904 | /* SYSIO inconsistency. For external SLOTS, we have to select | ||
| 905 | * the right ICLR register based upon the lower SBUS irq level | ||
| 906 | * bits. | ||
| 907 | */ | ||
| 908 | if (ino >= 0x20) { | ||
| 909 | iclr = sysio_imap_to_iclr(imap); | ||
| 910 | } else { | ||
| 911 | sbus_level = ino & 0x7; | ||
| 912 | |||
| 913 | switch(sbus_slot) { | ||
| 914 | case 0: | ||
| 915 | iclr = reg_base + SYSIO_ICLR_SLOT0; | ||
| 916 | break; | ||
| 917 | case 1: | ||
| 918 | iclr = reg_base + SYSIO_ICLR_SLOT1; | ||
| 919 | break; | ||
| 920 | case 2: | ||
| 921 | iclr = reg_base + SYSIO_ICLR_SLOT2; | ||
| 922 | break; | ||
| 923 | default: | ||
| 924 | case 3: | ||
| 925 | iclr = reg_base + SYSIO_ICLR_SLOT3; | ||
| 926 | break; | ||
| 927 | }; | ||
| 928 | |||
| 929 | iclr += ((unsigned long)sbus_level - 1UL) * 8UL; | ||
| 930 | } | ||
| 931 | return build_irq(sbus_level, iclr, imap); | ||
| 932 | } | ||
| 933 | |||
| 934 | static void sbus_irq_trans_init(struct device_node *dp) | ||
| 935 | { | ||
| 936 | struct linux_prom64_registers *regs; | ||
| 937 | |||
| 938 | dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller)); | ||
| 939 | dp->irq_trans->irq_build = sbus_of_build_irq; | ||
| 940 | |||
| 941 | regs = of_get_property(dp, "reg", NULL); | ||
| 942 | dp->irq_trans->data = (void *) (unsigned long) regs->phys_addr; | ||
| 943 | } | ||
| 944 | #endif /* CONFIG_SBUS */ | ||
| 945 | |||
| 946 | |||
| 947 | static unsigned int central_build_irq(struct device_node *dp, | ||
| 948 | unsigned int ino, | ||
| 949 | void *_data) | ||
| 950 | { | ||
| 951 | struct device_node *central_dp = _data; | ||
| 952 | struct of_device *central_op = of_find_device_by_node(central_dp); | ||
| 953 | struct resource *res; | ||
| 954 | unsigned long imap, iclr; | ||
| 955 | u32 tmp; | ||
| 956 | |||
| 957 | if (!strcmp(dp->name, "eeprom")) { | ||
| 958 | res = ¢ral_op->resource[5]; | ||
| 959 | } else if (!strcmp(dp->name, "zs")) { | ||
| 960 | res = ¢ral_op->resource[4]; | ||
| 961 | } else if (!strcmp(dp->name, "clock-board")) { | ||
| 962 | res = ¢ral_op->resource[3]; | ||
| 963 | } else { | ||
| 964 | return ino; | ||
| 965 | } | ||
| 966 | |||
| 967 | imap = res->start + 0x00UL; | ||
| 968 | iclr = res->start + 0x10UL; | ||
| 969 | |||
| 970 | /* Set the INO state to idle, and disable. */ | ||
| 971 | upa_writel(0, iclr); | ||
| 972 | upa_readl(iclr); | ||
| 973 | |||
| 974 | tmp = upa_readl(imap); | ||
| 975 | tmp &= ~0x80000000; | ||
| 976 | upa_writel(tmp, imap); | ||
| 977 | |||
| 978 | return build_irq(0, iclr, imap); | ||
| 979 | } | ||
| 980 | |||
| 981 | static void central_irq_trans_init(struct device_node *dp) | ||
| 982 | { | ||
| 983 | dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller)); | ||
| 984 | dp->irq_trans->irq_build = central_build_irq; | ||
| 985 | |||
| 986 | dp->irq_trans->data = dp; | ||
| 987 | } | ||
| 988 | |||
| 989 | struct irq_trans { | ||
| 990 | const char *name; | ||
| 991 | void (*init)(struct device_node *); | ||
| 992 | }; | ||
| 993 | |||
| 994 | #ifdef CONFIG_PCI | ||
| 995 | static struct irq_trans pci_irq_trans_table[] = { | ||
| 996 | { "SUNW,sabre", sabre_irq_trans_init }, | ||
| 997 | { "pci108e,a000", sabre_irq_trans_init }, | ||
| 998 | { "pci108e,a001", sabre_irq_trans_init }, | ||
| 999 | { "SUNW,psycho", psycho_irq_trans_init }, | ||
| 1000 | { "pci108e,8000", psycho_irq_trans_init }, | ||
| 1001 | { "SUNW,schizo", schizo_irq_trans_init }, | ||
| 1002 | { "pci108e,8001", schizo_irq_trans_init }, | ||
| 1003 | { "SUNW,schizo+", schizo_irq_trans_init }, | ||
| 1004 | { "pci108e,8002", schizo_irq_trans_init }, | ||
| 1005 | { "SUNW,tomatillo", schizo_irq_trans_init }, | ||
| 1006 | { "pci108e,a801", schizo_irq_trans_init }, | ||
| 1007 | { "SUNW,sun4v-pci", pci_sun4v_irq_trans_init }, | ||
| 1008 | }; | ||
| 1009 | #endif | ||
| 1010 | |||
| 1011 | static unsigned int sun4v_vdev_irq_build(struct device_node *dp, | ||
| 1012 | unsigned int devino, | ||
| 1013 | void *_data) | ||
| 1014 | { | ||
| 1015 | u32 devhandle = (u32) (unsigned long) _data; | ||
| 1016 | |||
| 1017 | return sun4v_build_irq(devhandle, devino); | ||
| 1018 | } | ||
| 1019 | |||
| 1020 | static void sun4v_vdev_irq_trans_init(struct device_node *dp) | ||
| 1021 | { | ||
| 1022 | struct linux_prom64_registers *regs; | ||
| 1023 | |||
| 1024 | dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller)); | ||
| 1025 | dp->irq_trans->irq_build = sun4v_vdev_irq_build; | ||
| 1026 | |||
| 1027 | regs = of_get_property(dp, "reg", NULL); | ||
| 1028 | dp->irq_trans->data = (void *) (unsigned long) | ||
| 1029 | ((regs->phys_addr >> 32UL) & 0x0fffffff); | ||
| 1030 | } | ||
| 1031 | |||
| 1032 | static void irq_trans_init(struct device_node *dp) | ||
| 1033 | { | ||
| 1034 | const char *model; | ||
| 1035 | int i; | ||
| 1036 | |||
| 1037 | model = of_get_property(dp, "model", NULL); | ||
| 1038 | if (!model) | ||
| 1039 | model = of_get_property(dp, "compatible", NULL); | ||
| 1040 | if (!model) | ||
| 1041 | return; | ||
| 1042 | |||
| 1043 | #ifdef CONFIG_PCI | ||
| 1044 | for (i = 0; i < ARRAY_SIZE(pci_irq_trans_table); i++) { | ||
| 1045 | struct irq_trans *t = &pci_irq_trans_table[i]; | ||
| 1046 | |||
| 1047 | if (!strcmp(model, t->name)) | ||
| 1048 | return t->init(dp); | ||
| 1049 | } | ||
| 1050 | #endif | ||
| 1051 | #ifdef CONFIG_SBUS | ||
| 1052 | if (!strcmp(dp->name, "sbus") || | ||
| 1053 | !strcmp(dp->name, "sbi")) | ||
| 1054 | return sbus_irq_trans_init(dp); | ||
| 1055 | #endif | ||
| 1056 | if (!strcmp(dp->name, "central")) | ||
| 1057 | return central_irq_trans_init(dp->child); | ||
| 1058 | if (!strcmp(dp->name, "virtual-devices")) | ||
| 1059 | return sun4v_vdev_irq_trans_init(dp); | ||
| 1060 | } | ||
| 1061 | |||
| 256 | static int is_root_node(const struct device_node *dp) | 1062 | static int is_root_node(const struct device_node *dp) |
| 257 | { | 1063 | { |
| 258 | if (!dp) | 1064 | if (!dp) |
| @@ -676,10 +1482,10 @@ static struct device_node * __init create_node(phandle node) | |||
| 676 | dp->type = get_one_property(node, "device_type"); | 1482 | dp->type = get_one_property(node, "device_type"); |
| 677 | dp->node = node; | 1483 | dp->node = node; |
| 678 | 1484 | ||
| 679 | /* Build interrupts later... */ | ||
| 680 | |||
| 681 | dp->properties = build_prop_list(node); | 1485 | dp->properties = build_prop_list(node); |
| 682 | 1486 | ||
| 1487 | irq_trans_init(dp); | ||
| 1488 | |||
| 683 | return dp; | 1489 | return dp; |
| 684 | } | 1490 | } |
| 685 | 1491 | ||
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index 7130e866f935..3522cd66f3bb 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 5 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #include <asm/asi.h> | 9 | #include <asm/asi.h> |
| 11 | #include <asm/pstate.h> | 10 | #include <asm/pstate.h> |
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index ac05e0f692ef..ef68aa4fec65 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c | |||
| @@ -1221,9 +1221,7 @@ static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus) | |||
| 1221 | 1221 | ||
| 1222 | /* Now some Xfire specific grot... */ | 1222 | /* Now some Xfire specific grot... */ |
| 1223 | if (this_is_starfire) | 1223 | if (this_is_starfire) |
| 1224 | sbus->starfire_cookie = starfire_hookup(sbus->portid); | 1224 | starfire_hookup(sbus->portid); |
| 1225 | else | ||
| 1226 | sbus->starfire_cookie = NULL; | ||
| 1227 | 1225 | ||
| 1228 | sysio_register_error_handlers(sbus); | 1226 | sysio_register_error_handlers(sbus); |
| 1229 | } | 1227 | } |
| @@ -1269,8 +1267,6 @@ int __init sbus_arch_preinit(void) | |||
| 1269 | void __init sbus_arch_postinit(void) | 1267 | void __init sbus_arch_postinit(void) |
| 1270 | { | 1268 | { |
| 1271 | extern void firetruck_init(void); | 1269 | extern void firetruck_init(void); |
| 1272 | extern void clock_probe(void); | ||
| 1273 | 1270 | ||
| 1274 | firetruck_init(); | 1271 | firetruck_init(); |
| 1275 | clock_probe(); | ||
| 1276 | } | 1272 | } |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 116d9632002d..a73140466e01 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/a.out.h> | 18 | #include <linux/a.out.h> |
| 19 | #include <linux/tty.h> | 19 | #include <linux/tty.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
| 23 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
| 24 | #include <linux/syscalls.h> | 23 | #include <linux/syscalls.h> |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index ca11a4c457d4..96d56a8410ad 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 8 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #ifdef CONFIG_SPARC32_COMPAT | 11 | #ifdef CONFIG_SPARC32_COMPAT |
| 13 | #include <linux/compat.h> /* for compat_old_sigset_t */ | 12 | #include <linux/compat.h> /* for compat_old_sigset_t */ |
| 14 | #endif | 13 | #endif |
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 4ac35dd2088b..4173de425f09 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #define EXPORT_SYMTAB_STROPS | 10 | #define EXPORT_SYMTAB_STROPS |
| 11 | #define PROMLIB_INTERNAL | 11 | #define PROMLIB_INTERNAL |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c index ae859d40771e..b930fee7708a 100644 --- a/arch/sparc64/kernel/starfire.c +++ b/arch/sparc64/kernel/starfire.c | |||
| @@ -54,7 +54,7 @@ struct starfire_irqinfo { | |||
| 54 | static struct starfire_irqinfo *sflist = NULL; | 54 | static struct starfire_irqinfo *sflist = NULL; |
| 55 | 55 | ||
| 56 | /* Beam me up Scott(McNeil)y... */ | 56 | /* Beam me up Scott(McNeil)y... */ |
| 57 | void *starfire_hookup(int upaid) | 57 | void starfire_hookup(int upaid) |
| 58 | { | 58 | { |
| 59 | struct starfire_irqinfo *p; | 59 | struct starfire_irqinfo *p; |
| 60 | unsigned long treg_base, hwmid, i; | 60 | unsigned long treg_base, hwmid, i; |
| @@ -81,8 +81,6 @@ void *starfire_hookup(int upaid) | |||
| 81 | p->upaid = upaid; | 81 | p->upaid = upaid; |
| 82 | p->next = sflist; | 82 | p->next = sflist; |
| 83 | sflist = p; | 83 | sflist = p; |
| 84 | |||
| 85 | return (void *) p; | ||
| 86 | } | 84 | } |
| 87 | 85 | ||
| 88 | unsigned int starfire_translate(unsigned long imap, | 86 | unsigned int starfire_translate(unsigned long imap, |
diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S index bdf1f4d02e3f..c09ab4b9431d 100644 --- a/arch/sparc64/kernel/sys32.S +++ b/arch/sparc64/kernel/sys32.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) | 6 | * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
| 11 | 10 | ||
| 12 | /* NOTE: call as jump breaks return stack, we have to avoid that */ | 11 | /* NOTE: call as jump breaks return stack, we have to avoid that */ |
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index 7a869138c37f..51c056df528e 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * platform. | 6 | * platform. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index 31030bf00f1a..c88ae23ce812 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * environment. | 8 | * environment. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/capability.h> | 13 | #include <linux/capability.h> |
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c index ae5b32f817f0..87ebdf858a3a 100644 --- a/arch/sparc64/kernel/sys_sunos32.c +++ b/arch/sparc64/kernel/sys_sunos32.c | |||
| @@ -155,7 +155,7 @@ asmlinkage int sunos_brk(u32 baddr) | |||
| 155 | * simple, it hopefully works in most obvious cases.. Easy to | 155 | * simple, it hopefully works in most obvious cases.. Easy to |
| 156 | * fool it, but this should catch most mistakes. | 156 | * fool it, but this should catch most mistakes. |
| 157 | */ | 157 | */ |
| 158 | freepages = get_page_cache_size(); | 158 | freepages = global_page_state(NR_FILE_PAGES); |
| 159 | freepages >>= 1; | 159 | freepages >>= 1; |
| 160 | freepages += nr_free_pages(); | 160 | freepages += nr_free_pages(); |
| 161 | freepages += nr_swap_pages; | 161 | freepages += nr_swap_pages; |
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S index 1136fc465e37..419a63fca172 100644 --- a/arch/sparc64/kernel/systbls.S +++ b/arch/sparc64/kernel/systbls.S | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) | 10 | * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | .text | 14 | .text |
| 16 | .align 4 | 15 | .align 4 |
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index 348b82035561..8dcbfbffacc9 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) | 9 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| @@ -38,11 +37,8 @@ | |||
| 38 | #include <asm/timer.h> | 37 | #include <asm/timer.h> |
| 39 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 40 | #include <asm/io.h> | 39 | #include <asm/io.h> |
| 41 | #include <asm/sbus.h> | 40 | #include <asm/prom.h> |
| 42 | #include <asm/fhc.h> | 41 | #include <asm/of_device.h> |
| 43 | #include <asm/pbm.h> | ||
| 44 | #include <asm/ebus.h> | ||
| 45 | #include <asm/isa.h> | ||
| 46 | #include <asm/starfire.h> | 42 | #include <asm/starfire.h> |
| 47 | #include <asm/smp.h> | 43 | #include <asm/smp.h> |
| 48 | #include <asm/sections.h> | 44 | #include <asm/sections.h> |
| @@ -770,237 +766,106 @@ static int __init clock_model_matches(char *model) | |||
| 770 | return 1; | 766 | return 1; |
| 771 | } | 767 | } |
| 772 | 768 | ||
| 773 | static void __init __clock_assign_common(void __iomem *addr, char *model) | 769 | static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match) |
| 774 | { | 770 | { |
| 775 | if (model[5] == '0' && model[6] == '2') { | 771 | struct device_node *dp = op->node; |
| 776 | mstk48t02_regs = addr; | 772 | char *model = of_get_property(dp, "model", NULL); |
| 777 | } else if(model[5] == '0' && model[6] == '8') { | 773 | unsigned long size, flags; |
| 778 | mstk48t08_regs = addr; | 774 | void __iomem *regs; |
| 779 | mstk48t02_regs = mstk48t08_regs + MOSTEK_48T08_48T02; | ||
| 780 | } else { | ||
| 781 | mstk48t59_regs = addr; | ||
| 782 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; | ||
| 783 | } | ||
| 784 | } | ||
| 785 | |||
| 786 | static void __init clock_assign_clk_reg(struct linux_prom_registers *clk_reg, | ||
| 787 | char *model) | ||
| 788 | { | ||
| 789 | unsigned long addr; | ||
| 790 | |||
| 791 | addr = ((unsigned long) clk_reg[0].phys_addr | | ||
| 792 | (((unsigned long) clk_reg[0].which_io) << 32UL)); | ||
| 793 | |||
| 794 | __clock_assign_common((void __iomem *) addr, model); | ||
| 795 | } | ||
| 796 | |||
| 797 | static int __init clock_probe_central(void) | ||
| 798 | { | ||
| 799 | struct linux_prom_registers clk_reg[2], *pr; | ||
| 800 | struct device_node *dp; | ||
| 801 | char *model; | ||
| 802 | 775 | ||
| 803 | if (!central_bus) | 776 | if (!model || !clock_model_matches(model)) |
| 804 | return 0; | 777 | return -ENODEV; |
| 805 | |||
| 806 | /* Get Central FHC's prom node. */ | ||
| 807 | dp = central_bus->child->prom_node; | ||
| 808 | |||
| 809 | /* Then get the first child device below it. */ | ||
| 810 | dp = dp->child; | ||
| 811 | |||
| 812 | while (dp) { | ||
| 813 | model = of_get_property(dp, "model", NULL); | ||
| 814 | if (!model || !clock_model_matches(model)) | ||
| 815 | goto next_sibling; | ||
| 816 | |||
| 817 | pr = of_get_property(dp, "reg", NULL); | ||
| 818 | memcpy(clk_reg, pr, sizeof(clk_reg)); | ||
| 819 | |||
| 820 | apply_fhc_ranges(central_bus->child, clk_reg, 1); | ||
| 821 | apply_central_ranges(central_bus, clk_reg, 1); | ||
| 822 | |||
| 823 | clock_assign_clk_reg(clk_reg, model); | ||
| 824 | return 1; | ||
| 825 | 778 | ||
| 826 | next_sibling: | 779 | /* On an Enterprise system there can be multiple mostek clocks. |
| 827 | dp = dp->sibling; | 780 | * We should only match the one that is on the central FHC bus. |
| 828 | } | 781 | */ |
| 782 | if (!strcmp(dp->parent->name, "fhc") && | ||
| 783 | strcmp(dp->parent->parent->name, "central") != 0) | ||
| 784 | return -ENODEV; | ||
| 829 | 785 | ||
| 830 | return 0; | 786 | size = (op->resource[0].end - op->resource[0].start) + 1; |
| 831 | } | 787 | regs = of_ioremap(&op->resource[0], 0, size, "clock"); |
| 788 | if (!regs) | ||
| 789 | return -ENOMEM; | ||
| 832 | 790 | ||
| 833 | #ifdef CONFIG_PCI | ||
| 834 | static void __init clock_isa_ebus_assign_regs(struct resource *res, char *model) | ||
| 835 | { | ||
| 836 | if (!strcmp(model, "ds1287") || | 791 | if (!strcmp(model, "ds1287") || |
| 837 | !strcmp(model, "m5819") || | 792 | !strcmp(model, "m5819") || |
| 838 | !strcmp(model, "m5819p") || | 793 | !strcmp(model, "m5819p") || |
| 839 | !strcmp(model, "m5823")) { | 794 | !strcmp(model, "m5823")) { |
| 840 | ds1287_regs = res->start; | 795 | ds1287_regs = (unsigned long) regs; |
| 796 | } else if (model[5] == '0' && model[6] == '2') { | ||
| 797 | mstk48t02_regs = regs; | ||
| 798 | } else if(model[5] == '0' && model[6] == '8') { | ||
| 799 | mstk48t08_regs = regs; | ||
| 800 | mstk48t02_regs = mstk48t08_regs + MOSTEK_48T08_48T02; | ||
| 841 | } else { | 801 | } else { |
| 842 | mstk48t59_regs = (void __iomem *) res->start; | 802 | mstk48t59_regs = regs; |
| 843 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; | 803 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; |
| 844 | } | 804 | } |
| 845 | } | ||
| 846 | |||
| 847 | static int __init clock_probe_one_ebus_dev(struct linux_ebus_device *edev) | ||
| 848 | { | ||
| 849 | struct device_node *dp = edev->prom_node; | ||
| 850 | char *model; | ||
| 851 | |||
| 852 | model = of_get_property(dp, "model", NULL); | ||
| 853 | if (!clock_model_matches(model)) | ||
| 854 | return 0; | ||
| 855 | 805 | ||
| 856 | clock_isa_ebus_assign_regs(&edev->resource[0], model); | 806 | printk(KERN_INFO "%s: Clock regs at %p\n", dp->full_name, regs); |
| 857 | 807 | ||
| 858 | return 1; | 808 | local_irq_save(flags); |
| 859 | } | ||
| 860 | |||
| 861 | static int __init clock_probe_ebus(void) | ||
| 862 | { | ||
| 863 | struct linux_ebus *ebus; | ||
| 864 | 809 | ||
| 865 | for_each_ebus(ebus) { | 810 | if (mstk48t02_regs != NULL) { |
| 866 | struct linux_ebus_device *edev; | 811 | /* Report a low battery voltage condition. */ |
| 812 | if (has_low_battery()) | ||
| 813 | prom_printf("NVRAM: Low battery voltage!\n"); | ||
| 867 | 814 | ||
| 868 | for_each_ebusdev(edev, ebus) { | 815 | /* Kick start the clock if it is completely stopped. */ |
| 869 | if (clock_probe_one_ebus_dev(edev)) | 816 | if (mostek_read(mstk48t02_regs + MOSTEK_SEC) & MSTK_STOP) |
| 870 | return 1; | 817 | kick_start_clock(); |
| 871 | } | ||
| 872 | } | 818 | } |
| 873 | 819 | ||
| 874 | return 0; | 820 | set_system_time(); |
| 875 | } | 821 | |
| 876 | 822 | local_irq_restore(flags); | |
| 877 | static int __init clock_probe_one_isa_dev(struct sparc_isa_device *idev) | ||
| 878 | { | ||
| 879 | struct device_node *dp = idev->prom_node; | ||
| 880 | char *model; | ||
| 881 | |||
| 882 | model = of_get_property(dp, "model", NULL); | ||
| 883 | if (!clock_model_matches(model)) | ||
| 884 | return 0; | ||
| 885 | |||
| 886 | clock_isa_ebus_assign_regs(&idev->resource, model); | ||
| 887 | |||
| 888 | return 1; | ||
| 889 | } | ||
| 890 | |||
| 891 | static int __init clock_probe_isa(void) | ||
| 892 | { | ||
| 893 | struct sparc_isa_bridge *isa_br; | ||
| 894 | |||
| 895 | for_each_isa(isa_br) { | ||
| 896 | struct sparc_isa_device *isa_dev; | ||
| 897 | |||
| 898 | for_each_isadev(isa_dev, isa_br) { | ||
| 899 | if (clock_probe_one_isa_dev(isa_dev)) | ||
| 900 | return 1; | ||
| 901 | } | ||
| 902 | } | ||
| 903 | 823 | ||
| 904 | return 0; | 824 | return 0; |
| 905 | } | 825 | } |
| 906 | #endif /* CONFIG_PCI */ | ||
| 907 | |||
| 908 | #ifdef CONFIG_SBUS | ||
| 909 | static int __init clock_probe_one_sbus_dev(struct sbus_bus *sbus, struct sbus_dev *sdev) | ||
| 910 | { | ||
| 911 | struct resource *res; | ||
| 912 | char model[64]; | ||
| 913 | void __iomem *addr; | ||
| 914 | |||
| 915 | prom_getstring(sdev->prom_node, "model", model, sizeof(model)); | ||
| 916 | if (!clock_model_matches(model)) | ||
| 917 | return 0; | ||
| 918 | |||
| 919 | res = &sdev->resource[0]; | ||
| 920 | addr = sbus_ioremap(res, 0, 0x800UL, "eeprom"); | ||
| 921 | 826 | ||
| 922 | __clock_assign_common(addr, model); | 827 | static struct of_device_id clock_match[] = { |
| 923 | 828 | { | |
| 924 | return 1; | 829 | .name = "eeprom", |
| 925 | } | 830 | }, |
| 926 | 831 | { | |
| 927 | static int __init clock_probe_sbus(void) | 832 | .name = "rtc", |
| 928 | { | 833 | }, |
| 929 | struct sbus_bus *sbus; | 834 | {}, |
| 930 | 835 | }; | |
| 931 | for_each_sbus(sbus) { | ||
| 932 | struct sbus_dev *sdev; | ||
| 933 | |||
| 934 | for_each_sbusdev(sdev, sbus) { | ||
| 935 | if (clock_probe_one_sbus_dev(sbus, sdev)) | ||
| 936 | return 1; | ||
| 937 | } | ||
| 938 | } | ||
| 939 | 836 | ||
| 940 | return 0; | 837 | static struct of_platform_driver clock_driver = { |
| 941 | } | 838 | .name = "clock", |
| 942 | #endif | 839 | .match_table = clock_match, |
| 840 | .probe = clock_probe, | ||
| 841 | }; | ||
| 943 | 842 | ||
| 944 | void __init clock_probe(void) | 843 | static int __init clock_init(void) |
| 945 | { | 844 | { |
| 946 | static int invoked; | ||
| 947 | unsigned long flags; | ||
| 948 | |||
| 949 | if (invoked) | ||
| 950 | return; | ||
| 951 | invoked = 1; | ||
| 952 | |||
| 953 | if (this_is_starfire) { | 845 | if (this_is_starfire) { |
| 954 | xtime.tv_sec = starfire_get_time(); | 846 | xtime.tv_sec = starfire_get_time(); |
| 955 | xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); | 847 | xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); |
| 956 | set_normalized_timespec(&wall_to_monotonic, | 848 | set_normalized_timespec(&wall_to_monotonic, |
| 957 | -xtime.tv_sec, -xtime.tv_nsec); | 849 | -xtime.tv_sec, -xtime.tv_nsec); |
| 958 | return; | 850 | return 0; |
| 959 | } | 851 | } |
| 960 | if (tlb_type == hypervisor) { | 852 | if (tlb_type == hypervisor) { |
| 961 | xtime.tv_sec = hypervisor_get_time(); | 853 | xtime.tv_sec = hypervisor_get_time(); |
| 962 | xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); | 854 | xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); |
| 963 | set_normalized_timespec(&wall_to_monotonic, | 855 | set_normalized_timespec(&wall_to_monotonic, |
| 964 | -xtime.tv_sec, -xtime.tv_nsec); | 856 | -xtime.tv_sec, -xtime.tv_nsec); |
| 965 | return; | 857 | return 0; |
| 966 | } | ||
| 967 | |||
| 968 | /* Check FHC Central then EBUSs then ISA bridges then SBUSs. | ||
| 969 | * That way we handle the presence of multiple properly. | ||
| 970 | * | ||
| 971 | * As a special case, machines with Central must provide the | ||
| 972 | * timer chip there. | ||
| 973 | */ | ||
| 974 | if (!clock_probe_central() && | ||
| 975 | #ifdef CONFIG_PCI | ||
| 976 | !clock_probe_ebus() && | ||
| 977 | !clock_probe_isa() && | ||
| 978 | #endif | ||
| 979 | #ifdef CONFIG_SBUS | ||
| 980 | !clock_probe_sbus() | ||
| 981 | #endif | ||
| 982 | ) { | ||
| 983 | printk(KERN_WARNING "No clock chip found.\n"); | ||
| 984 | return; | ||
| 985 | } | ||
| 986 | |||
| 987 | local_irq_save(flags); | ||
| 988 | |||
| 989 | if (mstk48t02_regs != NULL) { | ||
| 990 | /* Report a low battery voltage condition. */ | ||
| 991 | if (has_low_battery()) | ||
| 992 | prom_printf("NVRAM: Low battery voltage!\n"); | ||
| 993 | |||
| 994 | /* Kick start the clock if it is completely stopped. */ | ||
| 995 | if (mostek_read(mstk48t02_regs + MOSTEK_SEC) & MSTK_STOP) | ||
| 996 | kick_start_clock(); | ||
| 997 | } | 858 | } |
| 998 | 859 | ||
| 999 | set_system_time(); | 860 | return of_register_driver(&clock_driver, &of_bus_type); |
| 1000 | |||
| 1001 | local_irq_restore(flags); | ||
| 1002 | } | 861 | } |
| 1003 | 862 | ||
| 863 | /* Must be after subsys_initcall() so that busses are probed. Must | ||
| 864 | * be before device_initcall() because things like the RTC driver | ||
| 865 | * need to see the clock registers. | ||
| 866 | */ | ||
| 867 | fs_initcall(clock_init); | ||
| 868 | |||
| 1004 | /* This is gets the master TICK_INT timer going. */ | 869 | /* This is gets the master TICK_INT timer going. */ |
| 1005 | static unsigned long sparc64_init_timers(void) | 870 | static unsigned long sparc64_init_timers(void) |
| 1006 | { | 871 | { |
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index 1ff34b019f3f..68420e2dad0e 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * I like traps on v9, :)))) | 9 | * I like traps on v9, :)))) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/sched.h> /* for jiffies */ | 13 | #include <linux/sched.h> /* for jiffies */ |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/sparc64/kernel/tsb.S b/arch/sparc64/kernel/tsb.S index a0c8ba58920b..eedf94fa5664 100644 --- a/arch/sparc64/kernel/tsb.S +++ b/arch/sparc64/kernel/tsb.S | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright (C) 2006 David S. Miller <davem@davemloft.net> | 3 | * Copyright (C) 2006 David S. Miller <davem@davemloft.net> |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #include <asm/tsb.h> | 7 | #include <asm/tsb.h> |
| 9 | #include <asm/hypervisor.h> | 8 | #include <asm/hypervisor.h> |
diff --git a/arch/sparc64/kernel/ttable.S b/arch/sparc64/kernel/ttable.S index ee45ca2d7a04..d7d2a8bdc66e 100644 --- a/arch/sparc64/kernel/ttable.S +++ b/arch/sparc64/kernel/ttable.S | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright (C) 1996, 2001, 2006 David S. Miller (davem@davemloft.net) | 3 | * Copyright (C) 1996, 2001, 2006 David S. Miller (davem@davemloft.net) |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | .globl sparc64_ttable_tl0, sparc64_ttable_tl1 | 7 | .globl sparc64_ttable_tl0, sparc64_ttable_tl1 |
| 9 | .globl tl0_icpe, tl1_icpe | 8 | .globl tl0_icpe, tl1_icpe |
diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c index bb2d68577855..a9b765271b85 100644 --- a/arch/sparc64/kernel/unaligned.c +++ b/arch/sparc64/kernel/unaligned.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/smp.h> | 20 | #include <linux/smp.h> |
| 21 | #include <linux/smp_lock.h> | 21 | #include <linux/smp_lock.h> |
| 22 | #include <linux/bitops.h> | 22 | #include <linux/bitops.h> |
| 23 | #include <linux/kallsyms.h> | ||
| 23 | #include <asm/fpumacro.h> | 24 | #include <asm/fpumacro.h> |
| 24 | 25 | ||
| 25 | /* #define DEBUG_MNA */ | 26 | /* #define DEBUG_MNA */ |
| @@ -291,7 +292,8 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn) | |||
| 291 | if (count < 5) { | 292 | if (count < 5) { |
| 292 | last_time = jiffies; | 293 | last_time = jiffies; |
| 293 | count++; | 294 | count++; |
| 294 | printk("Kernel unaligned access at TPC[%lx]\n", regs->tpc); | 295 | printk("Kernel unaligned access at TPC[%lx] ", regs->tpc); |
| 296 | print_symbol("%s\n", regs->tpc); | ||
| 295 | } | 297 | } |
| 296 | 298 | ||
| 297 | if (!ok_for_kernel(insn) || dir == both) { | 299 | if (!ok_for_kernel(insn) || dir == both) { |
diff --git a/arch/sparc64/lib/atomic.S b/arch/sparc64/lib/atomic.S index faf87c31598b..9633750167d0 100644 --- a/arch/sparc64/lib/atomic.S +++ b/arch/sparc64/lib/atomic.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
| 9 | 8 | ||
| 10 | .text | 9 | .text |
diff --git a/arch/sparc64/lib/bitops.S b/arch/sparc64/lib/bitops.S index 31afbfe6c1e8..892431a82131 100644 --- a/arch/sparc64/lib/bitops.S +++ b/arch/sparc64/lib/bitops.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 2000 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 2000 David S. Miller (davem@redhat.com) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
| 9 | 8 | ||
| 10 | .text | 9 | .text |
diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S index 2ef2e268bdcf..9e4534b485c7 100644 --- a/arch/sparc64/lib/mcount.S +++ b/arch/sparc64/lib/mcount.S | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * This can also be tweaked for kernel stack overflow detection. | 5 | * This can also be tweaked for kernel stack overflow detection. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
| 10 | 9 | ||
| 11 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c index fbbbebbad8a4..53b9b1f528e5 100644 --- a/arch/sparc64/mm/hugetlbpage.c +++ b/arch/sparc64/mm/hugetlbpage.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 2002, 2003, 2006 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 2002, 2003, 2006 David S. Miller (davem@davemloft.net) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index cb75a27adb51..dcba4e6ab570 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1997-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 5 | * Copyright (C) 1997-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index f8479fad4047..d70b60a3bbcc 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
| 9 | #include <asm/pgtable.h> | 8 | #include <asm/pgtable.h> |
| 10 | #include <asm/page.h> | 9 | #include <asm/page.h> |
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 577bde8b6647..0b4213720d43 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 6 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c index 719c90905a1e..8135ec322c9c 100644 --- a/arch/sparc64/solaris/misc.c +++ b/arch/sparc64/solaris/misc.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/smp_lock.h> | 9 | #include <linux/smp_lock.h> |
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index dfd88b652fbe..dffd1184c956 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 | |||
| @@ -6,9 +6,11 @@ START := 0x60000000 | |||
| 6 | 6 | ||
| 7 | #We #undef __x86_64__ for kernelspace, not for userspace where | 7 | #We #undef __x86_64__ for kernelspace, not for userspace where |
| 8 | #it's needed for headers to work! | 8 | #it's needed for headers to work! |
| 9 | CFLAGS += -U__$(SUBARCH)__ -fno-builtin | 9 | CFLAGS += -U__$(SUBARCH)__ -fno-builtin -m64 |
| 10 | USER_CFLAGS += -fno-builtin | 10 | USER_CFLAGS += -fno-builtin -m64 |
| 11 | CHECKFLAGS += -m64 | 11 | CHECKFLAGS += -m64 |
| 12 | AFLAGS += -m64 | ||
| 13 | LDFLAGS += -m elf_x86_64 | ||
| 12 | 14 | ||
| 13 | ELF_ARCH := i386:x86-64 | 15 | ELF_ARCH := i386:x86-64 |
| 14 | ELF_FORMAT := elf64-x86-64 | 16 | ELF_FORMAT := elf64-x86-64 |
| @@ -16,3 +18,4 @@ ELF_FORMAT := elf64-x86-64 | |||
| 16 | # Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example. | 18 | # Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example. |
| 17 | 19 | ||
| 18 | LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64 | 20 | LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64 |
| 21 | LINK-y += -m64 | ||
diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c index d18a974735e6..64ff22aa077b 100644 --- a/arch/um/drivers/harddog_kern.c +++ b/arch/um/drivers/harddog_kern.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 40 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 41 | #include <linux/fs.h> | 40 | #include <linux/fs.h> |
diff --git a/arch/um/drivers/stderr_console.c b/arch/um/drivers/stderr_console.c index 429ae8e6c7e5..6d2cf32a9e8f 100644 --- a/arch/um/drivers/stderr_console.c +++ b/arch/um/drivers/stderr_console.c | |||
| @@ -8,10 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | /* | 9 | /* |
| 10 | * Don't register by default -- as this registeres very early in the | 10 | * Don't register by default -- as this registeres very early in the |
| 11 | * boot process it becomes the default console. And as this isn't a | 11 | * boot process it becomes the default console. |
| 12 | * real tty driver init isn't able to open /dev/console then. | ||
| 13 | * | ||
| 14 | * In most cases this isn't what you want ... | ||
| 15 | */ | 12 | */ |
| 16 | static int use_stderr_console = 0; | 13 | static int use_stderr_console = 0; |
| 17 | 14 | ||
| @@ -43,3 +40,20 @@ static int stderr_setup(char *str) | |||
| 43 | return 1; | 40 | return 1; |
| 44 | } | 41 | } |
| 45 | __setup("stderr=", stderr_setup); | 42 | __setup("stderr=", stderr_setup); |
| 43 | |||
| 44 | /* The previous behavior of not unregistering led to /dev/console being | ||
| 45 | * impossible to open. My FC5 filesystem started having init die, and the | ||
| 46 | * system panicing because of this. Unregistering causes the real | ||
| 47 | * console to become the default console, and /dev/console can then be | ||
| 48 | * opened. Making this an initcall makes this happen late enough that | ||
| 49 | * there is no added value in dumping everything to stderr, and the | ||
| 50 | * normal console is good enough to show you all available output. | ||
| 51 | */ | ||
| 52 | static int __init unregister_stderr(void) | ||
| 53 | { | ||
| 54 | unregister_console(&stderr_console); | ||
| 55 | |||
| 56 | return 0; | ||
| 57 | } | ||
| 58 | |||
| 59 | __initcall(unregister_stderr); | ||
diff --git a/arch/um/include/sysdep-x86_64/kernel-offsets.h b/arch/um/include/sysdep-x86_64/kernel-offsets.h index 939cc475757a..91d129fb3930 100644 --- a/arch/um/include/sysdep-x86_64/kernel-offsets.h +++ b/arch/um/include/sysdep-x86_64/kernel-offsets.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/stddef.h> | 1 | #include <linux/stddef.h> |
| 3 | #include <linux/sched.h> | 2 | #include <linux/sched.h> |
| 4 | #include <linux/time.h> | 3 | #include <linux/time.h> |
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index c5c9885a8297..624ca238d1fd 100644 --- a/arch/um/kernel/skas/mmu.c +++ b/arch/um/kernel/skas/mmu.c | |||
| @@ -152,7 +152,7 @@ void destroy_context_skas(struct mm_struct *mm) | |||
| 152 | free_page(mmu->id.stack); | 152 | free_page(mmu->id.stack); |
| 153 | pte_lock_deinit(virt_to_page(mmu->last_page_table)); | 153 | pte_lock_deinit(virt_to_page(mmu->last_page_table)); |
| 154 | pte_free_kernel((pte_t *) mmu->last_page_table); | 154 | pte_free_kernel((pte_t *) mmu->last_page_table); |
| 155 | dec_page_state(nr_page_table_pages); | 155 | dec_zone_page_state(virt_to_page(mmu->last_page_table), NR_PAGETABLE); |
| 156 | #ifdef CONFIG_3_LEVEL_PGTABLES | 156 | #ifdef CONFIG_3_LEVEL_PGTABLES |
| 157 | pmd_free((pmd_t *) mmu->last_pmd); | 157 | pmd_free((pmd_t *) mmu->last_pmd); |
| 158 | #endif | 158 | #endif |
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c index 5992c3257167..8912cec0fe43 100644 --- a/arch/um/kernel/skas/uaccess.c +++ b/arch/um/kernel/skas/uaccess.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include "linux/kernel.h" | 8 | #include "linux/kernel.h" |
| 9 | #include "linux/string.h" | 9 | #include "linux/string.h" |
| 10 | #include "linux/fs.h" | 10 | #include "linux/fs.h" |
| 11 | #include "linux/hardirq.h" | ||
| 11 | #include "linux/highmem.h" | 12 | #include "linux/highmem.h" |
| 12 | #include "asm/page.h" | 13 | #include "asm/page.h" |
| 13 | #include "asm/pgtable.h" | 14 | #include "asm/pgtable.h" |
| @@ -38,7 +39,7 @@ static unsigned long maybe_map(unsigned long virt, int is_write) | |||
| 38 | return((unsigned long) phys); | 39 | return((unsigned long) phys); |
| 39 | } | 40 | } |
| 40 | 41 | ||
| 41 | static int do_op(unsigned long addr, int len, int is_write, | 42 | static int do_op_one_page(unsigned long addr, int len, int is_write, |
| 42 | int (*op)(unsigned long addr, int len, void *arg), void *arg) | 43 | int (*op)(unsigned long addr, int len, void *arg), void *arg) |
| 43 | { | 44 | { |
| 44 | struct page *page; | 45 | struct page *page; |
| @@ -49,9 +50,11 @@ static int do_op(unsigned long addr, int len, int is_write, | |||
| 49 | return(-1); | 50 | return(-1); |
| 50 | 51 | ||
| 51 | page = phys_to_page(addr); | 52 | page = phys_to_page(addr); |
| 52 | addr = (unsigned long) kmap(page) + (addr & ~PAGE_MASK); | 53 | addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) + (addr & ~PAGE_MASK); |
| 54 | |||
| 53 | n = (*op)(addr, len, arg); | 55 | n = (*op)(addr, len, arg); |
| 54 | kunmap(page); | 56 | |
| 57 | kunmap_atomic(page, KM_UML_USERCOPY); | ||
| 55 | 58 | ||
| 56 | return(n); | 59 | return(n); |
| 57 | } | 60 | } |
| @@ -77,7 +80,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr) | |||
| 77 | remain = len; | 80 | remain = len; |
| 78 | 81 | ||
| 79 | current->thread.fault_catcher = jmpbuf; | 82 | current->thread.fault_catcher = jmpbuf; |
| 80 | n = do_op(addr, size, is_write, op, arg); | 83 | n = do_op_one_page(addr, size, is_write, op, arg); |
| 81 | if(n != 0){ | 84 | if(n != 0){ |
| 82 | *res = (n < 0 ? remain : 0); | 85 | *res = (n < 0 ? remain : 0); |
| 83 | goto out; | 86 | goto out; |
| @@ -91,7 +94,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr) | |||
| 91 | } | 94 | } |
| 92 | 95 | ||
| 93 | while(addr < ((addr + remain) & PAGE_MASK)){ | 96 | while(addr < ((addr + remain) & PAGE_MASK)){ |
| 94 | n = do_op(addr, PAGE_SIZE, is_write, op, arg); | 97 | n = do_op_one_page(addr, PAGE_SIZE, is_write, op, arg); |
| 95 | if(n != 0){ | 98 | if(n != 0){ |
| 96 | *res = (n < 0 ? remain : 0); | 99 | *res = (n < 0 ? remain : 0); |
| 97 | goto out; | 100 | goto out; |
| @@ -105,7 +108,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr) | |||
| 105 | goto out; | 108 | goto out; |
| 106 | } | 109 | } |
| 107 | 110 | ||
| 108 | n = do_op(addr, remain, is_write, op, arg); | 111 | n = do_op_one_page(addr, remain, is_write, op, arg); |
| 109 | if(n != 0) | 112 | if(n != 0) |
| 110 | *res = (n < 0 ? remain : 0); | 113 | *res = (n < 0 ? remain : 0); |
| 111 | else *res = 0; | 114 | else *res = 0; |
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c deleted file mode 100644 index 8fa2ae7f3026..000000000000 --- a/arch/um/kernel/time.c +++ /dev/null | |||
| @@ -1,172 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) | ||
| 3 | * Licensed under the GPL | ||
| 4 | */ | ||
| 5 | |||
| 6 | #include <stdio.h> | ||
| 7 | #include <stdlib.h> | ||
| 8 | #include <unistd.h> | ||
| 9 | #include <time.h> | ||
| 10 | #include <sys/time.h> | ||
| 11 | #include <signal.h> | ||
| 12 | #include <errno.h> | ||
| 13 | #include "user_util.h" | ||
| 14 | #include "kern_util.h" | ||
| 15 | #include "user.h" | ||
| 16 | #include "process.h" | ||
| 17 | #include "time_user.h" | ||
| 18 | #include "kern_constants.h" | ||
| 19 | #include "os.h" | ||
| 20 | |||
| 21 | /* XXX This really needs to be declared and initialized in a kernel file since | ||
| 22 | * it's in <linux/time.h> | ||
| 23 | */ | ||
| 24 | extern struct timespec wall_to_monotonic; | ||
| 25 | |||
| 26 | extern struct timeval xtime; | ||
| 27 | |||
| 28 | struct timeval local_offset = { 0, 0 }; | ||
| 29 | |||
| 30 | void timer(void) | ||
| 31 | { | ||
| 32 | gettimeofday(&xtime, NULL); | ||
| 33 | timeradd(&xtime, &local_offset, &xtime); | ||
| 34 | } | ||
| 35 | |||
| 36 | static void set_interval(int timer_type) | ||
| 37 | { | ||
| 38 | int usec = 1000000/hz(); | ||
| 39 | struct itimerval interval = ((struct itimerval) { { 0, usec }, | ||
| 40 | { 0, usec } }); | ||
| 41 | |||
| 42 | if(setitimer(timer_type, &interval, NULL) == -1) | ||
| 43 | panic("setitimer failed - errno = %d\n", errno); | ||
| 44 | } | ||
| 45 | |||
| 46 | void enable_timer(void) | ||
| 47 | { | ||
| 48 | set_interval(ITIMER_VIRTUAL); | ||
| 49 | } | ||
| 50 | |||
| 51 | void prepare_timer(void * ptr) | ||
| 52 | { | ||
| 53 | int usec = 1000000/hz(); | ||
| 54 | *(struct itimerval *)ptr = ((struct itimerval) { { 0, usec }, | ||
| 55 | { 0, usec }}); | ||
| 56 | } | ||
| 57 | |||
| 58 | void disable_timer(void) | ||
| 59 | { | ||
| 60 | struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }}); | ||
| 61 | if((setitimer(ITIMER_VIRTUAL, &disable, NULL) < 0) || | ||
| 62 | (setitimer(ITIMER_REAL, &disable, NULL) < 0)) | ||
| 63 | printk("disnable_timer - setitimer failed, errno = %d\n", | ||
| 64 | errno); | ||
| 65 | /* If there are signals already queued, after unblocking ignore them */ | ||
| 66 | set_handler(SIGALRM, SIG_IGN, 0, -1); | ||
| 67 | set_handler(SIGVTALRM, SIG_IGN, 0, -1); | ||
| 68 | } | ||
| 69 | |||
| 70 | void switch_timers(int to_real) | ||
| 71 | { | ||
| 72 | struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }}); | ||
| 73 | struct itimerval enable = ((struct itimerval) { { 0, 1000000/hz() }, | ||
| 74 | { 0, 1000000/hz() }}); | ||
| 75 | int old, new; | ||
| 76 | |||
| 77 | if(to_real){ | ||
| 78 | old = ITIMER_VIRTUAL; | ||
| 79 | new = ITIMER_REAL; | ||
| 80 | } | ||
| 81 | else { | ||
| 82 | old = ITIMER_REAL; | ||
| 83 | new = ITIMER_VIRTUAL; | ||
| 84 | } | ||
| 85 | |||
| 86 | if((setitimer(old, &disable, NULL) < 0) || | ||
| 87 | (setitimer(new, &enable, NULL))) | ||
| 88 | printk("switch_timers - setitimer failed, errno = %d\n", | ||
| 89 | errno); | ||
| 90 | } | ||
| 91 | |||
| 92 | void uml_idle_timer(void) | ||
| 93 | { | ||
| 94 | if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR) | ||
| 95 | panic("Couldn't unset SIGVTALRM handler"); | ||
| 96 | |||
| 97 | set_handler(SIGALRM, (__sighandler_t) alarm_handler, | ||
| 98 | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); | ||
| 99 | set_interval(ITIMER_REAL); | ||
| 100 | } | ||
| 101 | |||
| 102 | extern void ktime_get_ts(struct timespec *ts); | ||
| 103 | #define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts) | ||
| 104 | |||
| 105 | void time_init(void) | ||
| 106 | { | ||
| 107 | struct timespec now; | ||
| 108 | |||
| 109 | if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR) | ||
| 110 | panic("Couldn't set SIGVTALRM handler"); | ||
| 111 | set_interval(ITIMER_VIRTUAL); | ||
| 112 | |||
| 113 | do_posix_clock_monotonic_gettime(&now); | ||
| 114 | wall_to_monotonic.tv_sec = -now.tv_sec; | ||
| 115 | wall_to_monotonic.tv_nsec = -now.tv_nsec; | ||
| 116 | } | ||
| 117 | |||
| 118 | /* Defined in linux/ktimer.h, which can't be included here */ | ||
| 119 | #define clock_was_set() do { } while (0) | ||
| 120 | |||
| 121 | void do_gettimeofday(struct timeval *tv) | ||
| 122 | { | ||
| 123 | unsigned long flags; | ||
| 124 | |||
| 125 | flags = time_lock(); | ||
| 126 | gettimeofday(tv, NULL); | ||
| 127 | timeradd(tv, &local_offset, tv); | ||
| 128 | time_unlock(flags); | ||
| 129 | clock_was_set(); | ||
| 130 | } | ||
| 131 | |||
| 132 | int do_settimeofday(struct timespec *tv) | ||
| 133 | { | ||
| 134 | struct timeval now; | ||
| 135 | unsigned long flags; | ||
| 136 | struct timeval tv_in; | ||
| 137 | |||
| 138 | if ((unsigned long) tv->tv_nsec >= UM_NSEC_PER_SEC) | ||
| 139 | return -EINVAL; | ||
| 140 | |||
| 141 | tv_in.tv_sec = tv->tv_sec; | ||
| 142 | tv_in.tv_usec = tv->tv_nsec / 1000; | ||
| 143 | |||
| 144 | flags = time_lock(); | ||
| 145 | gettimeofday(&now, NULL); | ||
| 146 | timersub(&tv_in, &now, &local_offset); | ||
| 147 | time_unlock(flags); | ||
| 148 | |||
| 149 | return(0); | ||
| 150 | } | ||
| 151 | |||
| 152 | void idle_sleep(int secs) | ||
| 153 | { | ||
| 154 | struct timespec ts; | ||
| 155 | |||
| 156 | ts.tv_sec = secs; | ||
| 157 | ts.tv_nsec = 0; | ||
| 158 | nanosleep(&ts, NULL); | ||
| 159 | } | ||
| 160 | |||
| 161 | /* XXX This partly duplicates init_irq_signals */ | ||
| 162 | |||
| 163 | void user_time_init(void) | ||
| 164 | { | ||
| 165 | set_handler(SIGVTALRM, (__sighandler_t) alarm_handler, | ||
| 166 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, | ||
| 167 | SIGALRM, SIGUSR2, -1); | ||
| 168 | set_handler(SIGALRM, (__sighandler_t) alarm_handler, | ||
| 169 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, | ||
| 170 | SIGVTALRM, SIGUSR2, -1); | ||
| 171 | set_interval(ITIMER_VIRTUAL); | ||
| 172 | } | ||
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c index 87cdbc560d36..820fa3615a3f 100644 --- a/arch/um/kernel/time_kern.c +++ b/arch/um/kernel/time_kern.c | |||
| @@ -96,11 +96,15 @@ void time_init_kern(void) | |||
| 96 | 96 | ||
| 97 | void do_boot_timer_handler(struct sigcontext * sc) | 97 | void do_boot_timer_handler(struct sigcontext * sc) |
| 98 | { | 98 | { |
| 99 | unsigned long flags; | ||
| 99 | struct pt_regs regs; | 100 | struct pt_regs regs; |
| 100 | 101 | ||
| 101 | CHOOSE_MODE((void) (UPT_SC(®s.regs) = sc), | 102 | CHOOSE_MODE((void) (UPT_SC(®s.regs) = sc), |
| 102 | (void) (regs.regs.skas.is_user = 0)); | 103 | (void) (regs.regs.skas.is_user = 0)); |
| 104 | |||
| 105 | write_seqlock_irqsave(&xtime_lock, flags); | ||
| 103 | do_timer(®s); | 106 | do_timer(®s); |
| 107 | write_sequnlock_irqrestore(&xtime_lock, flags); | ||
| 104 | } | 108 | } |
| 105 | 109 | ||
| 106 | static DEFINE_SPINLOCK(timer_spinlock); | 110 | static DEFINE_SPINLOCK(timer_spinlock); |
| @@ -125,25 +129,17 @@ irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs) | |||
| 125 | unsigned long long nsecs; | 129 | unsigned long long nsecs; |
| 126 | unsigned long flags; | 130 | unsigned long flags; |
| 127 | 131 | ||
| 132 | write_seqlock_irqsave(&xtime_lock, flags); | ||
| 133 | |||
| 128 | do_timer(regs); | 134 | do_timer(regs); |
| 129 | 135 | ||
| 130 | write_seqlock_irqsave(&xtime_lock, flags); | ||
| 131 | nsecs = get_time() + local_offset; | 136 | nsecs = get_time() + local_offset; |
| 132 | xtime.tv_sec = nsecs / NSEC_PER_SEC; | 137 | xtime.tv_sec = nsecs / NSEC_PER_SEC; |
| 133 | xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC; | 138 | xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC; |
| 134 | write_sequnlock_irqrestore(&xtime_lock, flags); | ||
| 135 | |||
| 136 | return(IRQ_HANDLED); | ||
| 137 | } | ||
| 138 | 139 | ||
| 139 | long um_time(int __user *tloc) | 140 | write_sequnlock_irqrestore(&xtime_lock, flags); |
| 140 | { | ||
| 141 | long ret = get_time() / NSEC_PER_SEC; | ||
| 142 | |||
| 143 | if((tloc != NULL) && put_user(ret, tloc)) | ||
| 144 | return -EFAULT; | ||
| 145 | 141 | ||
| 146 | return ret; | 142 | return IRQ_HANDLED; |
| 147 | } | 143 | } |
| 148 | 144 | ||
| 149 | void do_gettimeofday(struct timeval *tv) | 145 | void do_gettimeofday(struct timeval *tv) |
| @@ -174,18 +170,6 @@ static inline void set_time(unsigned long long nsecs) | |||
| 174 | clock_was_set(); | 170 | clock_was_set(); |
| 175 | } | 171 | } |
| 176 | 172 | ||
| 177 | long um_stime(int __user *tptr) | ||
| 178 | { | ||
| 179 | int value; | ||
| 180 | |||
| 181 | if (get_user(value, tptr)) | ||
| 182 | return -EFAULT; | ||
| 183 | |||
| 184 | set_time((unsigned long long) value * NSEC_PER_SEC); | ||
| 185 | |||
| 186 | return 0; | ||
| 187 | } | ||
| 188 | |||
| 189 | int do_settimeofday(struct timespec *tv) | 173 | int do_settimeofday(struct timespec *tv) |
| 190 | { | 174 | { |
| 191 | set_time((unsigned long long) tv->tv_sec * NSEC_PER_SEC + tv->tv_nsec); | 175 | set_time((unsigned long long) tv->tv_sec * NSEC_PER_SEC + tv->tv_nsec); |
diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S index 1660a769674b..72acdce205e0 100644 --- a/arch/um/kernel/vmlinux.lds.S +++ b/arch/um/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/config.h> | 1 | /* in case the preprocessor is a 32bit one */ |
| 2 | #undef i386 | ||
| 2 | #ifdef CONFIG_LD_SCRIPT_STATIC | 3 | #ifdef CONFIG_LD_SCRIPT_STATIC |
| 3 | #include "uml.lds.S" | 4 | #include "uml.lds.S" |
| 4 | #else | 5 | #else |
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c index c6432e729241..560c8063c77c 100644 --- a/arch/um/os-Linux/mem.c +++ b/arch/um/os-Linux/mem.c | |||
| @@ -55,7 +55,7 @@ static void __init find_tempdir(void) | |||
| 55 | */ | 55 | */ |
| 56 | static int next(int fd, char *buf, int size, char c) | 56 | static int next(int fd, char *buf, int size, char c) |
| 57 | { | 57 | { |
| 58 | int n; | 58 | int n, len; |
| 59 | char *ptr; | 59 | char *ptr; |
| 60 | 60 | ||
| 61 | while((ptr = strchr(buf, c)) == NULL){ | 61 | while((ptr = strchr(buf, c)) == NULL){ |
| @@ -69,7 +69,17 @@ static int next(int fd, char *buf, int size, char c) | |||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | ptr++; | 71 | ptr++; |
| 72 | memmove(buf, ptr, strlen(ptr) + 1); | 72 | len = strlen(ptr); |
| 73 | memmove(buf, ptr, len + 1); | ||
| 74 | |||
| 75 | /* Refill the buffer so that if there's a partial string that we care | ||
| 76 | * about, it will be completed, and we can recognize it. | ||
| 77 | */ | ||
| 78 | n = read(fd, &buf[len], size - len - 1); | ||
| 79 | if(n < 0) | ||
| 80 | return -errno; | ||
| 81 | |||
| 82 | buf[len + n] = '\0'; | ||
| 73 | return 1; | 83 | return 1; |
| 74 | } | 84 | } |
| 75 | 85 | ||
| @@ -200,8 +210,11 @@ int create_tmp_file(unsigned long long len) | |||
| 200 | exit(1); | 210 | exit(1); |
| 201 | } | 211 | } |
| 202 | 212 | ||
| 203 | if (lseek64(fd, len, SEEK_SET) < 0) { | 213 | /* Seek to len - 1 because writing a character there will |
| 204 | perror("os_seek_file"); | 214 | * increase the file size by one byte, to the desired length. |
| 215 | */ | ||
| 216 | if (lseek64(fd, len - 1, SEEK_SET) < 0) { | ||
| 217 | perror("os_seek_file"); | ||
| 205 | exit(1); | 218 | exit(1); |
| 206 | } | 219 | } |
| 207 | 220 | ||
diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c index 362db059fe30..48092b95c8ab 100644 --- a/arch/um/os-Linux/umid.c +++ b/arch/um/os-Linux/umid.c | |||
| @@ -67,32 +67,53 @@ err: | |||
| 67 | return err; | 67 | return err; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static int actually_do_remove(char *dir) | 70 | /* |
| 71 | * Unlinks the files contained in @dir and then removes @dir. | ||
| 72 | * Doesn't handle directory trees, so it's not like rm -rf, but almost such. We | ||
| 73 | * ignore ENOENT errors for anything (they happen, strangely enough - possibly due | ||
| 74 | * to races between multiple dying UML threads). | ||
| 75 | */ | ||
| 76 | static int remove_files_and_dir(char *dir) | ||
| 71 | { | 77 | { |
| 72 | DIR *directory; | 78 | DIR *directory; |
| 73 | struct dirent *ent; | 79 | struct dirent *ent; |
| 74 | int len; | 80 | int len; |
| 75 | char file[256]; | 81 | char file[256]; |
| 82 | int ret; | ||
| 76 | 83 | ||
| 77 | directory = opendir(dir); | 84 | directory = opendir(dir); |
| 78 | if(directory == NULL) | 85 | if (directory == NULL) { |
| 79 | return -errno; | 86 | if (errno != ENOENT) |
| 87 | return -errno; | ||
| 88 | else | ||
| 89 | return 0; | ||
| 90 | } | ||
| 80 | 91 | ||
| 81 | while((ent = readdir(directory)) != NULL){ | 92 | while ((ent = readdir(directory)) != NULL) { |
| 82 | if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) | 93 | if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) |
| 83 | continue; | 94 | continue; |
| 84 | len = strlen(dir) + sizeof("/") + strlen(ent->d_name) + 1; | 95 | len = strlen(dir) + sizeof("/") + strlen(ent->d_name) + 1; |
| 85 | if(len > sizeof(file)) | 96 | if (len > sizeof(file)) { |
| 86 | return -E2BIG; | 97 | ret = -E2BIG; |
| 98 | goto out; | ||
| 99 | } | ||
| 87 | 100 | ||
| 88 | sprintf(file, "%s/%s", dir, ent->d_name); | 101 | sprintf(file, "%s/%s", dir, ent->d_name); |
| 89 | if(unlink(file) < 0) | 102 | if (unlink(file) < 0 && errno != ENOENT) { |
| 90 | return -errno; | 103 | ret = -errno; |
| 104 | goto out; | ||
| 105 | } | ||
| 91 | } | 106 | } |
| 92 | if(rmdir(dir) < 0) | ||
| 93 | return -errno; | ||
| 94 | 107 | ||
| 95 | return 0; | 108 | if (rmdir(dir) < 0 && errno != ENOENT) { |
| 109 | ret = -errno; | ||
| 110 | goto out; | ||
| 111 | } | ||
| 112 | |||
| 113 | ret = 0; | ||
| 114 | out: | ||
| 115 | closedir(directory); | ||
| 116 | return ret; | ||
| 96 | } | 117 | } |
| 97 | 118 | ||
| 98 | /* This says that there isn't already a user of the specified directory even if | 119 | /* This says that there isn't already a user of the specified directory even if |
| @@ -103,9 +124,10 @@ static int actually_do_remove(char *dir) | |||
| 103 | * something other than UML sticking stuff in the directory | 124 | * something other than UML sticking stuff in the directory |
| 104 | * this boot racing with a shutdown of the other UML | 125 | * this boot racing with a shutdown of the other UML |
| 105 | * In any of these cases, the directory isn't useful for anything else. | 126 | * In any of these cases, the directory isn't useful for anything else. |
| 127 | * | ||
| 128 | * Boolean return: 1 if in use, 0 otherwise. | ||
| 106 | */ | 129 | */ |
| 107 | 130 | static inline int is_umdir_used(char *dir) | |
| 108 | static int not_dead_yet(char *dir) | ||
| 109 | { | 131 | { |
| 110 | char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; | 132 | char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; |
| 111 | char pid[sizeof("nnnnn\0")], *end; | 133 | char pid[sizeof("nnnnn\0")], *end; |
| @@ -113,7 +135,7 @@ static int not_dead_yet(char *dir) | |||
| 113 | 135 | ||
| 114 | n = snprintf(file, sizeof(file), "%s/pid", dir); | 136 | n = snprintf(file, sizeof(file), "%s/pid", dir); |
| 115 | if(n >= sizeof(file)){ | 137 | if(n >= sizeof(file)){ |
| 116 | printk("not_dead_yet - pid filename too long\n"); | 138 | printk("is_umdir_used - pid filename too long\n"); |
| 117 | err = -E2BIG; | 139 | err = -E2BIG; |
| 118 | goto out; | 140 | goto out; |
| 119 | } | 141 | } |
| @@ -123,7 +145,7 @@ static int not_dead_yet(char *dir) | |||
| 123 | if(fd < 0) { | 145 | if(fd < 0) { |
| 124 | fd = -errno; | 146 | fd = -errno; |
| 125 | if(fd != -ENOENT){ | 147 | if(fd != -ENOENT){ |
| 126 | printk("not_dead_yet : couldn't open pid file '%s', " | 148 | printk("is_umdir_used : couldn't open pid file '%s', " |
| 127 | "err = %d\n", file, -fd); | 149 | "err = %d\n", file, -fd); |
| 128 | } | 150 | } |
| 129 | goto out; | 151 | goto out; |
| @@ -132,18 +154,18 @@ static int not_dead_yet(char *dir) | |||
| 132 | err = 0; | 154 | err = 0; |
| 133 | n = read(fd, pid, sizeof(pid)); | 155 | n = read(fd, pid, sizeof(pid)); |
| 134 | if(n < 0){ | 156 | if(n < 0){ |
| 135 | printk("not_dead_yet : couldn't read pid file '%s', " | 157 | printk("is_umdir_used : couldn't read pid file '%s', " |
| 136 | "err = %d\n", file, errno); | 158 | "err = %d\n", file, errno); |
| 137 | goto out_close; | 159 | goto out_close; |
| 138 | } else if(n == 0){ | 160 | } else if(n == 0){ |
| 139 | printk("not_dead_yet : couldn't read pid file '%s', " | 161 | printk("is_umdir_used : couldn't read pid file '%s', " |
| 140 | "0-byte read\n", file); | 162 | "0-byte read\n", file); |
| 141 | goto out_close; | 163 | goto out_close; |
| 142 | } | 164 | } |
| 143 | 165 | ||
| 144 | p = strtoul(pid, &end, 0); | 166 | p = strtoul(pid, &end, 0); |
| 145 | if(end == pid){ | 167 | if(end == pid){ |
| 146 | printk("not_dead_yet : couldn't parse pid file '%s', " | 168 | printk("is_umdir_used : couldn't parse pid file '%s', " |
| 147 | "errno = %d\n", file, errno); | 169 | "errno = %d\n", file, errno); |
| 148 | goto out_close; | 170 | goto out_close; |
| 149 | } | 171 | } |
| @@ -153,19 +175,32 @@ static int not_dead_yet(char *dir) | |||
| 153 | return 1; | 175 | return 1; |
| 154 | } | 176 | } |
| 155 | 177 | ||
| 156 | err = actually_do_remove(dir); | ||
| 157 | if(err) | ||
| 158 | printk("not_dead_yet - actually_do_remove failed with " | ||
| 159 | "err = %d\n", err); | ||
| 160 | |||
| 161 | return err; | ||
| 162 | |||
| 163 | out_close: | 178 | out_close: |
| 164 | close(fd); | 179 | close(fd); |
| 165 | out: | 180 | out: |
| 166 | return 0; | 181 | return 0; |
| 167 | } | 182 | } |
| 168 | 183 | ||
| 184 | /* | ||
| 185 | * Try to remove the directory @dir unless it's in use. | ||
| 186 | * Precondition: @dir exists. | ||
| 187 | * Returns 0 for success, < 0 for failure in removal or if the directory is in | ||
| 188 | * use. | ||
| 189 | */ | ||
| 190 | static int umdir_take_if_dead(char *dir) | ||
| 191 | { | ||
| 192 | int ret; | ||
| 193 | if (is_umdir_used(dir)) | ||
| 194 | return -EEXIST; | ||
| 195 | |||
| 196 | ret = remove_files_and_dir(dir); | ||
| 197 | if (ret) { | ||
| 198 | printk("is_umdir_used - remove_files_and_dir failed with " | ||
| 199 | "err = %d\n", ret); | ||
| 200 | } | ||
| 201 | return ret; | ||
| 202 | } | ||
| 203 | |||
| 169 | static void __init create_pid_file(void) | 204 | static void __init create_pid_file(void) |
| 170 | { | 205 | { |
| 171 | char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; | 206 | char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; |
| @@ -244,11 +279,7 @@ int __init make_umid(void) | |||
| 244 | if(err != -EEXIST) | 279 | if(err != -EEXIST) |
| 245 | goto err; | 280 | goto err; |
| 246 | 281 | ||
| 247 | /* 1 -> this umid is already in use | 282 | if (umdir_take_if_dead(tmp) < 0) |
| 248 | * < 0 -> we couldn't remove the umid directory | ||
| 249 | * In either case, we can't use this umid, so return -EEXIST. | ||
| 250 | */ | ||
| 251 | if(not_dead_yet(tmp) != 0) | ||
| 252 | goto err; | 283 | goto err; |
| 253 | 284 | ||
| 254 | err = mkdir(tmp, 0777); | 285 | err = mkdir(tmp, 0777); |
| @@ -344,9 +375,9 @@ static void remove_umid_dir(void) | |||
| 344 | char dir[strlen(uml_dir) + UMID_LEN + 1], err; | 375 | char dir[strlen(uml_dir) + UMID_LEN + 1], err; |
| 345 | 376 | ||
| 346 | sprintf(dir, "%s%s", uml_dir, umid); | 377 | sprintf(dir, "%s%s", uml_dir, umid); |
| 347 | err = actually_do_remove(dir); | 378 | err = remove_files_and_dir(dir); |
| 348 | if(err) | 379 | if(err) |
| 349 | printf("remove_umid_dir - actually_do_remove failed with " | 380 | printf("remove_umid_dir - remove_files_and_dir failed with " |
| 350 | "err = %d\n", err); | 381 | "err = %d\n", err); |
| 351 | } | 382 | } |
| 352 | 383 | ||
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules index 1347dc6d5218..813077fb1e5b 100644 --- a/arch/um/scripts/Makefile.rules +++ b/arch/um/scripts/Makefile.rules | |||
| @@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) | |||
| 8 | USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) | 8 | USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) |
| 9 | 9 | ||
| 10 | $(USER_OBJS:.o=.%): \ | 10 | $(USER_OBJS:.o=.%): \ |
| 11 | c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(*F).o) | 11 | c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(basetarget).o) |
| 12 | $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ | 12 | $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ |
| 13 | -Dunix -D__unix__ -D__$(SUBARCH)__ | 13 | -Dunix -D__unix__ -D__$(SUBARCH)__ |
| 14 | 14 | ||
| @@ -17,7 +17,7 @@ $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ | |||
| 17 | UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file)) | 17 | UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file)) |
| 18 | 18 | ||
| 19 | $(UNPROFILE_OBJS:.o=.%): \ | 19 | $(UNPROFILE_OBJS:.o=.%): \ |
| 20 | c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(*F).o) | 20 | c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(basetarget).o) |
| 21 | $(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ | 21 | $(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ |
| 22 | -Dunix -D__unix__ -D__$(SUBARCH)__ | 22 | -Dunix -D__unix__ -D__$(SUBARCH)__ |
| 23 | 23 | ||
diff --git a/arch/um/sys-i386/checksum.S b/arch/um/sys-i386/checksum.S index d98b2fff3d08..62c7e564f22e 100644 --- a/arch/um/sys-i386/checksum.S +++ b/arch/um/sys-i386/checksum.S | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * 2 of the License, or (at your option) any later version. | 25 | * 2 of the License, or (at your option) any later version. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <asm/errno.h> | 28 | #include <asm/errno.h> |
| 30 | 29 | ||
| 31 | /* | 30 | /* |
diff --git a/arch/um/sys-i386/ptrace.c b/arch/um/sys-i386/ptrace.c index 6028bc7cc01b..28bf01150323 100644 --- a/arch/um/sys-i386/ptrace.c +++ b/arch/um/sys-i386/ptrace.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
| 8 | #include "linux/sched.h" | 7 | #include "linux/sched.h" |
| 9 | #include "linux/mm.h" | 8 | #include "linux/mm.h" |
diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S index 1ff61474b25c..2497554b7b95 100644 --- a/arch/um/sys-i386/sys_call_table.S +++ b/arch/um/sys-i386/sys_call_table.S | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | #define sys_vm86old sys_ni_syscall | 7 | #define sys_vm86old sys_ni_syscall |
| 8 | #define sys_vm86 sys_ni_syscall | 8 | #define sys_vm86 sys_ni_syscall |
| 9 | 9 | ||
| 10 | #define sys_stime um_stime | ||
| 11 | #define sys_time um_time | ||
| 12 | #define old_mmap old_mmap_i386 | 10 | #define old_mmap old_mmap_i386 |
| 13 | 11 | ||
| 14 | #include "../../i386/kernel/syscall_table.S" | 12 | #include "../../i386/kernel/syscall_table.S" |
diff --git a/arch/um/sys-ppc/misc.S b/arch/um/sys-ppc/misc.S index f0c971db47e4..1364b7da578c 100644 --- a/arch/um/sys-ppc/misc.S +++ b/arch/um/sys-ppc/misc.S | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
| 20 | #include "ppc_asm.h" | 19 | #include "ppc_asm.h" |
| 21 | 20 | ||
diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c index 34b2e842864f..9e9ad72c2ba4 100644 --- a/arch/um/sys-x86_64/syscall_table.c +++ b/arch/um/sys-x86_64/syscall_table.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <linux/linkage.h> | 4 | #include <linux/linkage.h> |
| 5 | #include <linux/sys.h> | 5 | #include <linux/sys.h> |
| 6 | #include <linux/cache.h> | 6 | #include <linux/cache.h> |
| 7 | #include <linux/config.h> | ||
| 8 | 7 | ||
| 9 | #define __NO_STUBS | 8 | #define __NO_STUBS |
| 10 | 9 | ||
| @@ -20,12 +19,6 @@ | |||
| 20 | /*#define sys_set_thread_area sys_ni_syscall | 19 | /*#define sys_set_thread_area sys_ni_syscall |
| 21 | #define sys_get_thread_area sys_ni_syscall*/ | 20 | #define sys_get_thread_area sys_ni_syscall*/ |
| 22 | 21 | ||
| 23 | /* For __NR_time. The x86-64 name hopefully will change from sys_time64 to | ||
| 24 | * sys_time (since the current situation is bogus). I've sent a patch to cleanup | ||
| 25 | * this. Remove below the obsoleted line. */ | ||
| 26 | #define sys_time64 um_time | ||
| 27 | #define sys_time um_time | ||
| 28 | |||
| 29 | /* On UML we call it this way ("old" means it's not mmap2) */ | 22 | /* On UML we call it this way ("old" means it's not mmap2) */ |
| 30 | #define sys_mmap old_mmap | 23 | #define sys_mmap old_mmap |
| 31 | /* On x86-64 sys_uname is actually sys_newuname plus a compatibility trick. | 24 | /* On x86-64 sys_uname is actually sys_newuname plus a compatibility trick. |
diff --git a/arch/v850/kernel/anna.c b/arch/v850/kernel/anna.c index d0502e142437..40892d3e3c24 100644 --- a/arch/v850/kernel/anna.c +++ b/arch/v850/kernel/anna.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/v850/kernel/as85ep1.c b/arch/v850/kernel/as85ep1.c index d78c5e4ea9bc..5352f8a5aa07 100644 --- a/arch/v850/kernel/as85ep1.c +++ b/arch/v850/kernel/as85ep1.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/v850/kernel/fpga85e2c.c b/arch/v850/kernel/fpga85e2c.c index d8094519ad85..cb04a6954ccb 100644 --- a/arch/v850/kernel/fpga85e2c.c +++ b/arch/v850/kernel/fpga85e2c.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Written by Miles Bader <miles@gnu.org> | 12 | * Written by Miles Bader <miles@gnu.org> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/arch/v850/kernel/ma.c b/arch/v850/kernel/ma.c index b3dfbc5d2f40..2aa8ab0f7edc 100644 --- a/arch/v850/kernel/ma.c +++ b/arch/v850/kernel/ma.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
diff --git a/arch/v850/kernel/me2.c b/arch/v850/kernel/me2.c index 6527c218f91d..14b0c8858aa4 100644 --- a/arch/v850/kernel/me2.c +++ b/arch/v850/kernel/me2.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
diff --git a/arch/v850/kernel/process.c b/arch/v850/kernel/process.c index 57218c76925c..c4f844c86e50 100644 --- a/arch/v850/kernel/process.c +++ b/arch/v850/kernel/process.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 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/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/v850/kernel/rte_cb.c b/arch/v850/kernel/rte_cb.c index 0c794b9e0f9b..0f7f6cd705a2 100644 --- a/arch/v850/kernel/rte_cb.c +++ b/arch/v850/kernel/rte_cb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
diff --git a/arch/v850/kernel/rte_cb_leds.c b/arch/v850/kernel/rte_cb_leds.c index b662ad838940..f654088b2760 100644 --- a/arch/v850/kernel/rte_cb_leds.c +++ b/arch/v850/kernel/rte_cb_leds.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/spinlock.h> | 15 | #include <linux/spinlock.h> |
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
diff --git a/arch/v850/kernel/rte_ma1_cb.c b/arch/v850/kernel/rte_ma1_cb.c index 3873e276392f..9a716f946421 100644 --- a/arch/v850/kernel/rte_ma1_cb.c +++ b/arch/v850/kernel/rte_ma1_cb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/bootmem.h> | 16 | #include <linux/bootmem.h> |
diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c index 3a7c5c9c3ac6..f36b778f1432 100644 --- a/arch/v850/kernel/rte_mb_a_pci.c +++ b/arch/v850/kernel/rte_mb_a_pci.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/v850/kernel/rte_me2_cb.c b/arch/v850/kernel/rte_me2_cb.c index faaf3d95e6cf..df7027d85437 100644 --- a/arch/v850/kernel/rte_me2_cb.c +++ b/arch/v850/kernel/rte_me2_cb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/bootmem.h> | 16 | #include <linux/bootmem.h> |
diff --git a/arch/v850/kernel/rte_nb85e_cb.c b/arch/v850/kernel/rte_nb85e_cb.c index 990b20bffe47..b4a045da5d70 100644 --- a/arch/v850/kernel/rte_nb85e_cb.c +++ b/arch/v850/kernel/rte_nb85e_cb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
diff --git a/arch/v850/kernel/sim.c b/arch/v850/kernel/sim.c index 17049aaa8f11..467b4aa0acdd 100644 --- a/arch/v850/kernel/sim.c +++ b/arch/v850/kernel/sim.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/arch/v850/kernel/sim85e2.c b/arch/v850/kernel/sim85e2.c index 9111613fb53a..566dde5e6070 100644 --- a/arch/v850/kernel/sim85e2.c +++ b/arch/v850/kernel/sim85e2.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Written by Miles Bader <miles@gnu.org> | 12 | * Written by Miles Bader <miles@gnu.org> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c index 9224cb65f6ec..2ec0700fc46b 100644 --- a/arch/v850/kernel/syscalls.c +++ b/arch/v850/kernel/syscalls.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * and Paul Mackerras (paulus@cs.anu.edu.au). | 15 | * and Paul Mackerras (paulus@cs.anu.edu.au). |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 21 | #include <linux/smp.h> | 20 | #include <linux/smp.h> |
diff --git a/arch/v850/kernel/teg.c b/arch/v850/kernel/teg.c index 495cf8f37bcb..290d50665016 100644 --- a/arch/v850/kernel/teg.c +++ b/arch/v850/kernel/teg.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
diff --git a/arch/v850/kernel/v850_ksyms.c b/arch/v850/kernel/v850_ksyms.c index 6bcfcfe88384..c03ad6ed61cc 100644 --- a/arch/v850/kernel/v850_ksyms.c +++ b/arch/v850/kernel/v850_ksyms.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/elfcore.h> | 7 | #include <linux/elfcore.h> |
| 8 | #include <linux/in6.h> | 8 | #include <linux/in6.h> |
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/pgalloc.h> | 11 | #include <asm/pgalloc.h> |
| 13 | #include <asm/irq.h> | 12 | #include <asm/irq.h> |
diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S index 5b2ffcc6e2b2..63399219cd9f 100644 --- a/arch/v850/kernel/vmlinux.lds.S +++ b/arch/v850/kernel/vmlinux.lds.S | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #define VMLINUX_SYMBOL(_sym_) _##_sym_ | 15 | #define VMLINUX_SYMBOL(_sym_) _##_sym_ |
| 17 | #include <asm-generic/vmlinux.lds.h> | 16 | #include <asm-generic/vmlinux.lds.h> |
diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S index 12ea0b6c52e2..7de8b8fd1685 100644 --- a/arch/x86_64/boot/setup.S +++ b/arch/x86_64/boot/setup.S | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | * Added long mode checking and SSE force. March 2003, Andi Kleen. | 45 | * Added long mode checking and SSE force. March 2003, Andi Kleen. |
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | #include <linux/config.h> | ||
| 49 | #include <asm/segment.h> | 48 | #include <asm/segment.h> |
| 50 | #include <linux/version.h> | 49 | #include <linux/version.h> |
| 51 | #include <linux/compile.h> | 50 | #include <linux/compile.h> |
diff --git a/arch/x86_64/ia32/Makefile b/arch/x86_64/ia32/Makefile index e9263b4975e0..62bc5f56da9e 100644 --- a/arch/x86_64/ia32/Makefile +++ b/arch/x86_64/ia32/Makefile | |||
| @@ -11,6 +11,9 @@ obj-$(CONFIG_IA32_EMULATION) += $(sysv-y) | |||
| 11 | 11 | ||
| 12 | obj-$(CONFIG_IA32_AOUT) += ia32_aout.o | 12 | obj-$(CONFIG_IA32_AOUT) += ia32_aout.o |
| 13 | 13 | ||
| 14 | audit-class-$(CONFIG_AUDIT) := audit.o | ||
| 15 | obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y) | ||
| 16 | |||
| 14 | $(obj)/syscall32_syscall.o: \ | 17 | $(obj)/syscall32_syscall.o: \ |
| 15 | $(foreach F,sysenter syscall,$(obj)/vsyscall-$F.so) | 18 | $(foreach F,sysenter syscall,$(obj)/vsyscall-$F.so) |
| 16 | 19 | ||
diff --git a/arch/x86_64/ia32/audit.c b/arch/x86_64/ia32/audit.c new file mode 100644 index 000000000000..ab94f2e58cdd --- /dev/null +++ b/arch/x86_64/ia32/audit.c | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | #include <asm-i386/unistd.h> | ||
| 2 | |||
| 3 | unsigned ia32_dir_class[] = { | ||
| 4 | #include <asm-generic/audit_dir_write.h> | ||
| 5 | ~0U | ||
| 6 | }; | ||
| 7 | |||
| 8 | unsigned ia32_chattr_class[] = { | ||
| 9 | #include <asm-generic/audit_change_attr.h> | ||
| 10 | ~0U | ||
| 11 | }; | ||
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c index dc88154c412b..9c130993380d 100644 --- a/arch/x86_64/ia32/sys_ia32.c +++ b/arch/x86_64/ia32/sys_ia32.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * This should be fixed. | 20 | * This should be fixed. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index aeb9c560be88..819e84ec5b64 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile | |||
| @@ -35,6 +35,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o | |||
| 35 | obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o | 35 | obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o |
| 36 | obj-$(CONFIG_X86_VSMP) += vsmp.o | 36 | obj-$(CONFIG_X86_VSMP) += vsmp.o |
| 37 | obj-$(CONFIG_K8_NB) += k8.o | 37 | obj-$(CONFIG_K8_NB) += k8.o |
| 38 | obj-$(CONFIG_AUDIT) += audit.o | ||
| 38 | 39 | ||
| 39 | obj-$(CONFIG_MODULES) += module.o | 40 | obj-$(CONFIG_MODULES) += module.o |
| 40 | 41 | ||
diff --git a/arch/x86_64/kernel/acpi/sleep.c b/arch/x86_64/kernel/acpi/sleep.c index 091bc79c888f..5ebf62c7a3d2 100644 --- a/arch/x86_64/kernel/acpi/sleep.c +++ b/arch/x86_64/kernel/acpi/sleep.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 26 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index a195ef06ec55..58af8e73738b 100644 --- a/arch/x86_64/kernel/aperture.c +++ b/arch/x86_64/kernel/aperture.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * Copyright 2002 Andi Kleen, SuSE Labs. | 10 | * Copyright 2002 Andi Kleen, SuSE Labs. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index b2ead91df218..2b8cef037a65 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Mikael Pettersson : PM converted to driver model. | 14 | * Mikael Pettersson : PM converted to driver model. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | 18 | ||
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/x86_64/kernel/audit.c b/arch/x86_64/kernel/audit.c new file mode 100644 index 000000000000..a067aa468a85 --- /dev/null +++ b/arch/x86_64/kernel/audit.c | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | #include <linux/init.h> | ||
| 2 | #include <linux/types.h> | ||
| 3 | #include <linux/audit.h> | ||
| 4 | #include <asm/unistd.h> | ||
| 5 | |||
| 6 | static unsigned dir_class[] = { | ||
| 7 | #include <asm-generic/audit_dir_write.h> | ||
| 8 | ~0U | ||
| 9 | }; | ||
| 10 | |||
| 11 | static unsigned chattr_class[] = { | ||
| 12 | #include <asm-generic/audit_change_attr.h> | ||
| 13 | ~0U | ||
| 14 | }; | ||
| 15 | |||
| 16 | static int __init audit_classes_init(void) | ||
| 17 | { | ||
| 18 | #ifdef CONFIG_IA32_EMULATION | ||
| 19 | extern __u32 ia32_dir_class[]; | ||
| 20 | extern __u32 ia32_chattr_class[]; | ||
| 21 | audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class); | ||
| 22 | audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class); | ||
| 23 | #endif | ||
| 24 | audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); | ||
| 25 | audit_register_class(AUDIT_CLASS_CHATTR, chattr_class); | ||
| 26 | return 0; | ||
| 27 | } | ||
| 28 | |||
| 29 | __initcall(audit_classes_init); | ||
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c index 9e94d834624b..b8eee4c7888b 100644 --- a/arch/x86_64/kernel/e820.c +++ b/arch/x86_64/kernel/e820.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 8 | * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> |
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index 22cac4487b57..ed92c2983606 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #define ASSEMBLY 1 | 30 | #define ASSEMBLY 1 |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/linkage.h> | 31 | #include <linux/linkage.h> |
| 33 | #include <asm/segment.h> | 32 | #include <asm/segment.h> |
| 34 | #include <asm/smp.h> | 33 | #include <asm/smp.h> |
diff --git a/arch/x86_64/kernel/functionlist b/arch/x86_64/kernel/functionlist index 2bcebdc3eedb..01fa23580c85 100644 --- a/arch/x86_64/kernel/functionlist +++ b/arch/x86_64/kernel/functionlist | |||
| @@ -384,7 +384,6 @@ | |||
| 384 | *(.text.__end_that_request_first) | 384 | *(.text.__end_that_request_first) |
| 385 | *(.text.wake_up_bit) | 385 | *(.text.wake_up_bit) |
| 386 | *(.text.unuse_mm) | 386 | *(.text.unuse_mm) |
| 387 | *(.text.skb_release_data) | ||
| 388 | *(.text.shrink_icache_memory) | 387 | *(.text.shrink_icache_memory) |
| 389 | *(.text.sched_balance_self) | 388 | *(.text.sched_balance_self) |
| 390 | *(.text.__pmd_alloc) | 389 | *(.text.__pmd_alloc) |
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c index 7a64ea181788..8e78a75d1866 100644 --- a/arch/x86_64/kernel/genapic.c +++ b/arch/x86_64/kernel/genapic.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and | 8 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and |
| 9 | * James Cleverdon. | 9 | * James Cleverdon. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/threads.h> | 11 | #include <linux/threads.h> |
| 13 | #include <linux/cpumask.h> | 12 | #include <linux/cpumask.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
diff --git a/arch/x86_64/kernel/genapic_cluster.c b/arch/x86_64/kernel/genapic_cluster.c index 43fcf62fef0f..3020917546de 100644 --- a/arch/x86_64/kernel/genapic_cluster.c +++ b/arch/x86_64/kernel/genapic_cluster.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and | 9 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and |
| 10 | * James Cleverdon. | 10 | * James Cleverdon. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/threads.h> | 12 | #include <linux/threads.h> |
| 14 | #include <linux/cpumask.h> | 13 | #include <linux/cpumask.h> |
| 15 | #include <linux/string.h> | 14 | #include <linux/string.h> |
diff --git a/arch/x86_64/kernel/genapic_flat.c b/arch/x86_64/kernel/genapic_flat.c index 21c7066e236a..eb86d374813a 100644 --- a/arch/x86_64/kernel/genapic_flat.c +++ b/arch/x86_64/kernel/genapic_flat.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and | 8 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and |
| 9 | * James Cleverdon. | 9 | * James Cleverdon. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/threads.h> | 11 | #include <linux/threads.h> |
| 13 | #include <linux/cpumask.h> | 12 | #include <linux/cpumask.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
diff --git a/arch/x86_64/kernel/i387.c b/arch/x86_64/kernel/i387.c index 44ddb1ec808d..3aa1e9bb781d 100644 --- a/arch/x86_64/kernel/i387.c +++ b/arch/x86_64/kernel/i387.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * the 64bit user space sees a FXSAVE frame directly. | 14 | * the 64bit user space sees a FXSAVE frame directly. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <asm/processor.h> | 19 | #include <asm/processor.h> |
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c index 3dd1659427dc..0434b1f8e3dd 100644 --- a/arch/x86_64/kernel/i8259.c +++ b/arch/x86_64/kernel/i8259.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
| 2 | #include <linux/config.h> | ||
| 3 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 4 | #include <linux/signal.h> | 3 | #include <linux/signal.h> |
| 5 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 401b687fef21..924a4a332954 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/smp_lock.h> | 28 | #include <linux/smp_lock.h> |
| 30 | #include <linux/mc146818rtc.h> | 29 | #include <linux/mc146818rtc.h> |
| 31 | #include <linux/acpi.h> | 30 | #include <linux/acpi.h> |
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c index fa1d19ca700a..ffc73ac72485 100644 --- a/arch/x86_64/kernel/kprobes.c +++ b/arch/x86_64/kernel/kprobes.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * Added function return probes functionality | 31 | * Added function return probes functionality |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/kprobes.h> | 34 | #include <linux/kprobes.h> |
| 36 | #include <linux/ptrace.h> | 35 | #include <linux/ptrace.h> |
| 37 | #include <linux/string.h> | 36 | #include <linux/string.h> |
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c index 083da7e606b1..a1ab4197f8a1 100644 --- a/arch/x86_64/kernel/mpparse.c +++ b/arch/x86_64/kernel/mpparse.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/bootmem.h> | 19 | #include <linux/bootmem.h> |
| 21 | #include <linux/smp_lock.h> | 20 | #include <linux/smp_lock.h> |
| 22 | #include <linux/kernel_stat.h> | 21 | #include <linux/kernel_stat.h> |
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 0ef9cf2bc45e..476c1472fc07 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Mikael Pettersson : PM converted to driver model. Disable/enable API. | 12 | * Mikael Pettersson : PM converted to driver model. Disable/enable API. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 18 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index 4ca674d16b09..6d3e61baf7a0 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/arch/x86_64/kernel/pci-gart.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright 2002 Andi Kleen, SuSE Labs. | 10 | * Copyright 2002 Andi Kleen, SuSE Labs. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
| 16 | #include <linux/agp_backend.h> | 15 | #include <linux/agp_backend.h> |
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 1129918ede82..0925518b58d0 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/tty.h> | 24 | #include <linux/tty.h> |
| 25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/initrd.h> | 28 | #include <linux/initrd.h> |
| 30 | #include <linux/highmem.h> | 29 | #include <linux/highmem.h> |
diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c index f5934cb4a2b6..6fe58a634b5f 100644 --- a/arch/x86_64/kernel/setup64.c +++ b/arch/x86_64/kernel/setup64.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright 2001, 2002, 2003 SuSE Labs / Andi Kleen. | 4 | * Copyright 2001, 2002, 2003 SuSE Labs / Andi Kleen. |
| 5 | * See setup.c for older changelog. | 5 | * See setup.c for older changelog. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 540c0ccbcccc..9705a6a384f1 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
| 43 | 42 | ||
| 44 | #include <linux/mm.h> | 43 | #include <linux/mm.h> |
diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86_64/kernel/suspend.c index ecbd34c1093d..91f7e678bae7 100644 --- a/arch/x86_64/kernel/suspend.c +++ b/arch/x86_64/kernel/suspend.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> | 7 | * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
| 12 | #include <linux/suspend.h> | 11 | #include <linux/suspend.h> |
| 13 | #include <asm/proto.h> | 12 | #include <asm/proto.h> |
diff --git a/arch/x86_64/kernel/syscall.c b/arch/x86_64/kernel/syscall.c index 7c176b3edde0..213fd6ab789d 100644 --- a/arch/x86_64/kernel/syscall.c +++ b/arch/x86_64/kernel/syscall.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | #include <linux/linkage.h> | 3 | #include <linux/linkage.h> |
| 4 | #include <linux/sys.h> | 4 | #include <linux/sys.h> |
| 5 | #include <linux/cache.h> | 5 | #include <linux/cache.h> |
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #define __NO_STUBS | 7 | #define __NO_STUBS |
| 9 | 8 | ||
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index 3d11a2fe45b7..5a5311d3de0f 100644 --- a/arch/x86_64/kernel/traps.c +++ b/arch/x86_64/kernel/traps.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 'Traps.c' handles hardware traps and faults after we have saved some | 12 | * 'Traps.c' handles hardware traps and faults after we have saved some |
| 13 | * state in 'entry.S'. | 13 | * state in 'entry.S'. |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/string.h> | 17 | #include <linux/string.h> |
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index 1c6a5f322919..7c4de31471d4 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #include <asm-generic/vmlinux.lds.h> | 7 | #include <asm-generic/vmlinux.lds.h> |
| 8 | #include <asm/page.h> | 8 | #include <asm/page.h> |
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #undef i386 /* in case the preprocessor is a 32bit one */ | 10 | #undef i386 /* in case the preprocessor is a 32bit one */ |
| 12 | 11 | ||
diff --git a/arch/x86_64/mm/extable.c b/arch/x86_64/mm/extable.c index 2d78f9fb4035..79ac6e7100af 100644 --- a/arch/x86_64/mm/extable.c +++ b/arch/x86_64/mm/extable.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/arch/x86_64/mm/extable.c | 2 | * linux/arch/x86_64/mm/extable.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index 08dc696f54ee..5afcf6eb00fa 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2001,2002 Andi Kleen, SuSE Labs. | 5 | * Copyright (C) 2001,2002 Andi Kleen, SuSE Labs. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/signal.h> | 8 | #include <linux/signal.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| @@ -418,7 +417,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 418 | /* When running in the kernel we expect faults to occur only to | 417 | /* When running in the kernel we expect faults to occur only to |
| 419 | * addresses in user space. All other faults represent errors in the | 418 | * addresses in user space. All other faults represent errors in the |
| 420 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 419 | * kernel and should generate an OOPS. Unfortunatly, in the case of an |
| 421 | * erroneous fault occuring in a code path which already holds mmap_sem | 420 | * erroneous fault occurring in a code path which already holds mmap_sem |
| 422 | * we will deadlock attempting to validate the fault against the | 421 | * we will deadlock attempting to validate the fault against the |
| 423 | * address space. Luckily the kernel only validly references user | 422 | * address space. Luckily the kernel only validly references user |
| 424 | * space from well defined areas of code, which are listed in the | 423 | * space from well defined areas of code, which are listed in the |
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index 95bd232ff0cf..d14fb2dfbfc4 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 2002,2003 Andi Kleen <ak@suse.de> | 6 | * Copyright (C) 2002,2003 Andi Kleen <ak@suse.de> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/signal.h> | 9 | #include <linux/signal.h> |
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| @@ -679,16 +678,15 @@ void free_initmem(void) | |||
| 679 | 678 | ||
| 680 | #ifdef CONFIG_DEBUG_RODATA | 679 | #ifdef CONFIG_DEBUG_RODATA |
| 681 | 680 | ||
| 682 | extern char __start_rodata, __end_rodata; | ||
| 683 | void mark_rodata_ro(void) | 681 | void mark_rodata_ro(void) |
| 684 | { | 682 | { |
| 685 | unsigned long addr = (unsigned long)&__start_rodata; | 683 | unsigned long addr = (unsigned long)__start_rodata; |
| 686 | 684 | ||
| 687 | for (; addr < (unsigned long)&__end_rodata; addr += PAGE_SIZE) | 685 | for (; addr < (unsigned long)__end_rodata; addr += PAGE_SIZE) |
| 688 | change_page_attr_addr(addr, 1, PAGE_KERNEL_RO); | 686 | change_page_attr_addr(addr, 1, PAGE_KERNEL_RO); |
| 689 | 687 | ||
| 690 | printk ("Write protecting the kernel read-only data: %luk\n", | 688 | printk ("Write protecting the kernel read-only data: %luk\n", |
| 691 | (&__end_rodata - &__start_rodata) >> 10); | 689 | (__end_rodata - __start_rodata) >> 10); |
| 692 | 690 | ||
| 693 | /* | 691 | /* |
| 694 | * change_page_attr_addr() requires a global_flush_tlb() call after it. | 692 | * change_page_attr_addr() requires a global_flush_tlb() call after it. |
diff --git a/arch/x86_64/mm/mmap.c b/arch/x86_64/mm/mmap.c index 43e9b99bdf25..80bba0dc000e 100644 --- a/arch/x86_64/mm/mmap.c +++ b/arch/x86_64/mm/mmap.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* Copyright 2005 Andi Kleen, SuSE Labs. | 1 | /* Copyright 2005 Andi Kleen, SuSE Labs. |
| 2 | * Licensed under GPL, v.2 | 2 | * Licensed under GPL, v.2 |
| 3 | */ | 3 | */ |
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 6 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
| 7 | #include <linux/random.h> | 6 | #include <linux/random.h> |
diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86_64/mm/pageattr.c index 531ad21447b1..2685b1f3671c 100644 --- a/arch/x86_64/mm/pageattr.c +++ b/arch/x86_64/mm/pageattr.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Thanks to Ben LaHaise for precious feedback. | 3 | * Thanks to Ben LaHaise for precious feedback. |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/mm.h> | 6 | #include <linux/mm.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/highmem.h> | 8 | #include <linux/highmem.h> |
diff --git a/arch/xtensa/boot/boot-elf/bootstrap.S b/arch/xtensa/boot/boot-elf/bootstrap.S index 7cba94abdab8..f857fc760aa8 100644 --- a/arch/xtensa/boot/boot-elf/bootstrap.S +++ b/arch/xtensa/boot/boot-elf/bootstrap.S | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #include <xtensa/config/specreg.h> | 2 | #include <xtensa/config/specreg.h> |
| 3 | #include <xtensa/config/core.h> | 3 | #include <xtensa/config/core.h> |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/bootparam.h> | 5 | #include <asm/bootparam.h> |
| 7 | 6 | ||
| 8 | 7 | ||
diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S index 356192a4d39d..cf5a93fb6a2e 100644 --- a/arch/xtensa/kernel/coprocessor.S +++ b/arch/xtensa/kernel/coprocessor.S | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * assigned when the Xtensa processor is generated. | 24 | * assigned when the Xtensa processor is generated. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/linkage.h> | 27 | #include <linux/linkage.h> |
| 29 | #include <asm/processor.h> | 28 | #include <asm/processor.h> |
| 30 | 29 | ||
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S index 6e9b5225b8f6..c07cb2522993 100644 --- a/arch/xtensa/kernel/head.S +++ b/arch/xtensa/kernel/head.S | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <xtensa/cacheasm.h> | 18 | #include <xtensa/cacheasm.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <asm/processor.h> | 19 | #include <asm/processor.h> |
| 21 | #include <asm/page.h> | 20 | #include <asm/page.h> |
| 22 | 21 | ||
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index eda029fc8972..8709f8249d02 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c index a17930747f20..69675f216062 100644 --- a/arch/xtensa/kernel/platform.c +++ b/arch/xtensa/kernel/platform.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Chris Zankel <chris@zankel.net> | 12 | * Chris Zankel <chris@zankel.net> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 18 | #include <linux/time.h> | 17 | #include <linux/time.h> |
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index 64a649eb883f..a7c4178c2a8c 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Kevin Chea | 16 | * Kevin Chea |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c index 4cc85285a70a..5064d9383963 100644 --- a/arch/xtensa/kernel/ptrace.c +++ b/arch/xtensa/kernel/ptrace.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Marc Gauthier<marc@tensilica.com> <marc@alumni.uwaterloo.ca> | 13 | * Marc Gauthier<marc@tensilica.com> <marc@alumni.uwaterloo.ca> |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 513ed8d67766..edb29410d953 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Marc Gauthier<marc@tensilica.com> <marc@alumni.uwaterloo.ca> | 14 | * Marc Gauthier<marc@tensilica.com> <marc@alumni.uwaterloo.ca> |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/proc_fs.h> | 19 | #include <linux/proc_fs.h> |
diff --git a/arch/xtensa/kernel/syscalls.c b/arch/xtensa/kernel/syscalls.c index f20c6494c518..4688ba2db84d 100644 --- a/arch/xtensa/kernel/syscalls.c +++ b/arch/xtensa/kernel/syscalls.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | #define DEBUG 0 | 19 | #define DEBUG 0 |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/linkage.h> | 21 | #include <linux/linkage.h> |
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 24 | #include <linux/smp.h> | 23 | #include <linux/smp.h> |
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index fe14909f45e0..4a2c365ba684 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Chris Zankel <chris@zankel.net> | 12 | * Chris Zankel <chris@zankel.net> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/time.h> | 16 | #include <linux/time.h> |
| 18 | #include <linux/timex.h> | 17 | #include <linux/timex.h> |
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index 5ed71dfc8110..ab6cdbd5eb68 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include <asm-generic/vmlinux.lds.h> | 17 | #include <asm-generic/vmlinux.lds.h> |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #define _NOCLANGUAGE | 19 | #define _NOCLANGUAGE |
| 21 | #include <xtensa/config/core.h> | 20 | #include <xtensa/config/core.h> |
| 22 | #include <xtensa/config/system.h> | 21 | #include <xtensa/config/system.h> |
diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c index a15b6e3e72c8..0b4cb93db5a3 100644 --- a/arch/xtensa/kernel/xtensa_ksyms.c +++ b/arch/xtensa/kernel/xtensa_ksyms.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Joe Taylor <joe@tensilica.com> | 12 | * Joe Taylor <joe@tensilica.com> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index e1be4235f367..660ef058c149 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Kevin Chea | 15 | * Kevin Chea |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/signal.h> | 19 | #include <linux/signal.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c index 2a580efb58ec..22d3c571a7bc 100644 --- a/arch/xtensa/platform-iss/console.c +++ b/arch/xtensa/platform-iss/console.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/console.h> | 15 | #include <linux/console.h> |
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c index 0dc55cc8691b..d96164e602fe 100644 --- a/arch/xtensa/platform-iss/network.c +++ b/arch/xtensa/platform-iss/network.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/list.h> | 19 | #include <linux/list.h> |
| 21 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
| 22 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
diff --git a/arch/xtensa/platform-iss/setup.c b/arch/xtensa/platform-iss/setup.c index 23790a5610e2..c8a42b60c57a 100644 --- a/arch/xtensa/platform-iss/setup.c +++ b/arch/xtensa/platform-iss/setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * option) any later version. | 15 | * option) any later version. |
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/stddef.h> | 18 | #include <linux/stddef.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/block/as-iosched.c b/block/as-iosched.c index 3af31ed49a9c..5da56d48fbd3 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
| 11 | #include <linux/elevator.h> | 11 | #include <linux/elevator.h> |
| 12 | #include <linux/bio.h> | 12 | #include <linux/bio.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/block/blktrace.c b/block/blktrace.c index 36f3a172275f..92925e7d9e6c 100644 --- a/block/blktrace.c +++ b/block/blktrace.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 15 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/blkdev.h> | 19 | #include <linux/blkdev.h> |
| 21 | #include <linux/blktrace_api.h> | 20 | #include <linux/blktrace_api.h> |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index e25223e147a2..102ebc2c5c34 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) 2003 Jens Axboe <axboe@suse.de> | 7 | * Copyright (C) 2003 Jens Axboe <axboe@suse.de> |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
| 12 | #include <linux/elevator.h> | 11 | #include <linux/elevator.h> |
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 4469dd84623c..c7ca9f0b6498 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/blkdev.h> | 8 | #include <linux/blkdev.h> |
| 9 | #include <linux/elevator.h> | 9 | #include <linux/elevator.h> |
| 10 | #include <linux/bio.h> | 10 | #include <linux/bio.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/block/elevator.c b/block/elevator.c index d00b283f31d2..bc7baeec0d10 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/blkdev.h> | 27 | #include <linux/blkdev.h> |
| 28 | #include <linux/elevator.h> | 28 | #include <linux/elevator.h> |
| 29 | #include <linux/bio.h> | 29 | #include <linux/bio.h> |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/block/genhd.c b/block/genhd.c index 8d7339511e5e..25d1f42568cc 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * gendisk handling | 2 | * gendisk handling |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/fs.h> | 6 | #include <linux/fs.h> |
| 8 | #include <linux/genhd.h> | 7 | #include <linux/genhd.h> |
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index eee03a3876a3..5813d63c20af 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | /* | 10 | /* |
| 11 | * This handles all read/write requests to block devices | 11 | * This handles all read/write requests to block devices |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/backing-dev.h> | 15 | #include <linux/backing-dev.h> |
| @@ -3117,9 +3116,9 @@ void submit_bio(int rw, struct bio *bio) | |||
| 3117 | BIO_BUG_ON(!bio->bi_io_vec); | 3116 | BIO_BUG_ON(!bio->bi_io_vec); |
| 3118 | bio->bi_rw |= rw; | 3117 | bio->bi_rw |= rw; |
| 3119 | if (rw & WRITE) | 3118 | if (rw & WRITE) |
| 3120 | mod_page_state(pgpgout, count); | 3119 | count_vm_events(PGPGOUT, count); |
| 3121 | else | 3120 | else |
| 3122 | mod_page_state(pgpgin, count); | 3121 | count_vm_events(PGPGIN, count); |
| 3123 | 3122 | ||
| 3124 | if (unlikely(block_dump)) { | 3123 | if (unlikely(block_dump)) { |
| 3125 | char b[BDEVNAME_SIZE]; | 3124 | char b[BDEVNAME_SIZE]; |
diff --git a/drivers/acorn/block/Kconfig b/drivers/acorn/block/Kconfig index 073add35e66f..a0ff25ea439f 100644 --- a/drivers/acorn/block/Kconfig +++ b/drivers/acorn/block/Kconfig | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menu "Acorn-specific block devices" | 5 | menu "Acorn-specific block devices" |
| 6 | depends on ARCH_ACORN | 6 | depends on ARCH_ARC || ARCH_A5K |
| 7 | 7 | ||
| 8 | config BLK_DEV_FD1772 | 8 | config BLK_DEV_FD1772 |
| 9 | tristate "Old Archimedes floppy (1772) support" | 9 | tristate "Old Archimedes floppy (1772) support" |
diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c index ce074f6f3369..d9c9a35961b3 100644 --- a/drivers/acorn/block/mfmhd.c +++ b/drivers/acorn/block/mfmhd.c | |||
| @@ -99,7 +99,6 @@ | |||
| 99 | */ | 99 | */ |
| 100 | 100 | ||
| 101 | #include <linux/module.h> | 101 | #include <linux/module.h> |
| 102 | #include <linux/config.h> | ||
| 103 | #include <linux/sched.h> | 102 | #include <linux/sched.h> |
| 104 | #include <linux/fs.h> | 103 | #include <linux/fs.h> |
| 105 | #include <linux/interrupt.h> | 104 | #include <linux/interrupt.h> |
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 97863143d21d..81e970adeab3 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -248,7 +248,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) | |||
| 248 | num_enabled++; | 248 | num_enabled++; |
| 249 | } | 249 | } |
| 250 | if (!num_enabled) { | 250 | if (!num_enabled) { |
| 251 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "\nadd_memory failed\n")); | 251 | printk(KERN_ERR PREFIX "add_memory failed\n"); |
| 252 | mem_device->state = MEMORY_INVALID_STATE; | 252 | mem_device->state = MEMORY_INVALID_STATE; |
| 253 | return -EINVAL; | 253 | return -EINVAL; |
| 254 | } | 254 | } |
| @@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle) | |||
| 466 | 466 | ||
| 467 | info = buffer.pointer; | 467 | info = buffer.pointer; |
| 468 | if (!(info->valid & ACPI_VALID_HID)) { | 468 | if (!(info->valid & ACPI_VALID_HID)) { |
| 469 | acpi_os_free(buffer.pointer); | 469 | kfree(buffer.pointer); |
| 470 | return AE_ERROR; | 470 | return AE_ERROR; |
| 471 | } | 471 | } |
| 472 | 472 | ||
| @@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle) | |||
| 475 | (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID))) | 475 | (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID))) |
| 476 | status = AE_ERROR; | 476 | status = AE_ERROR; |
| 477 | 477 | ||
| 478 | acpi_os_free(buffer.pointer); | 478 | kfree(buffer.pointer); |
| 479 | return status; | 479 | return status; |
| 480 | } | 480 | } |
| 481 | 481 | ||
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 055cfd5c8766..eb0b8fb837c6 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c | |||
| @@ -1017,7 +1017,7 @@ static int asus_hotk_get_info(void) | |||
| 1017 | } | 1017 | } |
| 1018 | hotk->methods = &model_conf[hotk->model]; | 1018 | hotk->methods = &model_conf[hotk->model]; |
| 1019 | 1019 | ||
| 1020 | acpi_os_free(model); | 1020 | kfree(model); |
| 1021 | 1021 | ||
| 1022 | return AE_OK; | 1022 | return AE_OK; |
| 1023 | } | 1023 | } |
| @@ -1096,7 +1096,7 @@ static int asus_hotk_get_info(void) | |||
| 1096 | /* S1300A reports L84F, but L1400B too, account for that */ | 1096 | /* S1300A reports L84F, but L1400B too, account for that */ |
| 1097 | } | 1097 | } |
| 1098 | 1098 | ||
| 1099 | acpi_os_free(model); | 1099 | kfree(model); |
| 1100 | 1100 | ||
| 1101 | return AE_OK; | 1101 | return AE_OK; |
| 1102 | } | 1102 | } |
| @@ -1256,7 +1256,7 @@ static void __exit asus_acpi_exit(void) | |||
| 1256 | acpi_bus_unregister_driver(&asus_hotk_driver); | 1256 | acpi_bus_unregister_driver(&asus_hotk_driver); |
| 1257 | remove_proc_entry(PROC_ASUS, acpi_root_dir); | 1257 | remove_proc_entry(PROC_ASUS, acpi_root_dir); |
| 1258 | 1258 | ||
| 1259 | acpi_os_free(asus_info); | 1259 | kfree(asus_info); |
| 1260 | 1260 | ||
| 1261 | return; | 1261 | return; |
| 1262 | } | 1262 | } |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 6ce93306dd37..2b8aab560b58 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -171,7 +171,7 @@ acpi_battery_get_info(struct acpi_battery *battery, | |||
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | end: | 173 | end: |
| 174 | acpi_os_free(buffer.pointer); | 174 | kfree(buffer.pointer); |
| 175 | 175 | ||
| 176 | if (!result) | 176 | if (!result) |
| 177 | (*bif) = (struct acpi_battery_info *)data.pointer; | 177 | (*bif) = (struct acpi_battery_info *)data.pointer; |
| @@ -231,7 +231,7 @@ acpi_battery_get_status(struct acpi_battery *battery, | |||
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | end: | 233 | end: |
| 234 | acpi_os_free(buffer.pointer); | 234 | kfree(buffer.pointer); |
| 235 | 235 | ||
| 236 | if (!result) | 236 | if (!result) |
| 237 | (*bst) = (struct acpi_battery_status *)data.pointer; | 237 | (*bst) = (struct acpi_battery_status *)data.pointer; |
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index dec044c04273..ea5a0496a4fd 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
| @@ -192,7 +192,7 @@ int acpi_bus_set_power(acpi_handle handle, int state) | |||
| 192 | /* Make sure this is a valid target state */ | 192 | /* Make sure this is a valid target state */ |
| 193 | 193 | ||
| 194 | if (!device->flags.power_manageable) { | 194 | if (!device->flags.power_manageable) { |
| 195 | printk(KERN_DEBUG "Device `[%s]is not power manageable", | 195 | printk(KERN_DEBUG "Device `[%s]' is not power manageable", |
| 196 | device->kobj.name); | 196 | device->kobj.name); |
| 197 | return -ENODEV; | 197 | return -ENODEV; |
| 198 | } | 198 | } |
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 7f7e41d40a3b..871aa520ece7 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
| @@ -236,7 +236,7 @@ container_walk_namespace_cb(acpi_handle handle, | |||
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | end: | 238 | end: |
| 239 | acpi_os_free(buffer.pointer); | 239 | kfree(buffer.pointer); |
| 240 | 240 | ||
| 241 | return AE_OK; | 241 | return AE_OK; |
| 242 | } | 242 | } |
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 8daef57b994c..10f160dc75b1 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
| @@ -152,7 +152,7 @@ static int get_root_bridge_busnr(acpi_handle handle) | |||
| 152 | bbn = bus; | 152 | bbn = bus; |
| 153 | } | 153 | } |
| 154 | exit: | 154 | exit: |
| 155 | acpi_os_free(buffer.pointer); | 155 | kfree(buffer.pointer); |
| 156 | return (int)bbn; | 156 | return (int)bbn; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| @@ -192,7 +192,7 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
| 192 | find->handle = handle; | 192 | find->handle = handle; |
| 193 | status = AE_OK; | 193 | status = AE_OK; |
| 194 | exit: | 194 | exit: |
| 195 | acpi_os_free(buffer.pointer); | 195 | kfree(buffer.pointer); |
| 196 | return status; | 196 | return status; |
| 197 | } | 197 | } |
| 198 | 198 | ||
| @@ -224,7 +224,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
| 224 | info = buffer.pointer; | 224 | info = buffer.pointer; |
| 225 | if (info->address == find->address) | 225 | if (info->address == find->address) |
| 226 | find->handle = handle; | 226 | find->handle = handle; |
| 227 | acpi_os_free(buffer.pointer); | 227 | kfree(buffer.pointer); |
| 228 | } | 228 | } |
| 229 | return AE_OK; | 229 | return AE_OK; |
| 230 | } | 230 | } |
| @@ -330,7 +330,7 @@ static int acpi_platform_notify(struct device *dev) | |||
| 330 | 330 | ||
| 331 | acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer); | 331 | acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer); |
| 332 | DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer); | 332 | DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer); |
| 333 | acpi_os_free(buffer.pointer); | 333 | kfree(buffer.pointer); |
| 334 | } else | 334 | } else |
| 335 | DBG("Device %s -> No ACPI support\n", dev->bus_id); | 335 | DBG("Device %s -> No ACPI support\n", dev->bus_id); |
| 336 | #endif | 336 | #endif |
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index 6d9bd45af30a..dca6799ac678 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.c | |||
| @@ -133,7 +133,7 @@ acpi_evaluate_object_typed(acpi_handle handle, | |||
| 133 | 133 | ||
| 134 | /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */ | 134 | /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */ |
| 135 | 135 | ||
| 136 | acpi_os_free(return_buffer->pointer); | 136 | ACPI_FREE(return_buffer->pointer); |
| 137 | return_buffer->pointer = NULL; | 137 | return_buffer->pointer = NULL; |
| 138 | } | 138 | } |
| 139 | 139 | ||
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 13d6d5bdea26..4d622981f61a 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index afd937b158b3..d4bd314d60ba 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| @@ -147,13 +146,6 @@ void *acpi_os_allocate(acpi_size size) | |||
| 147 | return kmalloc(size, GFP_KERNEL); | 146 | return kmalloc(size, GFP_KERNEL); |
| 148 | } | 147 | } |
| 149 | 148 | ||
| 150 | void acpi_os_free(void *ptr) | ||
| 151 | { | ||
| 152 | kfree(ptr); | ||
| 153 | } | ||
| 154 | |||
| 155 | EXPORT_SYMBOL(acpi_os_free); | ||
| 156 | |||
| 157 | acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) | 149 | acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) |
| 158 | { | 150 | { |
| 159 | if (efi_enabled) { | 151 | if (efi_enabled) { |
| @@ -743,7 +735,7 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle) | |||
| 743 | 735 | ||
| 744 | ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle)); | 736 | ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle)); |
| 745 | 737 | ||
| 746 | acpi_os_free(sem); | 738 | kfree(sem); |
| 747 | sem = NULL; | 739 | sem = NULL; |
| 748 | 740 | ||
| 749 | return AE_OK; | 741 | return AE_OK; |
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index fb96e3bf969b..feda0341f5a7 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 24 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index e439eb77d283..8e9c26aae8fe 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -768,7 +768,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) | |||
| 768 | status = -EFAULT; | 768 | status = -EFAULT; |
| 769 | 769 | ||
| 770 | end: | 770 | end: |
| 771 | acpi_os_free(buffer.pointer); | 771 | kfree(buffer.pointer); |
| 772 | 772 | ||
| 773 | return status; | 773 | return status; |
| 774 | } | 774 | } |
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 14a00e5a8f6a..7ba5e49ab302 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
| @@ -216,7 +216,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr) | |||
| 216 | sizeof(struct acpi_pct_register)); | 216 | sizeof(struct acpi_pct_register)); |
| 217 | 217 | ||
| 218 | end: | 218 | end: |
| 219 | acpi_os_free(buffer.pointer); | 219 | kfree(buffer.pointer); |
| 220 | 220 | ||
| 221 | return result; | 221 | return result; |
| 222 | } | 222 | } |
| @@ -294,7 +294,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr) | |||
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | end: | 296 | end: |
| 297 | acpi_os_free(buffer.pointer); | 297 | kfree(buffer.pointer); |
| 298 | 298 | ||
| 299 | return result; | 299 | return result; |
| 300 | } | 300 | } |
| @@ -592,7 +592,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) | |||
| 592 | } | 592 | } |
| 593 | 593 | ||
| 594 | end: | 594 | end: |
| 595 | acpi_os_free(buffer.pointer); | 595 | kfree(buffer.pointer); |
| 596 | return result; | 596 | return result; |
| 597 | } | 597 | } |
| 598 | 598 | ||
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 401e723e6c66..5fcb50c7b778 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device) | |||
| 319 | goto end; | 319 | goto end; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | acpi_os_free(buffer.pointer); | 322 | kfree(buffer.pointer); |
| 323 | 323 | ||
| 324 | device->wakeup.flags.valid = 1; | 324 | device->wakeup.flags.valid = 1; |
| 325 | /* Power button, Lid switch always enable wakeup */ | 325 | /* Power button, Lid switch always enable wakeup */ |
| @@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device, | |||
| 854 | printk(KERN_ERR "Memory allocation error\n"); | 854 | printk(KERN_ERR "Memory allocation error\n"); |
| 855 | } | 855 | } |
| 856 | 856 | ||
| 857 | acpi_os_free(buffer.pointer); | 857 | kfree(buffer.pointer); |
| 858 | } | 858 | } |
| 859 | 859 | ||
| 860 | static int acpi_device_set_context(struct acpi_device *device, int type) | 860 | static int acpi_device_set_context(struct acpi_device *device, int type) |
| @@ -1433,7 +1433,7 @@ static int acpi_device_resume(struct device * dev) | |||
| 1433 | } | 1433 | } |
| 1434 | 1434 | ||
| 1435 | 1435 | ||
| 1436 | struct bus_type acpi_bus_type = { | 1436 | static struct bus_type acpi_bus_type = { |
| 1437 | .name = "acpi", | 1437 | .name = "acpi", |
| 1438 | .suspend = acpi_device_suspend, | 1438 | .suspend = acpi_device_suspend, |
| 1439 | .resume = acpi_device_resume, | 1439 | .resume = acpi_device_resume, |
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index c90bd2f70b3f..c3bb7faad75e 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
| @@ -86,7 +86,7 @@ acpi_system_read_dsdt(struct file *file, | |||
| 86 | 86 | ||
| 87 | res = simple_read_from_buffer(buffer, count, ppos, | 87 | res = simple_read_from_buffer(buffer, count, ppos, |
| 88 | dsdt.pointer, dsdt.length); | 88 | dsdt.pointer, dsdt.length); |
| 89 | acpi_os_free(dsdt.pointer); | 89 | kfree(dsdt.pointer); |
| 90 | 90 | ||
| 91 | return res; | 91 | return res; |
| 92 | } | 92 | } |
| @@ -113,7 +113,7 @@ acpi_system_read_fadt(struct file *file, | |||
| 113 | 113 | ||
| 114 | res = simple_read_from_buffer(buffer, count, ppos, | 114 | res = simple_read_from_buffer(buffer, count, ppos, |
| 115 | fadt.pointer, fadt.length); | 115 | fadt.pointer, fadt.length); |
| 116 | acpi_os_free(fadt.pointer); | 116 | kfree(fadt.pointer); |
| 117 | 117 | ||
| 118 | return res; | 118 | return res; |
| 119 | } | 119 | } |
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index ed5e8816d83d..bfb3bfcf9e91 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c index 7940fc1bd69e..5cff17dc78b3 100644 --- a/drivers/acpi/utilities/utalloc.c +++ b/drivers/acpi/utilities/utalloc.c | |||
| @@ -166,10 +166,10 @@ acpi_status acpi_ut_delete_caches(void) | |||
| 166 | 166 | ||
| 167 | /* Free memory lists */ | 167 | /* Free memory lists */ |
| 168 | 168 | ||
| 169 | acpi_os_free(acpi_gbl_global_list); | 169 | ACPI_FREE(acpi_gbl_global_list); |
| 170 | acpi_gbl_global_list = NULL; | 170 | acpi_gbl_global_list = NULL; |
| 171 | 171 | ||
| 172 | acpi_os_free(acpi_gbl_ns_node_list); | 172 | ACPI_FREE(acpi_gbl_ns_node_list); |
| 173 | acpi_gbl_ns_node_list = NULL; | 173 | acpi_gbl_ns_node_list = NULL; |
| 174 | #endif | 174 | #endif |
| 175 | 175 | ||
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c index 56270a30718a..1a1f8109159c 100644 --- a/drivers/acpi/utilities/utcache.c +++ b/drivers/acpi/utilities/utcache.c | |||
| @@ -162,7 +162,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache) | |||
| 162 | 162 | ||
| 163 | /* Now we can delete the cache object */ | 163 | /* Now we can delete the cache object */ |
| 164 | 164 | ||
| 165 | acpi_os_free(cache); | 165 | ACPI_FREE(cache); |
| 166 | return (AE_OK); | 166 | return (AE_OK); |
| 167 | } | 167 | } |
| 168 | 168 | ||
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 1930e1a75b22..f48227f4c8c9 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
| @@ -332,7 +332,7 @@ acpi_evaluate_string(acpi_handle handle, | |||
| 332 | 332 | ||
| 333 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data)); | 333 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data)); |
| 334 | 334 | ||
| 335 | acpi_os_free(buffer.pointer); | 335 | kfree(buffer.pointer); |
| 336 | 336 | ||
| 337 | return AE_OK; | 337 | return AE_OK; |
| 338 | } | 338 | } |
| @@ -418,7 +418,7 @@ acpi_evaluate_reference(acpi_handle handle, | |||
| 418 | //kfree(list->handles); | 418 | //kfree(list->handles); |
| 419 | } | 419 | } |
| 420 | 420 | ||
| 421 | acpi_os_free(buffer.pointer); | 421 | kfree(buffer.pointer); |
| 422 | 422 | ||
| 423 | return status; | 423 | return status; |
| 424 | } | 424 | } |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 7459ca52c1a8..56666a982476 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -1446,7 +1446,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video) | |||
| 1446 | video->attached_array = active_device_list; | 1446 | video->attached_array = active_device_list; |
| 1447 | video->attached_count = count; | 1447 | video->attached_count = count; |
| 1448 | out: | 1448 | out: |
| 1449 | acpi_os_free(buffer.pointer); | 1449 | kfree(buffer.pointer); |
| 1450 | return status; | 1450 | return status; |
| 1451 | } | 1451 | } |
| 1452 | 1452 | ||
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c index d1387cfe2d30..6cc93de0b71d 100644 --- a/drivers/atm/adummy.c +++ b/drivers/atm/adummy.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * adummy.c: a dummy ATM driver | 2 | * adummy.c: a dummy ATM driver |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/version.h> | 6 | #include <linux/version.h> |
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h index 84a93063cfe1..8296420ceaef 100644 --- a/drivers/atm/ambassador.h +++ b/drivers/atm/ambassador.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #ifndef AMBASSADOR_H | 23 | #ifndef AMBASSADOR_H |
| 24 | #define AMBASSADOR_H | 24 | #define AMBASSADOR_H |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | #ifdef CONFIG_ATM_AMBASSADOR_DEBUG | 27 | #ifdef CONFIG_ATM_AMBASSADOR_DEBUG |
| 29 | #define DEBUG_AMBASSADOR | 28 | #define DEBUG_AMBASSADOR |
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index c13c4d736ef5..976ced1f019e 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 92923bf27233..9be9a4055199 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h index 2558eb853235..f9abfdac33e4 100644 --- a/drivers/atm/fore200e.h +++ b/drivers/atm/fore200e.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | #define _FORE200E_H | 3 | #define _FORE200E_H |
| 4 | 4 | ||
| 5 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | /* rx buffer sizes */ | 7 | /* rx buffer sizes */ |
| 9 | 8 | ||
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index fde9334059af..a5cbd3d6e50f 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | 55 | ||
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | #include <linux/config.h> | ||
| 59 | #include <linux/module.h> | 58 | #include <linux/module.h> |
| 60 | #include <linux/kernel.h> | 59 | #include <linux/kernel.h> |
| 61 | #include <linux/skbuff.h> | 60 | #include <linux/skbuff.h> |
| @@ -1018,7 +1017,7 @@ he_init_irq(struct he_dev *he_dev) | |||
| 1018 | return 0; | 1017 | return 0; |
| 1019 | } | 1018 | } |
| 1020 | 1019 | ||
| 1021 | static int __init | 1020 | static int __devinit |
| 1022 | he_start(struct atm_dev *dev) | 1021 | he_start(struct atm_dev *dev) |
| 1023 | { | 1022 | { |
| 1024 | struct he_dev *he_dev; | 1023 | struct he_dev *he_dev; |
diff --git a/drivers/atm/horizon.h b/drivers/atm/horizon.h index e2cc7020fa3b..4461229f56a5 100644 --- a/drivers/atm/horizon.h +++ b/drivers/atm/horizon.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #ifndef DRIVER_ATM_HORIZON_H | 30 | #ifndef DRIVER_ATM_HORIZON_H |
| 31 | #define DRIVER_ATM_HORIZON_H | 31 | #define DRIVER_ATM_HORIZON_H |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | 33 | ||
| 35 | #ifdef CONFIG_ATM_HORIZON_DEBUG | 34 | #ifdef CONFIG_ATM_HORIZON_DEBUG |
| 36 | #define DEBUG_HORIZON | 35 | #define DEBUG_HORIZON |
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index 0aabfc2a59d9..325325afabec 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c | |||
| @@ -358,7 +358,7 @@ static const struct atmphy_ops idt77105_ops = { | |||
| 358 | }; | 358 | }; |
| 359 | 359 | ||
| 360 | 360 | ||
| 361 | int idt77105_init(struct atm_dev *dev) | 361 | int __devinit idt77105_init(struct atm_dev *dev) |
| 362 | { | 362 | { |
| 363 | dev->phy = &idt77105_ops; | 363 | dev->phy = &idt77105_ops; |
| 364 | return 0; | 364 | return 0; |
diff --git a/drivers/atm/idt77105.h b/drivers/atm/idt77105.h index 8ba8218aaefe..3fd2bc899761 100644 --- a/drivers/atm/idt77105.h +++ b/drivers/atm/idt77105.h | |||
| @@ -76,7 +76,7 @@ | |||
| 76 | #define IDT77105_CTRSEL_RHEC 0x01 /* W, Rx HEC Error Counter */ | 76 | #define IDT77105_CTRSEL_RHEC 0x01 /* W, Rx HEC Error Counter */ |
| 77 | 77 | ||
| 78 | #ifdef __KERNEL__ | 78 | #ifdef __KERNEL__ |
| 79 | int idt77105_init(struct atm_dev *dev) __init; | 79 | int idt77105_init(struct atm_dev *dev); |
| 80 | #endif | 80 | #endif |
| 81 | 81 | ||
| 82 | /* | 82 | /* |
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index b4a76cade646..8fdb30116f99 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c | |||
| @@ -34,7 +34,6 @@ static char const rcsid[] = | |||
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
| 39 | #include <linux/skbuff.h> | 38 | #include <linux/skbuff.h> |
| 40 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 2e2e50e1167a..333a7bc609d2 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
| @@ -2284,7 +2284,7 @@ static int reset_sar(struct atm_dev *dev) | |||
| 2284 | } | 2284 | } |
| 2285 | 2285 | ||
| 2286 | 2286 | ||
| 2287 | static int __init ia_init(struct atm_dev *dev) | 2287 | static int __devinit ia_init(struct atm_dev *dev) |
| 2288 | { | 2288 | { |
| 2289 | IADEV *iadev; | 2289 | IADEV *iadev; |
| 2290 | unsigned long real_base; | 2290 | unsigned long real_base; |
| @@ -2480,7 +2480,7 @@ static void ia_free_rx(IADEV *iadev) | |||
| 2480 | iadev->rx_dle_dma); | 2480 | iadev->rx_dle_dma); |
| 2481 | } | 2481 | } |
| 2482 | 2482 | ||
| 2483 | static int __init ia_start(struct atm_dev *dev) | 2483 | static int __devinit ia_start(struct atm_dev *dev) |
| 2484 | { | 2484 | { |
| 2485 | IADEV *iadev; | 2485 | IADEV *iadev; |
| 2486 | int error; | 2486 | int error; |
diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h index b8d0bd4d6c30..133eefcc0475 100644 --- a/drivers/atm/iphase.h +++ b/drivers/atm/iphase.h | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #ifndef IPHASE_H | 43 | #ifndef IPHASE_H |
| 44 | #define IPHASE_H | 44 | #define IPHASE_H |
| 45 | 45 | ||
| 46 | #include <linux/config.h> | ||
| 47 | 46 | ||
| 48 | /************************ IADBG DEFINE *********************************/ | 47 | /************************ IADBG DEFINE *********************************/ |
| 49 | /* IADebugFlag Bit Map */ | 48 | /* IADebugFlag Bit Map */ |
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 074abc81ec3d..b78612d3fa46 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | /* Header files ***************************************************************/ | 36 | /* Header files ***************************************************************/ |
| 37 | 37 | ||
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 41 | #include <linux/skbuff.h> | 40 | #include <linux/skbuff.h> |
| 42 | #include <linux/atmdev.h> | 41 | #include <linux/atmdev.h> |
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c index b1d063cc4fbe..f04f39c00833 100644 --- a/drivers/atm/suni.c +++ b/drivers/atm/suni.c | |||
| @@ -289,7 +289,7 @@ static const struct atmphy_ops suni_ops = { | |||
| 289 | }; | 289 | }; |
| 290 | 290 | ||
| 291 | 291 | ||
| 292 | int suni_init(struct atm_dev *dev) | 292 | int __devinit suni_init(struct atm_dev *dev) |
| 293 | { | 293 | { |
| 294 | unsigned char mri; | 294 | unsigned char mri; |
| 295 | 295 | ||
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index f484747f255e..1699c934bad0 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ | 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
diff --git a/drivers/atm/zatm.h b/drivers/atm/zatm.h index 416fe0fda60c..ae9165ce15a0 100644 --- a/drivers/atm/zatm.h +++ b/drivers/atm/zatm.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef DRIVER_ATM_ZATM_H | 6 | #ifndef DRIVER_ATM_ZATM_H |
| 7 | #define DRIVER_ATM_ZATM_H | 7 | #define DRIVER_ATM_ZATM_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/skbuff.h> | 9 | #include <linux/skbuff.h> |
| 11 | #include <linux/atm.h> | 10 | #include <linux/atm.h> |
| 12 | #include <linux/atmdev.h> | 11 | #include <linux/atmdev.h> |
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 050d86d0b872..83fa8b291a59 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
diff --git a/drivers/base/class.c b/drivers/base/class.c index 9aa127460262..de8908320f23 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/device.h> | 13 | #include <linux/device.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/drivers/base/core.c b/drivers/base/core.c index 27c2176895de..b21f864c9ce8 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 13 | #include <linux/err.h> | 12 | #include <linux/err.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index b400314e1c62..562600dd540a 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
diff --git a/drivers/base/node.c b/drivers/base/node.c index eae2bdc183bb..d7de1753e094 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
| @@ -40,24 +40,13 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) | |||
| 40 | int n; | 40 | int n; |
| 41 | int nid = dev->id; | 41 | int nid = dev->id; |
| 42 | struct sysinfo i; | 42 | struct sysinfo i; |
| 43 | struct page_state ps; | ||
| 44 | unsigned long inactive; | 43 | unsigned long inactive; |
| 45 | unsigned long active; | 44 | unsigned long active; |
| 46 | unsigned long free; | 45 | unsigned long free; |
| 47 | 46 | ||
| 48 | si_meminfo_node(&i, nid); | 47 | si_meminfo_node(&i, nid); |
| 49 | get_page_state_node(&ps, nid); | ||
| 50 | __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); | 48 | __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); |
| 51 | 49 | ||
| 52 | /* Check for negative values in these approximate counters */ | ||
| 53 | if ((long)ps.nr_dirty < 0) | ||
| 54 | ps.nr_dirty = 0; | ||
| 55 | if ((long)ps.nr_writeback < 0) | ||
| 56 | ps.nr_writeback = 0; | ||
| 57 | if ((long)ps.nr_mapped < 0) | ||
| 58 | ps.nr_mapped = 0; | ||
| 59 | if ((long)ps.nr_slab < 0) | ||
| 60 | ps.nr_slab = 0; | ||
| 61 | 50 | ||
| 62 | n = sprintf(buf, "\n" | 51 | n = sprintf(buf, "\n" |
| 63 | "Node %d MemTotal: %8lu kB\n" | 52 | "Node %d MemTotal: %8lu kB\n" |
| @@ -71,7 +60,12 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) | |||
| 71 | "Node %d LowFree: %8lu kB\n" | 60 | "Node %d LowFree: %8lu kB\n" |
| 72 | "Node %d Dirty: %8lu kB\n" | 61 | "Node %d Dirty: %8lu kB\n" |
| 73 | "Node %d Writeback: %8lu kB\n" | 62 | "Node %d Writeback: %8lu kB\n" |
| 63 | "Node %d FilePages: %8lu kB\n" | ||
| 74 | "Node %d Mapped: %8lu kB\n" | 64 | "Node %d Mapped: %8lu kB\n" |
| 65 | "Node %d AnonPages: %8lu kB\n" | ||
| 66 | "Node %d PageTables: %8lu kB\n" | ||
| 67 | "Node %d NFS Unstable: %8lu kB\n" | ||
| 68 | "Node %d Bounce: %8lu kB\n" | ||
| 75 | "Node %d Slab: %8lu kB\n", | 69 | "Node %d Slab: %8lu kB\n", |
| 76 | nid, K(i.totalram), | 70 | nid, K(i.totalram), |
| 77 | nid, K(i.freeram), | 71 | nid, K(i.freeram), |
| @@ -82,10 +76,15 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) | |||
| 82 | nid, K(i.freehigh), | 76 | nid, K(i.freehigh), |
| 83 | nid, K(i.totalram - i.totalhigh), | 77 | nid, K(i.totalram - i.totalhigh), |
| 84 | nid, K(i.freeram - i.freehigh), | 78 | nid, K(i.freeram - i.freehigh), |
| 85 | nid, K(ps.nr_dirty), | 79 | nid, K(node_page_state(nid, NR_FILE_DIRTY)), |
| 86 | nid, K(ps.nr_writeback), | 80 | nid, K(node_page_state(nid, NR_WRITEBACK)), |
| 87 | nid, K(ps.nr_mapped), | 81 | nid, K(node_page_state(nid, NR_FILE_PAGES)), |
| 88 | nid, K(ps.nr_slab)); | 82 | nid, K(node_page_state(nid, NR_FILE_MAPPED)), |
| 83 | nid, K(node_page_state(nid, NR_ANON_PAGES)), | ||
| 84 | nid, K(node_page_state(nid, NR_PAGETABLE)), | ||
| 85 | nid, K(node_page_state(nid, NR_UNSTABLE_NFS)), | ||
| 86 | nid, K(node_page_state(nid, NR_BOUNCE)), | ||
| 87 | nid, K(node_page_state(nid, NR_SLAB))); | ||
| 89 | n += hugetlb_report_node_meminfo(nid, buf + n); | 88 | n += hugetlb_report_node_meminfo(nid, buf + n); |
| 90 | return n; | 89 | return n; |
| 91 | } | 90 | } |
| @@ -95,28 +94,6 @@ static SYSDEV_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL); | |||
| 95 | 94 | ||
| 96 | static ssize_t node_read_numastat(struct sys_device * dev, char * buf) | 95 | static ssize_t node_read_numastat(struct sys_device * dev, char * buf) |
| 97 | { | 96 | { |
| 98 | unsigned long numa_hit, numa_miss, interleave_hit, numa_foreign; | ||
| 99 | unsigned long local_node, other_node; | ||
| 100 | int i, cpu; | ||
| 101 | pg_data_t *pg = NODE_DATA(dev->id); | ||
| 102 | numa_hit = 0; | ||
| 103 | numa_miss = 0; | ||
| 104 | interleave_hit = 0; | ||
| 105 | numa_foreign = 0; | ||
| 106 | local_node = 0; | ||
| 107 | other_node = 0; | ||
| 108 | for (i = 0; i < MAX_NR_ZONES; i++) { | ||
| 109 | struct zone *z = &pg->node_zones[i]; | ||
| 110 | for_each_online_cpu(cpu) { | ||
| 111 | struct per_cpu_pageset *ps = zone_pcp(z,cpu); | ||
| 112 | numa_hit += ps->numa_hit; | ||
| 113 | numa_miss += ps->numa_miss; | ||
| 114 | numa_foreign += ps->numa_foreign; | ||
| 115 | interleave_hit += ps->interleave_hit; | ||
| 116 | local_node += ps->local_node; | ||
| 117 | other_node += ps->other_node; | ||
| 118 | } | ||
| 119 | } | ||
| 120 | return sprintf(buf, | 97 | return sprintf(buf, |
| 121 | "numa_hit %lu\n" | 98 | "numa_hit %lu\n" |
| 122 | "numa_miss %lu\n" | 99 | "numa_miss %lu\n" |
| @@ -124,12 +101,12 @@ static ssize_t node_read_numastat(struct sys_device * dev, char * buf) | |||
| 124 | "interleave_hit %lu\n" | 101 | "interleave_hit %lu\n" |
| 125 | "local_node %lu\n" | 102 | "local_node %lu\n" |
| 126 | "other_node %lu\n", | 103 | "other_node %lu\n", |
| 127 | numa_hit, | 104 | node_page_state(dev->id, NUMA_HIT), |
| 128 | numa_miss, | 105 | node_page_state(dev->id, NUMA_MISS), |
| 129 | numa_foreign, | 106 | node_page_state(dev->id, NUMA_FOREIGN), |
| 130 | interleave_hit, | 107 | node_page_state(dev->id, NUMA_INTERLEAVE_HIT), |
| 131 | local_node, | 108 | node_page_state(dev->id, NUMA_LOCAL), |
| 132 | other_node); | 109 | node_page_state(dev->id, NUMA_OTHER)); |
| 133 | } | 110 | } |
| 134 | static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL); | 111 | static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL); |
| 135 | 112 | ||
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 0d2e101e4f15..fdfa3d0cf6af 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * ancestral dependencies that the subsystem list maintains. | 19 | * ancestral dependencies that the subsystem list maintains. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 24 | #include "power.h" | 23 | #include "power.h" |
| 25 | 24 | ||
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c index 8826a5b6673e..3483ae4d57f5 100644 --- a/drivers/base/power/shutdown.c +++ b/drivers/base/power/shutdown.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 13 | #include <asm/semaphore.h> | 12 | #include <asm/semaphore.h> |
| 14 | 13 | ||
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 6858178b3aff..04e5db445c74 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * add themselves as children of the system bus. | 12 | * add themselves as children of the system bus. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sysdev.h> | 15 | #include <linux/sysdev.h> |
| 17 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c index a317e4303952..0b80fbb8dbfd 100644 --- a/drivers/block/acsi.c +++ b/drivers/block/acsi.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | * | 43 | * |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/config.h> | ||
| 47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
| 49 | #include <linux/signal.h> | 48 | #include <linux/signal.h> |
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 013c5daddb0b..7b3b94ddddcc 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | * | 50 | * |
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #include <linux/config.h> | ||
| 54 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 55 | #include <linux/moduleparam.h> | 54 | #include <linux/moduleparam.h> |
| 56 | #include <linux/sched.h> | 55 | #include <linux/sched.h> |
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 39662f0c9cce..0a1b1ea36ddc 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
| @@ -50,9 +50,9 @@ | |||
| 50 | #define DBG_RX 0x0200 | 50 | #define DBG_RX 0x0200 |
| 51 | #define DBG_TX 0x0400 | 51 | #define DBG_TX 0x0400 |
| 52 | static unsigned int debugflags; | 52 | static unsigned int debugflags; |
| 53 | static unsigned int nbds_max = 16; | ||
| 54 | #endif /* NDEBUG */ | 53 | #endif /* NDEBUG */ |
| 55 | 54 | ||
| 55 | static unsigned int nbds_max = 16; | ||
| 56 | static struct nbd_device nbd_dev[MAX_NBD]; | 56 | static struct nbd_device nbd_dev[MAX_NBD]; |
| 57 | 57 | ||
| 58 | /* | 58 | /* |
diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c index ce94aa11f6a7..4b258f7836f3 100644 --- a/drivers/block/paride/paride.c +++ b/drivers/block/paride/paride.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #define PI_VERSION "1.06" | 21 | #define PI_VERSION "1.06" |
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kmod.h> | 24 | #include <linux/kmod.h> |
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 3e4cce5e4736..bde2c64b6346 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | *************************************************************************/ | 44 | *************************************************************************/ |
| 45 | 45 | ||
| 46 | #include <linux/pktcdvd.h> | 46 | #include <linux/pktcdvd.h> |
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 49 | #include <linux/types.h> | 48 | #include <linux/types.h> |
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c index a729013a3973..aef5a0ccabc9 100644 --- a/drivers/block/ps2esdi.c +++ b/drivers/block/ps2esdi.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #define DEVICE_NAME "PS/2 ESDI" | 30 | #define DEVICE_NAME "PS/2 ESDI" |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/major.h> | 32 | #include <linux/major.h> |
| 34 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
| 35 | #include <linux/wait.h> | 34 | #include <linux/wait.h> |
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index a9e1c2524c2a..3cf246abb5ec 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | * and set blk_size for -ENOSPC, Werner Fink <werner@suse.de>, Apr '99 | 42 | * and set blk_size for -ENOSPC, Werner Fink <werner@suse.de>, Apr '99 |
| 43 | */ | 43 | */ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/string.h> | 45 | #include <linux/string.h> |
| 47 | #include <linux/slab.h> | 46 | #include <linux/slab.h> |
| 48 | #include <asm/atomic.h> | 47 | #include <asm/atomic.h> |
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 628877945f9b..3721e12135d9 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * handle GCR disks | 16 | * handle GCR disks |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/stddef.h> | 19 | #include <linux/stddef.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 585197b95af7..f675f97f2a78 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | //#define DEBUG /* uncomment if you want debugging info (pr_debug) */ | 37 | //#define DEBUG /* uncomment if you want debugging info (pr_debug) */ |
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 40 | #include <linux/fs.h> | 39 | #include <linux/fs.h> |
| 41 | #include <linux/bio.h> | 40 | #include <linux/bio.h> |
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c index 3e7a067cc087..6f67141f4de0 100644 --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | 26 | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 8947c8837dac..23f96213f4ac 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | 25 | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 473a13b22b29..2830f58d6f77 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c index 9446960ac742..e0231dc2cb1a 100644 --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | 25 | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index b94ac2f9f7ba..c9dba5565cac 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | 25 | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 9ce4c93467e5..c889bf8109a1 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index ed8dca84ff69..be6eed175aa3 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 7bd4ef904115..d0cface535fb 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | 26 | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index 4804d474dc87..ad62abbbb739 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | 27 | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 613673b12fa6..1994270c16e1 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | 27 | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 92382e823285..a7d9d7e99e72 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | 35 | ||
| 37 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index 85738223ff0c..ea589007fa26 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | 27 | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 3170eaa25087..ca27ee89240b 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -263,7 +263,6 @@ | |||
| 263 | /* #define ERRLOGMASK (CD_WARNING|CD_OPEN|CD_COUNT_TRACKS|CD_CLOSE) */ | 263 | /* #define ERRLOGMASK (CD_WARNING|CD_OPEN|CD_COUNT_TRACKS|CD_CLOSE) */ |
| 264 | /* #define ERRLOGMASK (CD_WARNING|CD_REG_UNREG|CD_DO_IOCTL|CD_OPEN|CD_CLOSE|CD_COUNT_TRACKS) */ | 264 | /* #define ERRLOGMASK (CD_WARNING|CD_REG_UNREG|CD_DO_IOCTL|CD_OPEN|CD_CLOSE|CD_COUNT_TRACKS) */ |
| 265 | 265 | ||
| 266 | #include <linux/config.h> | ||
| 267 | #include <linux/module.h> | 266 | #include <linux/module.h> |
| 268 | #include <linux/fs.h> | 267 | #include <linux/fs.h> |
| 269 | #include <linux/buffer_head.h> | 268 | #include <linux/buffer_head.h> |
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index 4ee288688fed..9b05ddd23141 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
| @@ -914,7 +914,7 @@ static void seek(int lba) | |||
| 914 | cd->dsb = wait_dsb(); | 914 | cd->dsb = wait_dsb(); |
| 915 | } | 915 | } |
| 916 | 916 | ||
| 917 | uch bcdbin(unsigned char bcd) | 917 | static uch bcdbin(unsigned char bcd) |
| 918 | { /* stolen from mcd.c! */ | 918 | { /* stolen from mcd.c! */ |
| 919 | return (bcd >> 4) * 10 + (bcd & 0xf); | 919 | return (bcd >> 4) * 10 + (bcd & 0xf); |
| 920 | } | 920 | } |
| @@ -1532,7 +1532,7 @@ static void __init parse_options(void) | |||
| 1532 | } | 1532 | } |
| 1533 | } | 1533 | } |
| 1534 | 1534 | ||
| 1535 | static int __cm206_init(void) | 1535 | static int __init __cm206_init(void) |
| 1536 | { | 1536 | { |
| 1537 | parse_options(); | 1537 | parse_options(); |
| 1538 | #if !defined(AUTO_PROBE_MODULE) | 1538 | #if !defined(AUTO_PROBE_MODULE) |
| @@ -1593,8 +1593,3 @@ __setup("cm206=", cm206_setup); | |||
| 1593 | #endif /* !MODULE */ | 1593 | #endif /* !MODULE */ |
| 1594 | MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR); | 1594 | MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR); |
| 1595 | 1595 | ||
| 1596 | /* | ||
| 1597 | * Local variables: | ||
| 1598 | * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -DMODULE -DMODVERSIONS -include /usr/src/linux/include/linux/modversions.h -c -o cm206.o cm206.c" | ||
| 1599 | * End: | ||
| 1600 | */ | ||
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index 2fc966c65a0e..ba50e5a712f2 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c | |||
| @@ -381,7 +381,6 @@ | |||
| 381 | #include <asm/io.h> | 381 | #include <asm/io.h> |
| 382 | #include <asm/uaccess.h> | 382 | #include <asm/uaccess.h> |
| 383 | #include <stdarg.h> | 383 | #include <stdarg.h> |
| 384 | #include <linux/config.h> | ||
| 385 | #include "sbpcd.h" | 384 | #include "sbpcd.h" |
| 386 | 385 | ||
| 387 | #define MAJOR_NR MATSUSHITA_CDROM_MAJOR | 386 | #define MAJOR_NR MATSUSHITA_CDROM_MAJOR |
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index f74eeeb8e377..8cd52984cda5 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * work is done in the northbridge(s). | 8 | * work is done in the northbridge(s). |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index a92ab53a1370..cc5ea347a8a7 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * TODO: | 27 | * TODO: |
| 28 | * - Allocate more than order 0 pages to avoid too much linear map splitting. | 28 | * - Allocate more than order 0 pages to avoid too much linear map splitting. |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 6602b3156df5..3e7dc7cbd740 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * ever possible. | 31 | * ever possible. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | 35 | ||
| 37 | #undef SERIAL_PARANOIA_CHECK | 36 | #undef SERIAL_PARANOIA_CHECK |
diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c index c85a4fa60da7..04a12027a740 100644 --- a/drivers/char/consolemap.c +++ b/drivers/char/consolemap.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Fix bug in inverse translation. Stanislav Voronyi <stas@cnti.uanet.kharkov.ua>, Dec 1998 | 11 | * Fix bug in inverse translation. Stanislav Voronyi <stas@cnti.uanet.kharkov.ua>, Dec 1998 |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kd.h> | 15 | #include <linux/kd.h> |
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 2657eeba7da6..1f61a6744a26 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
| @@ -633,7 +633,6 @@ static char rcsid[] = | |||
| 633 | /* | 633 | /* |
| 634 | * Include section | 634 | * Include section |
| 635 | */ | 635 | */ |
| 636 | #include <linux/config.h> | ||
| 637 | #include <linux/module.h> | 636 | #include <linux/module.h> |
| 638 | #include <linux/errno.h> | 637 | #include <linux/errno.h> |
| 639 | #include <linux/signal.h> | 638 | #include <linux/signal.h> |
diff --git a/drivers/char/decserial.c b/drivers/char/decserial.c index aa1440934e95..85f404e25c73 100644 --- a/drivers/char/decserial.c +++ b/drivers/char/decserial.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * console device I strongly recommend to use only one. | 16 | * console device I strongly recommend to use only one. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <asm/dec/machtype.h> | 20 | #include <asm/dec/machtype.h> |
| 22 | 21 | ||
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 9da0ddb892b5..5642ac43e0f5 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | 38 | ||
| 39 | #if defined(__linux__) | 39 | #if defined(__linux__) |
| 40 | #if defined(__KERNEL__) | 40 | #if defined(__KERNEL__) |
| 41 | #include <linux/config.h> | ||
| 42 | #endif | 41 | #endif |
| 43 | #include <asm/ioctl.h> /* For _IO* macros */ | 42 | #include <asm/ioctl.h> /* For _IO* macros */ |
| 44 | #define DRM_IOCTL_NR(n) _IOC_NR(n) | 43 | #define DRM_IOCTL_NR(n) _IOC_NR(n) |
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index cb76e5ca9a23..d2a56182bc35 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * can build the DRM (part of PI DRI). 4/21/2000 S + B */ | 44 | * can build the DRM (part of PI DRI). 4/21/2000 S + B */ |
| 45 | #include <asm/current.h> | 45 | #include <asm/current.h> |
| 46 | #endif /* __alpha__ */ | 46 | #endif /* __alpha__ */ |
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 49 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 50 | #include <linux/miscdevice.h> | 49 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c index 7e3318e1d1c6..5681cae1d404 100644 --- a/drivers/char/drm/drm_memory.c +++ b/drivers/char/drm/drm_memory.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * OTHER DEALINGS IN THE SOFTWARE. | 33 | * OTHER DEALINGS IN THE SOFTWARE. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/highmem.h> | 36 | #include <linux/highmem.h> |
| 38 | #include "drmP.h" | 37 | #include "drmP.h" |
| 39 | 38 | ||
diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h index 714d9aedcff5..f1b97aff10cf 100644 --- a/drivers/char/drm/drm_memory.h +++ b/drivers/char/drm/drm_memory.h | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * OTHER DEALINGS IN THE SOFTWARE. | 33 | * OTHER DEALINGS IN THE SOFTWARE. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/highmem.h> | 36 | #include <linux/highmem.h> |
| 38 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
| 39 | #include "drmP.h" | 38 | #include "drmP.h" |
diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h index d117cc997192..74581af806e1 100644 --- a/drivers/char/drm/drm_memory_debug.h +++ b/drivers/char/drm/drm_memory_debug.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * OTHER DEALINGS IN THE SOFTWARE. | 31 | * OTHER DEALINGS IN THE SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include "drmP.h" | 34 | #include "drmP.h" |
| 36 | 35 | ||
| 37 | typedef struct drm_mem_stats { | 36 | typedef struct drm_mem_stats { |
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c index ce81bf248200..06ef7ddbe67d 100644 --- a/drivers/char/drm/drm_scatter.c +++ b/drivers/char/drm/drm_scatter.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * DEALINGS IN THE SOFTWARE. | 31 | * DEALINGS IN THE SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
| 36 | #include "drmP.h" | 35 | #include "drmP.h" |
| 37 | 36 | ||
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c index 0b9f98a7eb10..51ad98c685c3 100644 --- a/drivers/char/drm/drm_sysfs.c +++ b/drivers/char/drm/drm_sysfs.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 17 | #include <linux/kdev_t.h> | 16 | #include <linux/kdev_t.h> |
| 18 | #include <linux/err.h> | 17 | #include <linux/err.h> |
diff --git a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c index c13f9abb41e9..dd45111a4854 100644 --- a/drivers/char/drm/ffb_drv.c +++ b/drivers/char/drm/ffb_drv.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 2000 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 2000 David S. Miller (davem@redhat.com) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include "ffb.h" | 7 | #include "ffb.h" |
| 9 | #include "drmP.h" | 8 | #include "drmP.h" |
| 10 | 9 | ||
diff --git a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c index dfe6ad2b6a6e..fabb9a817966 100644 --- a/drivers/char/drm/i810_drv.c +++ b/drivers/char/drm/i810_drv.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * Gareth Hughes <gareth@valinux.com> | 30 | * Gareth Hughes <gareth@valinux.com> |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include "drmP.h" | 33 | #include "drmP.h" |
| 35 | #include "drm.h" | 34 | #include "drm.h" |
| 36 | #include "i810_drm.h" | 35 | #include "i810_drm.h" |
diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c index 722658188f5f..389597e4a623 100644 --- a/drivers/char/drm/i830_drv.c +++ b/drivers/char/drm/i830_drv.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * Keith Whitwell <keith@tungstengraphics.com> | 32 | * Keith Whitwell <keith@tungstengraphics.com> |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include "drmP.h" | 35 | #include "drmP.h" |
| 37 | #include "drm.h" | 36 | #include "drm.h" |
| 38 | #include "i830_drm.h" | 37 | #include "i830_drm.h" |
diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c index 9f7ed0e0351b..e30f556b79f1 100644 --- a/drivers/char/drm/mga_drv.c +++ b/drivers/char/drm/mga_drv.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * Gareth Hughes <gareth@valinux.com> | 29 | * Gareth Hughes <gareth@valinux.com> |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include "drmP.h" | 32 | #include "drmP.h" |
| 34 | #include "drm.h" | 33 | #include "drm.h" |
| 35 | #include "mga_drm.h" | 34 | #include "mga_drm.h" |
diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c index e20450ae220e..6108e7587e12 100644 --- a/drivers/char/drm/r128_drv.c +++ b/drivers/char/drm/r128_drv.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * Gareth Hughes <gareth@valinux.com> | 29 | * Gareth Hughes <gareth@valinux.com> |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include "drmP.h" | 32 | #include "drmP.h" |
| 34 | #include "drm.h" | 33 | #include "drm.h" |
| 35 | #include "r128_drm.h" | 34 | #include "r128_drm.h" |
diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c index b04ed1b562b9..eb985c2a31e9 100644 --- a/drivers/char/drm/radeon_drv.c +++ b/drivers/char/drm/radeon_drv.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * OTHER DEALINGS IN THE SOFTWARE. | 29 | * OTHER DEALINGS IN THE SOFTWARE. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include "drmP.h" | 32 | #include "drmP.h" |
| 34 | #include "drm.h" | 33 | #include "drm.h" |
| 35 | #include "radeon_drm.h" | 34 | #include "radeon_drm.h" |
diff --git a/drivers/char/drm/savage_drv.c b/drivers/char/drm/savage_drv.c index aa6c0d1a82f8..eee52aa92a7c 100644 --- a/drivers/char/drm/savage_drv.c +++ b/drivers/char/drm/savage_drv.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 23 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include "drmP.h" | 26 | #include "drmP.h" |
| 28 | #include "savage_drm.h" | 27 | #include "savage_drm.h" |
| 29 | #include "savage_drv.h" | 28 | #include "savage_drv.h" |
diff --git a/drivers/char/drm/sis_drv.c b/drivers/char/drm/sis_drv.c index 6f6d7d613ede..5e9dc86f2956 100644 --- a/drivers/char/drm/sis_drv.c +++ b/drivers/char/drm/sis_drv.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include "drmP.h" | 28 | #include "drmP.h" |
| 30 | #include "sis_drm.h" | 29 | #include "sis_drm.h" |
| 31 | #include "sis_drv.h" | 30 | #include "sis_drv.h" |
diff --git a/drivers/char/drm/tdfx_drv.c b/drivers/char/drm/tdfx_drv.c index baa4416032a8..012ff2e356b2 100644 --- a/drivers/char/drm/tdfx_drv.c +++ b/drivers/char/drm/tdfx_drv.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * Gareth Hughes <gareth@valinux.com> | 30 | * Gareth Hughes <gareth@valinux.com> |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include "drmP.h" | 33 | #include "drmP.h" |
| 35 | #include "tdfx_drv.h" | 34 | #include "tdfx_drv.h" |
| 36 | 35 | ||
diff --git a/drivers/char/drm/via_drv.c b/drivers/char/drm/via_drv.c index 3f012255d315..b3d364d793d7 100644 --- a/drivers/char/drm/via_drv.c +++ b/drivers/char/drm/via_drv.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include "drmP.h" | 25 | #include "drmP.h" |
| 27 | #include "via_drm.h" | 26 | #include "via_drm.h" |
| 28 | #include "via_drv.h" | 27 | #include "via_drv.h" |
diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c index a75e8609be01..625e8b517005 100644 --- a/drivers/char/ds1302.c +++ b/drivers/char/ds1302.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | *! | 12 | *! |
| 13 | *!***************************************************************************/ | 13 | *!***************************************************************************/ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c index 62cda25724e3..953e670dcd09 100644 --- a/drivers/char/ds1620.c +++ b/drivers/char/ds1620.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/drivers/char/ds1620.c: Dallas Semiconductors DS1620 | 2 | * linux/drivers/char/ds1620.c: Dallas Semiconductors DS1620 |
| 3 | * thermometer driver (as used in the Rebel.com NetWinder) | 3 | * thermometer driver (as used in the Rebel.com NetWinder) |
| 4 | */ | 4 | */ |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 8 | #include <linux/miscdevice.h> | 7 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/ec3104_keyb.c b/drivers/char/ec3104_keyb.c index 4aed66968821..abac18b1871c 100644 --- a/drivers/char/ec3104_keyb.c +++ b/drivers/char/ec3104_keyb.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * (prumpf@tux.org). | 26 | * (prumpf@tux.org). |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | 29 | ||
| 31 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 32 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index d0b3890d9302..86d290e9f307 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | /* See README.epca for change history --DAT*/ | 30 | /* See README.epca for change history --DAT*/ |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 36 | #include <linux/types.h> | 35 | #include <linux/types.h> |
diff --git a/drivers/char/ftape/lowlevel/ftape-calibr.c b/drivers/char/ftape/lowlevel/ftape-calibr.c index 956b2586e138..8e50bfd35a52 100644 --- a/drivers/char/ftape/lowlevel/ftape-calibr.c +++ b/drivers/char/ftape/lowlevel/ftape-calibr.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * functions. | 24 | * functions. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/jiffies.h> | 28 | #include <linux/jiffies.h> |
| 30 | #include <asm/system.h> | 29 | #include <asm/system.h> |
diff --git a/drivers/char/ftape/lowlevel/ftape-ctl.c b/drivers/char/ftape/lowlevel/ftape-ctl.c index 32e043911790..5d7c1ce92d59 100644 --- a/drivers/char/ftape/lowlevel/ftape-ctl.c +++ b/drivers/char/ftape/lowlevel/ftape-ctl.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * QIC-40/80/3010/3020 floppy-tape driver "ftape" for Linux. | 25 | * QIC-40/80/3010/3020 floppy-tape driver "ftape" for Linux. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
| 31 | #include <linux/mman.h> | 30 | #include <linux/mman.h> |
diff --git a/drivers/char/ftape/lowlevel/ftape-init.c b/drivers/char/ftape/lowlevel/ftape-init.c index b54260d457c2..4998132a81d1 100644 --- a/drivers/char/ftape/lowlevel/ftape-init.c +++ b/drivers/char/ftape/lowlevel/ftape-init.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * for the QIC-40/80/3010/3020 floppy-tape driver for Linux. | 21 | * for the QIC-40/80/3010/3020 floppy-tape driver for Linux. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/fs.h> | 26 | #include <linux/fs.h> |
diff --git a/drivers/char/ftape/lowlevel/ftape-proc.c b/drivers/char/ftape/lowlevel/ftape-proc.c index c66251e997ed..e805b15e0a12 100644 --- a/drivers/char/ftape/lowlevel/ftape-proc.c +++ b/drivers/char/ftape/lowlevel/ftape-proc.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Old code removed, switched to dynamic proc entry. | 26 | * Old code removed, switched to dynamic proc entry. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | 29 | ||
| 31 | #if defined(CONFIG_PROC_FS) && defined(CONFIG_FT_PROC_FS) | 30 | #if defined(CONFIG_PROC_FS) && defined(CONFIG_FT_PROC_FS) |
| 32 | 31 | ||
diff --git a/drivers/char/ftape/lowlevel/ftape-setup.c b/drivers/char/ftape/lowlevel/ftape-setup.c index 280a1a55d87e..678340acd0b7 100644 --- a/drivers/char/ftape/lowlevel/ftape-setup.c +++ b/drivers/char/ftape/lowlevel/ftape-setup.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * "ftape" for Linux. | 25 | * "ftape" for Linux. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 31 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
diff --git a/drivers/char/ftape/lowlevel/ftape-tracing.h b/drivers/char/ftape/lowlevel/ftape-tracing.h index fa7cd20ee66c..2950810c7085 100644 --- a/drivers/char/ftape/lowlevel/ftape-tracing.h +++ b/drivers/char/ftape/lowlevel/ftape-tracing.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * QIC-40/80/3010/3020 floppy-tape driver "ftape" for Linux. | 28 | * QIC-40/80/3010/3020 floppy-tape driver "ftape" for Linux. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | 32 | ||
| 34 | /* | 33 | /* |
diff --git a/drivers/char/ftape/lowlevel/ftape_syms.c b/drivers/char/ftape/lowlevel/ftape_syms.c index 5dc3a380c9bf..8e0dc4a07ca6 100644 --- a/drivers/char/ftape/lowlevel/ftape_syms.c +++ b/drivers/char/ftape/lowlevel/ftape_syms.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * exports to its high level clients | 25 | * exports to its high level clients |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | 29 | ||
| 31 | #include <linux/ftape.h> | 30 | #include <linux/ftape.h> |
diff --git a/drivers/char/ftape/zftape/zftape-ctl.c b/drivers/char/ftape/zftape/zftape-ctl.c index 6c7874e5c199..22ba0f5d00cf 100644 --- a/drivers/char/ftape/zftape/zftape-ctl.c +++ b/drivers/char/ftape/zftape/zftape-ctl.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * for the QIC-40/80/3010/3020 floppy-tape driver for Linux. | 24 | * for the QIC-40/80/3010/3020 floppy-tape driver for Linux. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
diff --git a/drivers/char/ftape/zftape/zftape-ctl.h b/drivers/char/ftape/zftape/zftape-ctl.h index 414159891990..8e6f2d7ac74e 100644 --- a/drivers/char/ftape/zftape/zftape-ctl.h +++ b/drivers/char/ftape/zftape/zftape-ctl.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * for the QIC-40/80 floppy-tape driver for Linux. | 27 | * for the QIC-40/80 floppy-tape driver for Linux. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/ioctl.h> | 30 | #include <linux/ioctl.h> |
| 32 | #include <linux/mtio.h> | 31 | #include <linux/mtio.h> |
| 33 | 32 | ||
diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c index 3eeb869a9a11..55272566b740 100644 --- a/drivers/char/ftape/zftape/zftape-init.c +++ b/drivers/char/ftape/zftape/zftape-init.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * to the ftape floppy tape driver for Linux | 20 | * to the ftape floppy tape driver for Linux |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c index 588fca542a98..bebd7e34f792 100644 --- a/drivers/char/genrtc.c +++ b/drivers/char/genrtc.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #define RTC_VERSION "1.07" | 43 | #define RTC_VERSION "1.07" |
| 44 | 44 | ||
| 45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 46 | #include <linux/config.h> | ||
| 47 | #include <linux/errno.h> | 46 | #include <linux/errno.h> |
| 48 | #include <linux/miscdevice.h> | 47 | #include <linux/miscdevice.h> |
| 49 | #include <linux/fcntl.h> | 48 | #include <linux/fcntl.h> |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 07473cd84121..8b6c76f8ef0e 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 6e380aecea6a..859e5005c785 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 27 | #include <linux/cpumask.h> | 26 | #include <linux/cpumask.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/drivers/char/ip2/i2ellis.h b/drivers/char/ip2/i2ellis.h index 510b026d7d26..5eabe47b0bc8 100644 --- a/drivers/char/ip2/i2ellis.h +++ b/drivers/char/ip2/i2ellis.h | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | //---------------------- | 47 | //---------------------- |
| 48 | // Mandatory Includes: | 48 | // Mandatory Includes: |
| 49 | //---------------------- | 49 | //---------------------- |
| 50 | #include <linux/config.h> | ||
| 51 | #include "ip2types.h" | 50 | #include "ip2types.h" |
| 52 | #include "i2hw.h" // The hardware definitions | 51 | #include "i2hw.h" // The hardware definitions |
| 53 | 52 | ||
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 8619542766cb..f9aa53c76f99 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | /************/ | 82 | /************/ |
| 83 | /* Includes */ | 83 | /* Includes */ |
| 84 | /************/ | 84 | /************/ |
| 85 | #include <linux/config.h> | ||
| 86 | 85 | ||
| 87 | #include <linux/ctype.h> | 86 | #include <linux/ctype.h> |
| 88 | #include <linux/string.h> | 87 | #include <linux/string.h> |
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c index da637adbbfaa..2fc894fef1cb 100644 --- a/drivers/char/ipmi/ipmi_devintf.c +++ b/drivers/char/ipmi/ipmi_devintf.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 37 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index ad26f4b997c5..0aa5d608fe6f 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
| 37 | #include <asm/system.h> | 36 | #include <asm/system.h> |
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index d0b5c08e7b4e..8d941db83457 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * with this program; if not, write to the Free Software Foundation, Inc., | 31 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 32 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 32 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 33 | */ | 33 | */ |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 37 | #include <linux/proc_fs.h> | 36 | #include <linux/proc_fs.h> |
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index bd4f2248b758..c7f3e5c80666 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * and drives the real SMI state machine. | 38 | * and drives the real SMI state machine. |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/module.h> | 41 | #include <linux/module.h> |
| 43 | #include <linux/moduleparam.h> | 42 | #include <linux/moduleparam.h> |
| 44 | #include <asm/system.h> | 43 | #include <asm/system.h> |
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 1a0a19c53605..74a889c58333 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 37 | #include <linux/ipmi.h> | 36 | #include <linux/ipmi.h> |
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 478bf4d7d065..c105b9540ad8 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
| @@ -245,7 +245,7 @@ static int lock_card(struct isi_board *card) | |||
| 245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", | 245 | printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", |
| 246 | card->base); | 246 | card->base); |
| 247 | 247 | ||
| 248 | return 0; /* Failed to aquire the card! */ | 248 | return 0; /* Failed to acquire the card! */ |
| 249 | } | 249 | } |
| 250 | 250 | ||
| 251 | static int lock_card_at_interrupt(struct isi_board *card) | 251 | static int lock_card_at_interrupt(struct isi_board *card) |
| @@ -262,7 +262,7 @@ static int lock_card_at_interrupt(struct isi_board *card) | |||
| 262 | spin_unlock_irqrestore(&card->card_lock, card->flags); | 262 | spin_unlock_irqrestore(&card->card_lock, card->flags); |
| 263 | } | 263 | } |
| 264 | /* Failing in interrupt is an acceptable event */ | 264 | /* Failing in interrupt is an acceptable event */ |
| 265 | return 0; /* Failed to aquire the card! */ | 265 | return 0; /* Failed to acquire the card! */ |
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | static void unlock_card(struct isi_board *card) | 268 | static void unlock_card(struct isi_board *card) |
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index c74e5660a9b7..fbce2f0669d6 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | /*****************************************************************************/ | 27 | /*****************************************************************************/ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| @@ -282,7 +281,6 @@ static char *stli_brdnames[] = { | |||
| 282 | 281 | ||
| 283 | /*****************************************************************************/ | 282 | /*****************************************************************************/ |
| 284 | 283 | ||
| 285 | #ifdef MODULE | ||
| 286 | /* | 284 | /* |
| 287 | * Define some string labels for arguments passed from the module | 285 | * Define some string labels for arguments passed from the module |
| 288 | * load line. These allow for easy board definitions, and easy | 286 | * load line. These allow for easy board definitions, and easy |
| @@ -381,8 +379,6 @@ MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]"); | |||
| 381 | module_param_array(board3, charp, NULL, 0); | 379 | module_param_array(board3, charp, NULL, 0); |
| 382 | MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]"); | 380 | MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]"); |
| 383 | 381 | ||
| 384 | #endif | ||
| 385 | |||
| 386 | /* | 382 | /* |
| 387 | * Set up a default memory address table for EISA board probing. | 383 | * Set up a default memory address table for EISA board probing. |
| 388 | * The default addresses are all bellow 1Mbyte, which has to be the | 384 | * The default addresses are all bellow 1Mbyte, which has to be the |
| @@ -643,14 +639,8 @@ static unsigned int stli_baudrates[] = { | |||
| 643 | * Prototype all functions in this driver! | 639 | * Prototype all functions in this driver! |
| 644 | */ | 640 | */ |
| 645 | 641 | ||
| 646 | #ifdef MODULE | ||
| 647 | static void stli_argbrds(void); | ||
| 648 | static int stli_parsebrd(stlconf_t *confp, char **argp); | 642 | static int stli_parsebrd(stlconf_t *confp, char **argp); |
| 649 | 643 | static int stli_init(void); | |
| 650 | static unsigned long stli_atol(char *str); | ||
| 651 | #endif | ||
| 652 | |||
| 653 | int stli_init(void); | ||
| 654 | static int stli_open(struct tty_struct *tty, struct file *filp); | 644 | static int stli_open(struct tty_struct *tty, struct file *filp); |
| 655 | static void stli_close(struct tty_struct *tty, struct file *filp); | 645 | static void stli_close(struct tty_struct *tty, struct file *filp); |
| 656 | static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count); | 646 | static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count); |
| @@ -786,8 +776,6 @@ static int stli_timeron; | |||
| 786 | 776 | ||
| 787 | static struct class *istallion_class; | 777 | static struct class *istallion_class; |
| 788 | 778 | ||
| 789 | #ifdef MODULE | ||
| 790 | |||
| 791 | /* | 779 | /* |
| 792 | * Loadable module initialization stuff. | 780 | * Loadable module initialization stuff. |
| 793 | */ | 781 | */ |
| @@ -954,8 +942,6 @@ static int stli_parsebrd(stlconf_t *confp, char **argp) | |||
| 954 | return(1); | 942 | return(1); |
| 955 | } | 943 | } |
| 956 | 944 | ||
| 957 | #endif | ||
| 958 | |||
| 959 | /*****************************************************************************/ | 945 | /*****************************************************************************/ |
| 960 | 946 | ||
| 961 | static int stli_open(struct tty_struct *tty, struct file *filp) | 947 | static int stli_open(struct tty_struct *tty, struct file *filp) |
| @@ -4694,7 +4680,7 @@ static struct tty_operations stli_ops = { | |||
| 4694 | 4680 | ||
| 4695 | /*****************************************************************************/ | 4681 | /*****************************************************************************/ |
| 4696 | 4682 | ||
| 4697 | int __init stli_init(void) | 4683 | static int __init stli_init(void) |
| 4698 | { | 4684 | { |
| 4699 | int i; | 4685 | int i; |
| 4700 | printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion); | 4686 | printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion); |
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 4bb3d2272604..056ebe84b81d 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * 21-08-02: Converted to input API, major cleanup. (Vojtech Pavlik) | 24 | * 21-08-02: Converted to input API, major cleanup. (Vojtech Pavlik) |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 30 | #include <linux/tty.h> | 29 | #include <linux/tty.h> |
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c index 29963d8be667..7d49b241de56 100644 --- a/drivers/char/lcd.c +++ b/drivers/char/lcd.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #define RTC_IO_EXTENT 0x10 /*Only really two ports, but... */ | 15 | #define RTC_IO_EXTENT 0x10 /*Only really two ports, but... */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/miscdevice.h> | 19 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index b11a390581ba..582cdbdb0c42 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c | |||
| @@ -114,7 +114,6 @@ | |||
| 114 | #include <linux/module.h> | 114 | #include <linux/module.h> |
| 115 | #include <linux/init.h> | 115 | #include <linux/init.h> |
| 116 | 116 | ||
| 117 | #include <linux/config.h> | ||
| 118 | #include <linux/errno.h> | 117 | #include <linux/errno.h> |
| 119 | #include <linux/kernel.h> | 118 | #include <linux/kernel.h> |
| 120 | #include <linux/major.h> | 119 | #include <linux/major.h> |
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c index c268ee04b2aa..bb07c2766b27 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * MOATB Core Services driver. | 10 | * MOATB Core Services driver. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/moduleparam.h> | 15 | #include <linux/moduleparam.h> |
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 6fe7b6c6c462..70f3954d6dfd 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Shared /dev/zero mmaping support, Feb 2000, Kanoj Sarcar <kanoj@sgi.com> | 8 | * Shared /dev/zero mmaping support, Feb 2000, Kanoj Sarcar <kanoj@sgi.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 13 | #include <linux/miscdevice.h> | 12 | #include <linux/miscdevice.h> |
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index dfe1cede3916..d5fa19da330b 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/config.h> | ||
| 38 | 37 | ||
| 39 | #include <linux/fs.h> | 38 | #include <linux/fs.h> |
| 40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 52ef61f54ba0..4ea7bd5f4f56 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * version : 5.1 | 29 | * version : 5.1 |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 35 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c index d1fe05e83882..4e4865e90e50 100644 --- a/drivers/char/mwave/3780i.c +++ b/drivers/char/mwave/3780i.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * First release to the public | 46 | * First release to the public |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
| 51 | #include <linux/unistd.h> | 50 | #include <linux/unistd.h> |
| 52 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 72cfd09091e0..eb1559fcb81a 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/autoconf.h> | 40 | #include <linux/autoconf.h> |
| 42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c index 9f54733f1623..337a87f86a3b 100644 --- a/drivers/char/n_hdlc.c +++ b/drivers/char/n_hdlc.c | |||
| @@ -81,7 +81,6 @@ | |||
| 81 | #define HDLC_MAGIC 0x239e | 81 | #define HDLC_MAGIC 0x239e |
| 82 | #define HDLC_VERSION "$Revision: 4.8 $" | 82 | #define HDLC_VERSION "$Revision: 4.8 $" |
| 83 | 83 | ||
| 84 | #include <linux/config.h> | ||
| 85 | #include <linux/module.h> | 84 | #include <linux/module.h> |
| 86 | #include <linux/init.h> | 85 | #include <linux/init.h> |
| 87 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 3556ccd77570..8c5f102622b6 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #define NVRAM_VERSION "1.2" | 37 | #define NVRAM_VERSION "1.2" |
| 38 | 38 | ||
| 39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/sched.h> | 40 | #include <linux/sched.h> |
| 42 | #include <linux/smp_lock.h> | 41 | #include <linux/smp_lock.h> |
| 43 | #include <linux/nvram.h> | 42 | #include <linux/nvram.h> |
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c index 4083b781adbf..94845dd12ca9 100644 --- a/drivers/char/nwbutton.c +++ b/drivers/char/nwbutton.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * | 4 | * |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c index 1c706ccfdbb3..c860de6a6fde 100644 --- a/drivers/char/pc8736x_gpio.c +++ b/drivers/char/pc8736x_gpio.c | |||
| @@ -319,9 +319,10 @@ static int __init pc8736x_gpio_init(void) | |||
| 319 | return 0; | 319 | return 0; |
| 320 | 320 | ||
| 321 | undo_platform_dev_add: | 321 | undo_platform_dev_add: |
| 322 | platform_device_put(pdev); | 322 | platform_device_del(pdev); |
| 323 | undo_platform_dev_alloc: | 323 | undo_platform_dev_alloc: |
| 324 | kfree(pdev); | 324 | platform_device_put(pdev); |
| 325 | |||
| 325 | return rc; | 326 | return rc; |
| 326 | } | 327 | } |
| 327 | 328 | ||
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index eab5394da666..31c8a21f9d87 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
| @@ -149,12 +149,7 @@ struct cm4000_dev { | |||
| 149 | #define ZERO_DEV(dev) \ | 149 | #define ZERO_DEV(dev) \ |
| 150 | memset(&dev->atr_csum,0, \ | 150 | memset(&dev->atr_csum,0, \ |
| 151 | sizeof(struct cm4000_dev) - \ | 151 | sizeof(struct cm4000_dev) - \ |
| 152 | /*link*/ sizeof(struct pcmcia_device *) - \ | 152 | offsetof(struct cm4000_dev, atr_csum)) |
| 153 | /*node*/ sizeof(dev_node_t) - \ | ||
| 154 | /*atr*/ MAX_ATR*sizeof(char) - \ | ||
| 155 | /*rbuf*/ 512*sizeof(char) - \ | ||
| 156 | /*sbuf*/ 512*sizeof(char) - \ | ||
| 157 | /*queue*/ 4*sizeof(wait_queue_head_t)) | ||
| 158 | 153 | ||
| 159 | static struct pcmcia_device *dev_table[CM4000_MAX_DEV]; | 154 | static struct pcmcia_device *dev_table[CM4000_MAX_DEV]; |
| 160 | static struct class *cmm_class; | 155 | static struct class *cmm_class; |
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 9491e4307566..34dd4c38110e 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> /* For EXPORT_SYMBOL */ | 14 | #include <linux/module.h> /* For EXPORT_SYMBOL */ |
| 16 | 15 | ||
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
diff --git a/drivers/char/qtronix.c b/drivers/char/qtronix.c index 601d09baf9d7..1087530e5854 100644 --- a/drivers/char/qtronix.c +++ b/drivers/char/qtronix.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | 36 | ||
| 38 | /* | 37 | /* |
| 39 | * NOTE: | 38 | * NOTE: |
diff --git a/drivers/char/random.c b/drivers/char/random.c index 58f3512c52e1..164bddae047f 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -224,7 +224,6 @@ | |||
| 224 | */ | 224 | */ |
| 225 | 225 | ||
| 226 | #include <linux/utsname.h> | 226 | #include <linux/utsname.h> |
| 227 | #include <linux/config.h> | ||
| 228 | #include <linux/module.h> | 227 | #include <linux/module.h> |
| 229 | #include <linux/kernel.h> | 228 | #include <linux/kernel.h> |
| 230 | #include <linux/major.h> | 229 | #include <linux/major.h> |
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index aa43436d5d1b..5332d1d4b0e4 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * */ | 33 | * */ |
| 34 | 34 | ||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/kdev_t.h> | 36 | #include <linux/kdev_t.h> |
| 38 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h index 55b9c97e8477..dc3f005614a3 100644 --- a/drivers/char/rio/rio_linux.h +++ b/drivers/char/rio/rio_linux.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Version 1.0 -- July, 1999. | 23 | * Version 1.0 -- July, 1999. |
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | #define RIO_NBOARDS 4 | 27 | #define RIO_NBOARDS 4 |
| 29 | #define RIO_PORTSPERBOARD 128 | 28 | #define RIO_PORTSPERBOARD 128 |
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c index 12e34bc3f7ce..99f3df02b61c 100644 --- a/drivers/char/rio/rioinit.c +++ b/drivers/char/rio/rioinit.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | static char *_rioinit_c_sccs_ = "@(#)rioinit.c 1.3"; | 33 | static char *_rioinit_c_sccs_ = "@(#)rioinit.c 1.3"; |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
| 39 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 0897b0c8d528..37dc2edd8d75 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
| @@ -61,7 +61,6 @@ | |||
| 61 | * this driver.) | 61 | * this driver.) |
| 62 | */ | 62 | */ |
| 63 | 63 | ||
| 64 | #include <linux/config.h> | ||
| 65 | #include <linux/interrupt.h> | 64 | #include <linux/interrupt.h> |
| 66 | #include <linux/module.h> | 65 | #include <linux/module.h> |
| 67 | #include <linux/kernel.h> | 66 | #include <linux/kernel.h> |
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c index 5a280a330401..45083e5dd23b 100644 --- a/drivers/char/scx200_gpio.c +++ b/drivers/char/scx200_gpio.c | |||
| @@ -126,9 +126,10 @@ static int __init scx200_gpio_init(void) | |||
| 126 | undo_chrdev_region: | 126 | undo_chrdev_region: |
| 127 | unregister_chrdev_region(dev, num_pins); | 127 | unregister_chrdev_region(dev, num_pins); |
| 128 | undo_platform_device_add: | 128 | undo_platform_device_add: |
| 129 | platform_device_put(pdev); | 129 | platform_device_del(pdev); |
| 130 | undo_malloc: | 130 | undo_malloc: |
| 131 | kfree(pdev); | 131 | platform_device_put(pdev); |
| 132 | |||
| 132 | return rc; | 133 | return rc; |
| 133 | } | 134 | } |
| 134 | 135 | ||
| @@ -136,7 +137,6 @@ static void __exit scx200_gpio_cleanup(void) | |||
| 136 | { | 137 | { |
| 137 | kfree(scx200_devices); | 138 | kfree(scx200_devices); |
| 138 | unregister_chrdev_region(MKDEV(major, 0), num_pins); | 139 | unregister_chrdev_region(MKDEV(major, 0), num_pins); |
| 139 | platform_device_put(pdev); | ||
| 140 | platform_device_unregister(pdev); | 140 | platform_device_unregister(pdev); |
| 141 | /* kfree(pdev); */ | 141 | /* kfree(pdev); */ |
| 142 | } | 142 | } |
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index c851eeaa4069..21a710cb4bba 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * - replace bottom half handler with task queue handler | 44 | * - replace bottom half handler with task queue handler |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
| 49 | #include <linux/signal.h> | 48 | #include <linux/signal.h> |
| 50 | #include <linux/sched.h> | 49 | #include <linux/sched.h> |
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 43dfd8689dce..e19d4856e9fc 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/input.h> | 37 | #include <linux/input.h> |
| 39 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c index d2d6b01dcd05..d4243fb80815 100644 --- a/drivers/char/specialix.c +++ b/drivers/char/specialix.c | |||
| @@ -75,7 +75,6 @@ | |||
| 75 | * Documentation/specialix.txt | 75 | * Documentation/specialix.txt |
| 76 | */ | 76 | */ |
| 77 | 77 | ||
| 78 | #include <linux/config.h> | ||
| 79 | #include <linux/module.h> | 78 | #include <linux/module.h> |
| 80 | 79 | ||
| 81 | #include <asm/io.h> | 80 | #include <asm/io.h> |
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 0f7a542d9041..f15df0e423e0 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | /*****************************************************************************/ | 27 | /*****************************************************************************/ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index 4e35d4181224..03edccc8a823 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | //#define DBGRBUF(info) dump_rbufs(info) | 46 | //#define DBGRBUF(info) dump_rbufs(info) |
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 51 | #include <linux/version.h> | 50 | #include <linux/version.h> |
| 52 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 21bf15ad9980..ba54df3cf60a 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | 34 | ||
| 35 | #define MAX_DEVICES 12 | 35 | #define MAX_DEVICES 12 |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 40 | #include <linux/signal.h> | 39 | #include <linux/signal.h> |
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 35082dc12eae..a064ee9181c0 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * based upon discusions in irc://irc.openprojects.net/#kernelnewbies | 12 | * based upon discusions in irc://irc.openprojects.net/#kernelnewbies |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c index f7802e5bd7ca..e0633a119d29 100644 --- a/drivers/char/tipar.c +++ b/drivers/char/tipar.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | */ | 42 | */ |
| 43 | #undef DEBUG /* change to #define to get debugging | 43 | #undef DEBUG /* change to #define to get debugging |
| 44 | * output - for pr_debug() */ | 44 | * output - for pr_debug() */ |
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 47 | #include <linux/types.h> | 46 | #include <linux/types.h> |
| 48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index ef68d152d3e4..dfc4437afefb 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * MPCBL0010 ATCA computer. | 27 | * MPCBL0010 ATCA computer. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 33 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index a1143238feca..615e934da05f 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | * alloc_tty_struct() always uses kmalloc() -- Andrew Morton <andrewm@uow.edu.eu> 17Mar01 | 65 | * alloc_tty_struct() always uses kmalloc() -- Andrew Morton <andrewm@uow.edu.eu> 17Mar01 |
| 66 | */ | 66 | */ |
| 67 | 67 | ||
| 68 | #include <linux/config.h> | ||
| 69 | #include <linux/types.h> | 68 | #include <linux/types.h> |
| 70 | #include <linux/major.h> | 69 | #include <linux/major.h> |
| 71 | #include <linux/errno.h> | 70 | #include <linux/errno.h> |
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c index 234d7f3fb114..45e9bd81bc0e 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/char/vc_screen.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * - making it shorter - scr_readw are macros which expand in PRETTY long code | 21 | * - making it shorter - scr_readw are macros which expand in PRETTY long code |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/major.h> | 25 | #include <linux/major.h> |
| 27 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 07f5ce4b28e3..766f7864c6c6 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * along with this program; if not, write to the Free Software Foundation, | 25 | * along with this program; if not, write to the Free Software Foundation, |
| 26 | * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 26 | * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/proc_fs.h> | 29 | #include <linux/proc_fs.h> |
| 31 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 198f1505ae23..7d42c8ec8dbc 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * the OS/400 partition. The format of the messages is defined in | 31 | * the OS/400 partition. The format of the messages is defined in |
| 32 | * iseries/vio.h | 32 | * iseries/vio.h |
| 33 | */ | 33 | */ |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 37 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c index fe99fc1aba45..b17a6e2bbca8 100644 --- a/drivers/char/vme_scc.c +++ b/drivers/char/vme_scc.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kdev_t.h> | 17 | #include <linux/kdev_t.h> |
| 19 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index d6f65032649a..3ef823d7d255 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -86,7 +86,6 @@ | |||
| 86 | #include <linux/consolemap.h> | 86 | #include <linux/consolemap.h> |
| 87 | #include <linux/timer.h> | 87 | #include <linux/timer.h> |
| 88 | #include <linux/interrupt.h> | 88 | #include <linux/interrupt.h> |
| 89 | #include <linux/config.h> | ||
| 90 | #include <linux/workqueue.h> | 89 | #include <linux/workqueue.h> |
| 91 | #include <linux/bootmem.h> | 90 | #include <linux/bootmem.h> |
| 92 | #include <linux/pm.h> | 91 | #include <linux/pm.h> |
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 24011e7c81ff..eccffaf26faa 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Check put/get_user, cleanups - acme@conectiva.com.br - Jun 2001 | 10 | * Check put/get_user, cleanups - acme@conectiva.com.br - Jun 2001 |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/drivers/char/watchdog/at91_wdt.c b/drivers/char/watchdog/at91_wdt.c index 00080655533d..f61dedc3c96c 100644 --- a/drivers/char/watchdog/at91_wdt.c +++ b/drivers/char/watchdog/at91_wdt.c | |||
| @@ -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/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c index b6640606b44d..537f5c6729bf 100644 --- a/drivers/char/watchdog/booke_wdt.c +++ b/drivers/char/watchdog/booke_wdt.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 20 | #include <linux/miscdevice.h> | 19 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c index 25c2f2575611..e89cda010b49 100644 --- a/drivers/char/watchdog/eurotechwdt.c +++ b/drivers/char/watchdog/eurotechwdt.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | * Added Matt Domsch's nowayout module option. | 40 | * Added Matt Domsch's nowayout module option. |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
| 45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| 46 | #include <linux/moduleparam.h> | 45 | #include <linux/moduleparam.h> |
diff --git a/drivers/char/watchdog/ib700wdt.c b/drivers/char/watchdog/ib700wdt.c index cf60329eec85..a2e53c715b36 100644 --- a/drivers/char/watchdog/ib700wdt.c +++ b/drivers/char/watchdog/ib700wdt.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/types.h> | 35 | #include <linux/types.h> |
| 37 | #include <linux/miscdevice.h> | 36 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c index 294c474ae485..b0741cbdc139 100644 --- a/drivers/char/watchdog/ibmasr.c +++ b/drivers/char/watchdog/ibmasr.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * of the GNU Public License, incorporated herein by reference. | 10 | * of the GNU Public License, incorporated herein by reference. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
diff --git a/drivers/char/watchdog/indydog.c b/drivers/char/watchdog/indydog.c index b4b94daba67e..d387979b2434 100644 --- a/drivers/char/watchdog/indydog.c +++ b/drivers/char/watchdog/indydog.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/moduleparam.h> | 15 | #include <linux/moduleparam.h> |
| 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 <linux/fs.h> | 18 | #include <linux/fs.h> |
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c index 0cfb9b9c4a4b..aa29a7d68759 100644 --- a/drivers/char/watchdog/ixp2000_wdt.c +++ b/drivers/char/watchdog/ixp2000_wdt.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * warranty of any kind, whether express or implied. | 16 | * warranty of any kind, whether express or implied. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/moduleparam.h> | 20 | #include <linux/moduleparam.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c index 3800835ca8f3..e6a3fe83fa01 100644 --- a/drivers/char/watchdog/ixp4xx_wdt.c +++ b/drivers/char/watchdog/ixp4xx_wdt.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c index a9a20aad61e7..b67b4878ae0f 100644 --- a/drivers/char/watchdog/machzwd.c +++ b/drivers/char/watchdog/machzwd.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT | 28 | * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/moduleparam.h> | 32 | #include <linux/moduleparam.h> |
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c index d8dede575402..433c27f98159 100644 --- a/drivers/char/watchdog/mixcomwd.c +++ b/drivers/char/watchdog/mixcomwd.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | 37 | ||
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/moduleparam.h> | 39 | #include <linux/moduleparam.h> |
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/types.h> | 40 | #include <linux/types.h> |
| 42 | #include <linux/miscdevice.h> | 41 | #include <linux/miscdevice.h> |
| 43 | #include <linux/ioport.h> | 42 | #include <linux/ioport.h> |
diff --git a/drivers/char/watchdog/mpc83xx_wdt.c b/drivers/char/watchdog/mpc83xx_wdt.c index 5d6f5061603a..dac1381af364 100644 --- a/drivers/char/watchdog/mpc83xx_wdt.c +++ b/drivers/char/watchdog/mpc83xx_wdt.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * option) any later version. | 15 | * option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/drivers/char/watchdog/mpc8xx_wdt.c b/drivers/char/watchdog/mpc8xx_wdt.c index b2fc71e20850..11f0ccd4c4d4 100644 --- a/drivers/char/watchdog/mpc8xx_wdt.c +++ b/drivers/char/watchdog/mpc8xx_wdt.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c index 2c2c51773200..9c11d920add5 100644 --- a/drivers/char/watchdog/mpcore_wdt.c +++ b/drivers/char/watchdog/mpcore_wdt.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | */ | 21 | */ |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 26 | #include <linux/miscdevice.h> | 25 | #include <linux/miscdevice.h> |
| 27 | #include <linux/watchdog.h> | 26 | #include <linux/watchdog.h> |
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c index f1b9cf89f153..20a6cbb0fbb8 100644 --- a/drivers/char/watchdog/mv64x60_wdt.c +++ b/drivers/char/watchdog/mv64x60_wdt.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * or implied. | 15 | * or implied. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c index 0d072bed501d..92bf8c1a0f0d 100644 --- a/drivers/char/watchdog/pcwd_usb.c +++ b/drivers/char/watchdog/pcwd_usb.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * http://www.berkprod.com/ or http://www.pcwatchdog.com/ | 24 | * http://www.berkprod.com/ or http://www.pcwatchdog.com/ |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index 1ea04e9b2b0b..f267dad26071 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | 37 | ||
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/moduleparam.h> | 39 | #include <linux/moduleparam.h> |
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/types.h> | 40 | #include <linux/types.h> |
| 42 | #include <linux/timer.h> | 41 | #include <linux/timer.h> |
| 43 | #include <linux/miscdevice.h> | 42 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c index 522a9370db94..b22e95c5470c 100644 --- a/drivers/char/watchdog/sa1100_wdt.c +++ b/drivers/char/watchdog/sa1100_wdt.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | * 27/11/2000 Initial release | 18 | * 27/11/2000 Initial release |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/char/watchdog/sbc8360.c index c6cbf808d8c2..6562aa910ace 100644 --- a/drivers/char/watchdog/sbc8360.c +++ b/drivers/char/watchdog/sbc8360.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * | 36 | * |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/types.h> | 40 | #include <linux/types.h> |
| 42 | #include <linux/miscdevice.h> | 41 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/watchdog/sbc_epx_c3.c b/drivers/char/watchdog/sbc_epx_c3.c index 837b1ec3ffe3..09867fadc720 100644 --- a/drivers/char/watchdog/sbc_epx_c3.c +++ b/drivers/char/watchdog/sbc_epx_c3.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c index 20b88f9b7be2..78ef6333c181 100644 --- a/drivers/char/watchdog/sc1200wdt.c +++ b/drivers/char/watchdog/sc1200wdt.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/moduleparam.h> | 31 | #include <linux/moduleparam.h> |
| 33 | #include <linux/miscdevice.h> | 32 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c index b4a102a2d7e3..c0b4754e8de0 100644 --- a/drivers/char/watchdog/scx200_wdt.c +++ b/drivers/char/watchdog/scx200_wdt.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | of any nature resulting due to the use of this software. This | 17 | of any nature resulting due to the use of this software. This |
| 18 | software is provided AS-IS with no warranties. */ | 18 | software is provided AS-IS with no warranties. */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
diff --git a/drivers/char/watchdog/shwdt.c b/drivers/char/watchdog/shwdt.c index 1f4cab55b2ef..803701b675c0 100644 --- a/drivers/char/watchdog/shwdt.c +++ b/drivers/char/watchdog/shwdt.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Added expect close support, made emulated timeout runtime changeable | 17 | * Added expect close support, made emulated timeout runtime changeable |
| 18 | * general cleanups, add some ioctls | 18 | * general cleanups, add some ioctls |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c index a91edaf3a350..79ce5c655428 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/char/watchdog/softdog.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | 38 | ||
| 39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 40 | #include <linux/moduleparam.h> | 40 | #include <linux/moduleparam.h> |
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 43 | #include <linux/timer.h> | 42 | #include <linux/timer.h> |
| 44 | #include <linux/miscdevice.h> | 43 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/watchdog/w83977f_wdt.c b/drivers/char/watchdog/w83977f_wdt.c index a7ff64c8921f..c31849e4c5c2 100644 --- a/drivers/char/watchdog/w83977f_wdt.c +++ b/drivers/char/watchdog/w83977f_wdt.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
diff --git a/drivers/char/watchdog/wd501p.h b/drivers/char/watchdog/wd501p.h index 84e60eb74337..a4504f40394d 100644 --- a/drivers/char/watchdog/wd501p.h +++ b/drivers/char/watchdog/wd501p.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #define WDT_COUNT0 (io+0) | 23 | #define WDT_COUNT0 (io+0) |
| 25 | #define WDT_COUNT1 (io+1) | 24 | #define WDT_COUNT1 (io+1) |
diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c index dacfe31caccf..3a462c34b92a 100644 --- a/drivers/char/watchdog/wdrtas.c +++ b/drivers/char/watchdog/wdrtas.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c index ec7e401228ee..2586e9e858e2 100644 --- a/drivers/char/watchdog/wdt.c +++ b/drivers/char/watchdog/wdt.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * Matt Domsch : Added nowayout module option | 31 | * Matt Domsch : Added nowayout module option |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/moduleparam.h> | 36 | #include <linux/moduleparam.h> |
diff --git a/drivers/char/watchdog/wdt977.c b/drivers/char/watchdog/wdt977.c index 3843900e94c4..3cde2b9bb763 100644 --- a/drivers/char/watchdog/wdt977.c +++ b/drivers/char/watchdog/wdt977.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/moduleparam.h> | 26 | #include <linux/moduleparam.h> |
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c index 4b3311993d48..c79cc9543d96 100644 --- a/drivers/char/watchdog/wdt_pci.c +++ b/drivers/char/watchdog/wdt_pci.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * Matt Domsch : nowayout module option | 35 | * Matt Domsch : nowayout module option |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/moduleparam.h> | 40 | #include <linux/moduleparam.h> |
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 35e0b9ceecf7..1ba4039777e8 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index 145061b8472a..25eee5394201 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sysdev.h> | 13 | #include <linux/sysdev.h> |
| 15 | #include <linux/cpu.h> | 14 | #include <linux/cpu.h> |
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c index 071ee4f1bbf2..44ae5e5b94cf 100644 --- a/drivers/cpufreq/cpufreq_userspace.c +++ b/drivers/cpufreq/cpufreq_userspace.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/smp.h> | 16 | #include <linux/smp.h> |
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c index 53423ad6d4a3..f79f6b587bfa 100644 --- a/drivers/edac/amd76x_edac.c +++ b/drivers/edac/amd76x_edac.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| @@ -20,6 +19,9 @@ | |||
| 20 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 21 | #include "edac_mc.h" | 20 | #include "edac_mc.h" |
| 22 | 21 | ||
| 22 | #define AMD76X_REVISION " Ver: 2.0.1 " __DATE__ | ||
| 23 | #define EDAC_MOD_STR "amd76x_edac" | ||
| 24 | |||
| 23 | #define amd76x_printk(level, fmt, arg...) \ | 25 | #define amd76x_printk(level, fmt, arg...) \ |
| 24 | edac_printk(level, "amd76x", fmt, ##arg) | 26 | edac_printk(level, "amd76x", fmt, ##arg) |
| 25 | 27 | ||
| @@ -102,15 +104,18 @@ static const struct amd76x_dev_info amd76x_devs[] = { | |||
| 102 | static void amd76x_get_error_info(struct mem_ctl_info *mci, | 104 | static void amd76x_get_error_info(struct mem_ctl_info *mci, |
| 103 | struct amd76x_error_info *info) | 105 | struct amd76x_error_info *info) |
| 104 | { | 106 | { |
| 105 | pci_read_config_dword(mci->pdev, AMD76X_ECC_MODE_STATUS, | 107 | struct pci_dev *pdev; |
| 108 | |||
| 109 | pdev = to_pci_dev(mci->dev); | ||
| 110 | pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS, | ||
| 106 | &info->ecc_mode_status); | 111 | &info->ecc_mode_status); |
| 107 | 112 | ||
| 108 | if (info->ecc_mode_status & BIT(8)) | 113 | if (info->ecc_mode_status & BIT(8)) |
| 109 | pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS, | 114 | pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS, |
| 110 | (u32) BIT(8), (u32) BIT(8)); | 115 | (u32) BIT(8), (u32) BIT(8)); |
| 111 | 116 | ||
| 112 | if (info->ecc_mode_status & BIT(9)) | 117 | if (info->ecc_mode_status & BIT(9)) |
| 113 | pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS, | 118 | pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS, |
| 114 | (u32) BIT(9), (u32) BIT(9)); | 119 | (u32) BIT(9), (u32) BIT(9)); |
| 115 | } | 120 | } |
| 116 | 121 | ||
| @@ -176,6 +181,38 @@ static void amd76x_check(struct mem_ctl_info *mci) | |||
| 176 | amd76x_process_error_info(mci, &info, 1); | 181 | amd76x_process_error_info(mci, &info, 1); |
| 177 | } | 182 | } |
| 178 | 183 | ||
| 184 | static void amd76x_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev, | ||
| 185 | enum edac_type edac_mode) | ||
| 186 | { | ||
| 187 | struct csrow_info *csrow; | ||
| 188 | u32 mba, mba_base, mba_mask, dms; | ||
| 189 | int index; | ||
| 190 | |||
| 191 | for (index = 0; index < mci->nr_csrows; index++) { | ||
| 192 | csrow = &mci->csrows[index]; | ||
| 193 | |||
| 194 | /* find the DRAM Chip Select Base address and mask */ | ||
| 195 | pci_read_config_dword(pdev, | ||
| 196 | AMD76X_MEM_BASE_ADDR + (index * 4), | ||
| 197 | &mba); | ||
| 198 | |||
| 199 | if (!(mba & BIT(0))) | ||
| 200 | continue; | ||
| 201 | |||
| 202 | mba_base = mba & 0xff800000UL; | ||
| 203 | mba_mask = ((mba & 0xff80) << 16) | 0x7fffffUL; | ||
| 204 | pci_read_config_dword(pdev, AMD76X_DRAM_MODE_STATUS, &dms); | ||
| 205 | csrow->first_page = mba_base >> PAGE_SHIFT; | ||
| 206 | csrow->nr_pages = (mba_mask + 1) >> PAGE_SHIFT; | ||
| 207 | csrow->last_page = csrow->first_page + csrow->nr_pages - 1; | ||
| 208 | csrow->page_mask = mba_mask >> PAGE_SHIFT; | ||
| 209 | csrow->grain = csrow->nr_pages << PAGE_SHIFT; | ||
| 210 | csrow->mtype = MEM_RDDR; | ||
| 211 | csrow->dtype = ((dms >> index) & 0x1) ? DEV_X4 : DEV_UNKNOWN; | ||
| 212 | csrow->edac_mode = edac_mode; | ||
| 213 | } | ||
| 214 | } | ||
| 215 | |||
| 179 | /** | 216 | /** |
| 180 | * amd76x_probe1 - Perform set up for detected device | 217 | * amd76x_probe1 - Perform set up for detected device |
| 181 | * @pdev; PCI device detected | 218 | * @pdev; PCI device detected |
| @@ -187,15 +224,13 @@ static void amd76x_check(struct mem_ctl_info *mci) | |||
| 187 | */ | 224 | */ |
| 188 | static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) | 225 | static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) |
| 189 | { | 226 | { |
| 190 | int rc = -ENODEV; | 227 | static const enum edac_type ems_modes[] = { |
| 191 | int index; | ||
| 192 | struct mem_ctl_info *mci = NULL; | ||
| 193 | enum edac_type ems_modes[] = { | ||
| 194 | EDAC_NONE, | 228 | EDAC_NONE, |
| 195 | EDAC_EC, | 229 | EDAC_EC, |
| 196 | EDAC_SECDED, | 230 | EDAC_SECDED, |
| 197 | EDAC_SECDED | 231 | EDAC_SECDED |
| 198 | }; | 232 | }; |
| 233 | struct mem_ctl_info *mci = NULL; | ||
| 199 | u32 ems; | 234 | u32 ems; |
| 200 | u32 ems_mode; | 235 | u32 ems_mode; |
| 201 | struct amd76x_error_info discard; | 236 | struct amd76x_error_info discard; |
| @@ -206,53 +241,28 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 206 | mci = edac_mc_alloc(0, AMD76X_NR_CSROWS, AMD76X_NR_CHANS); | 241 | mci = edac_mc_alloc(0, AMD76X_NR_CSROWS, AMD76X_NR_CHANS); |
| 207 | 242 | ||
| 208 | if (mci == NULL) { | 243 | if (mci == NULL) { |
| 209 | rc = -ENOMEM; | 244 | return -ENOMEM; |
| 210 | goto fail; | ||
| 211 | } | 245 | } |
| 212 | 246 | ||
| 213 | debugf0("%s(): mci = %p\n", __func__, mci); | 247 | debugf0("%s(): mci = %p\n", __func__, mci); |
| 214 | mci->pdev = pdev; | 248 | mci->dev = &pdev->dev; |
| 215 | mci->mtype_cap = MEM_FLAG_RDDR; | 249 | mci->mtype_cap = MEM_FLAG_RDDR; |
| 216 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; | 250 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; |
| 217 | mci->edac_cap = ems_mode ? | 251 | mci->edac_cap = ems_mode ? |
| 218 | (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE; | 252 | (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE; |
| 219 | mci->mod_name = EDAC_MOD_STR; | 253 | mci->mod_name = EDAC_MOD_STR; |
| 220 | mci->mod_ver = "$Revision: 1.4.2.5 $"; | 254 | mci->mod_ver = AMD76X_REVISION; |
| 221 | mci->ctl_name = amd76x_devs[dev_idx].ctl_name; | 255 | mci->ctl_name = amd76x_devs[dev_idx].ctl_name; |
| 222 | mci->edac_check = amd76x_check; | 256 | mci->edac_check = amd76x_check; |
| 223 | mci->ctl_page_to_phys = NULL; | 257 | mci->ctl_page_to_phys = NULL; |
| 224 | 258 | ||
| 225 | for (index = 0; index < mci->nr_csrows; index++) { | 259 | amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]); |
| 226 | struct csrow_info *csrow = &mci->csrows[index]; | ||
| 227 | u32 mba; | ||
| 228 | u32 mba_base; | ||
| 229 | u32 mba_mask; | ||
| 230 | u32 dms; | ||
| 231 | |||
| 232 | /* find the DRAM Chip Select Base address and mask */ | ||
| 233 | pci_read_config_dword(mci->pdev, | ||
| 234 | AMD76X_MEM_BASE_ADDR + (index * 4), &mba); | ||
| 235 | |||
| 236 | if (!(mba & BIT(0))) | ||
| 237 | continue; | ||
| 238 | |||
| 239 | mba_base = mba & 0xff800000UL; | ||
| 240 | mba_mask = ((mba & 0xff80) << 16) | 0x7fffffUL; | ||
| 241 | pci_read_config_dword(mci->pdev, AMD76X_DRAM_MODE_STATUS, | ||
| 242 | &dms); | ||
| 243 | csrow->first_page = mba_base >> PAGE_SHIFT; | ||
| 244 | csrow->nr_pages = (mba_mask + 1) >> PAGE_SHIFT; | ||
| 245 | csrow->last_page = csrow->first_page + csrow->nr_pages - 1; | ||
| 246 | csrow->page_mask = mba_mask >> PAGE_SHIFT; | ||
| 247 | csrow->grain = csrow->nr_pages << PAGE_SHIFT; | ||
| 248 | csrow->mtype = MEM_RDDR; | ||
| 249 | csrow->dtype = ((dms >> index) & 0x1) ? DEV_X4 : DEV_UNKNOWN; | ||
| 250 | csrow->edac_mode = ems_modes[ems_mode]; | ||
| 251 | } | ||
| 252 | |||
| 253 | amd76x_get_error_info(mci, &discard); /* clear counters */ | 260 | amd76x_get_error_info(mci, &discard); /* clear counters */ |
| 254 | 261 | ||
| 255 | if (edac_mc_add_mc(mci)) { | 262 | /* Here we assume that we will never see multiple instances of this |
| 263 | * type of memory controller. The ID is therefore hardcoded to 0. | ||
| 264 | */ | ||
| 265 | if (edac_mc_add_mc(mci,0)) { | ||
| 256 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 266 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
| 257 | goto fail; | 267 | goto fail; |
| 258 | } | 268 | } |
| @@ -262,9 +272,8 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 262 | return 0; | 272 | return 0; |
| 263 | 273 | ||
| 264 | fail: | 274 | fail: |
| 265 | if (mci != NULL) | 275 | edac_mc_free(mci); |
| 266 | edac_mc_free(mci); | 276 | return -ENODEV; |
| 267 | return rc; | ||
| 268 | } | 277 | } |
| 269 | 278 | ||
| 270 | /* returns count (>= 0), or negative on error */ | 279 | /* returns count (>= 0), or negative on error */ |
| @@ -291,7 +300,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev) | |||
| 291 | 300 | ||
| 292 | debugf0("%s()\n", __func__); | 301 | debugf0("%s()\n", __func__); |
| 293 | 302 | ||
| 294 | if ((mci = edac_mc_del_mc(pdev)) == NULL) | 303 | if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) |
| 295 | return; | 304 | return; |
| 296 | 305 | ||
| 297 | edac_mc_free(mci); | 306 | edac_mc_free(mci); |
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index fce31936e6d7..c82bc0ed7f14 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| @@ -25,6 +24,9 @@ | |||
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include "edac_mc.h" | 25 | #include "edac_mc.h" |
| 27 | 26 | ||
| 27 | #define E752X_REVISION " Ver: 2.0.1 " __DATE__ | ||
| 28 | #define EDAC_MOD_STR "e752x_edac" | ||
| 29 | |||
| 28 | static int force_function_unhide; | 30 | static int force_function_unhide; |
| 29 | 31 | ||
| 30 | #define e752x_printk(level, fmt, arg...) \ | 32 | #define e752x_printk(level, fmt, arg...) \ |
| @@ -763,22 +765,174 @@ static void e752x_check(struct mem_ctl_info *mci) | |||
| 763 | e752x_process_error_info(mci, &info, 1); | 765 | e752x_process_error_info(mci, &info, 1); |
| 764 | } | 766 | } |
| 765 | 767 | ||
| 766 | static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | 768 | /* Return 1 if dual channel mode is active. Else return 0. */ |
| 769 | static inline int dual_channel_active(u16 ddrcsr) | ||
| 770 | { | ||
| 771 | return (((ddrcsr >> 12) & 3) == 3); | ||
| 772 | } | ||
| 773 | |||
| 774 | static void e752x_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev, | ||
| 775 | u16 ddrcsr) | ||
| 776 | { | ||
| 777 | struct csrow_info *csrow; | ||
| 778 | unsigned long last_cumul_size; | ||
| 779 | int index, mem_dev, drc_chan; | ||
| 780 | int drc_drbg; /* DRB granularity 0=64mb, 1=128mb */ | ||
| 781 | int drc_ddim; /* DRAM Data Integrity Mode 0=none, 2=edac */ | ||
| 782 | u8 value; | ||
| 783 | u32 dra, drc, cumul_size; | ||
| 784 | |||
| 785 | pci_read_config_dword(pdev, E752X_DRA, &dra); | ||
| 786 | pci_read_config_dword(pdev, E752X_DRC, &drc); | ||
| 787 | drc_chan = dual_channel_active(ddrcsr); | ||
| 788 | drc_drbg = drc_chan + 1; /* 128 in dual mode, 64 in single */ | ||
| 789 | drc_ddim = (drc >> 20) & 0x3; | ||
| 790 | |||
| 791 | /* The dram row boundary (DRB) reg values are boundary address for | ||
| 792 | * each DRAM row with a granularity of 64 or 128MB (single/dual | ||
| 793 | * channel operation). DRB regs are cumulative; therefore DRB7 will | ||
| 794 | * contain the total memory contained in all eight rows. | ||
| 795 | */ | ||
| 796 | for (last_cumul_size = index = 0; index < mci->nr_csrows; index++) { | ||
| 797 | /* mem_dev 0=x8, 1=x4 */ | ||
| 798 | mem_dev = (dra >> (index * 4 + 2)) & 0x3; | ||
| 799 | csrow = &mci->csrows[index]; | ||
| 800 | |||
| 801 | mem_dev = (mem_dev == 2); | ||
| 802 | pci_read_config_byte(pdev, E752X_DRB + index, &value); | ||
| 803 | /* convert a 128 or 64 MiB DRB to a page size. */ | ||
| 804 | cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); | ||
| 805 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, | ||
| 806 | cumul_size); | ||
| 807 | if (cumul_size == last_cumul_size) | ||
| 808 | continue; /* not populated */ | ||
| 809 | |||
| 810 | csrow->first_page = last_cumul_size; | ||
| 811 | csrow->last_page = cumul_size - 1; | ||
| 812 | csrow->nr_pages = cumul_size - last_cumul_size; | ||
| 813 | last_cumul_size = cumul_size; | ||
| 814 | csrow->grain = 1 << 12; /* 4KiB - resolution of CELOG */ | ||
| 815 | csrow->mtype = MEM_RDDR; /* only one type supported */ | ||
| 816 | csrow->dtype = mem_dev ? DEV_X4 : DEV_X8; | ||
| 817 | |||
| 818 | /* | ||
| 819 | * if single channel or x8 devices then SECDED | ||
| 820 | * if dual channel and x4 then S4ECD4ED | ||
| 821 | */ | ||
| 822 | if (drc_ddim) { | ||
| 823 | if (drc_chan && mem_dev) { | ||
| 824 | csrow->edac_mode = EDAC_S4ECD4ED; | ||
| 825 | mci->edac_cap |= EDAC_FLAG_S4ECD4ED; | ||
| 826 | } else { | ||
| 827 | csrow->edac_mode = EDAC_SECDED; | ||
| 828 | mci->edac_cap |= EDAC_FLAG_SECDED; | ||
| 829 | } | ||
| 830 | } else | ||
| 831 | csrow->edac_mode = EDAC_NONE; | ||
| 832 | } | ||
| 833 | } | ||
| 834 | |||
| 835 | static void e752x_init_mem_map_table(struct pci_dev *pdev, | ||
| 836 | struct e752x_pvt *pvt) | ||
| 767 | { | 837 | { |
| 768 | int rc = -ENODEV; | ||
| 769 | int index; | 838 | int index; |
| 839 | u8 value, last, row, stat8; | ||
| 840 | |||
| 841 | last = 0; | ||
| 842 | row = 0; | ||
| 843 | |||
| 844 | for (index = 0; index < 8; index += 2) { | ||
| 845 | pci_read_config_byte(pdev, E752X_DRB + index, &value); | ||
| 846 | /* test if there is a dimm in this slot */ | ||
| 847 | if (value == last) { | ||
| 848 | /* no dimm in the slot, so flag it as empty */ | ||
| 849 | pvt->map[index] = 0xff; | ||
| 850 | pvt->map[index + 1] = 0xff; | ||
| 851 | } else { /* there is a dimm in the slot */ | ||
| 852 | pvt->map[index] = row; | ||
| 853 | row++; | ||
| 854 | last = value; | ||
| 855 | /* test the next value to see if the dimm is double | ||
| 856 | * sided | ||
| 857 | */ | ||
| 858 | pci_read_config_byte(pdev, E752X_DRB + index + 1, | ||
| 859 | &value); | ||
| 860 | pvt->map[index + 1] = (value == last) ? | ||
| 861 | 0xff : /* the dimm is single sided, | ||
| 862 | so flag as empty */ | ||
| 863 | row; /* this is a double sided dimm | ||
| 864 | to save the next row # */ | ||
| 865 | row++; | ||
| 866 | last = value; | ||
| 867 | } | ||
| 868 | } | ||
| 869 | |||
| 870 | /* set the map type. 1 = normal, 0 = reversed */ | ||
| 871 | pci_read_config_byte(pdev, E752X_DRM, &stat8); | ||
| 872 | pvt->map_type = ((stat8 & 0x0f) > ((stat8 >> 4) & 0x0f)); | ||
| 873 | } | ||
| 874 | |||
| 875 | /* Return 0 on success or 1 on failure. */ | ||
| 876 | static int e752x_get_devs(struct pci_dev *pdev, int dev_idx, | ||
| 877 | struct e752x_pvt *pvt) | ||
| 878 | { | ||
| 879 | struct pci_dev *dev; | ||
| 880 | |||
| 881 | pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL, | ||
| 882 | pvt->dev_info->err_dev, | ||
| 883 | pvt->bridge_ck); | ||
| 884 | |||
| 885 | if (pvt->bridge_ck == NULL) | ||
| 886 | pvt->bridge_ck = pci_scan_single_device(pdev->bus, | ||
| 887 | PCI_DEVFN(0, 1)); | ||
| 888 | |||
| 889 | if (pvt->bridge_ck == NULL) { | ||
| 890 | e752x_printk(KERN_ERR, "error reporting device not found:" | ||
| 891 | "vendor %x device 0x%x (broken BIOS?)\n", | ||
| 892 | PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].err_dev); | ||
| 893 | return 1; | ||
| 894 | } | ||
| 895 | |||
| 896 | dev = pci_get_device(PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].ctl_dev, | ||
| 897 | NULL); | ||
| 898 | |||
| 899 | if (dev == NULL) | ||
| 900 | goto fail; | ||
| 901 | |||
| 902 | pvt->dev_d0f0 = dev; | ||
| 903 | pvt->dev_d0f1 = pci_dev_get(pvt->bridge_ck); | ||
| 904 | |||
| 905 | return 0; | ||
| 906 | |||
| 907 | fail: | ||
| 908 | pci_dev_put(pvt->bridge_ck); | ||
| 909 | return 1; | ||
| 910 | } | ||
| 911 | |||
| 912 | static void e752x_init_error_reporting_regs(struct e752x_pvt *pvt) | ||
| 913 | { | ||
| 914 | struct pci_dev *dev; | ||
| 915 | |||
| 916 | dev = pvt->dev_d0f1; | ||
| 917 | /* Turn off error disable & SMI in case the BIOS turned it on */ | ||
| 918 | pci_write_config_byte(dev, E752X_HI_ERRMASK, 0x00); | ||
| 919 | pci_write_config_byte(dev, E752X_HI_SMICMD, 0x00); | ||
| 920 | pci_write_config_word(dev, E752X_SYSBUS_ERRMASK, 0x00); | ||
| 921 | pci_write_config_word(dev, E752X_SYSBUS_SMICMD, 0x00); | ||
| 922 | pci_write_config_byte(dev, E752X_BUF_ERRMASK, 0x00); | ||
| 923 | pci_write_config_byte(dev, E752X_BUF_SMICMD, 0x00); | ||
| 924 | pci_write_config_byte(dev, E752X_DRAM_ERRMASK, 0x00); | ||
| 925 | pci_write_config_byte(dev, E752X_DRAM_SMICMD, 0x00); | ||
| 926 | } | ||
| 927 | |||
| 928 | static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | ||
| 929 | { | ||
| 770 | u16 pci_data; | 930 | u16 pci_data; |
| 771 | u8 stat8; | 931 | u8 stat8; |
| 772 | struct mem_ctl_info *mci = NULL; | 932 | struct mem_ctl_info *mci; |
| 773 | struct e752x_pvt *pvt = NULL; | 933 | struct e752x_pvt *pvt; |
| 774 | u16 ddrcsr; | 934 | u16 ddrcsr; |
| 775 | u32 drc; | ||
| 776 | int drc_chan; /* Number of channels 0=1chan,1=2chan */ | 935 | int drc_chan; /* Number of channels 0=1chan,1=2chan */ |
| 777 | int drc_drbg; /* DRB granularity 0=64mb, 1=128mb */ | ||
| 778 | int drc_ddim; /* DRAM Data Integrity Mode 0=none,2=edac */ | ||
| 779 | u32 dra; | ||
| 780 | unsigned long last_cumul_size; | ||
| 781 | struct pci_dev *dev = NULL; | ||
| 782 | struct e752x_error_info discard; | 936 | struct e752x_error_info discard; |
| 783 | 937 | ||
| 784 | debugf0("%s(): mci\n", __func__); | 938 | debugf0("%s(): mci\n", __func__); |
| @@ -792,25 +946,20 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 792 | if (!force_function_unhide && !(stat8 & (1 << 5))) { | 946 | if (!force_function_unhide && !(stat8 & (1 << 5))) { |
| 793 | printk(KERN_INFO "Contact your BIOS vendor to see if the " | 947 | printk(KERN_INFO "Contact your BIOS vendor to see if the " |
| 794 | "E752x error registers can be safely un-hidden\n"); | 948 | "E752x error registers can be safely un-hidden\n"); |
| 795 | goto fail; | 949 | return -ENOMEM; |
| 796 | } | 950 | } |
| 797 | stat8 |= (1 << 5); | 951 | stat8 |= (1 << 5); |
| 798 | pci_write_config_byte(pdev, E752X_DEVPRES1, stat8); | 952 | pci_write_config_byte(pdev, E752X_DEVPRES1, stat8); |
| 799 | 953 | ||
| 800 | /* need to find out the number of channels */ | ||
| 801 | pci_read_config_dword(pdev, E752X_DRC, &drc); | ||
| 802 | pci_read_config_word(pdev, E752X_DDRCSR, &ddrcsr); | 954 | pci_read_config_word(pdev, E752X_DDRCSR, &ddrcsr); |
| 803 | /* FIXME: should check >>12 or 0xf, true for all? */ | 955 | /* FIXME: should check >>12 or 0xf, true for all? */ |
| 804 | /* Dual channel = 1, Single channel = 0 */ | 956 | /* Dual channel = 1, Single channel = 0 */ |
| 805 | drc_chan = (((ddrcsr >> 12) & 3) == 3); | 957 | drc_chan = dual_channel_active(ddrcsr); |
| 806 | drc_drbg = drc_chan + 1; /* 128 in dual mode, 64 in single */ | ||
| 807 | drc_ddim = (drc >> 20) & 0x3; | ||
| 808 | 958 | ||
| 809 | mci = edac_mc_alloc(sizeof(*pvt), E752X_NR_CSROWS, drc_chan + 1); | 959 | mci = edac_mc_alloc(sizeof(*pvt), E752X_NR_CSROWS, drc_chan + 1); |
| 810 | 960 | ||
| 811 | if (mci == NULL) { | 961 | if (mci == NULL) { |
| 812 | rc = -ENOMEM; | 962 | return -ENOMEM; |
| 813 | goto fail; | ||
| 814 | } | 963 | } |
| 815 | 964 | ||
| 816 | debugf3("%s(): init mci\n", __func__); | 965 | debugf3("%s(): init mci\n", __func__); |
| @@ -819,159 +968,54 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 819 | EDAC_FLAG_S4ECD4ED; | 968 | EDAC_FLAG_S4ECD4ED; |
| 820 | /* FIXME - what if different memory types are in different csrows? */ | 969 | /* FIXME - what if different memory types are in different csrows? */ |
| 821 | mci->mod_name = EDAC_MOD_STR; | 970 | mci->mod_name = EDAC_MOD_STR; |
| 822 | mci->mod_ver = "$Revision: 1.5.2.11 $"; | 971 | mci->mod_ver = E752X_REVISION; |
| 823 | mci->pdev = pdev; | 972 | mci->dev = &pdev->dev; |
| 824 | 973 | ||
| 825 | debugf3("%s(): init pvt\n", __func__); | 974 | debugf3("%s(): init pvt\n", __func__); |
| 826 | pvt = (struct e752x_pvt *) mci->pvt_info; | 975 | pvt = (struct e752x_pvt *) mci->pvt_info; |
| 827 | pvt->dev_info = &e752x_devs[dev_idx]; | 976 | pvt->dev_info = &e752x_devs[dev_idx]; |
| 828 | pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL, | 977 | pvt->mc_symmetric = ((ddrcsr & 0x10) != 0); |
| 829 | pvt->dev_info->err_dev, | ||
| 830 | pvt->bridge_ck); | ||
| 831 | |||
| 832 | if (pvt->bridge_ck == NULL) | ||
| 833 | pvt->bridge_ck = pci_scan_single_device(pdev->bus, | ||
| 834 | PCI_DEVFN(0, 1)); | ||
| 835 | 978 | ||
| 836 | if (pvt->bridge_ck == NULL) { | 979 | if (e752x_get_devs(pdev, dev_idx, pvt)) { |
| 837 | e752x_printk(KERN_ERR, "error reporting device not found:" | 980 | edac_mc_free(mci); |
| 838 | "vendor %x device 0x%x (broken BIOS?)\n", | 981 | return -ENODEV; |
| 839 | PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].err_dev); | ||
| 840 | goto fail; | ||
| 841 | } | 982 | } |
| 842 | 983 | ||
| 843 | pvt->mc_symmetric = ((ddrcsr & 0x10) != 0); | ||
| 844 | debugf3("%s(): more mci init\n", __func__); | 984 | debugf3("%s(): more mci init\n", __func__); |
| 845 | mci->ctl_name = pvt->dev_info->ctl_name; | 985 | mci->ctl_name = pvt->dev_info->ctl_name; |
| 846 | mci->edac_check = e752x_check; | 986 | mci->edac_check = e752x_check; |
| 847 | mci->ctl_page_to_phys = ctl_page_to_phys; | 987 | mci->ctl_page_to_phys = ctl_page_to_phys; |
| 848 | 988 | ||
| 849 | /* find out the device types */ | 989 | e752x_init_csrows(mci, pdev, ddrcsr); |
| 850 | pci_read_config_dword(pdev, E752X_DRA, &dra); | 990 | e752x_init_mem_map_table(pdev, pvt); |
| 851 | |||
| 852 | /* | ||
| 853 | * The dram row boundary (DRB) reg values are boundary address for | ||
| 854 | * each DRAM row with a granularity of 64 or 128MB (single/dual | ||
| 855 | * channel operation). DRB regs are cumulative; therefore DRB7 will | ||
| 856 | * contain the total memory contained in all eight rows. | ||
| 857 | */ | ||
| 858 | for (last_cumul_size = index = 0; index < mci->nr_csrows; index++) { | ||
| 859 | u8 value; | ||
| 860 | u32 cumul_size; | ||
| 861 | |||
| 862 | /* mem_dev 0=x8, 1=x4 */ | ||
| 863 | int mem_dev = (dra >> (index * 4 + 2)) & 0x3; | ||
| 864 | struct csrow_info *csrow = &mci->csrows[index]; | ||
| 865 | |||
| 866 | mem_dev = (mem_dev == 2); | ||
| 867 | pci_read_config_byte(mci->pdev, E752X_DRB + index, &value); | ||
| 868 | /* convert a 128 or 64 MiB DRB to a page size. */ | ||
| 869 | cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); | ||
| 870 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, | ||
| 871 | cumul_size); | ||
| 872 | |||
| 873 | if (cumul_size == last_cumul_size) | ||
| 874 | continue; /* not populated */ | ||
| 875 | |||
| 876 | csrow->first_page = last_cumul_size; | ||
| 877 | csrow->last_page = cumul_size - 1; | ||
| 878 | csrow->nr_pages = cumul_size - last_cumul_size; | ||
| 879 | last_cumul_size = cumul_size; | ||
| 880 | csrow->grain = 1 << 12; /* 4KiB - resolution of CELOG */ | ||
| 881 | csrow->mtype = MEM_RDDR; /* only one type supported */ | ||
| 882 | csrow->dtype = mem_dev ? DEV_X4 : DEV_X8; | ||
| 883 | |||
| 884 | /* | ||
| 885 | * if single channel or x8 devices then SECDED | ||
| 886 | * if dual channel and x4 then S4ECD4ED | ||
| 887 | */ | ||
| 888 | if (drc_ddim) { | ||
| 889 | if (drc_chan && mem_dev) { | ||
| 890 | csrow->edac_mode = EDAC_S4ECD4ED; | ||
| 891 | mci->edac_cap |= EDAC_FLAG_S4ECD4ED; | ||
| 892 | } else { | ||
| 893 | csrow->edac_mode = EDAC_SECDED; | ||
| 894 | mci->edac_cap |= EDAC_FLAG_SECDED; | ||
| 895 | } | ||
| 896 | } else | ||
| 897 | csrow->edac_mode = EDAC_NONE; | ||
| 898 | } | ||
| 899 | |||
| 900 | /* Fill in the memory map table */ | ||
| 901 | { | ||
| 902 | u8 value; | ||
| 903 | u8 last = 0; | ||
| 904 | u8 row = 0; | ||
| 905 | |||
| 906 | for (index = 0; index < 8; index += 2) { | ||
| 907 | pci_read_config_byte(mci->pdev, E752X_DRB + index, | ||
| 908 | &value); | ||
| 909 | |||
| 910 | /* test if there is a dimm in this slot */ | ||
| 911 | if (value == last) { | ||
| 912 | /* no dimm in the slot, so flag it as empty */ | ||
| 913 | pvt->map[index] = 0xff; | ||
| 914 | pvt->map[index + 1] = 0xff; | ||
| 915 | } else { /* there is a dimm in the slot */ | ||
| 916 | pvt->map[index] = row; | ||
| 917 | row++; | ||
| 918 | last = value; | ||
| 919 | /* test the next value to see if the dimm is | ||
| 920 | double sided */ | ||
| 921 | pci_read_config_byte(mci->pdev, | ||
| 922 | E752X_DRB + index + 1, | ||
| 923 | &value); | ||
| 924 | pvt->map[index + 1] = (value == last) ? | ||
| 925 | 0xff : /* the dimm is single sided, | ||
| 926 | * so flag as empty | ||
| 927 | */ | ||
| 928 | row; /* this is a double sided dimm | ||
| 929 | * to save the next row # | ||
| 930 | */ | ||
| 931 | row++; | ||
| 932 | last = value; | ||
| 933 | } | ||
| 934 | } | ||
| 935 | } | ||
| 936 | 991 | ||
| 937 | /* set the map type. 1 = normal, 0 = reversed */ | 992 | /* set the map type. 1 = normal, 0 = reversed */ |
| 938 | pci_read_config_byte(mci->pdev, E752X_DRM, &stat8); | 993 | pci_read_config_byte(pdev, E752X_DRM, &stat8); |
| 939 | pvt->map_type = ((stat8 & 0x0f) > ((stat8 >> 4) & 0x0f)); | 994 | pvt->map_type = ((stat8 & 0x0f) > ((stat8 >> 4) & 0x0f)); |
| 940 | 995 | ||
| 941 | mci->edac_cap |= EDAC_FLAG_NONE; | 996 | mci->edac_cap |= EDAC_FLAG_NONE; |
| 942 | debugf3("%s(): tolm, remapbase, remaplimit\n", __func__); | 997 | debugf3("%s(): tolm, remapbase, remaplimit\n", __func__); |
| 943 | 998 | ||
| 944 | /* load the top of low memory, remap base, and remap limit vars */ | 999 | /* load the top of low memory, remap base, and remap limit vars */ |
| 945 | pci_read_config_word(mci->pdev, E752X_TOLM, &pci_data); | 1000 | pci_read_config_word(pdev, E752X_TOLM, &pci_data); |
| 946 | pvt->tolm = ((u32) pci_data) << 4; | 1001 | pvt->tolm = ((u32) pci_data) << 4; |
| 947 | pci_read_config_word(mci->pdev, E752X_REMAPBASE, &pci_data); | 1002 | pci_read_config_word(pdev, E752X_REMAPBASE, &pci_data); |
| 948 | pvt->remapbase = ((u32) pci_data) << 14; | 1003 | pvt->remapbase = ((u32) pci_data) << 14; |
| 949 | pci_read_config_word(mci->pdev, E752X_REMAPLIMIT, &pci_data); | 1004 | pci_read_config_word(pdev, E752X_REMAPLIMIT, &pci_data); |
| 950 | pvt->remaplimit = ((u32) pci_data) << 14; | 1005 | pvt->remaplimit = ((u32) pci_data) << 14; |
| 951 | e752x_printk(KERN_INFO, | 1006 | e752x_printk(KERN_INFO, |
| 952 | "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm, | 1007 | "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm, |
| 953 | pvt->remapbase, pvt->remaplimit); | 1008 | pvt->remapbase, pvt->remaplimit); |
| 954 | 1009 | ||
| 955 | if (edac_mc_add_mc(mci)) { | 1010 | /* Here we assume that we will never see multiple instances of this |
| 1011 | * type of memory controller. The ID is therefore hardcoded to 0. | ||
| 1012 | */ | ||
| 1013 | if (edac_mc_add_mc(mci,0)) { | ||
| 956 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 1014 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
| 957 | goto fail; | 1015 | goto fail; |
| 958 | } | 1016 | } |
| 959 | 1017 | ||
| 960 | dev = pci_get_device(PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].ctl_dev, | 1018 | e752x_init_error_reporting_regs(pvt); |
| 961 | NULL); | ||
| 962 | pvt->dev_d0f0 = dev; | ||
| 963 | /* find the error reporting device and clear errors */ | ||
| 964 | dev = pvt->dev_d0f1 = pci_dev_get(pvt->bridge_ck); | ||
| 965 | /* Turn off error disable & SMI in case the BIOS turned it on */ | ||
| 966 | pci_write_config_byte(dev, E752X_HI_ERRMASK, 0x00); | ||
| 967 | pci_write_config_byte(dev, E752X_HI_SMICMD, 0x00); | ||
| 968 | pci_write_config_word(dev, E752X_SYSBUS_ERRMASK, 0x00); | ||
| 969 | pci_write_config_word(dev, E752X_SYSBUS_SMICMD, 0x00); | ||
| 970 | pci_write_config_byte(dev, E752X_BUF_ERRMASK, 0x00); | ||
| 971 | pci_write_config_byte(dev, E752X_BUF_SMICMD, 0x00); | ||
| 972 | pci_write_config_byte(dev, E752X_DRAM_ERRMASK, 0x00); | ||
| 973 | pci_write_config_byte(dev, E752X_DRAM_SMICMD, 0x00); | ||
| 974 | |||
| 975 | e752x_get_error_info(mci, &discard); /* clear other MCH errors */ | 1019 | e752x_get_error_info(mci, &discard); /* clear other MCH errors */ |
| 976 | 1020 | ||
| 977 | /* get this far and it's successful */ | 1021 | /* get this far and it's successful */ |
| @@ -979,20 +1023,12 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 979 | return 0; | 1023 | return 0; |
| 980 | 1024 | ||
| 981 | fail: | 1025 | fail: |
| 982 | if (mci) { | 1026 | pci_dev_put(pvt->dev_d0f0); |
| 983 | if (pvt->dev_d0f0) | 1027 | pci_dev_put(pvt->dev_d0f1); |
| 984 | pci_dev_put(pvt->dev_d0f0); | 1028 | pci_dev_put(pvt->bridge_ck); |
| 985 | 1029 | edac_mc_free(mci); | |
| 986 | if (pvt->dev_d0f1) | ||
| 987 | pci_dev_put(pvt->dev_d0f1); | ||
| 988 | |||
| 989 | if (pvt->bridge_ck) | ||
| 990 | pci_dev_put(pvt->bridge_ck); | ||
| 991 | |||
| 992 | edac_mc_free(mci); | ||
| 993 | } | ||
| 994 | 1030 | ||
| 995 | return rc; | 1031 | return -ENODEV; |
| 996 | } | 1032 | } |
| 997 | 1033 | ||
| 998 | /* returns count (>= 0), or negative on error */ | 1034 | /* returns count (>= 0), or negative on error */ |
| @@ -1015,7 +1051,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev) | |||
| 1015 | 1051 | ||
| 1016 | debugf0("%s()\n", __func__); | 1052 | debugf0("%s()\n", __func__); |
| 1017 | 1053 | ||
| 1018 | if ((mci = edac_mc_del_mc(pdev)) == NULL) | 1054 | if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) |
| 1019 | return; | 1055 | return; |
| 1020 | 1056 | ||
| 1021 | pvt = (struct e752x_pvt *) mci->pvt_info; | 1057 | pvt = (struct e752x_pvt *) mci->pvt_info; |
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index a9518d3e4be4..310d91b41c96 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| @@ -30,6 +29,9 @@ | |||
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 31 | #include "edac_mc.h" | 30 | #include "edac_mc.h" |
| 32 | 31 | ||
| 32 | #define E7XXX_REVISION " Ver: 2.0.1 " __DATE__ | ||
| 33 | #define EDAC_MOD_STR "e7xxx_edac" | ||
| 34 | |||
| 33 | #define e7xxx_printk(level, fmt, arg...) \ | 35 | #define e7xxx_printk(level, fmt, arg...) \ |
| 34 | edac_printk(level, "e7xxx", fmt, ##arg) | 36 | edac_printk(level, "e7xxx", fmt, ##arg) |
| 35 | 37 | ||
| @@ -333,99 +335,61 @@ static void e7xxx_check(struct mem_ctl_info *mci) | |||
| 333 | e7xxx_process_error_info(mci, &info, 1); | 335 | e7xxx_process_error_info(mci, &info, 1); |
| 334 | } | 336 | } |
| 335 | 337 | ||
| 336 | static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) | 338 | /* Return 1 if dual channel mode is active. Else return 0. */ |
| 339 | static inline int dual_channel_active(u32 drc, int dev_idx) | ||
| 337 | { | 340 | { |
| 338 | int rc = -ENODEV; | 341 | return (dev_idx == E7501) ? ((drc >> 22) & 0x1) : 1; |
| 339 | int index; | 342 | } |
| 340 | u16 pci_data; | ||
| 341 | struct mem_ctl_info *mci = NULL; | ||
| 342 | struct e7xxx_pvt *pvt = NULL; | ||
| 343 | u32 drc; | ||
| 344 | int drc_chan = 1; /* Number of channels 0=1chan,1=2chan */ | ||
| 345 | int drc_drbg = 1; /* DRB granularity 0=32mb,1=64mb */ | ||
| 346 | int drc_ddim; /* DRAM Data Integrity Mode 0=none,2=edac */ | ||
| 347 | u32 dra; | ||
| 348 | unsigned long last_cumul_size; | ||
| 349 | struct e7xxx_error_info discard; | ||
| 350 | |||
| 351 | debugf0("%s(): mci\n", __func__); | ||
| 352 | 343 | ||
| 353 | /* need to find out the number of channels */ | ||
| 354 | pci_read_config_dword(pdev, E7XXX_DRC, &drc); | ||
| 355 | 344 | ||
| 345 | /* Return DRB granularity (0=32mb, 1=64mb). */ | ||
| 346 | static inline int drb_granularity(u32 drc, int dev_idx) | ||
| 347 | { | ||
| 356 | /* only e7501 can be single channel */ | 348 | /* only e7501 can be single channel */ |
| 357 | if (dev_idx == E7501) { | 349 | return (dev_idx == E7501) ? ((drc >> 18) & 0x3) : 1; |
| 358 | drc_chan = ((drc >> 22) & 0x1); | 350 | } |
| 359 | drc_drbg = (drc >> 18) & 0x3; | ||
| 360 | } | ||
| 361 | |||
| 362 | drc_ddim = (drc >> 20) & 0x3; | ||
| 363 | mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1); | ||
| 364 | |||
| 365 | if (mci == NULL) { | ||
| 366 | rc = -ENOMEM; | ||
| 367 | goto fail; | ||
| 368 | } | ||
| 369 | |||
| 370 | debugf3("%s(): init mci\n", __func__); | ||
| 371 | mci->mtype_cap = MEM_FLAG_RDDR; | ||
| 372 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED | | ||
| 373 | EDAC_FLAG_S4ECD4ED; | ||
| 374 | /* FIXME - what if different memory types are in different csrows? */ | ||
| 375 | mci->mod_name = EDAC_MOD_STR; | ||
| 376 | mci->mod_ver = "$Revision: 1.5.2.9 $"; | ||
| 377 | mci->pdev = pdev; | ||
| 378 | 351 | ||
| 379 | debugf3("%s(): init pvt\n", __func__); | ||
| 380 | pvt = (struct e7xxx_pvt *) mci->pvt_info; | ||
| 381 | pvt->dev_info = &e7xxx_devs[dev_idx]; | ||
| 382 | pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL, | ||
| 383 | pvt->dev_info->err_dev, | ||
| 384 | pvt->bridge_ck); | ||
| 385 | 352 | ||
| 386 | if (!pvt->bridge_ck) { | 353 | static void e7xxx_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev, |
| 387 | e7xxx_printk(KERN_ERR, "error reporting device not found:" | 354 | int dev_idx, u32 drc) |
| 388 | "vendor %x device 0x%x (broken BIOS?)\n", | 355 | { |
| 389 | PCI_VENDOR_ID_INTEL, e7xxx_devs[dev_idx].err_dev); | 356 | unsigned long last_cumul_size; |
| 390 | goto fail; | 357 | int index; |
| 391 | } | 358 | u8 value; |
| 392 | 359 | u32 dra, cumul_size; | |
| 393 | debugf3("%s(): more mci init\n", __func__); | 360 | int drc_chan, drc_drbg, drc_ddim, mem_dev; |
| 394 | mci->ctl_name = pvt->dev_info->ctl_name; | 361 | struct csrow_info *csrow; |
| 395 | mci->edac_check = e7xxx_check; | ||
| 396 | mci->ctl_page_to_phys = ctl_page_to_phys; | ||
| 397 | 362 | ||
| 398 | /* find out the device types */ | ||
| 399 | pci_read_config_dword(pdev, E7XXX_DRA, &dra); | 363 | pci_read_config_dword(pdev, E7XXX_DRA, &dra); |
| 364 | drc_chan = dual_channel_active(drc, dev_idx); | ||
| 365 | drc_drbg = drb_granularity(drc, dev_idx); | ||
| 366 | drc_ddim = (drc >> 20) & 0x3; | ||
| 367 | last_cumul_size = 0; | ||
| 400 | 368 | ||
| 401 | /* | 369 | /* The dram row boundary (DRB) reg values are boundary address |
| 402 | * The dram row boundary (DRB) reg values are boundary address | ||
| 403 | * for each DRAM row with a granularity of 32 or 64MB (single/dual | 370 | * for each DRAM row with a granularity of 32 or 64MB (single/dual |
| 404 | * channel operation). DRB regs are cumulative; therefore DRB7 will | 371 | * channel operation). DRB regs are cumulative; therefore DRB7 will |
| 405 | * contain the total memory contained in all eight rows. | 372 | * contain the total memory contained in all eight rows. |
| 406 | */ | 373 | */ |
| 407 | for (last_cumul_size = index = 0; index < mci->nr_csrows; index++) { | 374 | for (index = 0; index < mci->nr_csrows; index++) { |
| 408 | u8 value; | ||
| 409 | u32 cumul_size; | ||
| 410 | /* mem_dev 0=x8, 1=x4 */ | 375 | /* mem_dev 0=x8, 1=x4 */ |
| 411 | int mem_dev = (dra >> (index * 4 + 3)) & 0x1; | 376 | mem_dev = (dra >> (index * 4 + 3)) & 0x1; |
| 412 | struct csrow_info *csrow = &mci->csrows[index]; | 377 | csrow = &mci->csrows[index]; |
| 413 | 378 | ||
| 414 | pci_read_config_byte(mci->pdev, E7XXX_DRB + index, &value); | 379 | pci_read_config_byte(pdev, E7XXX_DRB + index, &value); |
| 415 | /* convert a 64 or 32 MiB DRB to a page size. */ | 380 | /* convert a 64 or 32 MiB DRB to a page size. */ |
| 416 | cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); | 381 | cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); |
| 417 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, | 382 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, |
| 418 | cumul_size); | 383 | cumul_size); |
| 419 | |||
| 420 | if (cumul_size == last_cumul_size) | 384 | if (cumul_size == last_cumul_size) |
| 421 | continue; /* not populated */ | 385 | continue; /* not populated */ |
| 422 | 386 | ||
| 423 | csrow->first_page = last_cumul_size; | 387 | csrow->first_page = last_cumul_size; |
| 424 | csrow->last_page = cumul_size - 1; | 388 | csrow->last_page = cumul_size - 1; |
| 425 | csrow->nr_pages = cumul_size - last_cumul_size; | 389 | csrow->nr_pages = cumul_size - last_cumul_size; |
| 426 | last_cumul_size = cumul_size; | 390 | last_cumul_size = cumul_size; |
| 427 | csrow->grain = 1 << 12; /* 4KiB - resolution of CELOG */ | 391 | csrow->grain = 1 << 12; /* 4KiB - resolution of CELOG */ |
| 428 | csrow->mtype = MEM_RDDR; /* only one type supported */ | 392 | csrow->mtype = MEM_RDDR; /* only one type supported */ |
| 429 | csrow->dtype = mem_dev ? DEV_X4 : DEV_X8; | 393 | csrow->dtype = mem_dev ? DEV_X4 : DEV_X8; |
| 430 | 394 | ||
| 431 | /* | 395 | /* |
| @@ -443,16 +407,61 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 443 | } else | 407 | } else |
| 444 | csrow->edac_mode = EDAC_NONE; | 408 | csrow->edac_mode = EDAC_NONE; |
| 445 | } | 409 | } |
| 410 | } | ||
| 446 | 411 | ||
| 447 | mci->edac_cap |= EDAC_FLAG_NONE; | 412 | static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) |
| 413 | { | ||
| 414 | u16 pci_data; | ||
| 415 | struct mem_ctl_info *mci = NULL; | ||
| 416 | struct e7xxx_pvt *pvt = NULL; | ||
| 417 | u32 drc; | ||
| 418 | int drc_chan; | ||
| 419 | struct e7xxx_error_info discard; | ||
| 420 | |||
| 421 | debugf0("%s(): mci\n", __func__); | ||
| 422 | pci_read_config_dword(pdev, E7XXX_DRC, &drc); | ||
| 423 | |||
| 424 | drc_chan = dual_channel_active(drc, dev_idx); | ||
| 425 | mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1); | ||
| 426 | |||
| 427 | if (mci == NULL) | ||
| 428 | return -ENOMEM; | ||
| 429 | |||
| 430 | debugf3("%s(): init mci\n", __func__); | ||
| 431 | mci->mtype_cap = MEM_FLAG_RDDR; | ||
| 432 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED | | ||
| 433 | EDAC_FLAG_S4ECD4ED; | ||
| 434 | /* FIXME - what if different memory types are in different csrows? */ | ||
| 435 | mci->mod_name = EDAC_MOD_STR; | ||
| 436 | mci->mod_ver = E7XXX_REVISION; | ||
| 437 | mci->dev = &pdev->dev; | ||
| 438 | debugf3("%s(): init pvt\n", __func__); | ||
| 439 | pvt = (struct e7xxx_pvt *) mci->pvt_info; | ||
| 440 | pvt->dev_info = &e7xxx_devs[dev_idx]; | ||
| 441 | pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL, | ||
| 442 | pvt->dev_info->err_dev, | ||
| 443 | pvt->bridge_ck); | ||
| 448 | 444 | ||
| 445 | if (!pvt->bridge_ck) { | ||
| 446 | e7xxx_printk(KERN_ERR, "error reporting device not found:" | ||
| 447 | "vendor %x device 0x%x (broken BIOS?)\n", | ||
| 448 | PCI_VENDOR_ID_INTEL, e7xxx_devs[dev_idx].err_dev); | ||
| 449 | goto fail0; | ||
| 450 | } | ||
| 451 | |||
| 452 | debugf3("%s(): more mci init\n", __func__); | ||
| 453 | mci->ctl_name = pvt->dev_info->ctl_name; | ||
| 454 | mci->edac_check = e7xxx_check; | ||
| 455 | mci->ctl_page_to_phys = ctl_page_to_phys; | ||
| 456 | e7xxx_init_csrows(mci, pdev, dev_idx, drc); | ||
| 457 | mci->edac_cap |= EDAC_FLAG_NONE; | ||
| 449 | debugf3("%s(): tolm, remapbase, remaplimit\n", __func__); | 458 | debugf3("%s(): tolm, remapbase, remaplimit\n", __func__); |
| 450 | /* load the top of low memory, remap base, and remap limit vars */ | 459 | /* load the top of low memory, remap base, and remap limit vars */ |
| 451 | pci_read_config_word(mci->pdev, E7XXX_TOLM, &pci_data); | 460 | pci_read_config_word(pdev, E7XXX_TOLM, &pci_data); |
| 452 | pvt->tolm = ((u32) pci_data) << 4; | 461 | pvt->tolm = ((u32) pci_data) << 4; |
| 453 | pci_read_config_word(mci->pdev, E7XXX_REMAPBASE, &pci_data); | 462 | pci_read_config_word(pdev, E7XXX_REMAPBASE, &pci_data); |
| 454 | pvt->remapbase = ((u32) pci_data) << 14; | 463 | pvt->remapbase = ((u32) pci_data) << 14; |
| 455 | pci_read_config_word(mci->pdev, E7XXX_REMAPLIMIT, &pci_data); | 464 | pci_read_config_word(pdev, E7XXX_REMAPLIMIT, &pci_data); |
| 456 | pvt->remaplimit = ((u32) pci_data) << 14; | 465 | pvt->remaplimit = ((u32) pci_data) << 14; |
| 457 | e7xxx_printk(KERN_INFO, | 466 | e7xxx_printk(KERN_INFO, |
| 458 | "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm, | 467 | "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm, |
| @@ -461,23 +470,25 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 461 | /* clear any pending errors, or initial state bits */ | 470 | /* clear any pending errors, or initial state bits */ |
| 462 | e7xxx_get_error_info(mci, &discard); | 471 | e7xxx_get_error_info(mci, &discard); |
| 463 | 472 | ||
| 464 | if (edac_mc_add_mc(mci) != 0) { | 473 | /* Here we assume that we will never see multiple instances of this |
| 474 | * type of memory controller. The ID is therefore hardcoded to 0. | ||
| 475 | */ | ||
| 476 | if (edac_mc_add_mc(mci,0)) { | ||
| 465 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 477 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
| 466 | goto fail; | 478 | goto fail1; |
| 467 | } | 479 | } |
| 468 | 480 | ||
| 469 | /* get this far and it's successful */ | 481 | /* get this far and it's successful */ |
| 470 | debugf3("%s(): success\n", __func__); | 482 | debugf3("%s(): success\n", __func__); |
| 471 | return 0; | 483 | return 0; |
| 472 | 484 | ||
| 473 | fail: | 485 | fail1: |
| 474 | if (mci != NULL) { | 486 | pci_dev_put(pvt->bridge_ck); |
| 475 | if(pvt != NULL && pvt->bridge_ck) | 487 | |
| 476 | pci_dev_put(pvt->bridge_ck); | 488 | fail0: |
| 477 | edac_mc_free(mci); | 489 | edac_mc_free(mci); |
| 478 | } | ||
| 479 | 490 | ||
| 480 | return rc; | 491 | return -ENODEV; |
| 481 | } | 492 | } |
| 482 | 493 | ||
| 483 | /* returns count (>= 0), or negative on error */ | 494 | /* returns count (>= 0), or negative on error */ |
| @@ -498,7 +509,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev) | |||
| 498 | 509 | ||
| 499 | debugf0("%s()\n", __func__); | 510 | debugf0("%s()\n", __func__); |
| 500 | 511 | ||
| 501 | if ((mci = edac_mc_del_mc(pdev)) == NULL) | 512 | if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) |
| 502 | return; | 513 | return; |
| 503 | 514 | ||
| 504 | pvt = (struct e7xxx_pvt *) mci->pvt_info; | 515 | pvt = (struct e7xxx_pvt *) mci->pvt_info; |
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index ea06e3a4dc35..3a7cfe88b169 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/proc_fs.h> | 16 | #include <linux/proc_fs.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| @@ -54,16 +53,17 @@ static int log_ce = 1; | |||
| 54 | static int panic_on_ue; | 53 | static int panic_on_ue; |
| 55 | static int poll_msec = 1000; | 54 | static int poll_msec = 1000; |
| 56 | 55 | ||
| 57 | static int check_pci_parity = 0; /* default YES check PCI parity */ | ||
| 58 | static int panic_on_pci_parity; /* default no panic on PCI Parity */ | ||
| 59 | static atomic_t pci_parity_count = ATOMIC_INIT(0); | ||
| 60 | |||
| 61 | /* lock to memory controller's control array */ | 56 | /* lock to memory controller's control array */ |
| 62 | static DECLARE_MUTEX(mem_ctls_mutex); | 57 | static DECLARE_MUTEX(mem_ctls_mutex); |
| 63 | static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices); | 58 | static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices); |
| 64 | 59 | ||
| 65 | static struct task_struct *edac_thread; | 60 | static struct task_struct *edac_thread; |
| 66 | 61 | ||
| 62 | #ifdef CONFIG_PCI | ||
| 63 | static int check_pci_parity = 0; /* default YES check PCI parity */ | ||
| 64 | static int panic_on_pci_parity; /* default no panic on PCI Parity */ | ||
| 65 | static atomic_t pci_parity_count = ATOMIC_INIT(0); | ||
| 66 | |||
| 67 | /* Structure of the whitelist and blacklist arrays */ | 67 | /* Structure of the whitelist and blacklist arrays */ |
| 68 | struct edac_pci_device_list { | 68 | struct edac_pci_device_list { |
| 69 | unsigned int vendor; /* Vendor ID */ | 69 | unsigned int vendor; /* Vendor ID */ |
| @@ -80,6 +80,12 @@ static int pci_blacklist_count; | |||
| 80 | static struct edac_pci_device_list pci_whitelist[MAX_LISTED_PCI_DEVICES]; | 80 | static struct edac_pci_device_list pci_whitelist[MAX_LISTED_PCI_DEVICES]; |
| 81 | static int pci_whitelist_count ; | 81 | static int pci_whitelist_count ; |
| 82 | 82 | ||
| 83 | #ifndef DISABLE_EDAC_SYSFS | ||
| 84 | static struct kobject edac_pci_kobj; /* /sys/devices/system/edac/pci */ | ||
| 85 | static struct completion edac_pci_kobj_complete; | ||
| 86 | #endif /* DISABLE_EDAC_SYSFS */ | ||
| 87 | #endif /* CONFIG_PCI */ | ||
| 88 | |||
| 83 | /* START sysfs data and methods */ | 89 | /* START sysfs data and methods */ |
| 84 | 90 | ||
| 85 | #ifndef DISABLE_EDAC_SYSFS | 91 | #ifndef DISABLE_EDAC_SYSFS |
| @@ -127,18 +133,15 @@ static struct sysdev_class edac_class = { | |||
| 127 | set_kset_name("edac"), | 133 | set_kset_name("edac"), |
| 128 | }; | 134 | }; |
| 129 | 135 | ||
| 130 | /* sysfs objects: | 136 | /* sysfs object: |
| 131 | * /sys/devices/system/edac/mc | 137 | * /sys/devices/system/edac/mc |
| 132 | * /sys/devices/system/edac/pci | ||
| 133 | */ | 138 | */ |
| 134 | static struct kobject edac_memctrl_kobj; | 139 | static struct kobject edac_memctrl_kobj; |
| 135 | static struct kobject edac_pci_kobj; | ||
| 136 | 140 | ||
| 137 | /* We use these to wait for the reference counts on edac_memctrl_kobj and | 141 | /* We use these to wait for the reference counts on edac_memctrl_kobj and |
| 138 | * edac_pci_kobj to reach 0. | 142 | * edac_pci_kobj to reach 0. |
| 139 | */ | 143 | */ |
| 140 | static struct completion edac_memctrl_kobj_complete; | 144 | static struct completion edac_memctrl_kobj_complete; |
| 141 | static struct completion edac_pci_kobj_complete; | ||
| 142 | 145 | ||
| 143 | /* | 146 | /* |
| 144 | * /sys/devices/system/edac/mc; | 147 | * /sys/devices/system/edac/mc; |
| @@ -324,6 +327,8 @@ static void edac_sysfs_memctrl_teardown(void) | |||
| 324 | #endif /* DISABLE_EDAC_SYSFS */ | 327 | #endif /* DISABLE_EDAC_SYSFS */ |
| 325 | } | 328 | } |
| 326 | 329 | ||
| 330 | #ifdef CONFIG_PCI | ||
| 331 | |||
| 327 | #ifndef DISABLE_EDAC_SYSFS | 332 | #ifndef DISABLE_EDAC_SYSFS |
| 328 | 333 | ||
| 329 | /* | 334 | /* |
| @@ -624,6 +629,252 @@ static void edac_sysfs_pci_teardown(void) | |||
| 624 | #endif | 629 | #endif |
| 625 | } | 630 | } |
| 626 | 631 | ||
| 632 | |||
| 633 | static u16 get_pci_parity_status(struct pci_dev *dev, int secondary) | ||
| 634 | { | ||
| 635 | int where; | ||
| 636 | u16 status; | ||
| 637 | |||
| 638 | where = secondary ? PCI_SEC_STATUS : PCI_STATUS; | ||
| 639 | pci_read_config_word(dev, where, &status); | ||
| 640 | |||
| 641 | /* If we get back 0xFFFF then we must suspect that the card has been | ||
| 642 | * pulled but the Linux PCI layer has not yet finished cleaning up. | ||
| 643 | * We don't want to report on such devices | ||
| 644 | */ | ||
| 645 | |||
| 646 | if (status == 0xFFFF) { | ||
| 647 | u32 sanity; | ||
| 648 | |||
| 649 | pci_read_config_dword(dev, 0, &sanity); | ||
| 650 | |||
| 651 | if (sanity == 0xFFFFFFFF) | ||
| 652 | return 0; | ||
| 653 | } | ||
| 654 | |||
| 655 | status &= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | | ||
| 656 | PCI_STATUS_PARITY; | ||
| 657 | |||
| 658 | if (status) | ||
| 659 | /* reset only the bits we are interested in */ | ||
| 660 | pci_write_config_word(dev, where, status); | ||
| 661 | |||
| 662 | return status; | ||
| 663 | } | ||
| 664 | |||
| 665 | typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev); | ||
| 666 | |||
| 667 | /* Clear any PCI parity errors logged by this device. */ | ||
| 668 | static void edac_pci_dev_parity_clear(struct pci_dev *dev) | ||
| 669 | { | ||
| 670 | u8 header_type; | ||
| 671 | |||
| 672 | get_pci_parity_status(dev, 0); | ||
| 673 | |||
| 674 | /* read the device TYPE, looking for bridges */ | ||
| 675 | pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type); | ||
| 676 | |||
| 677 | if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) | ||
| 678 | get_pci_parity_status(dev, 1); | ||
| 679 | } | ||
| 680 | |||
| 681 | /* | ||
| 682 | * PCI Parity polling | ||
| 683 | * | ||
| 684 | */ | ||
| 685 | static void edac_pci_dev_parity_test(struct pci_dev *dev) | ||
| 686 | { | ||
| 687 | u16 status; | ||
| 688 | u8 header_type; | ||
| 689 | |||
| 690 | /* read the STATUS register on this device | ||
| 691 | */ | ||
| 692 | status = get_pci_parity_status(dev, 0); | ||
| 693 | |||
| 694 | debugf2("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id ); | ||
| 695 | |||
| 696 | /* check the status reg for errors */ | ||
| 697 | if (status) { | ||
| 698 | if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) | ||
| 699 | edac_printk(KERN_CRIT, EDAC_PCI, | ||
| 700 | "Signaled System Error on %s\n", | ||
| 701 | pci_name(dev)); | ||
| 702 | |||
| 703 | if (status & (PCI_STATUS_PARITY)) { | ||
| 704 | edac_printk(KERN_CRIT, EDAC_PCI, | ||
| 705 | "Master Data Parity Error on %s\n", | ||
| 706 | pci_name(dev)); | ||
| 707 | |||
| 708 | atomic_inc(&pci_parity_count); | ||
| 709 | } | ||
| 710 | |||
| 711 | if (status & (PCI_STATUS_DETECTED_PARITY)) { | ||
| 712 | edac_printk(KERN_CRIT, EDAC_PCI, | ||
| 713 | "Detected Parity Error on %s\n", | ||
| 714 | pci_name(dev)); | ||
| 715 | |||
| 716 | atomic_inc(&pci_parity_count); | ||
| 717 | } | ||
| 718 | } | ||
| 719 | |||
| 720 | /* read the device TYPE, looking for bridges */ | ||
| 721 | pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type); | ||
| 722 | |||
| 723 | debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id ); | ||
| 724 | |||
| 725 | if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { | ||
| 726 | /* On bridges, need to examine secondary status register */ | ||
| 727 | status = get_pci_parity_status(dev, 1); | ||
| 728 | |||
| 729 | debugf2("PCI SEC_STATUS= 0x%04x %s\n", | ||
| 730 | status, dev->dev.bus_id ); | ||
| 731 | |||
| 732 | /* check the secondary status reg for errors */ | ||
| 733 | if (status) { | ||
| 734 | if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) | ||
| 735 | edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " | ||
| 736 | "Signaled System Error on %s\n", | ||
| 737 | pci_name(dev)); | ||
| 738 | |||
| 739 | if (status & (PCI_STATUS_PARITY)) { | ||
| 740 | edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " | ||
| 741 | "Master Data Parity Error on " | ||
| 742 | "%s\n", pci_name(dev)); | ||
| 743 | |||
| 744 | atomic_inc(&pci_parity_count); | ||
| 745 | } | ||
| 746 | |||
| 747 | if (status & (PCI_STATUS_DETECTED_PARITY)) { | ||
| 748 | edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " | ||
| 749 | "Detected Parity Error on %s\n", | ||
| 750 | pci_name(dev)); | ||
| 751 | |||
| 752 | atomic_inc(&pci_parity_count); | ||
| 753 | } | ||
| 754 | } | ||
| 755 | } | ||
| 756 | } | ||
| 757 | |||
| 758 | /* | ||
| 759 | * check_dev_on_list: Scan for a PCI device on a white/black list | ||
| 760 | * @list: an EDAC &edac_pci_device_list white/black list pointer | ||
| 761 | * @free_index: index of next free entry on the list | ||
| 762 | * @pci_dev: PCI Device pointer | ||
| 763 | * | ||
| 764 | * see if list contains the device. | ||
| 765 | * | ||
| 766 | * Returns: 0 not found | ||
| 767 | * 1 found on list | ||
| 768 | */ | ||
| 769 | static int check_dev_on_list(struct edac_pci_device_list *list, | ||
| 770 | int free_index, struct pci_dev *dev) | ||
| 771 | { | ||
| 772 | int i; | ||
| 773 | int rc = 0; /* Assume not found */ | ||
| 774 | unsigned short vendor=dev->vendor; | ||
| 775 | unsigned short device=dev->device; | ||
| 776 | |||
| 777 | /* Scan the list, looking for a vendor/device match */ | ||
| 778 | for (i = 0; i < free_index; i++, list++ ) { | ||
| 779 | if ((list->vendor == vendor ) && (list->device == device )) { | ||
| 780 | rc = 1; | ||
| 781 | break; | ||
| 782 | } | ||
| 783 | } | ||
| 784 | |||
| 785 | return rc; | ||
| 786 | } | ||
| 787 | |||
| 788 | /* | ||
| 789 | * pci_dev parity list iterator | ||
| 790 | * Scan the PCI device list for one iteration, looking for SERRORs | ||
| 791 | * Master Parity ERRORS or Parity ERRORs on primary or secondary devices | ||
| 792 | */ | ||
| 793 | static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn) | ||
| 794 | { | ||
| 795 | struct pci_dev *dev = NULL; | ||
| 796 | |||
| 797 | /* request for kernel access to the next PCI device, if any, | ||
| 798 | * and while we are looking at it have its reference count | ||
| 799 | * bumped until we are done with it | ||
| 800 | */ | ||
| 801 | while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { | ||
| 802 | /* if whitelist exists then it has priority, so only scan | ||
| 803 | * those devices on the whitelist | ||
| 804 | */ | ||
| 805 | if (pci_whitelist_count > 0 ) { | ||
| 806 | if (check_dev_on_list(pci_whitelist, | ||
| 807 | pci_whitelist_count, dev)) | ||
| 808 | fn(dev); | ||
| 809 | } else { | ||
| 810 | /* | ||
| 811 | * if no whitelist, then check if this devices is | ||
| 812 | * blacklisted | ||
| 813 | */ | ||
| 814 | if (!check_dev_on_list(pci_blacklist, | ||
| 815 | pci_blacklist_count, dev)) | ||
| 816 | fn(dev); | ||
| 817 | } | ||
| 818 | } | ||
| 819 | } | ||
| 820 | |||
| 821 | static void do_pci_parity_check(void) | ||
| 822 | { | ||
| 823 | unsigned long flags; | ||
| 824 | int before_count; | ||
| 825 | |||
| 826 | debugf3("%s()\n", __func__); | ||
| 827 | |||
| 828 | if (!check_pci_parity) | ||
| 829 | return; | ||
| 830 | |||
| 831 | before_count = atomic_read(&pci_parity_count); | ||
| 832 | |||
| 833 | /* scan all PCI devices looking for a Parity Error on devices and | ||
| 834 | * bridges | ||
| 835 | */ | ||
| 836 | local_irq_save(flags); | ||
| 837 | edac_pci_dev_parity_iterator(edac_pci_dev_parity_test); | ||
| 838 | local_irq_restore(flags); | ||
| 839 | |||
| 840 | /* Only if operator has selected panic on PCI Error */ | ||
| 841 | if (panic_on_pci_parity) { | ||
| 842 | /* If the count is different 'after' from 'before' */ | ||
| 843 | if (before_count != atomic_read(&pci_parity_count)) | ||
| 844 | panic("EDAC: PCI Parity Error"); | ||
| 845 | } | ||
| 846 | } | ||
| 847 | |||
| 848 | static inline void clear_pci_parity_errors(void) | ||
| 849 | { | ||
| 850 | /* Clear any PCI bus parity errors that devices initially have logged | ||
| 851 | * in their registers. | ||
| 852 | */ | ||
| 853 | edac_pci_dev_parity_iterator(edac_pci_dev_parity_clear); | ||
| 854 | } | ||
| 855 | |||
| 856 | #else /* CONFIG_PCI */ | ||
| 857 | |||
| 858 | static inline void do_pci_parity_check(void) | ||
| 859 | { | ||
| 860 | /* no-op */ | ||
| 861 | } | ||
| 862 | |||
| 863 | static inline void clear_pci_parity_errors(void) | ||
| 864 | { | ||
| 865 | /* no-op */ | ||
| 866 | } | ||
| 867 | |||
| 868 | static void edac_sysfs_pci_teardown(void) | ||
| 869 | { | ||
| 870 | } | ||
| 871 | |||
| 872 | static int edac_sysfs_pci_setup(void) | ||
| 873 | { | ||
| 874 | return 0; | ||
| 875 | } | ||
| 876 | #endif /* CONFIG_PCI */ | ||
| 877 | |||
| 627 | #ifndef DISABLE_EDAC_SYSFS | 878 | #ifndef DISABLE_EDAC_SYSFS |
| 628 | 879 | ||
| 629 | /* EDAC sysfs CSROW data structures and methods */ | 880 | /* EDAC sysfs CSROW data structures and methods */ |
| @@ -1132,7 +1383,7 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci) | |||
| 1132 | return err; | 1383 | return err; |
| 1133 | 1384 | ||
| 1134 | /* create a symlink for the device */ | 1385 | /* create a symlink for the device */ |
| 1135 | err = sysfs_create_link(edac_mci_kobj, &mci->pdev->dev.kobj, | 1386 | err = sysfs_create_link(edac_mci_kobj, &mci->dev->kobj, |
| 1136 | EDAC_DEVICE_SYMLINK); | 1387 | EDAC_DEVICE_SYMLINK); |
| 1137 | 1388 | ||
| 1138 | if (err) | 1389 | if (err) |
| @@ -1238,7 +1489,7 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci) | |||
| 1238 | debugf4("\tmci->edac_check = %p\n", mci->edac_check); | 1489 | debugf4("\tmci->edac_check = %p\n", mci->edac_check); |
| 1239 | debugf3("\tmci->nr_csrows = %d, csrows = %p\n", | 1490 | debugf3("\tmci->nr_csrows = %d, csrows = %p\n", |
| 1240 | mci->nr_csrows, mci->csrows); | 1491 | mci->nr_csrows, mci->csrows); |
| 1241 | debugf3("\tpdev = %p\n", mci->pdev); | 1492 | debugf3("\tdev = %p\n", mci->dev); |
| 1242 | debugf3("\tmod_name:ctl_name = %s:%s\n", | 1493 | debugf3("\tmod_name:ctl_name = %s:%s\n", |
| 1243 | mci->mod_name, mci->ctl_name); | 1494 | mci->mod_name, mci->ctl_name); |
| 1244 | debugf3("\tpvt_info = %p\n\n", mci->pvt_info); | 1495 | debugf3("\tpvt_info = %p\n\n", mci->pvt_info); |
| @@ -1363,7 +1614,7 @@ void edac_mc_free(struct mem_ctl_info *mci) | |||
| 1363 | } | 1614 | } |
| 1364 | EXPORT_SYMBOL_GPL(edac_mc_free); | 1615 | EXPORT_SYMBOL_GPL(edac_mc_free); |
| 1365 | 1616 | ||
| 1366 | static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev) | 1617 | static struct mem_ctl_info *find_mci_by_dev(struct device *dev) |
| 1367 | { | 1618 | { |
| 1368 | struct mem_ctl_info *mci; | 1619 | struct mem_ctl_info *mci; |
| 1369 | struct list_head *item; | 1620 | struct list_head *item; |
| @@ -1373,54 +1624,53 @@ static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev) | |||
| 1373 | list_for_each(item, &mc_devices) { | 1624 | list_for_each(item, &mc_devices) { |
| 1374 | mci = list_entry(item, struct mem_ctl_info, link); | 1625 | mci = list_entry(item, struct mem_ctl_info, link); |
| 1375 | 1626 | ||
| 1376 | if (mci->pdev == pdev) | 1627 | if (mci->dev == dev) |
| 1377 | return mci; | 1628 | return mci; |
| 1378 | } | 1629 | } |
| 1379 | 1630 | ||
| 1380 | return NULL; | 1631 | return NULL; |
| 1381 | } | 1632 | } |
| 1382 | 1633 | ||
| 1383 | static int add_mc_to_global_list(struct mem_ctl_info *mci) | 1634 | /* Return 0 on success, 1 on failure. |
| 1635 | * Before calling this function, caller must | ||
| 1636 | * assign a unique value to mci->mc_idx. | ||
| 1637 | */ | ||
| 1638 | static int add_mc_to_global_list (struct mem_ctl_info *mci) | ||
| 1384 | { | 1639 | { |
| 1385 | struct list_head *item, *insert_before; | 1640 | struct list_head *item, *insert_before; |
| 1386 | struct mem_ctl_info *p; | 1641 | struct mem_ctl_info *p; |
| 1387 | int i; | ||
| 1388 | 1642 | ||
| 1389 | if (list_empty(&mc_devices)) { | 1643 | insert_before = &mc_devices; |
| 1390 | mci->mc_idx = 0; | ||
| 1391 | insert_before = &mc_devices; | ||
| 1392 | } else { | ||
| 1393 | if (find_mci_by_pdev(mci->pdev)) { | ||
| 1394 | edac_printk(KERN_WARNING, EDAC_MC, | ||
| 1395 | "%s (%s) %s %s already assigned %d\n", | ||
| 1396 | mci->pdev->dev.bus_id, | ||
| 1397 | pci_name(mci->pdev), mci->mod_name, | ||
| 1398 | mci->ctl_name, mci->mc_idx); | ||
| 1399 | return 1; | ||
| 1400 | } | ||
| 1401 | 1644 | ||
| 1402 | insert_before = NULL; | 1645 | if (unlikely((p = find_mci_by_dev(mci->dev)) != NULL)) |
| 1403 | i = 0; | 1646 | goto fail0; |
| 1404 | 1647 | ||
| 1405 | list_for_each(item, &mc_devices) { | 1648 | list_for_each(item, &mc_devices) { |
| 1406 | p = list_entry(item, struct mem_ctl_info, link); | 1649 | p = list_entry(item, struct mem_ctl_info, link); |
| 1407 | 1650 | ||
| 1408 | if (p->mc_idx != i) { | 1651 | if (p->mc_idx >= mci->mc_idx) { |
| 1409 | insert_before = item; | 1652 | if (unlikely(p->mc_idx == mci->mc_idx)) |
| 1410 | break; | 1653 | goto fail1; |
| 1411 | } | ||
| 1412 | 1654 | ||
| 1413 | i++; | 1655 | insert_before = item; |
| 1656 | break; | ||
| 1414 | } | 1657 | } |
| 1415 | |||
| 1416 | mci->mc_idx = i; | ||
| 1417 | |||
| 1418 | if (insert_before == NULL) | ||
| 1419 | insert_before = &mc_devices; | ||
| 1420 | } | 1658 | } |
| 1421 | 1659 | ||
| 1422 | list_add_tail_rcu(&mci->link, insert_before); | 1660 | list_add_tail_rcu(&mci->link, insert_before); |
| 1423 | return 0; | 1661 | return 0; |
| 1662 | |||
| 1663 | fail0: | ||
| 1664 | edac_printk(KERN_WARNING, EDAC_MC, | ||
| 1665 | "%s (%s) %s %s already assigned %d\n", p->dev->bus_id, | ||
| 1666 | dev_name(p->dev), p->mod_name, p->ctl_name, p->mc_idx); | ||
| 1667 | return 1; | ||
| 1668 | |||
| 1669 | fail1: | ||
| 1670 | edac_printk(KERN_WARNING, EDAC_MC, | ||
| 1671 | "bug in low-level driver: attempt to assign\n" | ||
| 1672 | " duplicate mc_idx %d in %s()\n", p->mc_idx, __func__); | ||
| 1673 | return 1; | ||
| 1424 | } | 1674 | } |
| 1425 | 1675 | ||
| 1426 | static void complete_mc_list_del(struct rcu_head *head) | 1676 | static void complete_mc_list_del(struct rcu_head *head) |
| @@ -1444,6 +1694,7 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci) | |||
| 1444 | * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and | 1694 | * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and |
| 1445 | * create sysfs entries associated with mci structure | 1695 | * create sysfs entries associated with mci structure |
| 1446 | * @mci: pointer to the mci structure to be added to the list | 1696 | * @mci: pointer to the mci structure to be added to the list |
| 1697 | * @mc_idx: A unique numeric identifier to be assigned to the 'mci' structure. | ||
| 1447 | * | 1698 | * |
| 1448 | * Return: | 1699 | * Return: |
| 1449 | * 0 Success | 1700 | * 0 Success |
| @@ -1451,9 +1702,10 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci) | |||
| 1451 | */ | 1702 | */ |
| 1452 | 1703 | ||
| 1453 | /* FIXME - should a warning be printed if no error detection? correction? */ | 1704 | /* FIXME - should a warning be printed if no error detection? correction? */ |
| 1454 | int edac_mc_add_mc(struct mem_ctl_info *mci) | 1705 | int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx) |
| 1455 | { | 1706 | { |
| 1456 | debugf0("%s()\n", __func__); | 1707 | debugf0("%s()\n", __func__); |
| 1708 | mci->mc_idx = mc_idx; | ||
| 1457 | #ifdef CONFIG_EDAC_DEBUG | 1709 | #ifdef CONFIG_EDAC_DEBUG |
| 1458 | if (edac_debug_level >= 3) | 1710 | if (edac_debug_level >= 3) |
| 1459 | edac_mc_dump_mci(mci); | 1711 | edac_mc_dump_mci(mci); |
| @@ -1486,8 +1738,8 @@ int edac_mc_add_mc(struct mem_ctl_info *mci) | |||
| 1486 | } | 1738 | } |
| 1487 | 1739 | ||
| 1488 | /* Report action taken */ | 1740 | /* Report action taken */ |
| 1489 | edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: PCI %s\n", | 1741 | edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n", |
| 1490 | mci->mod_name, mci->ctl_name, pci_name(mci->pdev)); | 1742 | mci->mod_name, mci->ctl_name, dev_name(mci->dev)); |
| 1491 | 1743 | ||
| 1492 | up(&mem_ctls_mutex); | 1744 | up(&mem_ctls_mutex); |
| 1493 | return 0; | 1745 | return 0; |
| @@ -1504,18 +1756,18 @@ EXPORT_SYMBOL_GPL(edac_mc_add_mc); | |||
| 1504 | /** | 1756 | /** |
| 1505 | * edac_mc_del_mc: Remove sysfs entries for specified mci structure and | 1757 | * edac_mc_del_mc: Remove sysfs entries for specified mci structure and |
| 1506 | * remove mci structure from global list | 1758 | * remove mci structure from global list |
| 1507 | * @pdev: Pointer to 'struct pci_dev' representing mci structure to remove. | 1759 | * @pdev: Pointer to 'struct device' representing mci structure to remove. |
| 1508 | * | 1760 | * |
| 1509 | * Return pointer to removed mci structure, or NULL if device not found. | 1761 | * Return pointer to removed mci structure, or NULL if device not found. |
| 1510 | */ | 1762 | */ |
| 1511 | struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev) | 1763 | struct mem_ctl_info * edac_mc_del_mc(struct device *dev) |
| 1512 | { | 1764 | { |
| 1513 | struct mem_ctl_info *mci; | 1765 | struct mem_ctl_info *mci; |
| 1514 | 1766 | ||
| 1515 | debugf0("MC: %s()\n", __func__); | 1767 | debugf0("MC: %s()\n", __func__); |
| 1516 | down(&mem_ctls_mutex); | 1768 | down(&mem_ctls_mutex); |
| 1517 | 1769 | ||
| 1518 | if ((mci = find_mci_by_pdev(pdev)) == NULL) { | 1770 | if ((mci = find_mci_by_dev(dev)) == NULL) { |
| 1519 | up(&mem_ctls_mutex); | 1771 | up(&mem_ctls_mutex); |
| 1520 | return NULL; | 1772 | return NULL; |
| 1521 | } | 1773 | } |
| @@ -1524,8 +1776,8 @@ struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev) | |||
| 1524 | del_mc_from_global_list(mci); | 1776 | del_mc_from_global_list(mci); |
| 1525 | up(&mem_ctls_mutex); | 1777 | up(&mem_ctls_mutex); |
| 1526 | edac_printk(KERN_INFO, EDAC_MC, | 1778 | edac_printk(KERN_INFO, EDAC_MC, |
| 1527 | "Removed device %d for %s %s: PCI %s\n", mci->mc_idx, | 1779 | "Removed device %d for %s %s: DEV %s\n", mci->mc_idx, |
| 1528 | mci->mod_name, mci->ctl_name, pci_name(mci->pdev)); | 1780 | mci->mod_name, mci->ctl_name, dev_name(mci->dev)); |
| 1529 | return mci; | 1781 | return mci; |
| 1530 | } | 1782 | } |
| 1531 | EXPORT_SYMBOL_GPL(edac_mc_del_mc); | 1783 | EXPORT_SYMBOL_GPL(edac_mc_del_mc); |
| @@ -1739,244 +1991,6 @@ void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg) | |||
| 1739 | } | 1991 | } |
| 1740 | EXPORT_SYMBOL_GPL(edac_mc_handle_ue_no_info); | 1992 | EXPORT_SYMBOL_GPL(edac_mc_handle_ue_no_info); |
| 1741 | 1993 | ||
| 1742 | #ifdef CONFIG_PCI | ||
| 1743 | |||
| 1744 | static u16 get_pci_parity_status(struct pci_dev *dev, int secondary) | ||
| 1745 | { | ||
| 1746 | int where; | ||
| 1747 | u16 status; | ||
| 1748 | |||
| 1749 | where = secondary ? PCI_SEC_STATUS : PCI_STATUS; | ||
| 1750 | pci_read_config_word(dev, where, &status); | ||
| 1751 | |||
| 1752 | /* If we get back 0xFFFF then we must suspect that the card has been | ||
| 1753 | * pulled but the Linux PCI layer has not yet finished cleaning up. | ||
| 1754 | * We don't want to report on such devices | ||
| 1755 | */ | ||
| 1756 | |||
| 1757 | if (status == 0xFFFF) { | ||
| 1758 | u32 sanity; | ||
| 1759 | |||
| 1760 | pci_read_config_dword(dev, 0, &sanity); | ||
| 1761 | |||
| 1762 | if (sanity == 0xFFFFFFFF) | ||
| 1763 | return 0; | ||
| 1764 | } | ||
| 1765 | |||
| 1766 | status &= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | | ||
| 1767 | PCI_STATUS_PARITY; | ||
| 1768 | |||
| 1769 | if (status) | ||
| 1770 | /* reset only the bits we are interested in */ | ||
| 1771 | pci_write_config_word(dev, where, status); | ||
| 1772 | |||
| 1773 | return status; | ||
| 1774 | } | ||
| 1775 | |||
| 1776 | typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev); | ||
| 1777 | |||
| 1778 | /* Clear any PCI parity errors logged by this device. */ | ||
| 1779 | static void edac_pci_dev_parity_clear(struct pci_dev *dev) | ||
| 1780 | { | ||
| 1781 | u8 header_type; | ||
| 1782 | |||
| 1783 | get_pci_parity_status(dev, 0); | ||
| 1784 | |||
| 1785 | /* read the device TYPE, looking for bridges */ | ||
| 1786 | pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type); | ||
| 1787 | |||
| 1788 | if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) | ||
| 1789 | get_pci_parity_status(dev, 1); | ||
| 1790 | } | ||
| 1791 | |||
| 1792 | /* | ||
| 1793 | * PCI Parity polling | ||
| 1794 | * | ||
| 1795 | */ | ||
| 1796 | static void edac_pci_dev_parity_test(struct pci_dev *dev) | ||
| 1797 | { | ||
| 1798 | u16 status; | ||
| 1799 | u8 header_type; | ||
| 1800 | |||
| 1801 | /* read the STATUS register on this device | ||
| 1802 | */ | ||
| 1803 | status = get_pci_parity_status(dev, 0); | ||
| 1804 | |||
| 1805 | debugf2("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id ); | ||
| 1806 | |||
| 1807 | /* check the status reg for errors */ | ||
| 1808 | if (status) { | ||
| 1809 | if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) | ||
| 1810 | edac_printk(KERN_CRIT, EDAC_PCI, | ||
| 1811 | "Signaled System Error on %s\n", | ||
| 1812 | pci_name(dev)); | ||
| 1813 | |||
| 1814 | if (status & (PCI_STATUS_PARITY)) { | ||
| 1815 | edac_printk(KERN_CRIT, EDAC_PCI, | ||
| 1816 | "Master Data Parity Error on %s\n", | ||
| 1817 | pci_name(dev)); | ||
| 1818 | |||
| 1819 | atomic_inc(&pci_parity_count); | ||
| 1820 | } | ||
| 1821 | |||
| 1822 | if (status & (PCI_STATUS_DETECTED_PARITY)) { | ||
| 1823 | edac_printk(KERN_CRIT, EDAC_PCI, | ||
| 1824 | "Detected Parity Error on %s\n", | ||
| 1825 | pci_name(dev)); | ||
| 1826 | |||
| 1827 | atomic_inc(&pci_parity_count); | ||
| 1828 | } | ||
| 1829 | } | ||
| 1830 | |||
| 1831 | /* read the device TYPE, looking for bridges */ | ||
| 1832 | pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type); | ||
| 1833 | |||
| 1834 | debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id ); | ||
| 1835 | |||
| 1836 | if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { | ||
| 1837 | /* On bridges, need to examine secondary status register */ | ||
| 1838 | status = get_pci_parity_status(dev, 1); | ||
| 1839 | |||
| 1840 | debugf2("PCI SEC_STATUS= 0x%04x %s\n", | ||
| 1841 | status, dev->dev.bus_id ); | ||
| 1842 | |||
| 1843 | /* check the secondary status reg for errors */ | ||
| 1844 | if (status) { | ||
| 1845 | if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) | ||
| 1846 | edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " | ||
| 1847 | "Signaled System Error on %s\n", | ||
| 1848 | pci_name(dev)); | ||
| 1849 | |||
| 1850 | if (status & (PCI_STATUS_PARITY)) { | ||
| 1851 | edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " | ||
| 1852 | "Master Data Parity Error on " | ||
| 1853 | "%s\n", pci_name(dev)); | ||
| 1854 | |||
| 1855 | atomic_inc(&pci_parity_count); | ||
| 1856 | } | ||
| 1857 | |||
| 1858 | if (status & (PCI_STATUS_DETECTED_PARITY)) { | ||
| 1859 | edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " | ||
| 1860 | "Detected Parity Error on %s\n", | ||
| 1861 | pci_name(dev)); | ||
| 1862 | |||
| 1863 | atomic_inc(&pci_parity_count); | ||
| 1864 | } | ||
| 1865 | } | ||
| 1866 | } | ||
| 1867 | } | ||
| 1868 | |||
| 1869 | /* | ||
| 1870 | * check_dev_on_list: Scan for a PCI device on a white/black list | ||
| 1871 | * @list: an EDAC &edac_pci_device_list white/black list pointer | ||
| 1872 | * @free_index: index of next free entry on the list | ||
| 1873 | * @pci_dev: PCI Device pointer | ||
| 1874 | * | ||
| 1875 | * see if list contains the device. | ||
| 1876 | * | ||
| 1877 | * Returns: 0 not found | ||
| 1878 | * 1 found on list | ||
| 1879 | */ | ||
| 1880 | static int check_dev_on_list(struct edac_pci_device_list *list, | ||
| 1881 | int free_index, struct pci_dev *dev) | ||
| 1882 | { | ||
| 1883 | int i; | ||
| 1884 | int rc = 0; /* Assume not found */ | ||
| 1885 | unsigned short vendor=dev->vendor; | ||
| 1886 | unsigned short device=dev->device; | ||
| 1887 | |||
| 1888 | /* Scan the list, looking for a vendor/device match */ | ||
| 1889 | for (i = 0; i < free_index; i++, list++ ) { | ||
| 1890 | if ((list->vendor == vendor ) && (list->device == device )) { | ||
| 1891 | rc = 1; | ||
| 1892 | break; | ||
| 1893 | } | ||
| 1894 | } | ||
| 1895 | |||
| 1896 | return rc; | ||
| 1897 | } | ||
| 1898 | |||
| 1899 | /* | ||
| 1900 | * pci_dev parity list iterator | ||
| 1901 | * Scan the PCI device list for one iteration, looking for SERRORs | ||
| 1902 | * Master Parity ERRORS or Parity ERRORs on primary or secondary devices | ||
| 1903 | */ | ||
| 1904 | static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn) | ||
| 1905 | { | ||
| 1906 | struct pci_dev *dev = NULL; | ||
| 1907 | |||
| 1908 | /* request for kernel access to the next PCI device, if any, | ||
| 1909 | * and while we are looking at it have its reference count | ||
| 1910 | * bumped until we are done with it | ||
| 1911 | */ | ||
| 1912 | while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { | ||
| 1913 | /* if whitelist exists then it has priority, so only scan | ||
| 1914 | * those devices on the whitelist | ||
| 1915 | */ | ||
| 1916 | if (pci_whitelist_count > 0 ) { | ||
| 1917 | if (check_dev_on_list(pci_whitelist, | ||
| 1918 | pci_whitelist_count, dev)) | ||
| 1919 | fn(dev); | ||
| 1920 | } else { | ||
| 1921 | /* | ||
| 1922 | * if no whitelist, then check if this devices is | ||
| 1923 | * blacklisted | ||
| 1924 | */ | ||
| 1925 | if (!check_dev_on_list(pci_blacklist, | ||
| 1926 | pci_blacklist_count, dev)) | ||
| 1927 | fn(dev); | ||
| 1928 | } | ||
| 1929 | } | ||
| 1930 | } | ||
| 1931 | |||
| 1932 | static void do_pci_parity_check(void) | ||
| 1933 | { | ||
| 1934 | unsigned long flags; | ||
| 1935 | int before_count; | ||
| 1936 | |||
| 1937 | debugf3("%s()\n", __func__); | ||
| 1938 | |||
| 1939 | if (!check_pci_parity) | ||
| 1940 | return; | ||
| 1941 | |||
| 1942 | before_count = atomic_read(&pci_parity_count); | ||
| 1943 | |||
| 1944 | /* scan all PCI devices looking for a Parity Error on devices and | ||
| 1945 | * bridges | ||
| 1946 | */ | ||
| 1947 | local_irq_save(flags); | ||
| 1948 | edac_pci_dev_parity_iterator(edac_pci_dev_parity_test); | ||
| 1949 | local_irq_restore(flags); | ||
| 1950 | |||
| 1951 | /* Only if operator has selected panic on PCI Error */ | ||
| 1952 | if (panic_on_pci_parity) { | ||
| 1953 | /* If the count is different 'after' from 'before' */ | ||
| 1954 | if (before_count != atomic_read(&pci_parity_count)) | ||
| 1955 | panic("EDAC: PCI Parity Error"); | ||
| 1956 | } | ||
| 1957 | } | ||
| 1958 | |||
| 1959 | static inline void clear_pci_parity_errors(void) | ||
| 1960 | { | ||
| 1961 | /* Clear any PCI bus parity errors that devices initially have logged | ||
| 1962 | * in their registers. | ||
| 1963 | */ | ||
| 1964 | edac_pci_dev_parity_iterator(edac_pci_dev_parity_clear); | ||
| 1965 | } | ||
| 1966 | |||
| 1967 | #else /* CONFIG_PCI */ | ||
| 1968 | |||
| 1969 | static inline void do_pci_parity_check(void) | ||
| 1970 | { | ||
| 1971 | /* no-op */ | ||
| 1972 | } | ||
| 1973 | |||
| 1974 | static inline void clear_pci_parity_errors(void) | ||
| 1975 | { | ||
| 1976 | /* no-op */ | ||
| 1977 | } | ||
| 1978 | |||
| 1979 | #endif /* CONFIG_PCI */ | ||
| 1980 | 1994 | ||
| 1981 | /* | 1995 | /* |
| 1982 | * Iterate over all MC instances and check for ECC, et al, errors | 1996 | * Iterate over all MC instances and check for ECC, et al, errors |
| @@ -2096,10 +2110,12 @@ MODULE_DESCRIPTION("Core library routines for MC reporting"); | |||
| 2096 | 2110 | ||
| 2097 | module_param(panic_on_ue, int, 0644); | 2111 | module_param(panic_on_ue, int, 0644); |
| 2098 | MODULE_PARM_DESC(panic_on_ue, "Panic on uncorrected error: 0=off 1=on"); | 2112 | MODULE_PARM_DESC(panic_on_ue, "Panic on uncorrected error: 0=off 1=on"); |
| 2113 | #ifdef CONFIG_PCI | ||
| 2099 | module_param(check_pci_parity, int, 0644); | 2114 | module_param(check_pci_parity, int, 0644); |
| 2100 | MODULE_PARM_DESC(check_pci_parity, "Check for PCI bus parity errors: 0=off 1=on"); | 2115 | MODULE_PARM_DESC(check_pci_parity, "Check for PCI bus parity errors: 0=off 1=on"); |
| 2101 | module_param(panic_on_pci_parity, int, 0644); | 2116 | module_param(panic_on_pci_parity, int, 0644); |
| 2102 | MODULE_PARM_DESC(panic_on_pci_parity, "Panic on PCI Bus Parity error: 0=off 1=on"); | 2117 | MODULE_PARM_DESC(panic_on_pci_parity, "Panic on PCI Bus Parity error: 0=off 1=on"); |
| 2118 | #endif | ||
| 2103 | module_param(log_ue, int, 0644); | 2119 | module_param(log_ue, int, 0644); |
| 2104 | MODULE_PARM_DESC(log_ue, "Log uncorrectable error to console: 0=off 1=on"); | 2120 | MODULE_PARM_DESC(log_ue, "Log uncorrectable error to console: 0=off 1=on"); |
| 2105 | module_param(log_ce, int, 0644); | 2121 | module_param(log_ce, int, 0644); |
diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h index 8d9e83909b9c..bf6ab8a8d5ed 100644 --- a/drivers/edac/edac_mc.h +++ b/drivers/edac/edac_mc.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef _EDAC_MC_H_ | 18 | #ifndef _EDAC_MC_H_ |
| 19 | #define _EDAC_MC_H_ | 19 | #define _EDAC_MC_H_ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| @@ -79,15 +78,17 @@ extern int edac_debug_level; | |||
| 79 | 78 | ||
| 80 | #endif /* !CONFIG_EDAC_DEBUG */ | 79 | #endif /* !CONFIG_EDAC_DEBUG */ |
| 81 | 80 | ||
| 82 | #define edac_xstr(s) edac_str(s) | ||
| 83 | #define edac_str(s) #s | ||
| 84 | #define EDAC_MOD_STR edac_xstr(KBUILD_BASENAME) | ||
| 85 | |||
| 86 | #define BIT(x) (1 << (x)) | 81 | #define BIT(x) (1 << (x)) |
| 87 | 82 | ||
| 88 | #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \ | 83 | #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \ |
| 89 | PCI_DEVICE_ID_ ## vend ## _ ## dev | 84 | PCI_DEVICE_ID_ ## vend ## _ ## dev |
| 90 | 85 | ||
| 86 | #if defined(CONFIG_X86) && defined(CONFIG_PCI) | ||
| 87 | #define dev_name(dev) pci_name(to_pci_dev(dev)) | ||
| 88 | #else | ||
| 89 | #define dev_name(dev) to_platform_device(dev)->name | ||
| 90 | #endif | ||
| 91 | |||
| 91 | /* memory devices */ | 92 | /* memory devices */ |
| 92 | enum dev_type { | 93 | enum dev_type { |
| 93 | DEV_UNKNOWN = 0, | 94 | DEV_UNKNOWN = 0, |
| @@ -327,10 +328,10 @@ struct mem_ctl_info { | |||
| 327 | struct csrow_info *csrows; | 328 | struct csrow_info *csrows; |
| 328 | /* | 329 | /* |
| 329 | * FIXME - what about controllers on other busses? - IDs must be | 330 | * FIXME - what about controllers on other busses? - IDs must be |
| 330 | * unique. pdev pointer should be sufficiently unique, but | 331 | * unique. dev pointer should be sufficiently unique, but |
| 331 | * BUS:SLOT.FUNC numbers may not be unique. | 332 | * BUS:SLOT.FUNC numbers may not be unique. |
| 332 | */ | 333 | */ |
| 333 | struct pci_dev *pdev; | 334 | struct device *dev; |
| 334 | const char *mod_name; | 335 | const char *mod_name; |
| 335 | const char *mod_ver; | 336 | const char *mod_ver; |
| 336 | const char *ctl_name; | 337 | const char *ctl_name; |
| @@ -353,6 +354,8 @@ struct mem_ctl_info { | |||
| 353 | struct completion kobj_complete; | 354 | struct completion kobj_complete; |
| 354 | }; | 355 | }; |
| 355 | 356 | ||
| 357 | #ifdef CONFIG_PCI | ||
| 358 | |||
| 356 | /* write all or some bits in a byte-register*/ | 359 | /* write all or some bits in a byte-register*/ |
| 357 | static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value, | 360 | static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value, |
| 358 | u8 mask) | 361 | u8 mask) |
| @@ -401,14 +404,16 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset, | |||
| 401 | pci_write_config_dword(pdev, offset, value); | 404 | pci_write_config_dword(pdev, offset, value); |
| 402 | } | 405 | } |
| 403 | 406 | ||
| 407 | #endif /* CONFIG_PCI */ | ||
| 408 | |||
| 404 | #ifdef CONFIG_EDAC_DEBUG | 409 | #ifdef CONFIG_EDAC_DEBUG |
| 405 | void edac_mc_dump_channel(struct channel_info *chan); | 410 | void edac_mc_dump_channel(struct channel_info *chan); |
| 406 | void edac_mc_dump_mci(struct mem_ctl_info *mci); | 411 | void edac_mc_dump_mci(struct mem_ctl_info *mci); |
| 407 | void edac_mc_dump_csrow(struct csrow_info *csrow); | 412 | void edac_mc_dump_csrow(struct csrow_info *csrow); |
| 408 | #endif /* CONFIG_EDAC_DEBUG */ | 413 | #endif /* CONFIG_EDAC_DEBUG */ |
| 409 | 414 | ||
| 410 | extern int edac_mc_add_mc(struct mem_ctl_info *mci); | 415 | extern int edac_mc_add_mc(struct mem_ctl_info *mci,int mc_idx); |
| 411 | extern struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev); | 416 | extern struct mem_ctl_info * edac_mc_del_mc(struct device *dev); |
| 412 | extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, | 417 | extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, |
| 413 | unsigned long page); | 418 | unsigned long page); |
| 414 | extern void edac_mc_scrub_block(unsigned long page, unsigned long offset, | 419 | extern void edac_mc_scrub_block(unsigned long page, unsigned long offset, |
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c index fd342163cf97..e4bb298e613f 100644 --- a/drivers/edac/i82860_edac.c +++ b/drivers/edac/i82860_edac.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * by Thayne Harbaugh of Linux Networx. (http://lnxi.com) | 9 | * by Thayne Harbaugh of Linux Networx. (http://lnxi.com) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| @@ -17,6 +16,9 @@ | |||
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 18 | #include "edac_mc.h" | 17 | #include "edac_mc.h" |
| 19 | 18 | ||
| 19 | #define I82860_REVISION " Ver: 2.0.1 " __DATE__ | ||
| 20 | #define EDAC_MOD_STR "i82860_edac" | ||
| 21 | |||
| 20 | #define i82860_printk(level, fmt, arg...) \ | 22 | #define i82860_printk(level, fmt, arg...) \ |
| 21 | edac_printk(level, "i82860", fmt, ##arg) | 23 | edac_printk(level, "i82860", fmt, ##arg) |
| 22 | 24 | ||
| @@ -63,17 +65,21 @@ static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code | |||
| 63 | static void i82860_get_error_info(struct mem_ctl_info *mci, | 65 | static void i82860_get_error_info(struct mem_ctl_info *mci, |
| 64 | struct i82860_error_info *info) | 66 | struct i82860_error_info *info) |
| 65 | { | 67 | { |
| 68 | struct pci_dev *pdev; | ||
| 69 | |||
| 70 | pdev = to_pci_dev(mci->dev); | ||
| 71 | |||
| 66 | /* | 72 | /* |
| 67 | * This is a mess because there is no atomic way to read all the | 73 | * This is a mess because there is no atomic way to read all the |
| 68 | * registers at once and the registers can transition from CE being | 74 | * registers at once and the registers can transition from CE being |
| 69 | * overwritten by UE. | 75 | * overwritten by UE. |
| 70 | */ | 76 | */ |
| 71 | pci_read_config_word(mci->pdev, I82860_ERRSTS, &info->errsts); | 77 | pci_read_config_word(pdev, I82860_ERRSTS, &info->errsts); |
| 72 | pci_read_config_dword(mci->pdev, I82860_EAP, &info->eap); | 78 | pci_read_config_dword(pdev, I82860_EAP, &info->eap); |
| 73 | pci_read_config_word(mci->pdev, I82860_DERRCTL_STS, &info->derrsyn); | 79 | pci_read_config_word(pdev, I82860_DERRCTL_STS, &info->derrsyn); |
| 74 | pci_read_config_word(mci->pdev, I82860_ERRSTS, &info->errsts2); | 80 | pci_read_config_word(pdev, I82860_ERRSTS, &info->errsts2); |
| 75 | 81 | ||
| 76 | pci_write_bits16(mci->pdev, I82860_ERRSTS, 0x0003, 0x0003); | 82 | pci_write_bits16(pdev, I82860_ERRSTS, 0x0003, 0x0003); |
| 77 | 83 | ||
| 78 | /* | 84 | /* |
| 79 | * If the error is the same for both reads then the first set of reads | 85 | * If the error is the same for both reads then the first set of reads |
| @@ -84,8 +90,8 @@ static void i82860_get_error_info(struct mem_ctl_info *mci, | |||
| 84 | return; | 90 | return; |
| 85 | 91 | ||
| 86 | if ((info->errsts ^ info->errsts2) & 0x0003) { | 92 | if ((info->errsts ^ info->errsts2) & 0x0003) { |
| 87 | pci_read_config_dword(mci->pdev, I82860_EAP, &info->eap); | 93 | pci_read_config_dword(pdev, I82860_EAP, &info->eap); |
| 88 | pci_read_config_word(mci->pdev, I82860_DERRCTL_STS, | 94 | pci_read_config_word(pdev, I82860_DERRCTL_STS, |
| 89 | &info->derrsyn); | 95 | &info->derrsyn); |
| 90 | } | 96 | } |
| 91 | } | 97 | } |
| @@ -127,15 +133,50 @@ static void i82860_check(struct mem_ctl_info *mci) | |||
| 127 | i82860_process_error_info(mci, &info, 1); | 133 | i82860_process_error_info(mci, &info, 1); |
| 128 | } | 134 | } |
| 129 | 135 | ||
| 130 | static int i82860_probe1(struct pci_dev *pdev, int dev_idx) | 136 | static void i82860_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev) |
| 131 | { | 137 | { |
| 132 | int rc = -ENODEV; | ||
| 133 | int index; | ||
| 134 | struct mem_ctl_info *mci = NULL; | ||
| 135 | unsigned long last_cumul_size; | 138 | unsigned long last_cumul_size; |
| 136 | struct i82860_error_info discard; | 139 | u16 mchcfg_ddim; /* DRAM Data Integrity Mode 0=none, 2=edac */ |
| 140 | u16 value; | ||
| 141 | u32 cumul_size; | ||
| 142 | struct csrow_info *csrow; | ||
| 143 | int index; | ||
| 144 | |||
| 145 | pci_read_config_word(pdev, I82860_MCHCFG, &mchcfg_ddim); | ||
| 146 | mchcfg_ddim = mchcfg_ddim & 0x180; | ||
| 147 | last_cumul_size = 0; | ||
| 148 | |||
| 149 | /* The group row boundary (GRA) reg values are boundary address | ||
| 150 | * for each DRAM row with a granularity of 16MB. GRA regs are | ||
| 151 | * cumulative; therefore GRA15 will contain the total memory contained | ||
| 152 | * in all eight rows. | ||
| 153 | */ | ||
| 154 | for (index = 0; index < mci->nr_csrows; index++) { | ||
| 155 | csrow = &mci->csrows[index]; | ||
| 156 | pci_read_config_word(pdev, I82860_GBA + index * 2, &value); | ||
| 157 | cumul_size = (value & I82860_GBA_MASK) << | ||
| 158 | (I82860_GBA_SHIFT - PAGE_SHIFT); | ||
| 159 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, | ||
| 160 | cumul_size); | ||
| 137 | 161 | ||
| 138 | u16 mchcfg_ddim; /* DRAM Data Integrity Mode 0=none,2=edac */ | 162 | if (cumul_size == last_cumul_size) |
| 163 | continue; /* not populated */ | ||
| 164 | |||
| 165 | csrow->first_page = last_cumul_size; | ||
| 166 | csrow->last_page = cumul_size - 1; | ||
| 167 | csrow->nr_pages = cumul_size - last_cumul_size; | ||
| 168 | last_cumul_size = cumul_size; | ||
| 169 | csrow->grain = 1 << 12; /* I82860_EAP has 4KiB reolution */ | ||
| 170 | csrow->mtype = MEM_RMBS; | ||
| 171 | csrow->dtype = DEV_UNKNOWN; | ||
| 172 | csrow->edac_mode = mchcfg_ddim ? EDAC_SECDED : EDAC_NONE; | ||
| 173 | } | ||
| 174 | } | ||
| 175 | |||
| 176 | static int i82860_probe1(struct pci_dev *pdev, int dev_idx) | ||
| 177 | { | ||
| 178 | struct mem_ctl_info *mci; | ||
| 179 | struct i82860_error_info discard; | ||
| 139 | 180 | ||
| 140 | /* RDRAM has channels but these don't map onto the abstractions that | 181 | /* RDRAM has channels but these don't map onto the abstractions that |
| 141 | edac uses. | 182 | edac uses. |
| @@ -151,67 +192,35 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 151 | return -ENOMEM; | 192 | return -ENOMEM; |
| 152 | 193 | ||
| 153 | debugf3("%s(): init mci\n", __func__); | 194 | debugf3("%s(): init mci\n", __func__); |
| 154 | mci->pdev = pdev; | 195 | mci->dev = &pdev->dev; |
| 155 | mci->mtype_cap = MEM_FLAG_DDR; | 196 | mci->mtype_cap = MEM_FLAG_DDR; |
| 156 | |||
| 157 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; | 197 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; |
| 158 | /* I"m not sure about this but I think that all RDRAM is SECDED */ | 198 | /* I"m not sure about this but I think that all RDRAM is SECDED */ |
| 159 | mci->edac_cap = EDAC_FLAG_SECDED; | 199 | mci->edac_cap = EDAC_FLAG_SECDED; |
| 160 | /* adjust FLAGS */ | ||
| 161 | |||
| 162 | mci->mod_name = EDAC_MOD_STR; | 200 | mci->mod_name = EDAC_MOD_STR; |
| 163 | mci->mod_ver = "$Revision: 1.1.2.6 $"; | 201 | mci->mod_ver = I82860_REVISION; |
| 164 | mci->ctl_name = i82860_devs[dev_idx].ctl_name; | 202 | mci->ctl_name = i82860_devs[dev_idx].ctl_name; |
| 165 | mci->edac_check = i82860_check; | 203 | mci->edac_check = i82860_check; |
| 166 | mci->ctl_page_to_phys = NULL; | 204 | mci->ctl_page_to_phys = NULL; |
| 205 | i82860_init_csrows(mci, pdev); | ||
| 206 | i82860_get_error_info(mci, &discard); /* clear counters */ | ||
| 167 | 207 | ||
| 168 | pci_read_config_word(mci->pdev, I82860_MCHCFG, &mchcfg_ddim); | 208 | /* Here we assume that we will never see multiple instances of this |
| 169 | mchcfg_ddim = mchcfg_ddim & 0x180; | 209 | * type of memory controller. The ID is therefore hardcoded to 0. |
| 170 | |||
| 171 | /* | ||
| 172 | * The group row boundary (GRA) reg values are boundary address | ||
| 173 | * for each DRAM row with a granularity of 16MB. GRA regs are | ||
| 174 | * cumulative; therefore GRA15 will contain the total memory contained | ||
| 175 | * in all eight rows. | ||
| 176 | */ | 210 | */ |
| 177 | for (last_cumul_size = index = 0; index < mci->nr_csrows; index++) { | 211 | if (edac_mc_add_mc(mci,0)) { |
| 178 | u16 value; | 212 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
| 179 | u32 cumul_size; | 213 | goto fail; |
| 180 | struct csrow_info *csrow = &mci->csrows[index]; | ||
| 181 | |||
| 182 | pci_read_config_word(mci->pdev, I82860_GBA + index * 2, | ||
| 183 | &value); | ||
| 184 | |||
| 185 | cumul_size = (value & I82860_GBA_MASK) << | ||
| 186 | (I82860_GBA_SHIFT - PAGE_SHIFT); | ||
| 187 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, | ||
| 188 | cumul_size); | ||
| 189 | |||
| 190 | if (cumul_size == last_cumul_size) | ||
| 191 | continue; /* not populated */ | ||
| 192 | |||
| 193 | csrow->first_page = last_cumul_size; | ||
| 194 | csrow->last_page = cumul_size - 1; | ||
| 195 | csrow->nr_pages = cumul_size - last_cumul_size; | ||
| 196 | last_cumul_size = cumul_size; | ||
| 197 | csrow->grain = 1 << 12; /* I82860_EAP has 4KiB reolution */ | ||
| 198 | csrow->mtype = MEM_RMBS; | ||
| 199 | csrow->dtype = DEV_UNKNOWN; | ||
| 200 | csrow->edac_mode = mchcfg_ddim ? EDAC_SECDED : EDAC_NONE; | ||
| 201 | } | 214 | } |
| 202 | 215 | ||
| 203 | i82860_get_error_info(mci, &discard); /* clear counters */ | 216 | /* get this far and it's successful */ |
| 217 | debugf3("%s(): success\n", __func__); | ||
| 204 | 218 | ||
| 205 | if (edac_mc_add_mc(mci)) { | 219 | return 0; |
| 206 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | ||
| 207 | edac_mc_free(mci); | ||
| 208 | } else { | ||
| 209 | /* get this far and it's successful */ | ||
| 210 | debugf3("%s(): success\n", __func__); | ||
| 211 | rc = 0; | ||
| 212 | } | ||
| 213 | 220 | ||
| 214 | return rc; | 221 | fail: |
| 222 | edac_mc_free(mci); | ||
| 223 | return -ENODEV; | ||
| 215 | } | 224 | } |
| 216 | 225 | ||
| 217 | /* returns count (>= 0), or negative on error */ | 226 | /* returns count (>= 0), or negative on error */ |
| @@ -240,7 +249,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev) | |||
| 240 | 249 | ||
| 241 | debugf0("%s()\n", __func__); | 250 | debugf0("%s()\n", __func__); |
| 242 | 251 | ||
| 243 | if ((mci = edac_mc_del_mc(pdev)) == NULL) | 252 | if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) |
| 244 | return; | 253 | return; |
| 245 | 254 | ||
| 246 | edac_mc_free(mci); | 255 | edac_mc_free(mci); |
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index 0aec92698f17..161fe09a6d38 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Note: E7210 appears same as D82875P - zhenyu.z.wang at intel.com | 13 | * Note: E7210 appears same as D82875P - zhenyu.z.wang at intel.com |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| @@ -21,6 +20,9 @@ | |||
| 21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 22 | #include "edac_mc.h" | 21 | #include "edac_mc.h" |
| 23 | 22 | ||
| 23 | #define I82875P_REVISION " Ver: 2.0.1 " __DATE__ | ||
| 24 | #define EDAC_MOD_STR "i82875p_edac" | ||
| 25 | |||
| 24 | #define i82875p_printk(level, fmt, arg...) \ | 26 | #define i82875p_printk(level, fmt, arg...) \ |
| 25 | edac_printk(level, "i82875p", fmt, ##arg) | 27 | edac_printk(level, "i82875p", fmt, ##arg) |
| 26 | 28 | ||
| @@ -185,18 +187,22 @@ static int i82875p_registered = 1; | |||
| 185 | static void i82875p_get_error_info(struct mem_ctl_info *mci, | 187 | static void i82875p_get_error_info(struct mem_ctl_info *mci, |
| 186 | struct i82875p_error_info *info) | 188 | struct i82875p_error_info *info) |
| 187 | { | 189 | { |
| 190 | struct pci_dev *pdev; | ||
| 191 | |||
| 192 | pdev = to_pci_dev(mci->dev); | ||
| 193 | |||
| 188 | /* | 194 | /* |
| 189 | * This is a mess because there is no atomic way to read all the | 195 | * This is a mess because there is no atomic way to read all the |
| 190 | * registers at once and the registers can transition from CE being | 196 | * registers at once and the registers can transition from CE being |
| 191 | * overwritten by UE. | 197 | * overwritten by UE. |
| 192 | */ | 198 | */ |
| 193 | pci_read_config_word(mci->pdev, I82875P_ERRSTS, &info->errsts); | 199 | pci_read_config_word(pdev, I82875P_ERRSTS, &info->errsts); |
| 194 | pci_read_config_dword(mci->pdev, I82875P_EAP, &info->eap); | 200 | pci_read_config_dword(pdev, I82875P_EAP, &info->eap); |
| 195 | pci_read_config_byte(mci->pdev, I82875P_DES, &info->des); | 201 | pci_read_config_byte(pdev, I82875P_DES, &info->des); |
| 196 | pci_read_config_byte(mci->pdev, I82875P_DERRSYN, &info->derrsyn); | 202 | pci_read_config_byte(pdev, I82875P_DERRSYN, &info->derrsyn); |
| 197 | pci_read_config_word(mci->pdev, I82875P_ERRSTS, &info->errsts2); | 203 | pci_read_config_word(pdev, I82875P_ERRSTS, &info->errsts2); |
| 198 | 204 | ||
| 199 | pci_write_bits16(mci->pdev, I82875P_ERRSTS, 0x0081, 0x0081); | 205 | pci_write_bits16(pdev, I82875P_ERRSTS, 0x0081, 0x0081); |
| 200 | 206 | ||
| 201 | /* | 207 | /* |
| 202 | * If the error is the same then we can for both reads then | 208 | * If the error is the same then we can for both reads then |
| @@ -208,9 +214,9 @@ static void i82875p_get_error_info(struct mem_ctl_info *mci, | |||
| 208 | return; | 214 | return; |
| 209 | 215 | ||
| 210 | if ((info->errsts ^ info->errsts2) & 0x0081) { | 216 | if ((info->errsts ^ info->errsts2) & 0x0081) { |
| 211 | pci_read_config_dword(mci->pdev, I82875P_EAP, &info->eap); | 217 | pci_read_config_dword(pdev, I82875P_EAP, &info->eap); |
| 212 | pci_read_config_byte(mci->pdev, I82875P_DES, &info->des); | 218 | pci_read_config_byte(pdev, I82875P_DES, &info->des); |
| 213 | pci_read_config_byte(mci->pdev, I82875P_DERRSYN, | 219 | pci_read_config_byte(pdev, I82875P_DERRSYN, |
| 214 | &info->derrsyn); | 220 | &info->derrsyn); |
| 215 | } | 221 | } |
| 216 | } | 222 | } |
| @@ -259,116 +265,109 @@ static void i82875p_check(struct mem_ctl_info *mci) | |||
| 259 | extern int pci_proc_attach_device(struct pci_dev *); | 265 | extern int pci_proc_attach_device(struct pci_dev *); |
| 260 | #endif | 266 | #endif |
| 261 | 267 | ||
| 262 | static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) | 268 | /* Return 0 on success or 1 on failure. */ |
| 269 | static int i82875p_setup_overfl_dev(struct pci_dev *pdev, | ||
| 270 | struct pci_dev **ovrfl_pdev, void __iomem **ovrfl_window) | ||
| 263 | { | 271 | { |
| 264 | int rc = -ENODEV; | 272 | struct pci_dev *dev; |
| 265 | int index; | 273 | void __iomem *window; |
| 266 | struct mem_ctl_info *mci = NULL; | ||
| 267 | struct i82875p_pvt *pvt = NULL; | ||
| 268 | unsigned long last_cumul_size; | ||
| 269 | struct pci_dev *ovrfl_pdev; | ||
| 270 | void __iomem *ovrfl_window = NULL; | ||
| 271 | u32 drc; | ||
| 272 | u32 drc_chan; /* Number of channels 0=1chan,1=2chan */ | ||
| 273 | u32 nr_chans; | ||
| 274 | u32 drc_ddim; /* DRAM Data Integrity Mode 0=none,2=edac */ | ||
| 275 | struct i82875p_error_info discard; | ||
| 276 | 274 | ||
| 277 | debugf0("%s()\n", __func__); | 275 | *ovrfl_pdev = NULL; |
| 278 | ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL); | 276 | *ovrfl_window = NULL; |
| 277 | dev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL); | ||
| 279 | 278 | ||
| 280 | if (!ovrfl_pdev) { | 279 | if (dev == NULL) { |
| 281 | /* | 280 | /* Intel tells BIOS developers to hide device 6 which |
| 282 | * Intel tells BIOS developers to hide device 6 which | ||
| 283 | * configures the overflow device access containing | 281 | * configures the overflow device access containing |
| 284 | * the DRBs - this is where we expose device 6. | 282 | * the DRBs - this is where we expose device 6. |
| 285 | * http://www.x86-secret.com/articles/tweak/pat/patsecrets-2.htm | 283 | * http://www.x86-secret.com/articles/tweak/pat/patsecrets-2.htm |
| 286 | */ | 284 | */ |
| 287 | pci_write_bits8(pdev, 0xf4, 0x2, 0x2); | 285 | pci_write_bits8(pdev, 0xf4, 0x2, 0x2); |
| 288 | ovrfl_pdev = | 286 | dev = pci_scan_single_device(pdev->bus, PCI_DEVFN(6, 0)); |
| 289 | pci_scan_single_device(pdev->bus, PCI_DEVFN(6, 0)); | ||
| 290 | 287 | ||
| 291 | if (!ovrfl_pdev) | 288 | if (dev == NULL) |
| 292 | return -ENODEV; | 289 | return 1; |
| 293 | } | 290 | } |
| 294 | 291 | ||
| 292 | *ovrfl_pdev = dev; | ||
| 293 | |||
| 295 | #ifdef CONFIG_PROC_FS | 294 | #ifdef CONFIG_PROC_FS |
| 296 | if (!ovrfl_pdev->procent && pci_proc_attach_device(ovrfl_pdev)) { | 295 | if ((dev->procent == NULL) && pci_proc_attach_device(dev)) { |
| 297 | i82875p_printk(KERN_ERR, | 296 | i82875p_printk(KERN_ERR, "%s(): Failed to attach overflow " |
| 298 | "%s(): Failed to attach overflow device\n", __func__); | 297 | "device\n", __func__); |
| 299 | return -ENODEV; | 298 | return 1; |
| 300 | } | 299 | } |
| 301 | #endif | 300 | #endif /* CONFIG_PROC_FS */ |
| 302 | /* CONFIG_PROC_FS */ | 301 | if (pci_enable_device(dev)) { |
| 303 | if (pci_enable_device(ovrfl_pdev)) { | 302 | i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow " |
| 304 | i82875p_printk(KERN_ERR, | 303 | "device\n", __func__); |
| 305 | "%s(): Failed to enable overflow device\n", __func__); | 304 | return 1; |
| 306 | return -ENODEV; | ||
| 307 | } | 305 | } |
| 308 | 306 | ||
| 309 | if (pci_request_regions(ovrfl_pdev, pci_name(ovrfl_pdev))) { | 307 | if (pci_request_regions(dev, pci_name(dev))) { |
| 310 | #ifdef CORRECT_BIOS | 308 | #ifdef CORRECT_BIOS |
| 311 | goto fail0; | 309 | goto fail0; |
| 312 | #endif | 310 | #endif |
| 313 | } | 311 | } |
| 314 | 312 | ||
| 315 | /* cache is irrelevant for PCI bus reads/writes */ | 313 | /* cache is irrelevant for PCI bus reads/writes */ |
| 316 | ovrfl_window = ioremap_nocache(pci_resource_start(ovrfl_pdev, 0), | 314 | window = ioremap_nocache(pci_resource_start(dev, 0), |
| 317 | pci_resource_len(ovrfl_pdev, 0)); | 315 | pci_resource_len(dev, 0)); |
| 318 | 316 | ||
| 319 | if (!ovrfl_window) { | 317 | if (window == NULL) { |
| 320 | i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n", | 318 | i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n", |
| 321 | __func__); | 319 | __func__); |
| 322 | goto fail1; | 320 | goto fail1; |
| 323 | } | 321 | } |
| 324 | 322 | ||
| 325 | /* need to find out the number of channels */ | 323 | *ovrfl_window = window; |
| 326 | drc = readl(ovrfl_window + I82875P_DRC); | 324 | return 0; |
| 327 | drc_chan = ((drc >> 21) & 0x1); | ||
| 328 | nr_chans = drc_chan + 1; | ||
| 329 | 325 | ||
| 330 | drc_ddim = (drc >> 18) & 0x1; | 326 | fail1: |
| 331 | mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans), | 327 | pci_release_regions(dev); |
| 332 | nr_chans); | ||
| 333 | 328 | ||
| 334 | if (!mci) { | 329 | #ifdef CORRECT_BIOS |
| 335 | rc = -ENOMEM; | 330 | fail0: |
| 336 | goto fail2; | 331 | pci_disable_device(dev); |
| 337 | } | 332 | #endif |
| 333 | /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */ | ||
| 334 | return 1; | ||
| 335 | } | ||
| 338 | 336 | ||
| 339 | debugf3("%s(): init mci\n", __func__); | ||
| 340 | mci->pdev = pdev; | ||
| 341 | mci->mtype_cap = MEM_FLAG_DDR; | ||
| 342 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; | ||
| 343 | mci->edac_cap = EDAC_FLAG_UNKNOWN; | ||
| 344 | /* adjust FLAGS */ | ||
| 345 | 337 | ||
| 346 | mci->mod_name = EDAC_MOD_STR; | 338 | /* Return 1 if dual channel mode is active. Else return 0. */ |
| 347 | mci->mod_ver = "$Revision: 1.5.2.11 $"; | 339 | static inline int dual_channel_active(u32 drc) |
| 348 | mci->ctl_name = i82875p_devs[dev_idx].ctl_name; | 340 | { |
| 349 | mci->edac_check = i82875p_check; | 341 | return (drc >> 21) & 0x1; |
| 350 | mci->ctl_page_to_phys = NULL; | 342 | } |
| 351 | debugf3("%s(): init pvt\n", __func__); | ||
| 352 | pvt = (struct i82875p_pvt *) mci->pvt_info; | ||
| 353 | pvt->ovrfl_pdev = ovrfl_pdev; | ||
| 354 | pvt->ovrfl_window = ovrfl_window; | ||
| 355 | 343 | ||
| 356 | /* | 344 | |
| 357 | * The dram row boundary (DRB) reg values are boundary address | 345 | static void i82875p_init_csrows(struct mem_ctl_info *mci, |
| 346 | struct pci_dev *pdev, void __iomem *ovrfl_window, u32 drc) | ||
| 347 | { | ||
| 348 | struct csrow_info *csrow; | ||
| 349 | unsigned long last_cumul_size; | ||
| 350 | u8 value; | ||
| 351 | u32 drc_ddim; /* DRAM Data Integrity Mode 0=none,2=edac */ | ||
| 352 | u32 cumul_size; | ||
| 353 | int index; | ||
| 354 | |||
| 355 | drc_ddim = (drc >> 18) & 0x1; | ||
| 356 | last_cumul_size = 0; | ||
| 357 | |||
| 358 | /* The dram row boundary (DRB) reg values are boundary address | ||
| 358 | * for each DRAM row with a granularity of 32 or 64MB (single/dual | 359 | * for each DRAM row with a granularity of 32 or 64MB (single/dual |
| 359 | * channel operation). DRB regs are cumulative; therefore DRB7 will | 360 | * channel operation). DRB regs are cumulative; therefore DRB7 will |
| 360 | * contain the total memory contained in all eight rows. | 361 | * contain the total memory contained in all eight rows. |
| 361 | */ | 362 | */ |
| 362 | for (last_cumul_size = index = 0; index < mci->nr_csrows; index++) { | 363 | |
| 363 | u8 value; | 364 | for (index = 0; index < mci->nr_csrows; index++) { |
| 364 | u32 cumul_size; | 365 | csrow = &mci->csrows[index]; |
| 365 | struct csrow_info *csrow = &mci->csrows[index]; | ||
| 366 | 366 | ||
| 367 | value = readb(ovrfl_window + I82875P_DRB + index); | 367 | value = readb(ovrfl_window + I82875P_DRB + index); |
| 368 | cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT); | 368 | cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT); |
| 369 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, | 369 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, |
| 370 | cumul_size); | 370 | cumul_size); |
| 371 | |||
| 372 | if (cumul_size == last_cumul_size) | 371 | if (cumul_size == last_cumul_size) |
| 373 | continue; /* not populated */ | 372 | continue; /* not populated */ |
| 374 | 373 | ||
| @@ -376,35 +375,75 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 376 | csrow->last_page = cumul_size - 1; | 375 | csrow->last_page = cumul_size - 1; |
| 377 | csrow->nr_pages = cumul_size - last_cumul_size; | 376 | csrow->nr_pages = cumul_size - last_cumul_size; |
| 378 | last_cumul_size = cumul_size; | 377 | last_cumul_size = cumul_size; |
| 379 | csrow->grain = 1 << 12; /* I82875P_EAP has 4KiB reolution */ | 378 | csrow->grain = 1 << 12; /* I82875P_EAP has 4KiB reolution */ |
| 380 | csrow->mtype = MEM_DDR; | 379 | csrow->mtype = MEM_DDR; |
| 381 | csrow->dtype = DEV_UNKNOWN; | 380 | csrow->dtype = DEV_UNKNOWN; |
| 382 | csrow->edac_mode = drc_ddim ? EDAC_SECDED : EDAC_NONE; | 381 | csrow->edac_mode = drc_ddim ? EDAC_SECDED : EDAC_NONE; |
| 383 | } | 382 | } |
| 383 | } | ||
| 384 | |||
| 385 | static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) | ||
| 386 | { | ||
| 387 | int rc = -ENODEV; | ||
| 388 | struct mem_ctl_info *mci; | ||
| 389 | struct i82875p_pvt *pvt; | ||
| 390 | struct pci_dev *ovrfl_pdev; | ||
| 391 | void __iomem *ovrfl_window; | ||
| 392 | u32 drc; | ||
| 393 | u32 nr_chans; | ||
| 394 | struct i82875p_error_info discard; | ||
| 395 | |||
| 396 | debugf0("%s()\n", __func__); | ||
| 397 | ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL); | ||
| 398 | |||
| 399 | if (i82875p_setup_overfl_dev(pdev, &ovrfl_pdev, &ovrfl_window)) | ||
| 400 | return -ENODEV; | ||
| 401 | drc = readl(ovrfl_window + I82875P_DRC); | ||
| 402 | nr_chans = dual_channel_active(drc) + 1; | ||
| 403 | mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans), | ||
| 404 | nr_chans); | ||
| 405 | |||
| 406 | if (!mci) { | ||
| 407 | rc = -ENOMEM; | ||
| 408 | goto fail0; | ||
| 409 | } | ||
| 384 | 410 | ||
| 411 | debugf3("%s(): init mci\n", __func__); | ||
| 412 | mci->dev = &pdev->dev; | ||
| 413 | mci->mtype_cap = MEM_FLAG_DDR; | ||
| 414 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; | ||
| 415 | mci->edac_cap = EDAC_FLAG_UNKNOWN; | ||
| 416 | mci->mod_name = EDAC_MOD_STR; | ||
| 417 | mci->mod_ver = I82875P_REVISION; | ||
| 418 | mci->ctl_name = i82875p_devs[dev_idx].ctl_name; | ||
| 419 | mci->edac_check = i82875p_check; | ||
| 420 | mci->ctl_page_to_phys = NULL; | ||
| 421 | debugf3("%s(): init pvt\n", __func__); | ||
| 422 | pvt = (struct i82875p_pvt *) mci->pvt_info; | ||
| 423 | pvt->ovrfl_pdev = ovrfl_pdev; | ||
| 424 | pvt->ovrfl_window = ovrfl_window; | ||
| 425 | i82875p_init_csrows(mci, pdev, ovrfl_window, drc); | ||
| 385 | i82875p_get_error_info(mci, &discard); /* clear counters */ | 426 | i82875p_get_error_info(mci, &discard); /* clear counters */ |
| 386 | 427 | ||
| 387 | if (edac_mc_add_mc(mci)) { | 428 | /* Here we assume that we will never see multiple instances of this |
| 429 | * type of memory controller. The ID is therefore hardcoded to 0. | ||
| 430 | */ | ||
| 431 | if (edac_mc_add_mc(mci,0)) { | ||
| 388 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 432 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
| 389 | goto fail3; | 433 | goto fail1; |
| 390 | } | 434 | } |
| 391 | 435 | ||
| 392 | /* get this far and it's successful */ | 436 | /* get this far and it's successful */ |
| 393 | debugf3("%s(): success\n", __func__); | 437 | debugf3("%s(): success\n", __func__); |
| 394 | return 0; | 438 | return 0; |
| 395 | 439 | ||
| 396 | fail3: | 440 | fail1: |
| 397 | edac_mc_free(mci); | 441 | edac_mc_free(mci); |
| 398 | 442 | ||
| 399 | fail2: | 443 | fail0: |
| 400 | iounmap(ovrfl_window); | 444 | iounmap(ovrfl_window); |
| 401 | |||
| 402 | fail1: | ||
| 403 | pci_release_regions(ovrfl_pdev); | 445 | pci_release_regions(ovrfl_pdev); |
| 404 | 446 | ||
| 405 | #ifdef CORRECT_BIOS | ||
| 406 | fail0: | ||
| 407 | #endif | ||
| 408 | pci_disable_device(ovrfl_pdev); | 447 | pci_disable_device(ovrfl_pdev); |
| 409 | /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */ | 448 | /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */ |
| 410 | return rc; | 449 | return rc; |
| @@ -437,7 +476,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev) | |||
| 437 | 476 | ||
| 438 | debugf0("%s()\n", __func__); | 477 | debugf0("%s()\n", __func__); |
| 439 | 478 | ||
| 440 | if ((mci = edac_mc_del_mc(pdev)) == NULL) | 479 | if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) |
| 441 | return; | 480 | return; |
| 442 | 481 | ||
| 443 | pvt = (struct i82875p_pvt *) mci->pvt_info; | 482 | pvt = (struct i82875p_pvt *) mci->pvt_info; |
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c index 2c29fafe67c7..a49cf0a39398 100644 --- a/drivers/edac/r82600_edac.c +++ b/drivers/edac/r82600_edac.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * references to this document given in [] | 15 | * references to this document given in [] |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| @@ -23,6 +22,9 @@ | |||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include "edac_mc.h" | 23 | #include "edac_mc.h" |
| 25 | 24 | ||
| 25 | #define R82600_REVISION " Ver: 2.0.1 " __DATE__ | ||
| 26 | #define EDAC_MOD_STR "r82600_edac" | ||
| 27 | |||
| 26 | #define r82600_printk(level, fmt, arg...) \ | 28 | #define r82600_printk(level, fmt, arg...) \ |
| 27 | edac_printk(level, "r82600", fmt, ##arg) | 29 | edac_printk(level, "r82600", fmt, ##arg) |
| 28 | 30 | ||
| @@ -134,17 +136,20 @@ static unsigned int disable_hardware_scrub = 0; | |||
| 134 | static void r82600_get_error_info (struct mem_ctl_info *mci, | 136 | static void r82600_get_error_info (struct mem_ctl_info *mci, |
| 135 | struct r82600_error_info *info) | 137 | struct r82600_error_info *info) |
| 136 | { | 138 | { |
| 137 | pci_read_config_dword(mci->pdev, R82600_EAP, &info->eapr); | 139 | struct pci_dev *pdev; |
| 140 | |||
| 141 | pdev = to_pci_dev(mci->dev); | ||
| 142 | pci_read_config_dword(pdev, R82600_EAP, &info->eapr); | ||
| 138 | 143 | ||
| 139 | if (info->eapr & BIT(0)) | 144 | if (info->eapr & BIT(0)) |
| 140 | /* Clear error to allow next error to be reported [p.62] */ | 145 | /* Clear error to allow next error to be reported [p.62] */ |
| 141 | pci_write_bits32(mci->pdev, R82600_EAP, | 146 | pci_write_bits32(pdev, R82600_EAP, |
| 142 | ((u32) BIT(0) & (u32) BIT(1)), | 147 | ((u32) BIT(0) & (u32) BIT(1)), |
| 143 | ((u32) BIT(0) & (u32) BIT(1))); | 148 | ((u32) BIT(0) & (u32) BIT(1))); |
| 144 | 149 | ||
| 145 | if (info->eapr & BIT(1)) | 150 | if (info->eapr & BIT(1)) |
| 146 | /* Clear error to allow next error to be reported [p.62] */ | 151 | /* Clear error to allow next error to be reported [p.62] */ |
| 147 | pci_write_bits32(mci->pdev, R82600_EAP, | 152 | pci_write_bits32(pdev, R82600_EAP, |
| 148 | ((u32) BIT(0) & (u32) BIT(1)), | 153 | ((u32) BIT(0) & (u32) BIT(1)), |
| 149 | ((u32) BIT(0) & (u32) BIT(1))); | 154 | ((u32) BIT(0) & (u32) BIT(1))); |
| 150 | } | 155 | } |
| @@ -200,25 +205,72 @@ static void r82600_check(struct mem_ctl_info *mci) | |||
| 200 | r82600_process_error_info(mci, &info, 1); | 205 | r82600_process_error_info(mci, &info, 1); |
| 201 | } | 206 | } |
| 202 | 207 | ||
| 203 | static int r82600_probe1(struct pci_dev *pdev, int dev_idx) | 208 | static inline int ecc_enabled(u8 dramcr) |
| 209 | { | ||
| 210 | return dramcr & BIT(5); | ||
| 211 | } | ||
| 212 | |||
| 213 | static void r82600_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev, | ||
| 214 | u8 dramcr) | ||
| 204 | { | 215 | { |
| 205 | int rc = -ENODEV; | 216 | struct csrow_info *csrow; |
| 206 | int index; | 217 | int index; |
| 207 | struct mem_ctl_info *mci = NULL; | 218 | u8 drbar; /* SDRAM Row Boundry Address Register */ |
| 219 | u32 row_high_limit, row_high_limit_last; | ||
| 220 | u32 reg_sdram, ecc_on, row_base; | ||
| 221 | |||
| 222 | ecc_on = ecc_enabled(dramcr); | ||
| 223 | reg_sdram = dramcr & BIT(4); | ||
| 224 | row_high_limit_last = 0; | ||
| 225 | |||
| 226 | for (index = 0; index < mci->nr_csrows; index++) { | ||
| 227 | csrow = &mci->csrows[index]; | ||
| 228 | |||
| 229 | /* find the DRAM Chip Select Base address and mask */ | ||
| 230 | pci_read_config_byte(pdev, R82600_DRBA + index, &drbar); | ||
| 231 | |||
| 232 | debugf1("%s() Row=%d DRBA = %#0x\n", __func__, index, drbar); | ||
| 233 | |||
| 234 | row_high_limit = ((u32) drbar << 24); | ||
| 235 | /* row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */ | ||
| 236 | |||
| 237 | debugf1("%s() Row=%d, Boundry Address=%#0x, Last = %#0x\n", | ||
| 238 | __func__, index, row_high_limit, row_high_limit_last); | ||
| 239 | |||
| 240 | /* Empty row [p.57] */ | ||
| 241 | if (row_high_limit == row_high_limit_last) | ||
| 242 | continue; | ||
| 243 | |||
| 244 | row_base = row_high_limit_last; | ||
| 245 | |||
| 246 | csrow->first_page = row_base >> PAGE_SHIFT; | ||
| 247 | csrow->last_page = (row_high_limit >> PAGE_SHIFT) - 1; | ||
| 248 | csrow->nr_pages = csrow->last_page - csrow->first_page + 1; | ||
| 249 | /* Error address is top 19 bits - so granularity is * | ||
| 250 | * 14 bits */ | ||
| 251 | csrow->grain = 1 << 14; | ||
| 252 | csrow->mtype = reg_sdram ? MEM_RDDR : MEM_DDR; | ||
| 253 | /* FIXME - check that this is unknowable with this chipset */ | ||
| 254 | csrow->dtype = DEV_UNKNOWN; | ||
| 255 | |||
| 256 | /* Mode is global on 82600 */ | ||
| 257 | csrow->edac_mode = ecc_on ? EDAC_SECDED : EDAC_NONE; | ||
| 258 | row_high_limit_last = row_high_limit; | ||
| 259 | } | ||
| 260 | } | ||
| 261 | |||
| 262 | static int r82600_probe1(struct pci_dev *pdev, int dev_idx) | ||
| 263 | { | ||
| 264 | struct mem_ctl_info *mci; | ||
| 208 | u8 dramcr; | 265 | u8 dramcr; |
| 209 | u32 ecc_on; | ||
| 210 | u32 reg_sdram; | ||
| 211 | u32 eapr; | 266 | u32 eapr; |
| 212 | u32 scrub_disabled; | 267 | u32 scrub_disabled; |
| 213 | u32 sdram_refresh_rate; | 268 | u32 sdram_refresh_rate; |
| 214 | u32 row_high_limit_last = 0; | ||
| 215 | struct r82600_error_info discard; | 269 | struct r82600_error_info discard; |
| 216 | 270 | ||
| 217 | debugf0("%s()\n", __func__); | 271 | debugf0("%s()\n", __func__); |
| 218 | pci_read_config_byte(pdev, R82600_DRAMC, &dramcr); | 272 | pci_read_config_byte(pdev, R82600_DRAMC, &dramcr); |
| 219 | pci_read_config_dword(pdev, R82600_EAP, &eapr); | 273 | pci_read_config_dword(pdev, R82600_EAP, &eapr); |
| 220 | ecc_on = dramcr & BIT(5); | ||
| 221 | reg_sdram = dramcr & BIT(4); | ||
| 222 | scrub_disabled = eapr & BIT(31); | 274 | scrub_disabled = eapr & BIT(31); |
| 223 | sdram_refresh_rate = dramcr & (BIT(0) | BIT(1)); | 275 | sdram_refresh_rate = dramcr & (BIT(0) | BIT(1)); |
| 224 | debugf2("%s(): sdram refresh rate = %#0x\n", __func__, | 276 | debugf2("%s(): sdram refresh rate = %#0x\n", __func__, |
| @@ -226,13 +278,11 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 226 | debugf2("%s(): DRAMC register = %#0x\n", __func__, dramcr); | 278 | debugf2("%s(): DRAMC register = %#0x\n", __func__, dramcr); |
| 227 | mci = edac_mc_alloc(0, R82600_NR_CSROWS, R82600_NR_CHANS); | 279 | mci = edac_mc_alloc(0, R82600_NR_CSROWS, R82600_NR_CHANS); |
| 228 | 280 | ||
| 229 | if (mci == NULL) { | 281 | if (mci == NULL) |
| 230 | rc = -ENOMEM; | 282 | return -ENOMEM; |
| 231 | goto fail; | ||
| 232 | } | ||
| 233 | 283 | ||
| 234 | debugf0("%s(): mci = %p\n", __func__, mci); | 284 | debugf0("%s(): mci = %p\n", __func__, mci); |
| 235 | mci->pdev = pdev; | 285 | mci->dev = &pdev->dev; |
| 236 | mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR; | 286 | mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR; |
| 237 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; | 287 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; |
| 238 | /* FIXME try to work out if the chip leads have been used for COM2 | 288 | /* FIXME try to work out if the chip leads have been used for COM2 |
| @@ -245,7 +295,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 245 | * is possible. */ | 295 | * is possible. */ |
| 246 | mci->edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; | 296 | mci->edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; |
| 247 | 297 | ||
| 248 | if (ecc_on) { | 298 | if (ecc_enabled(dramcr)) { |
| 249 | if (scrub_disabled) | 299 | if (scrub_disabled) |
| 250 | debugf3("%s(): mci = %p - Scrubbing disabled! EAP: " | 300 | debugf3("%s(): mci = %p - Scrubbing disabled! EAP: " |
| 251 | "%#0x\n", __func__, mci, eapr); | 301 | "%#0x\n", __func__, mci, eapr); |
| @@ -253,53 +303,17 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 253 | mci->edac_cap = EDAC_FLAG_NONE; | 303 | mci->edac_cap = EDAC_FLAG_NONE; |
| 254 | 304 | ||
| 255 | mci->mod_name = EDAC_MOD_STR; | 305 | mci->mod_name = EDAC_MOD_STR; |
| 256 | mci->mod_ver = "$Revision: 1.1.2.6 $"; | 306 | mci->mod_ver = R82600_REVISION; |
| 257 | mci->ctl_name = "R82600"; | 307 | mci->ctl_name = "R82600"; |
| 258 | mci->edac_check = r82600_check; | 308 | mci->edac_check = r82600_check; |
| 259 | mci->ctl_page_to_phys = NULL; | 309 | mci->ctl_page_to_phys = NULL; |
| 260 | 310 | r82600_init_csrows(mci, pdev, dramcr); | |
| 261 | for (index = 0; index < mci->nr_csrows; index++) { | ||
| 262 | struct csrow_info *csrow = &mci->csrows[index]; | ||
| 263 | u8 drbar; /* sDram Row Boundry Address Register */ | ||
| 264 | u32 row_high_limit; | ||
| 265 | u32 row_base; | ||
| 266 | |||
| 267 | /* find the DRAM Chip Select Base address and mask */ | ||
| 268 | pci_read_config_byte(mci->pdev, R82600_DRBA + index, &drbar); | ||
| 269 | |||
| 270 | debugf1("MC%d: %s() Row=%d DRBA = %#0x\n", mci->mc_idx, | ||
| 271 | __func__, index, drbar); | ||
| 272 | |||
| 273 | row_high_limit = ((u32) drbar << 24); | ||
| 274 | /* row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */ | ||
| 275 | |||
| 276 | debugf1("MC%d: %s() Row=%d, Boundry Address=%#0x, Last = " | ||
| 277 | "%#0x \n", mci->mc_idx, __func__, index, | ||
| 278 | row_high_limit, row_high_limit_last); | ||
| 279 | |||
| 280 | /* Empty row [p.57] */ | ||
| 281 | if (row_high_limit == row_high_limit_last) | ||
| 282 | continue; | ||
| 283 | |||
| 284 | row_base = row_high_limit_last; | ||
| 285 | csrow->first_page = row_base >> PAGE_SHIFT; | ||
| 286 | csrow->last_page = (row_high_limit >> PAGE_SHIFT) - 1; | ||
| 287 | csrow->nr_pages = csrow->last_page - csrow->first_page + 1; | ||
| 288 | /* Error address is top 19 bits - so granularity is * | ||
| 289 | * 14 bits */ | ||
| 290 | csrow->grain = 1 << 14; | ||
| 291 | csrow->mtype = reg_sdram ? MEM_RDDR : MEM_DDR; | ||
| 292 | /* FIXME - check that this is unknowable with this chipset */ | ||
| 293 | csrow->dtype = DEV_UNKNOWN; | ||
| 294 | |||
| 295 | /* Mode is global on 82600 */ | ||
| 296 | csrow->edac_mode = ecc_on ? EDAC_SECDED : EDAC_NONE; | ||
| 297 | row_high_limit_last = row_high_limit; | ||
| 298 | } | ||
| 299 | |||
| 300 | r82600_get_error_info(mci, &discard); /* clear counters */ | 311 | r82600_get_error_info(mci, &discard); /* clear counters */ |
| 301 | 312 | ||
| 302 | if (edac_mc_add_mc(mci)) { | 313 | /* Here we assume that we will never see multiple instances of this |
| 314 | * type of memory controller. The ID is therefore hardcoded to 0. | ||
| 315 | */ | ||
| 316 | if (edac_mc_add_mc(mci,0)) { | ||
| 303 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 317 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
| 304 | goto fail; | 318 | goto fail; |
| 305 | } | 319 | } |
| @@ -309,17 +323,15 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 309 | if (disable_hardware_scrub) { | 323 | if (disable_hardware_scrub) { |
| 310 | debugf3("%s(): Disabling Hardware Scrub (scrub on error)\n", | 324 | debugf3("%s(): Disabling Hardware Scrub (scrub on error)\n", |
| 311 | __func__); | 325 | __func__); |
| 312 | pci_write_bits32(mci->pdev, R82600_EAP, BIT(31), BIT(31)); | 326 | pci_write_bits32(pdev, R82600_EAP, BIT(31), BIT(31)); |
| 313 | } | 327 | } |
| 314 | 328 | ||
| 315 | debugf3("%s(): success\n", __func__); | 329 | debugf3("%s(): success\n", __func__); |
| 316 | return 0; | 330 | return 0; |
| 317 | 331 | ||
| 318 | fail: | 332 | fail: |
| 319 | if (mci) | 333 | edac_mc_free(mci); |
| 320 | edac_mc_free(mci); | 334 | return -ENODEV; |
| 321 | |||
| 322 | return rc; | ||
| 323 | } | 335 | } |
| 324 | 336 | ||
| 325 | /* returns count (>= 0), or negative on error */ | 337 | /* returns count (>= 0), or negative on error */ |
| @@ -338,7 +350,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev) | |||
| 338 | 350 | ||
| 339 | debugf0("%s()\n", __func__); | 351 | debugf0("%s()\n", __func__); |
| 340 | 352 | ||
| 341 | if ((mci = edac_mc_del_mc(pdev)) == NULL) | 353 | if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) |
| 342 | return; | 354 | return; |
| 343 | 355 | ||
| 344 | edac_mc_free(mci); | 356 | edac_mc_free(mci); |
diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c index 0f97a0cb0ff4..9b4fcac03ad5 100644 --- a/drivers/eisa/virtual_root.c +++ b/drivers/eisa/virtual_root.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * This code is released under the GPL version 2. | 7 | * This code is released under the GPL version 2. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
| 13 | #include <linux/eisa.h> | 12 | #include <linux/eisa.h> |
diff --git a/drivers/fc4/fc_syms.c b/drivers/fc4/fc_syms.c index ed85dfcef69a..8700a8076d04 100644 --- a/drivers/fc4/fc_syms.c +++ b/drivers/fc4/fc_syms.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * We should not even be trying to compile this if we are not doing | 2 | * We should not even be trying to compile this if we are not doing |
| 3 | * a module. | 3 | * a module. |
| 4 | */ | 4 | */ |
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | 6 | ||
| 8 | #ifdef CONFIG_MODULES | 7 | #ifdef CONFIG_MODULES |
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index fdb8b042e64d..23b086685453 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 34 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 35 | * GNU General Public License for more details. | 35 | * GNU General Public License for more details. |
| 36 | */ | 36 | */ |
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 40 | #include <linux/string.h> | 39 | #include <linux/string.h> |
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 9b7e4d52ffd4..8ebce1c03ad7 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | */ | 66 | */ |
| 67 | 67 | ||
| 68 | #include <linux/capability.h> | 68 | #include <linux/capability.h> |
| 69 | #include <linux/config.h> | ||
| 70 | #include <linux/types.h> | 69 | #include <linux/types.h> |
| 71 | #include <linux/errno.h> | 70 | #include <linux/errno.h> |
| 72 | #include <linux/init.h> | 71 | #include <linux/init.h> |
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c index c37baf9448bc..c2ad72fefd9d 100644 --- a/drivers/firmware/pcdp.c +++ b/drivers/firmware/pcdp.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 16 | #include <linux/console.h> | 15 | #include <linux/console.h> |
| 17 | #include <linux/efi.h> | 16 | #include <linux/efi.h> |
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index a6764ff00803..9d67320e6840 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/hwmon-vid.h> | 27 | #include <linux/hwmon-vid.h> |
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index e407c74bda35..7576ec9426a3 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | w83792d 9 7 7 3 0x7a 0x5ca3 yes no | 35 | w83792d 9 7 7 3 0x7a 0x5ca3 yes no |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 8b46ef7d9ff8..7be1d0a3e8f8 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
| @@ -494,8 +494,8 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id | |||
| 494 | err = pci_request_region(dev, SMBBAR, i801_driver.name); | 494 | err = pci_request_region(dev, SMBBAR, i801_driver.name); |
| 495 | if (err) { | 495 | if (err) { |
| 496 | dev_err(&dev->dev, "Failed to request SMBus region " | 496 | dev_err(&dev->dev, "Failed to request SMBus region " |
| 497 | "0x%lx-0x%lx\n", i801_smba, | 497 | "0x%lx-0x%Lx\n", i801_smba, |
| 498 | pci_resource_end(dev, SMBBAR)); | 498 | (unsigned long long)pci_resource_end(dev, SMBBAR)); |
| 499 | goto exit; | 499 | goto exit; |
| 500 | } | 500 | } |
| 501 | 501 | ||
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 87fae937e666..0599bbd65d93 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index d00a02fc23e4..aca7e1668605 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * the Free Software Foundation, version 2. | 26 | * the Free Software Foundation, version 2. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 2721e4c8184a..de93601de178 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index df786eb55295..2a0b3be7cdd0 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index f7d40f8e5f5c..512b8791c328 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | 25 | ||
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c index 27fbfecc414f..cb3ef5ac99fd 100644 --- a/drivers/i2c/busses/scx200_i2c.c +++ b/drivers/i2c/busses/scx200_i2c.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index e6f1ab7b913c..b638ac6e59f4 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #undef DEBUG | 21 | #undef DEBUG |
| 22 | #undef VERBOSE | 22 | #undef VERBOSE |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c index 179b1e022d80..e27ee12245d3 100644 --- a/drivers/i2c/chips/tps65010.c +++ b/drivers/i2c/chips/tps65010.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 308897e57e4d..8a1c27f28692 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Please note that this platform does not support 32-bit IDE IO. | 6 | * Please note that this platform does not support 32-bit IDE IO. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/ioport.h> | 11 | #include <linux/ioport.h> |
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c index cd15e6260510..5797e0b5a132 100644 --- a/drivers/ide/cris/ide-cris.c +++ b/drivers/ide/cris/ide-cris.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 20 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/timer.h> | 24 | #include <linux/timer.h> |
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c index fb91cb8bf2d2..15955996a1f3 100644 --- a/drivers/ide/h8300/ide-h8300.c +++ b/drivers/ide/h8300/ide-h8300.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/ide.h> | 7 | #include <linux/ide.h> |
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #include <asm/io.h> | 9 | #include <asm/io.h> |
| 11 | #include <asm/irq.h> | 10 | #include <asm/irq.h> |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index bfafd4846a08..654d4cd09847 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -301,7 +301,6 @@ | |||
| 301 | 301 | ||
| 302 | #define IDECD_VERSION "4.61" | 302 | #define IDECD_VERSION "4.61" |
| 303 | 303 | ||
| 304 | #include <linux/config.h> | ||
| 305 | #include <linux/module.h> | 304 | #include <linux/module.h> |
| 306 | #include <linux/types.h> | 305 | #include <linux/types.h> |
| 307 | #include <linux/kernel.h> | 306 | #include <linux/kernel.h> |
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index d0227c39ced1..f712e4cfd9dc 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | 47 | ||
| 48 | //#define DEBUG | 48 | //#define DEBUG |
| 49 | 49 | ||
| 50 | #include <linux/config.h> | ||
| 51 | #include <linux/module.h> | 50 | #include <linux/module.h> |
| 52 | #include <linux/types.h> | 51 | #include <linux/types.h> |
| 53 | #include <linux/string.h> | 52 | #include <linux/string.h> |
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 783a2475ee8b..98918fb6b2ce 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | * | 74 | * |
| 75 | */ | 75 | */ |
| 76 | 76 | ||
| 77 | #include <linux/config.h> | ||
| 78 | #include <linux/module.h> | 77 | #include <linux/module.h> |
| 79 | #include <linux/types.h> | 78 | #include <linux/types.h> |
| 80 | #include <linux/kernel.h> | 79 | #include <linux/kernel.h> |
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 68628327c0f5..6ca3476d02c7 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | 82 | ||
| 83 | #define IDEFLOPPY_VERSION "0.99.newide" | 83 | #define IDEFLOPPY_VERSION "0.99.newide" |
| 84 | 84 | ||
| 85 | #include <linux/config.h> | ||
| 86 | #include <linux/module.h> | 85 | #include <linux/module.h> |
| 87 | #include <linux/types.h> | 86 | #include <linux/types.h> |
| 88 | #include <linux/string.h> | 87 | #include <linux/string.h> |
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 26ceab1e90bb..7dba9992ad30 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 30 | #include <linux/string.h> | 29 | #include <linux/string.h> |
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 32117f0ec5c0..657165297dc7 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/string.h> | 11 | #include <linux/string.h> |
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index 7ddb11828731..1feff23487d4 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 4 | #include <linux/string.h> | 3 | #include <linux/string.h> |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 0d5038a28560..c5f71ac28d14 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 34 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 39 | #include <linux/string.h> | 38 | #include <linux/string.h> |
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 84665e2ba3c8..c12f1b71e934 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | 26 | ||
| 28 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 4b91101e12b7..7067ab997927 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
| @@ -424,7 +424,6 @@ | |||
| 424 | 424 | ||
| 425 | #define IDETAPE_VERSION "1.19" | 425 | #define IDETAPE_VERSION "1.19" |
| 426 | 426 | ||
| 427 | #include <linux/config.h> | ||
| 428 | #include <linux/module.h> | 427 | #include <linux/module.h> |
| 429 | #include <linux/types.h> | 428 | #include <linux/types.h> |
| 430 | #include <linux/string.h> | 429 | #include <linux/string.h> |
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index a839b2a8f6f4..04547eb0833f 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * request. | 27 | * request. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 33 | #include <linux/string.h> | 32 | #include <linux/string.h> |
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 1cdf44205162..05fbd9298db7 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
| @@ -130,7 +130,6 @@ | |||
| 130 | 130 | ||
| 131 | #define _IDE_C /* Tell ide.h it's really us */ | 131 | #define _IDE_C /* Tell ide.h it's really us */ |
| 132 | 132 | ||
| 133 | #include <linux/config.h> | ||
| 134 | #include <linux/module.h> | 133 | #include <linux/module.h> |
| 135 | #include <linux/types.h> | 134 | #include <linux/types.h> |
| 136 | #include <linux/string.h> | 135 | #include <linux/string.h> |
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c index fb88711812e6..9c544467cb74 100644 --- a/drivers/ide/legacy/ali14xx.c +++ b/drivers/ide/legacy/ali14xx.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 40 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
| 41 | 41 | ||
| 42 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/types.h> | 43 | #include <linux/types.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 46 | #include <linux/delay.h> | 45 | #include <linux/delay.h> |
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c index 20eb5b872ca9..3b1d33baaa2f 100644 --- a/drivers/ide/legacy/dtc2278.c +++ b/drivers/ide/legacy/dtc2278.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 7 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
| 8 | 8 | ||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c index 3fac3e9ec47d..64d42619ab06 100644 --- a/drivers/ide/legacy/gayle.c +++ b/drivers/ide/legacy/gayle.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * more details. | 8 | * more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 14 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c index a77fb249d5cf..c48e87e512d3 100644 --- a/drivers/ide/legacy/ht6560b.c +++ b/drivers/ide/legacy/ht6560b.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 39 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
| 40 | 40 | ||
| 41 | #include <linux/module.h> | 41 | #include <linux/module.h> |
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/types.h> | 42 | #include <linux/types.h> |
| 44 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| 45 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 602797a44208..b7e459e4f284 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
| @@ -146,7 +146,16 @@ static void ide_detach(struct pcmcia_device *link) | |||
| 146 | kfree(link->priv); | 146 | kfree(link->priv); |
| 147 | } /* ide_detach */ | 147 | } /* ide_detach */ |
| 148 | 148 | ||
| 149 | static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq, struct pcmcia_device *handle) | 149 | static void idecs_mmio_fixup(ide_hwif_t *hwif) |
| 150 | { | ||
| 151 | default_hwif_mmiops(hwif); | ||
| 152 | hwif->mmio = 2; | ||
| 153 | |||
| 154 | ide_undecoded_slave(hwif); | ||
| 155 | } | ||
| 156 | |||
| 157 | static int idecs_register(unsigned long io, unsigned long ctl, | ||
| 158 | unsigned long irq, struct pcmcia_device *handle, int is_mmio) | ||
| 150 | { | 159 | { |
| 151 | hw_regs_t hw; | 160 | hw_regs_t hw; |
| 152 | memset(&hw, 0, sizeof(hw)); | 161 | memset(&hw, 0, sizeof(hw)); |
| @@ -154,7 +163,19 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq | |||
| 154 | hw.irq = irq; | 163 | hw.irq = irq; |
| 155 | hw.chipset = ide_pci; | 164 | hw.chipset = ide_pci; |
| 156 | hw.dev = &handle->dev; | 165 | hw.dev = &handle->dev; |
| 157 | return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); | 166 | |
| 167 | if(is_mmio) | ||
| 168 | return ide_register_hw_with_fixup(&hw, NULL, idecs_mmio_fixup); | ||
| 169 | else | ||
| 170 | return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); | ||
| 171 | } | ||
| 172 | |||
| 173 | void outb_io(unsigned char value, unsigned long port) { | ||
| 174 | outb(value, port); | ||
| 175 | } | ||
| 176 | |||
| 177 | void outb_mem(unsigned char value, unsigned long port) { | ||
| 178 | writeb(value, (void __iomem *) port); | ||
| 158 | } | 179 | } |
| 159 | 180 | ||
| 160 | /*====================================================================== | 181 | /*====================================================================== |
| @@ -180,7 +201,8 @@ static int ide_config(struct pcmcia_device *link) | |||
| 180 | } *stk = NULL; | 201 | } *stk = NULL; |
| 181 | cistpl_cftable_entry_t *cfg; | 202 | cistpl_cftable_entry_t *cfg; |
| 182 | int i, pass, last_ret = 0, last_fn = 0, hd, is_kme = 0; | 203 | int i, pass, last_ret = 0, last_fn = 0, hd, is_kme = 0; |
| 183 | unsigned long io_base, ctl_base; | 204 | unsigned long io_base, ctl_base, is_mmio, try_slave; |
| 205 | void (*my_outb)(unsigned char, unsigned long); | ||
| 184 | 206 | ||
| 185 | DEBUG(0, "ide_config(0x%p)\n", link); | 207 | DEBUG(0, "ide_config(0x%p)\n", link); |
| 186 | 208 | ||
| @@ -210,7 +232,7 @@ static int ide_config(struct pcmcia_device *link) | |||
| 210 | /* Not sure if this is right... look up the current Vcc */ | 232 | /* Not sure if this is right... look up the current Vcc */ |
| 211 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf)); | 233 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf)); |
| 212 | 234 | ||
| 213 | pass = io_base = ctl_base = 0; | 235 | pass = io_base = ctl_base = is_mmio = try_slave = 0; |
| 214 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 236 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; |
| 215 | tuple.Attributes = 0; | 237 | tuple.Attributes = 0; |
| 216 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); | 238 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); |
| @@ -258,11 +280,45 @@ static int ide_config(struct pcmcia_device *link) | |||
| 258 | goto next_entry; | 280 | goto next_entry; |
| 259 | io_base = link->io.BasePort1; | 281 | io_base = link->io.BasePort1; |
| 260 | ctl_base = link->io.BasePort1 + 0x0e; | 282 | ctl_base = link->io.BasePort1 + 0x0e; |
| 283 | |||
| 284 | if (io->win[0].len >= 0x20) | ||
| 285 | try_slave = 1; | ||
| 286 | |||
| 261 | } else goto next_entry; | 287 | } else goto next_entry; |
| 262 | /* If we've got this far, we're done */ | 288 | /* If we've got this far, we're done */ |
| 263 | break; | 289 | break; |
| 264 | } | 290 | } |
| 265 | 291 | ||
| 292 | if ((cfg->mem.nwin > 0) || (stk->dflt.mem.nwin > 0)) { | ||
| 293 | win_req_t req; | ||
| 294 | memreq_t map; | ||
| 295 | cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &stk->dflt.mem; | ||
| 296 | |||
| 297 | if (mem->win[0].len < 16) | ||
| 298 | goto next_entry; | ||
| 299 | |||
| 300 | req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM; | ||
| 301 | req.Attributes |= WIN_ENABLE; | ||
| 302 | req.Base = mem->win[0].host_addr; | ||
| 303 | req.Size = 0; | ||
| 304 | |||
| 305 | req.AccessSpeed = 0; | ||
| 306 | if (pcmcia_request_window(&link, &req, &link->win) != 0) | ||
| 307 | goto next_entry; | ||
| 308 | map.Page = 0; map.CardOffset = mem->win[0].card_addr; | ||
| 309 | if (pcmcia_map_mem_page(link->win, &map) != 0) | ||
| 310 | goto next_entry; | ||
| 311 | |||
| 312 | io_base = (unsigned long) ioremap(req.Base, req.Size); | ||
| 313 | ctl_base = io_base + 0x0e; | ||
| 314 | is_mmio = 1; | ||
| 315 | |||
| 316 | if (mem->win[0].len >= 0x20) | ||
| 317 | try_slave = 1; | ||
| 318 | |||
| 319 | break; | ||
| 320 | } | ||
| 321 | |||
| 266 | next_entry: | 322 | next_entry: |
| 267 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | 323 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) |
| 268 | memcpy(&stk->dflt, cfg, sizeof(stk->dflt)); | 324 | memcpy(&stk->dflt, cfg, sizeof(stk->dflt)); |
| @@ -278,21 +334,26 @@ static int ide_config(struct pcmcia_device *link) | |||
| 278 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 334 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); |
| 279 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 335 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); |
| 280 | 336 | ||
| 337 | if(is_mmio) | ||
| 338 | my_outb = outb_mem; | ||
| 339 | else | ||
| 340 | my_outb = outb_io; | ||
| 341 | |||
| 281 | /* disable drive interrupts during IDE probe */ | 342 | /* disable drive interrupts during IDE probe */ |
| 282 | outb(0x02, ctl_base); | 343 | my_outb(0x02, ctl_base); |
| 283 | 344 | ||
| 284 | /* special setup for KXLC005 card */ | 345 | /* special setup for KXLC005 card */ |
| 285 | if (is_kme) | 346 | if (is_kme) |
| 286 | outb(0x81, ctl_base+1); | 347 | my_outb(0x81, ctl_base+1); |
| 287 | 348 | ||
| 288 | /* retry registration in case device is still spinning up */ | 349 | /* retry registration in case device is still spinning up */ |
| 289 | for (hd = -1, i = 0; i < 10; i++) { | 350 | for (hd = -1, i = 0; i < 10; i++) { |
| 290 | hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link); | 351 | hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link, is_mmio); |
| 291 | if (hd >= 0) break; | 352 | if (hd >= 0) break; |
| 292 | if (link->io.NumPorts1 == 0x20) { | 353 | if (try_slave) { |
| 293 | outb(0x02, ctl_base + 0x10); | 354 | my_outb(0x02, ctl_base + 0x10); |
| 294 | hd = idecs_register(io_base + 0x10, ctl_base + 0x10, | 355 | hd = idecs_register(io_base + 0x10, ctl_base + 0x10, |
| 295 | link->irq.AssignedIRQ, link); | 356 | link->irq.AssignedIRQ, link, is_mmio); |
| 296 | if (hd >= 0) { | 357 | if (hd >= 0) { |
| 297 | io_base += 0x10; | 358 | io_base += 0x10; |
| 298 | ctl_base += 0x10; | 359 | ctl_base += 0x10; |
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c index 90cac609d9cf..d655da749144 100644 --- a/drivers/ide/legacy/macide.c +++ b/drivers/ide/legacy/macide.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * more details. | 11 | * more details. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c index 563fab0098be..d3c3bc2640e7 100644 --- a/drivers/ide/legacy/qd65xx.c +++ b/drivers/ide/legacy/qd65xx.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 28 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
| 29 | 29 | ||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c index cdbdb2ff9f15..6e2c58c5f6a2 100644 --- a/drivers/ide/legacy/umc8672.c +++ b/drivers/ide/legacy/umc8672.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #define REALLY_SLOW_IO /* some systems can safely undef this */ | 40 | #define REALLY_SLOW_IO /* some systems can safely undef this */ |
| 41 | 41 | ||
| 42 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/types.h> | 43 | #include <linux/types.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 46 | #include <linux/delay.h> | 45 | #include <linux/delay.h> |
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index 3edd7060510f..a7c725f8bf64 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
| 12 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 8b24b4f2a839..351dab2fcacf 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 85007cb12c52..2b0ea8b6608d 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * the Free Software Foundation. | 16 | * the Free Software Foundation. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c index 900efd1da587..a574de5f0835 100644 --- a/drivers/ide/pci/atiixp.c +++ b/drivers/ide/pci/atiixp.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c index 11d035f1983d..61b5f9c0b2f4 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c | |||
| @@ -103,7 +103,6 @@ | |||
| 103 | 103 | ||
| 104 | //#define CMD640_DUMP_REGS | 104 | //#define CMD640_DUMP_REGS |
| 105 | 105 | ||
| 106 | #include <linux/config.h> | ||
| 107 | #include <linux/types.h> | 106 | #include <linux/types.h> |
| 108 | #include <linux/kernel.h> | 107 | #include <linux/kernel.h> |
| 109 | #include <linux/delay.h> | 108 | #include <linux/delay.h> |
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 92b7b1549b16..20c32716bbc4 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Copyright (C) 1999-2002 Andre Hedrick <andre@linux-ide.org> | 14 | * Copyright (C) 1999-2002 Andre Hedrick <andre@linux-ide.org> |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index ea3c52cc8ac1..079f7c86726b 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * | 32 | * |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/types.h> | 36 | #include <linux/types.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c index 09269e574b3e..380bb28c7c54 100644 --- a/drivers/ide/pci/cs5530.c +++ b/drivers/ide/pci/cs5530.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * CS5530 documentation available from National Semiconductor. | 14 | * CS5530 documentation available from National Semiconductor. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index 6eb305197f3c..5c5aec28e671 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * CS5535 documentation available from AMD | 23 | * CS5535 documentation available from AMD |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 29 | #include <linux/ide.h> | 28 | #include <linux/ide.h> |
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 9f41ecd56338..120929fbe7a3 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * | 44 | * |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 49 | #include <linux/types.h> | 48 | #include <linux/types.h> |
| 50 | #include <linux/pci.h> | 49 | #include <linux/pci.h> |
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 7da550281cf2..b46cb042290a 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Non-bootable card or HPT343 :: pcicmd == 0x05 | 24 | * Non-bootable card or HPT343 :: pcicmd == 0x05 |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 940bdd4c5784..e993a51f250e 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | 57 | ||
| 58 | #include <linux/config.h> | ||
| 59 | #include <linux/types.h> | 58 | #include <linux/types.h> |
| 60 | #include <linux/module.h> | 59 | #include <linux/module.h> |
| 61 | #include <linux/kernel.h> | 60 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c index 93462926b9d5..0fc89fafad65 100644 --- a/drivers/ide/pci/it8172.c +++ b/drivers/ide/pci/it8172.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index 38f41b377ff6..3cb04424d351 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | * - Move to libata once it grows up | 62 | * - Move to libata once it grows up |
| 63 | */ | 63 | */ |
| 64 | 64 | ||
| 65 | #include <linux/config.h> | ||
| 66 | #include <linux/types.h> | 65 | #include <linux/types.h> |
| 67 | #include <linux/module.h> | 66 | #include <linux/module.h> |
| 68 | #include <linux/pci.h> | 67 | #include <linux/pci.h> |
| @@ -651,6 +650,8 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif) | |||
| 651 | } | 650 | } |
| 652 | ide_set_hwifdata(hwif, idev); | 651 | ide_set_hwifdata(hwif, idev); |
| 653 | 652 | ||
| 653 | hwif->atapi_dma = 1; | ||
| 654 | |||
| 654 | pci_read_config_byte(hwif->pci_dev, 0x50, &conf); | 655 | pci_read_config_byte(hwif->pci_dev, 0x50, &conf); |
| 655 | if(conf & 1) { | 656 | if(conf & 1) { |
| 656 | idev->smart = 1; | 657 | idev->smart = 1; |
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index fcd5142f5cfe..d95714bcee4e 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Inspired by an earlier effort from David S. Miller <davem@redhat.com> | 9 | * Inspired by an earlier effort from David S. Miller <davem@redhat.com> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index 5a8334d134fb..6c097e80b4df 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Released under terms of General Public License | 14 | * Released under terms of General Public License |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 1e209d8f9437..b46022a11bef 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * Released under terms of General Public License | 28 | * Released under terms of General Public License |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index 7fac6f57b5d6..50332ddd5ddb 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
| @@ -90,7 +90,6 @@ | |||
| 90 | * ICH3 errata #18 - Don't use native mode | 90 | * ICH3 errata #18 - Don't use native mode |
| 91 | */ | 91 | */ |
| 92 | 92 | ||
| 93 | #include <linux/config.h> | ||
| 94 | #include <linux/types.h> | 93 | #include <linux/types.h> |
| 95 | #include <linux/module.h> | 94 | #include <linux/module.h> |
| 96 | #include <linux/kernel.h> | 95 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 778b82ae964d..fc2b5496b6d2 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Available from National Semiconductor | 11 | * Available from National Semiconductor |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index 5100b827a935..03677bff0d72 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * | 29 | * |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 72dade14c725..25ceb4a39ed2 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * if neccessary | 27 | * if neccessary |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 8e9d87701ce2..8a6c23ac8cc1 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * 962/963. | 44 | * 962/963. |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/types.h> | 47 | #include <linux/types.h> |
| 49 | #include <linux/module.h> | 48 | #include <linux/module.h> |
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 900301e43818..0b4b60498515 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * -- Benjamin Herrenschmidt (01/11/03) benh@kernel.crashing.org | 13 | * -- Benjamin Herrenschmidt (01/11/03) benh@kernel.crashing.org |
| 14 | */ | 14 | */ |
| 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/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index 0968f6bc669a..4a1853af3bbb 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c index f96b56838f33..56d84931d6de 100644 --- a/drivers/ide/pci/triflex.c +++ b/drivers/ide/pci/triflex.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * Not publically available. | 27 | * Not publically available. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index fe80295974e1..2a282529bfc1 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
| @@ -128,7 +128,6 @@ | |||
| 128 | * | 128 | * |
| 129 | */ | 129 | */ |
| 130 | 130 | ||
| 131 | #include <linux/config.h> | ||
| 132 | #include <linux/types.h> | 131 | #include <linux/types.h> |
| 133 | #include <linux/module.h> | 132 | #include <linux/module.h> |
| 134 | #include <linux/kernel.h> | 133 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 3e677c4f8c28..afdaee3c15c9 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * the Free Software Foundation. | 26 | * the Free Software Foundation. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c index b80c6135ae93..0ac9da3a7378 100644 --- a/drivers/ide/ppc/mpc8xx.c +++ b/drivers/ide/ppc/mpc8xx.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * by Mathew Locke <mattl@mvista.com> | 11 | * by Mathew Locke <mattl@mvista.com> |
| 12 | */ | 12 | */ |
| 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/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index e8ef3455ec35..ebf961f1718d 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * big table | 22 | * big table |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index c11e3b2e67a6..eb0945284acc 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * configuration of all PCI IDE interfaces present in a system. | 18 | * configuration of all PCI IDE interfaces present in a system. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/drivers/ieee1394/config_roms.c b/drivers/ieee1394/config_roms.c index 1017fd717248..e2de6fa0c9fe 100644 --- a/drivers/ieee1394/config_roms.c +++ b/drivers/ieee1394/config_roms.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * directory of the kernel sources for details. | 9 | * directory of the kernel sources for details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | 13 | ||
| 15 | #include "csr1212.h" | 14 | #include "csr1212.h" |
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 85c2d4ca0def..87532dd43374 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
| @@ -83,7 +83,6 @@ | |||
| 83 | 83 | ||
| 84 | */ | 84 | */ |
| 85 | 85 | ||
| 86 | #include <linux/config.h> | ||
| 87 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
| 88 | #include <linux/list.h> | 87 | #include <linux/list.h> |
| 89 | #include <linux/slab.h> | 88 | #include <linux/slab.h> |
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c index 25b22609e793..694da82d820b 100644 --- a/drivers/ieee1394/highlevel.c +++ b/drivers/ieee1394/highlevel.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 22 | #include <linux/list.h> | 21 | #include <linux/list.h> |
| 23 | #include <linux/bitops.h> | 22 | #include <linux/bitops.h> |
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c index ad49c040b674..2c669287f5bd 100644 --- a/drivers/ieee1394/hosts.c +++ b/drivers/ieee1394/hosts.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * directory of the kernel sources for details. | 10 | * directory of the kernel sources for details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/list.h> | 15 | #include <linux/list.h> |
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index 49354de9fb8a..f43739c5cab2 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 26 | #include <linux/string.h> | 25 | #include <linux/string.h> |
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 50c71e17de73..d541b508a159 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/bitmap.h> | 11 | #include <linux/bitmap.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/list.h> | 13 | #include <linux/list.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
| 16 | #include <linux/smp_lock.h> | 15 | #include <linux/smp_lock.h> |
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 800c8d518430..8de81ecd3ba6 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | * | 82 | * |
| 83 | */ | 83 | */ |
| 84 | 84 | ||
| 85 | #include <linux/config.h> | ||
| 86 | #include <linux/kernel.h> | 85 | #include <linux/kernel.h> |
| 87 | #include <linux/list.h> | 86 | #include <linux/list.h> |
| 88 | #include <linux/slab.h> | 87 | #include <linux/slab.h> |
diff --git a/drivers/ieee1394/oui2c.sh b/drivers/ieee1394/oui2c.sh index d50dc7a2d087..b9d0e8f10abb 100644 --- a/drivers/ieee1394/oui2c.sh +++ b/drivers/ieee1394/oui2c.sh | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | cat <<EOF | 3 | cat <<EOF |
| 4 | /* Generated file for OUI database */ | 4 | /* Generated file for OUI database */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | 6 | ||
| 8 | #ifdef CONFIG_IEEE1394_OUI_DB | 7 | #ifdef CONFIG_IEEE1394_OUI_DB |
| 9 | struct oui_list_struct { | 8 | struct oui_list_struct { |
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index e29dfd280bee..5b48f6ac5c7f 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * Enhancements in async and iso send code | 30 | * Enhancements in async and iso send code |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 35 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 36 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
diff --git a/drivers/ieee1394/pcilynx.h b/drivers/ieee1394/pcilynx.h index d631aa8383ad..ec27321f6724 100644 --- a/drivers/ieee1394/pcilynx.h +++ b/drivers/ieee1394/pcilynx.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __PCILYNX_H__ | 1 | #ifndef __PCILYNX_H__ |
| 2 | #define __PCILYNX_H__ | 2 | #define __PCILYNX_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #define PCILYNX_DRIVER_NAME "pcilynx" | 5 | #define PCILYNX_DRIVER_NAME "pcilynx" |
| 7 | #define PCILYNX_MAJOR 177 | 6 | #define PCILYNX_MAJOR 177 |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 1d5ceb7ecc83..aaa74f293aaf 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * but the code needs additional debugging. | 38 | * but the code needs additional debugging. |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 43 | #include <linux/list.h> | 42 | #include <linux/list.h> |
| 44 | #include <linux/string.h> | 43 | #include <linux/string.h> |
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 295d0f8c3d06..c6e3f02bc6d7 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * ENOTTY for unsupported ioctl request | 28 | * ENOTTY for unsupported ioctl request |
| 29 | * | 29 | * |
| 30 | */ | 30 | */ |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/list.h> | 32 | #include <linux/list.h> |
| 34 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 450adfe0a4f1..3f6705f3083a 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c | |||
| @@ -3152,6 +3152,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv, | |||
| 3152 | } | 3152 | } |
| 3153 | if (cm_id_priv->alt_av.ah_attr.dlid) { | 3153 | if (cm_id_priv->alt_av.ah_attr.dlid) { |
| 3154 | *qp_attr_mask |= IB_QP_ALT_PATH; | 3154 | *qp_attr_mask |= IB_QP_ALT_PATH; |
| 3155 | qp_attr->alt_port_num = cm_id_priv->alt_av.port->port_num; | ||
| 3155 | qp_attr->alt_ah_attr = cm_id_priv->alt_av.ah_attr; | 3156 | qp_attr->alt_ah_attr = cm_id_priv->alt_av.ah_attr; |
| 3156 | } | 3157 | } |
| 3157 | ret = 0; | 3158 | ret = 0; |
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index a908a7bdcd7f..bdf5d5098190 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c | |||
| @@ -1963,7 +1963,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file, | |||
| 1963 | if (!obj) | 1963 | if (!obj) |
| 1964 | return -ENOMEM; | 1964 | return -ENOMEM; |
| 1965 | 1965 | ||
| 1966 | init_uobj(&obj->uobject, 0, file->ucontext); | 1966 | init_uobj(&obj->uobject, cmd.user_handle, file->ucontext); |
| 1967 | down_write(&obj->uobject.mutex); | 1967 | down_write(&obj->uobject.mutex); |
| 1968 | 1968 | ||
| 1969 | pd = idr_read_pd(cmd.pd_handle, file->ucontext); | 1969 | pd = idr_read_pd(cmd.pd_handle, file->ucontext); |
diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/infiniband/hw/ipath/Kconfig index 9ea67c409b6d..1db9489f1e82 100644 --- a/drivers/infiniband/hw/ipath/Kconfig +++ b/drivers/infiniband/hw/ipath/Kconfig | |||
| @@ -1,16 +1,16 @@ | |||
| 1 | config IPATH_CORE | 1 | config IPATH_CORE |
| 2 | tristate "PathScale InfiniPath Driver" | 2 | tristate "QLogic InfiniPath Driver" |
| 3 | depends on 64BIT && PCI_MSI && NET | 3 | depends on 64BIT && PCI_MSI && NET |
| 4 | ---help--- | 4 | ---help--- |
| 5 | This is a low-level driver for PathScale InfiniPath host channel | 5 | This is a low-level driver for QLogic InfiniPath host channel |
| 6 | adapters (HCAs) based on the HT-400 and PE-800 chips. | 6 | adapters (HCAs) based on the HT-400 and PE-800 chips. |
| 7 | 7 | ||
| 8 | config INFINIBAND_IPATH | 8 | config INFINIBAND_IPATH |
| 9 | tristate "PathScale InfiniPath Verbs Driver" | 9 | tristate "QLogic InfiniPath Verbs Driver" |
| 10 | depends on IPATH_CORE && INFINIBAND | 10 | depends on IPATH_CORE && INFINIBAND |
| 11 | ---help--- | 11 | ---help--- |
| 12 | This is a driver that provides InfiniBand verbs support for | 12 | This is a driver that provides InfiniBand verbs support for |
| 13 | PathScale InfiniPath host channel adapters (HCAs). This | 13 | QLogic InfiniPath host channel adapters (HCAs). This |
| 14 | allows these devices to be used with both kernel upper level | 14 | allows these devices to be used with both kernel upper level |
| 15 | protocols such as IP-over-InfiniBand as well as with userspace | 15 | protocols such as IP-over-InfiniBand as well as with userspace |
| 16 | applications (in conjunction with InfiniBand userspace access). | 16 | applications (in conjunction with InfiniBand userspace access). |
diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile index b4d084abfd22..b0bf72864130 100644 --- a/drivers/infiniband/hw/ipath/Makefile +++ b/drivers/infiniband/hw/ipath/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | EXTRA_CFLAGS += -DIPATH_IDSTR='"PathScale kernel.org driver"' \ | 1 | EXTRA_CFLAGS += -DIPATH_IDSTR='"QLogic kernel.org driver"' \ |
| 2 | -DIPATH_KERN_TYPE=0 | 2 | -DIPATH_KERN_TYPE=0 |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_IPATH_CORE) += ipath_core.o | 4 | obj-$(CONFIG_IPATH_CORE) += ipath_core.o |
diff --git a/drivers/infiniband/hw/ipath/ipath_common.h b/drivers/infiniband/hw/ipath/ipath_common.h index 48a55247b832..062bd392e7e5 100644 --- a/drivers/infiniband/hw/ipath/ipath_common.h +++ b/drivers/infiniband/hw/ipath/ipath_common.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -38,7 +39,8 @@ | |||
| 38 | * to communicate between kernel and user code. | 39 | * to communicate between kernel and user code. |
| 39 | */ | 40 | */ |
| 40 | 41 | ||
| 41 | /* This is the IEEE-assigned OUI for PathScale, Inc. */ | 42 | |
| 43 | /* This is the IEEE-assigned OUI for QLogic Inc. InfiniPath */ | ||
| 42 | #define IPATH_SRC_OUI_1 0x00 | 44 | #define IPATH_SRC_OUI_1 0x00 |
| 43 | #define IPATH_SRC_OUI_2 0x11 | 45 | #define IPATH_SRC_OUI_2 0x11 |
| 44 | #define IPATH_SRC_OUI_3 0x75 | 46 | #define IPATH_SRC_OUI_3 0x75 |
| @@ -96,8 +98,8 @@ struct infinipath_stats { | |||
| 96 | __u64 sps_hwerrs; | 98 | __u64 sps_hwerrs; |
| 97 | /* number of times IB link changed state unexpectedly */ | 99 | /* number of times IB link changed state unexpectedly */ |
| 98 | __u64 sps_iblink; | 100 | __u64 sps_iblink; |
| 99 | /* no longer used; left for compatibility */ | 101 | /* kernel receive interrupts that didn't read intstat */ |
| 100 | __u64 sps_unused3; | 102 | __u64 sps_fastrcvint; |
| 101 | /* number of kernel (port0) packets received */ | 103 | /* number of kernel (port0) packets received */ |
| 102 | __u64 sps_port0pkts; | 104 | __u64 sps_port0pkts; |
| 103 | /* number of "ethernet" packets sent by driver */ | 105 | /* number of "ethernet" packets sent by driver */ |
| @@ -121,8 +123,7 @@ struct infinipath_stats { | |||
| 121 | __u64 sps_ports; | 123 | __u64 sps_ports; |
| 122 | /* list of pkeys (other than default) accepted (0 means not set) */ | 124 | /* list of pkeys (other than default) accepted (0 means not set) */ |
| 123 | __u16 sps_pkeys[4]; | 125 | __u16 sps_pkeys[4]; |
| 124 | /* lids for up to 4 infinipaths, indexed by infinipath # */ | 126 | __u16 sps_unused16[4]; /* available; maintaining compatible layout */ |
| 125 | __u16 sps_lid[4]; | ||
| 126 | /* number of user ports per chip (not IB ports) */ | 127 | /* number of user ports per chip (not IB ports) */ |
| 127 | __u32 sps_nports; | 128 | __u32 sps_nports; |
| 128 | /* not our interrupt, or already handled */ | 129 | /* not our interrupt, or already handled */ |
| @@ -140,10 +141,8 @@ struct infinipath_stats { | |||
| 140 | * packets if ipath not configured, sma/mad, etc.) | 141 | * packets if ipath not configured, sma/mad, etc.) |
| 141 | */ | 142 | */ |
| 142 | __u64 sps_krdrops; | 143 | __u64 sps_krdrops; |
| 143 | /* mlids for up to 4 infinipaths, indexed by infinipath # */ | ||
| 144 | __u16 sps_mlid[4]; | ||
| 145 | /* pad for future growth */ | 144 | /* pad for future growth */ |
| 146 | __u64 __sps_pad[45]; | 145 | __u64 __sps_pad[46]; |
| 147 | }; | 146 | }; |
| 148 | 147 | ||
| 149 | /* | 148 | /* |
| @@ -310,6 +309,9 @@ struct ipath_base_info { | |||
| 310 | __u32 spi_rcv_egrchunksize; | 309 | __u32 spi_rcv_egrchunksize; |
| 311 | /* total size of mmap to cover full rcvegrbuffers */ | 310 | /* total size of mmap to cover full rcvegrbuffers */ |
| 312 | __u32 spi_rcv_egrbuftotlen; | 311 | __u32 spi_rcv_egrbuftotlen; |
| 312 | __u32 spi_filler_for_align; | ||
| 313 | /* address of readonly memory copy of the rcvhdrq tail register. */ | ||
| 314 | __u64 spi_rcvhdr_tailaddr; | ||
| 313 | } __attribute__ ((aligned(8))); | 315 | } __attribute__ ((aligned(8))); |
| 314 | 316 | ||
| 315 | 317 | ||
| @@ -342,9 +344,9 @@ struct ipath_base_info { | |||
| 342 | /* | 344 | /* |
| 343 | * Similarly, this is the kernel version going back to the user. It's | 345 | * Similarly, this is the kernel version going back to the user. It's |
| 344 | * slightly different, in that we want to tell if the driver was built as | 346 | * slightly different, in that we want to tell if the driver was built as |
| 345 | * part of a PathScale release, or from the driver from OpenIB, kernel.org, | 347 | * part of a QLogic release, or from the driver from openfabrics.org, |
| 346 | * or a standard distribution, for support reasons. The high bit is 0 for | 348 | * kernel.org, or a standard distribution, for support reasons. |
| 347 | * non-PathScale, and 1 for PathScale-built/supplied. | 349 | * The high bit is 0 for non-QLogic and 1 for QLogic-built/supplied. |
| 348 | * | 350 | * |
| 349 | * It's returned by the driver to the user code during initialization in the | 351 | * It's returned by the driver to the user code during initialization in the |
| 350 | * spi_sw_version field of ipath_base_info, so the user code can in turn | 352 | * spi_sw_version field of ipath_base_info, so the user code can in turn |
| @@ -379,13 +381,7 @@ struct ipath_user_info { | |||
| 379 | */ | 381 | */ |
| 380 | __u32 spu_rcvhdrsize; | 382 | __u32 spu_rcvhdrsize; |
| 381 | 383 | ||
| 382 | /* | 384 | __u64 spu_unused; /* kept for compatible layout */ |
| 383 | * cache line aligned (64 byte) user address to | ||
| 384 | * which the rcvhdrtail register will be written by infinipath | ||
| 385 | * whenever it changes, so that no chip registers are read in | ||
| 386 | * the performance path. | ||
| 387 | */ | ||
| 388 | __u64 spu_rcvhdraddr; | ||
| 389 | 385 | ||
| 390 | /* | 386 | /* |
| 391 | * address of struct base_info to write to | 387 | * address of struct base_info to write to |
| @@ -481,7 +477,7 @@ struct ipath_sma_pkt | |||
| 481 | * Data layout in I2C flash (for GUID, etc.) | 477 | * Data layout in I2C flash (for GUID, etc.) |
| 482 | * All fields are little-endian binary unless otherwise stated | 478 | * All fields are little-endian binary unless otherwise stated |
| 483 | */ | 479 | */ |
| 484 | #define IPATH_FLASH_VERSION 1 | 480 | #define IPATH_FLASH_VERSION 2 |
| 485 | struct ipath_flash { | 481 | struct ipath_flash { |
| 486 | /* flash layout version (IPATH_FLASH_VERSION) */ | 482 | /* flash layout version (IPATH_FLASH_VERSION) */ |
| 487 | __u8 if_fversion; | 483 | __u8 if_fversion; |
| @@ -489,14 +485,14 @@ struct ipath_flash { | |||
| 489 | __u8 if_csum; | 485 | __u8 if_csum; |
| 490 | /* | 486 | /* |
| 491 | * valid length (in use, protected by if_csum), including | 487 | * valid length (in use, protected by if_csum), including |
| 492 | * if_fversion and if_sum themselves) | 488 | * if_fversion and if_csum themselves) |
| 493 | */ | 489 | */ |
| 494 | __u8 if_length; | 490 | __u8 if_length; |
| 495 | /* the GUID, in network order */ | 491 | /* the GUID, in network order */ |
| 496 | __u8 if_guid[8]; | 492 | __u8 if_guid[8]; |
| 497 | /* number of GUIDs to use, starting from if_guid */ | 493 | /* number of GUIDs to use, starting from if_guid */ |
| 498 | __u8 if_numguid; | 494 | __u8 if_numguid; |
| 499 | /* the board serial number, in ASCII */ | 495 | /* the (last 10 characters of) board serial number, in ASCII */ |
| 500 | char if_serial[12]; | 496 | char if_serial[12]; |
| 501 | /* board mfg date (YYYYMMDD ASCII) */ | 497 | /* board mfg date (YYYYMMDD ASCII) */ |
| 502 | char if_mfgdate[8]; | 498 | char if_mfgdate[8]; |
| @@ -508,8 +504,10 @@ struct ipath_flash { | |||
| 508 | __u8 if_powerhour[2]; | 504 | __u8 if_powerhour[2]; |
| 509 | /* ASCII free-form comment field */ | 505 | /* ASCII free-form comment field */ |
| 510 | char if_comment[32]; | 506 | char if_comment[32]; |
| 511 | /* 78 bytes used, min flash size is 128 bytes */ | 507 | /* Backwards compatible prefix for longer QLogic Serial Numbers */ |
| 512 | __u8 if_future[50]; | 508 | char if_sprefix[4]; |
| 509 | /* 82 bytes used, min flash size is 128 bytes */ | ||
| 510 | __u8 if_future[46]; | ||
| 513 | }; | 511 | }; |
| 514 | 512 | ||
| 515 | /* | 513 | /* |
| @@ -603,14 +601,118 @@ struct infinipath_counters { | |||
| 603 | #define INFINIPATH_KPF_INTR 0x1 | 601 | #define INFINIPATH_KPF_INTR 0x1 |
| 604 | 602 | ||
| 605 | /* SendPIO per-buffer control */ | 603 | /* SendPIO per-buffer control */ |
| 606 | #define INFINIPATH_SP_LENGTHP1_MASK 0x3FF | 604 | #define INFINIPATH_SP_TEST 0x40 |
| 607 | #define INFINIPATH_SP_LENGTHP1_SHIFT 0 | 605 | #define INFINIPATH_SP_TESTEBP 0x20 |
| 608 | #define INFINIPATH_SP_INTR 0x80000000 | ||
| 609 | #define INFINIPATH_SP_TEST 0x40000000 | ||
| 610 | #define INFINIPATH_SP_TESTEBP 0x20000000 | ||
| 611 | 606 | ||
| 612 | /* SendPIOAvail bits */ | 607 | /* SendPIOAvail bits */ |
| 613 | #define INFINIPATH_SENDPIOAVAIL_BUSY_SHIFT 1 | 608 | #define INFINIPATH_SENDPIOAVAIL_BUSY_SHIFT 1 |
| 614 | #define INFINIPATH_SENDPIOAVAIL_CHECK_SHIFT 0 | 609 | #define INFINIPATH_SENDPIOAVAIL_CHECK_SHIFT 0 |
| 615 | 610 | ||
| 611 | /* infinipath header format */ | ||
| 612 | struct ipath_header { | ||
| 613 | /* | ||
| 614 | * Version - 4 bits, Port - 4 bits, TID - 10 bits and Offset - | ||
| 615 | * 14 bits before ECO change ~28 Dec 03. After that, Vers 4, | ||
| 616 | * Port 3, TID 11, offset 14. | ||
| 617 | */ | ||
| 618 | __le32 ver_port_tid_offset; | ||
| 619 | __le16 chksum; | ||
| 620 | __le16 pkt_flags; | ||
| 621 | }; | ||
| 622 | |||
| 623 | /* infinipath user message header format. | ||
| 624 | * This structure contains the first 4 fields common to all protocols | ||
| 625 | * that employ infinipath. | ||
| 626 | */ | ||
| 627 | struct ipath_message_header { | ||
| 628 | __be16 lrh[4]; | ||
| 629 | __be32 bth[3]; | ||
| 630 | /* fields below this point are in host byte order */ | ||
| 631 | struct ipath_header iph; | ||
| 632 | __u8 sub_opcode; | ||
| 633 | }; | ||
| 634 | |||
| 635 | /* infinipath ethernet header format */ | ||
| 636 | struct ether_header { | ||
| 637 | __be16 lrh[4]; | ||
| 638 | __be32 bth[3]; | ||
| 639 | struct ipath_header iph; | ||
| 640 | __u8 sub_opcode; | ||
| 641 | __u8 cmd; | ||
| 642 | __be16 lid; | ||
| 643 | __u16 mac[3]; | ||
| 644 | __u8 frag_num; | ||
| 645 | __u8 seq_num; | ||
| 646 | __le32 len; | ||
| 647 | /* MUST be of word size due to PIO write requirements */ | ||
| 648 | __le32 csum; | ||
| 649 | __le16 csum_offset; | ||
| 650 | __le16 flags; | ||
| 651 | __u16 first_2_bytes; | ||
| 652 | __u8 unused[2]; /* currently unused */ | ||
| 653 | }; | ||
| 654 | |||
| 655 | |||
| 656 | /* IB - LRH header consts */ | ||
| 657 | #define IPATH_LRH_GRH 0x0003 /* 1. word of IB LRH - next header: GRH */ | ||
| 658 | #define IPATH_LRH_BTH 0x0002 /* 1. word of IB LRH - next header: BTH */ | ||
| 659 | |||
| 660 | /* misc. */ | ||
| 661 | #define SIZE_OF_CRC 1 | ||
| 662 | |||
| 663 | #define IPATH_DEFAULT_P_KEY 0xFFFF | ||
| 664 | #define IPATH_PERMISSIVE_LID 0xFFFF | ||
| 665 | #define IPATH_AETH_CREDIT_SHIFT 24 | ||
| 666 | #define IPATH_AETH_CREDIT_MASK 0x1F | ||
| 667 | #define IPATH_AETH_CREDIT_INVAL 0x1F | ||
| 668 | #define IPATH_PSN_MASK 0xFFFFFF | ||
| 669 | #define IPATH_MSN_MASK 0xFFFFFF | ||
| 670 | #define IPATH_QPN_MASK 0xFFFFFF | ||
| 671 | #define IPATH_MULTICAST_LID_BASE 0xC000 | ||
| 672 | #define IPATH_MULTICAST_QPN 0xFFFFFF | ||
| 673 | |||
| 674 | /* Receive Header Queue: receive type (from infinipath) */ | ||
| 675 | #define RCVHQ_RCV_TYPE_EXPECTED 0 | ||
| 676 | #define RCVHQ_RCV_TYPE_EAGER 1 | ||
| 677 | #define RCVHQ_RCV_TYPE_NON_KD 2 | ||
| 678 | #define RCVHQ_RCV_TYPE_ERROR 3 | ||
| 679 | |||
| 680 | |||
| 681 | /* sub OpCodes - ith4x */ | ||
| 682 | #define IPATH_ITH4X_OPCODE_ENCAP 0x81 | ||
| 683 | #define IPATH_ITH4X_OPCODE_LID_ARP 0x82 | ||
| 684 | |||
| 685 | #define IPATH_HEADER_QUEUE_WORDS 9 | ||
| 686 | |||
| 687 | /* functions for extracting fields from rcvhdrq entries for the driver. | ||
| 688 | */ | ||
| 689 | static inline __u32 ipath_hdrget_err_flags(const __le32 * rbuf) | ||
| 690 | { | ||
| 691 | return __le32_to_cpu(rbuf[1]); | ||
| 692 | } | ||
| 693 | |||
| 694 | static inline __u32 ipath_hdrget_rcv_type(const __le32 * rbuf) | ||
| 695 | { | ||
| 696 | return (__le32_to_cpu(rbuf[0]) >> INFINIPATH_RHF_RCVTYPE_SHIFT) | ||
| 697 | & INFINIPATH_RHF_RCVTYPE_MASK; | ||
| 698 | } | ||
| 699 | |||
| 700 | static inline __u32 ipath_hdrget_length_in_bytes(const __le32 * rbuf) | ||
| 701 | { | ||
| 702 | return ((__le32_to_cpu(rbuf[0]) >> INFINIPATH_RHF_LENGTH_SHIFT) | ||
| 703 | & INFINIPATH_RHF_LENGTH_MASK) << 2; | ||
| 704 | } | ||
| 705 | |||
| 706 | static inline __u32 ipath_hdrget_index(const __le32 * rbuf) | ||
| 707 | { | ||
| 708 | return (__le32_to_cpu(rbuf[0]) >> INFINIPATH_RHF_EGRINDEX_SHIFT) | ||
| 709 | & INFINIPATH_RHF_EGRINDEX_MASK; | ||
| 710 | } | ||
| 711 | |||
| 712 | static inline __u32 ipath_hdrget_ipath_ver(__le32 hdrword) | ||
| 713 | { | ||
| 714 | return (__le32_to_cpu(hdrword) >> INFINIPATH_I_VERS_SHIFT) | ||
| 715 | & INFINIPATH_I_VERS_MASK; | ||
| 716 | } | ||
| 717 | |||
| 616 | #endif /* _IPATH_COMMON_H */ | 718 | #endif /* _IPATH_COMMON_H */ |
diff --git a/drivers/infiniband/hw/ipath/ipath_cq.c b/drivers/infiniband/hw/ipath/ipath_cq.c index 7ece1135ddfe..3efee341c9bc 100644 --- a/drivers/infiniband/hw/ipath/ipath_cq.c +++ b/drivers/infiniband/hw/ipath/ipath_cq.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -157,10 +158,21 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, | |||
| 157 | struct ib_ucontext *context, | 158 | struct ib_ucontext *context, |
| 158 | struct ib_udata *udata) | 159 | struct ib_udata *udata) |
| 159 | { | 160 | { |
| 161 | struct ipath_ibdev *dev = to_idev(ibdev); | ||
| 160 | struct ipath_cq *cq; | 162 | struct ipath_cq *cq; |
| 161 | struct ib_wc *wc; | 163 | struct ib_wc *wc; |
| 162 | struct ib_cq *ret; | 164 | struct ib_cq *ret; |
| 163 | 165 | ||
| 166 | if (entries > ib_ipath_max_cqes) { | ||
| 167 | ret = ERR_PTR(-EINVAL); | ||
| 168 | goto bail; | ||
| 169 | } | ||
| 170 | |||
| 171 | if (dev->n_cqs_allocated == ib_ipath_max_cqs) { | ||
| 172 | ret = ERR_PTR(-ENOMEM); | ||
| 173 | goto bail; | ||
| 174 | } | ||
| 175 | |||
| 164 | /* | 176 | /* |
| 165 | * Need to use vmalloc() if we want to support large #s of | 177 | * Need to use vmalloc() if we want to support large #s of |
| 166 | * entries. | 178 | * entries. |
| @@ -196,6 +208,8 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, | |||
| 196 | 208 | ||
| 197 | ret = &cq->ibcq; | 209 | ret = &cq->ibcq; |
| 198 | 210 | ||
| 211 | dev->n_cqs_allocated++; | ||
| 212 | |||
| 199 | bail: | 213 | bail: |
| 200 | return ret; | 214 | return ret; |
| 201 | } | 215 | } |
| @@ -210,9 +224,11 @@ bail: | |||
| 210 | */ | 224 | */ |
| 211 | int ipath_destroy_cq(struct ib_cq *ibcq) | 225 | int ipath_destroy_cq(struct ib_cq *ibcq) |
| 212 | { | 226 | { |
| 227 | struct ipath_ibdev *dev = to_idev(ibcq->device); | ||
| 213 | struct ipath_cq *cq = to_icq(ibcq); | 228 | struct ipath_cq *cq = to_icq(ibcq); |
| 214 | 229 | ||
| 215 | tasklet_kill(&cq->comptask); | 230 | tasklet_kill(&cq->comptask); |
| 231 | dev->n_cqs_allocated--; | ||
| 216 | vfree(cq->queue); | 232 | vfree(cq->queue); |
| 217 | kfree(cq); | 233 | kfree(cq); |
| 218 | 234 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_debug.h b/drivers/infiniband/hw/ipath/ipath_debug.h index 46762387f5f8..f415beda0d32 100644 --- a/drivers/infiniband/hw/ipath/ipath_debug.h +++ b/drivers/infiniband/hw/ipath/ipath_debug.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c index 28ddceb260e8..147dd89e21c9 100644 --- a/drivers/infiniband/hw/ipath/ipath_diag.c +++ b/drivers/infiniband/hw/ipath/ipath_diag.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -43,10 +44,9 @@ | |||
| 43 | #include <linux/pci.h> | 44 | #include <linux/pci.h> |
| 44 | #include <asm/uaccess.h> | 45 | #include <asm/uaccess.h> |
| 45 | 46 | ||
| 46 | #include "ipath_common.h" | ||
| 47 | #include "ipath_kernel.h" | 47 | #include "ipath_kernel.h" |
| 48 | #include "ips_common.h" | ||
| 49 | #include "ipath_layer.h" | 48 | #include "ipath_layer.h" |
| 49 | #include "ipath_common.h" | ||
| 50 | 50 | ||
| 51 | int ipath_diag_inuse; | 51 | int ipath_diag_inuse; |
| 52 | static int diag_set_link; | 52 | static int diag_set_link; |
| @@ -66,18 +66,20 @@ static struct file_operations diag_file_ops = { | |||
| 66 | .release = ipath_diag_release | 66 | .release = ipath_diag_release |
| 67 | }; | 67 | }; |
| 68 | 68 | ||
| 69 | static struct cdev *diag_cdev; | 69 | int ipath_diag_add(struct ipath_devdata *dd) |
| 70 | static struct class_device *diag_class_dev; | ||
| 71 | |||
| 72 | int ipath_diag_init(void) | ||
| 73 | { | 70 | { |
| 74 | return ipath_cdev_init(IPATH_DIAG_MINOR, "ipath_diag", | 71 | char name[16]; |
| 75 | &diag_file_ops, &diag_cdev, &diag_class_dev); | 72 | |
| 73 | snprintf(name, sizeof(name), "ipath_diag%d", dd->ipath_unit); | ||
| 74 | |||
| 75 | return ipath_cdev_init(IPATH_DIAG_MINOR_BASE + dd->ipath_unit, name, | ||
| 76 | &diag_file_ops, &dd->diag_cdev, | ||
| 77 | &dd->diag_class_dev); | ||
| 76 | } | 78 | } |
| 77 | 79 | ||
| 78 | void ipath_diag_cleanup(void) | 80 | void ipath_diag_remove(struct ipath_devdata *dd) |
| 79 | { | 81 | { |
| 80 | ipath_cdev_cleanup(&diag_cdev, &diag_class_dev); | 82 | ipath_cdev_cleanup(&dd->diag_cdev, &dd->diag_class_dev); |
| 81 | } | 83 | } |
| 82 | 84 | ||
| 83 | /** | 85 | /** |
| @@ -101,8 +103,7 @@ static int ipath_read_umem64(struct ipath_devdata *dd, void __user *uaddr, | |||
| 101 | int ret; | 103 | int ret; |
| 102 | 104 | ||
| 103 | /* not very efficient, but it works for now */ | 105 | /* not very efficient, but it works for now */ |
| 104 | if (reg_addr < dd->ipath_kregbase || | 106 | if (reg_addr < dd->ipath_kregbase || reg_end > dd->ipath_kregend) { |
| 105 | reg_end > dd->ipath_kregend) { | ||
| 106 | ret = -EINVAL; | 107 | ret = -EINVAL; |
| 107 | goto bail; | 108 | goto bail; |
| 108 | } | 109 | } |
| @@ -113,7 +114,7 @@ static int ipath_read_umem64(struct ipath_devdata *dd, void __user *uaddr, | |||
| 113 | goto bail; | 114 | goto bail; |
| 114 | } | 115 | } |
| 115 | reg_addr++; | 116 | reg_addr++; |
| 116 | uaddr++; | 117 | uaddr += sizeof(u64); |
| 117 | } | 118 | } |
| 118 | ret = 0; | 119 | ret = 0; |
| 119 | bail: | 120 | bail: |
| @@ -139,8 +140,7 @@ static int ipath_write_umem64(struct ipath_devdata *dd, void __iomem *caddr, | |||
| 139 | int ret; | 140 | int ret; |
| 140 | 141 | ||
| 141 | /* not very efficient, but it works for now */ | 142 | /* not very efficient, but it works for now */ |
| 142 | if (reg_addr < dd->ipath_kregbase || | 143 | if (reg_addr < dd->ipath_kregbase || reg_end > dd->ipath_kregend) { |
| 143 | reg_end > dd->ipath_kregend) { | ||
| 144 | ret = -EINVAL; | 144 | ret = -EINVAL; |
| 145 | goto bail; | 145 | goto bail; |
| 146 | } | 146 | } |
| @@ -153,7 +153,7 @@ static int ipath_write_umem64(struct ipath_devdata *dd, void __iomem *caddr, | |||
| 153 | writeq(data, reg_addr); | 153 | writeq(data, reg_addr); |
| 154 | 154 | ||
| 155 | reg_addr++; | 155 | reg_addr++; |
| 156 | uaddr++; | 156 | uaddr += sizeof(u64); |
| 157 | } | 157 | } |
| 158 | ret = 0; | 158 | ret = 0; |
| 159 | bail: | 159 | bail: |
| @@ -191,7 +191,8 @@ static int ipath_read_umem32(struct ipath_devdata *dd, void __user *uaddr, | |||
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | reg_addr++; | 193 | reg_addr++; |
| 194 | uaddr++; | 194 | uaddr += sizeof(u32); |
| 195 | |||
| 195 | } | 196 | } |
| 196 | ret = 0; | 197 | ret = 0; |
| 197 | bail: | 198 | bail: |
| @@ -230,7 +231,7 @@ static int ipath_write_umem32(struct ipath_devdata *dd, void __iomem *caddr, | |||
| 230 | writel(data, reg_addr); | 231 | writel(data, reg_addr); |
| 231 | 232 | ||
| 232 | reg_addr++; | 233 | reg_addr++; |
| 233 | uaddr++; | 234 | uaddr += sizeof(u32); |
| 234 | } | 235 | } |
| 235 | ret = 0; | 236 | ret = 0; |
| 236 | bail: | 237 | bail: |
| @@ -239,59 +240,45 @@ bail: | |||
| 239 | 240 | ||
| 240 | static int ipath_diag_open(struct inode *in, struct file *fp) | 241 | static int ipath_diag_open(struct inode *in, struct file *fp) |
| 241 | { | 242 | { |
| 243 | int unit = iminor(in) - IPATH_DIAG_MINOR_BASE; | ||
| 242 | struct ipath_devdata *dd; | 244 | struct ipath_devdata *dd; |
| 243 | int unit = 0; /* XXX this is bogus */ | ||
| 244 | unsigned long flags; | ||
| 245 | int ret; | 245 | int ret; |
| 246 | 246 | ||
| 247 | dd = ipath_lookup(unit); | ||
| 248 | |||
| 249 | mutex_lock(&ipath_mutex); | 247 | mutex_lock(&ipath_mutex); |
| 250 | spin_lock_irqsave(&ipath_devs_lock, flags); | ||
| 251 | 248 | ||
| 252 | if (ipath_diag_inuse) { | 249 | if (ipath_diag_inuse) { |
| 253 | ret = -EBUSY; | 250 | ret = -EBUSY; |
| 254 | goto bail; | 251 | goto bail; |
| 255 | } | 252 | } |
| 256 | 253 | ||
| 257 | list_for_each_entry(dd, &ipath_dev_list, ipath_list) { | 254 | dd = ipath_lookup(unit); |
| 258 | /* | 255 | |
| 259 | * we need at least one infinipath device to be present | 256 | if (dd == NULL || !(dd->ipath_flags & IPATH_PRESENT) || |
| 260 | * (don't use INITTED, because we want to be able to open | 257 | !dd->ipath_kregbase) { |
| 261 | * even if device is in freeze mode, which cleared INITTED). | 258 | ret = -ENODEV; |
| 262 | * There is a small amount of risk to this, which is why we | ||
| 263 | * also verify kregbase is set. | ||
| 264 | */ | ||
| 265 | |||
| 266 | if (!(dd->ipath_flags & IPATH_PRESENT) || | ||
| 267 | !dd->ipath_kregbase) | ||
| 268 | continue; | ||
| 269 | |||
| 270 | ipath_diag_inuse = 1; | ||
| 271 | diag_set_link = 0; | ||
| 272 | ret = 0; | ||
| 273 | goto bail; | 259 | goto bail; |
| 274 | } | 260 | } |
| 275 | 261 | ||
| 276 | ret = -ENODEV; | 262 | fp->private_data = dd; |
| 277 | 263 | ipath_diag_inuse = 1; | |
| 278 | bail: | 264 | diag_set_link = 0; |
| 279 | spin_unlock_irqrestore(&ipath_devs_lock, flags); | 265 | ret = 0; |
| 280 | 266 | ||
| 281 | /* Only expose a way to reset the device if we | 267 | /* Only expose a way to reset the device if we |
| 282 | make it into diag mode. */ | 268 | make it into diag mode. */ |
| 283 | if (ret == 0) | 269 | ipath_expose_reset(&dd->pcidev->dev); |
| 284 | ipath_expose_reset(&dd->pcidev->dev); | ||
| 285 | 270 | ||
| 271 | bail: | ||
| 286 | mutex_unlock(&ipath_mutex); | 272 | mutex_unlock(&ipath_mutex); |
| 287 | 273 | ||
| 288 | return ret; | 274 | return ret; |
| 289 | } | 275 | } |
| 290 | 276 | ||
| 291 | static int ipath_diag_release(struct inode *i, struct file *f) | 277 | static int ipath_diag_release(struct inode *in, struct file *fp) |
| 292 | { | 278 | { |
| 293 | mutex_lock(&ipath_mutex); | 279 | mutex_lock(&ipath_mutex); |
| 294 | ipath_diag_inuse = 0; | 280 | ipath_diag_inuse = 0; |
| 281 | fp->private_data = NULL; | ||
| 295 | mutex_unlock(&ipath_mutex); | 282 | mutex_unlock(&ipath_mutex); |
| 296 | return 0; | 283 | return 0; |
| 297 | } | 284 | } |
| @@ -299,17 +286,10 @@ static int ipath_diag_release(struct inode *i, struct file *f) | |||
| 299 | static ssize_t ipath_diag_read(struct file *fp, char __user *data, | 286 | static ssize_t ipath_diag_read(struct file *fp, char __user *data, |
| 300 | size_t count, loff_t *off) | 287 | size_t count, loff_t *off) |
| 301 | { | 288 | { |
| 302 | int unit = 0; /* XXX provide for reads on other units some day */ | 289 | struct ipath_devdata *dd = fp->private_data; |
| 303 | struct ipath_devdata *dd; | ||
| 304 | void __iomem *kreg_base; | 290 | void __iomem *kreg_base; |
| 305 | ssize_t ret; | 291 | ssize_t ret; |
| 306 | 292 | ||
| 307 | dd = ipath_lookup(unit); | ||
| 308 | if (!dd) { | ||
| 309 | ret = -ENODEV; | ||
| 310 | goto bail; | ||
| 311 | } | ||
| 312 | |||
| 313 | kreg_base = dd->ipath_kregbase; | 293 | kreg_base = dd->ipath_kregbase; |
| 314 | 294 | ||
| 315 | if (count == 0) | 295 | if (count == 0) |
| @@ -328,23 +308,16 @@ static ssize_t ipath_diag_read(struct file *fp, char __user *data, | |||
| 328 | ret = count; | 308 | ret = count; |
| 329 | } | 309 | } |
| 330 | 310 | ||
| 331 | bail: | ||
| 332 | return ret; | 311 | return ret; |
| 333 | } | 312 | } |
| 334 | 313 | ||
| 335 | static ssize_t ipath_diag_write(struct file *fp, const char __user *data, | 314 | static ssize_t ipath_diag_write(struct file *fp, const char __user *data, |
| 336 | size_t count, loff_t *off) | 315 | size_t count, loff_t *off) |
| 337 | { | 316 | { |
| 338 | int unit = 0; /* XXX this is bogus */ | 317 | struct ipath_devdata *dd = fp->private_data; |
| 339 | struct ipath_devdata *dd; | ||
| 340 | void __iomem *kreg_base; | 318 | void __iomem *kreg_base; |
| 341 | ssize_t ret; | 319 | ssize_t ret; |
| 342 | 320 | ||
| 343 | dd = ipath_lookup(unit); | ||
| 344 | if (!dd) { | ||
| 345 | ret = -ENODEV; | ||
| 346 | goto bail; | ||
| 347 | } | ||
| 348 | kreg_base = dd->ipath_kregbase; | 321 | kreg_base = dd->ipath_kregbase; |
| 349 | 322 | ||
| 350 | if (count == 0) | 323 | if (count == 0) |
| @@ -363,6 +336,5 @@ static ssize_t ipath_diag_write(struct file *fp, const char __user *data, | |||
| 363 | ret = count; | 336 | ret = count; |
| 364 | } | 337 | } |
| 365 | 338 | ||
| 366 | bail: | ||
| 367 | return ret; | 339 | return ret; |
| 368 | } | 340 | } |
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c index e4b897fa569a..6efc56bce921 100644 --- a/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/drivers/infiniband/hw/ipath/ipath_driver.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -38,8 +39,8 @@ | |||
| 38 | #include <linux/vmalloc.h> | 39 | #include <linux/vmalloc.h> |
| 39 | 40 | ||
| 40 | #include "ipath_kernel.h" | 41 | #include "ipath_kernel.h" |
| 41 | #include "ips_common.h" | ||
| 42 | #include "ipath_layer.h" | 42 | #include "ipath_layer.h" |
| 43 | #include "ipath_common.h" | ||
| 43 | 44 | ||
| 44 | static void ipath_update_pio_bufs(struct ipath_devdata *); | 45 | static void ipath_update_pio_bufs(struct ipath_devdata *); |
| 45 | 46 | ||
| @@ -52,7 +53,7 @@ const char *ipath_get_unit_name(int unit) | |||
| 52 | 53 | ||
| 53 | EXPORT_SYMBOL_GPL(ipath_get_unit_name); | 54 | EXPORT_SYMBOL_GPL(ipath_get_unit_name); |
| 54 | 55 | ||
| 55 | #define DRIVER_LOAD_MSG "PathScale " IPATH_DRV_NAME " loaded: " | 56 | #define DRIVER_LOAD_MSG "QLogic " IPATH_DRV_NAME " loaded: " |
| 56 | #define PFX IPATH_DRV_NAME ": " | 57 | #define PFX IPATH_DRV_NAME ": " |
| 57 | 58 | ||
| 58 | /* | 59 | /* |
| @@ -74,8 +75,8 @@ MODULE_PARM_DESC(debug, "mask for debug prints"); | |||
| 74 | EXPORT_SYMBOL_GPL(ipath_debug); | 75 | EXPORT_SYMBOL_GPL(ipath_debug); |
| 75 | 76 | ||
| 76 | MODULE_LICENSE("GPL"); | 77 | MODULE_LICENSE("GPL"); |
| 77 | MODULE_AUTHOR("PathScale <support@pathscale.com>"); | 78 | MODULE_AUTHOR("QLogic <support@pathscale.com>"); |
| 78 | MODULE_DESCRIPTION("Pathscale InfiniPath driver"); | 79 | MODULE_DESCRIPTION("QLogic InfiniPath driver"); |
| 79 | 80 | ||
| 80 | const char *ipath_ibcstatus_str[] = { | 81 | const char *ipath_ibcstatus_str[] = { |
| 81 | "Disabled", | 82 | "Disabled", |
| @@ -130,14 +131,6 @@ static struct pci_driver ipath_driver = { | |||
| 130 | .id_table = ipath_pci_tbl, | 131 | .id_table = ipath_pci_tbl, |
| 131 | }; | 132 | }; |
| 132 | 133 | ||
| 133 | /* | ||
| 134 | * This is where port 0's rcvhdrtail register is written back; we also | ||
| 135 | * want nothing else sharing the cache line, so make it a cache line | ||
| 136 | * in size. Used for all units. | ||
| 137 | */ | ||
| 138 | volatile __le64 *ipath_port0_rcvhdrtail; | ||
| 139 | dma_addr_t ipath_port0_rcvhdrtail_dma; | ||
| 140 | static int port0_rcvhdrtail_refs; | ||
| 141 | 134 | ||
| 142 | static inline void read_bars(struct ipath_devdata *dd, struct pci_dev *dev, | 135 | static inline void read_bars(struct ipath_devdata *dd, struct pci_dev *dev, |
| 143 | u32 *bar0, u32 *bar1) | 136 | u32 *bar0, u32 *bar1) |
| @@ -170,14 +163,13 @@ static void ipath_free_devdata(struct pci_dev *pdev, | |||
| 170 | list_del(&dd->ipath_list); | 163 | list_del(&dd->ipath_list); |
| 171 | spin_unlock_irqrestore(&ipath_devs_lock, flags); | 164 | spin_unlock_irqrestore(&ipath_devs_lock, flags); |
| 172 | } | 165 | } |
| 173 | dma_free_coherent(&pdev->dev, sizeof(*dd), dd, dd->ipath_dma_addr); | 166 | vfree(dd); |
| 174 | } | 167 | } |
| 175 | 168 | ||
| 176 | static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev) | 169 | static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev) |
| 177 | { | 170 | { |
| 178 | unsigned long flags; | 171 | unsigned long flags; |
| 179 | struct ipath_devdata *dd; | 172 | struct ipath_devdata *dd; |
| 180 | dma_addr_t dma_addr; | ||
| 181 | int ret; | 173 | int ret; |
| 182 | 174 | ||
| 183 | if (!idr_pre_get(&unit_table, GFP_KERNEL)) { | 175 | if (!idr_pre_get(&unit_table, GFP_KERNEL)) { |
| @@ -185,15 +177,12 @@ static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev) | |||
| 185 | goto bail; | 177 | goto bail; |
| 186 | } | 178 | } |
| 187 | 179 | ||
| 188 | dd = dma_alloc_coherent(&pdev->dev, sizeof(*dd), &dma_addr, | 180 | dd = vmalloc(sizeof(*dd)); |
| 189 | GFP_KERNEL); | ||
| 190 | |||
| 191 | if (!dd) { | 181 | if (!dd) { |
| 192 | dd = ERR_PTR(-ENOMEM); | 182 | dd = ERR_PTR(-ENOMEM); |
| 193 | goto bail; | 183 | goto bail; |
| 194 | } | 184 | } |
| 195 | 185 | memset(dd, 0, sizeof(*dd)); | |
| 196 | dd->ipath_dma_addr = dma_addr; | ||
| 197 | dd->ipath_unit = -1; | 186 | dd->ipath_unit = -1; |
| 198 | 187 | ||
| 199 | spin_lock_irqsave(&ipath_devs_lock, flags); | 188 | spin_lock_irqsave(&ipath_devs_lock, flags); |
| @@ -271,47 +260,6 @@ int ipath_count_units(int *npresentp, int *nupp, u32 *maxportsp) | |||
| 271 | return nunits; | 260 | return nunits; |
| 272 | } | 261 | } |
| 273 | 262 | ||
| 274 | static int init_port0_rcvhdrtail(struct pci_dev *pdev) | ||
| 275 | { | ||
| 276 | int ret; | ||
| 277 | |||
| 278 | mutex_lock(&ipath_mutex); | ||
| 279 | |||
| 280 | if (!ipath_port0_rcvhdrtail) { | ||
| 281 | ipath_port0_rcvhdrtail = | ||
| 282 | dma_alloc_coherent(&pdev->dev, | ||
| 283 | IPATH_PORT0_RCVHDRTAIL_SIZE, | ||
| 284 | &ipath_port0_rcvhdrtail_dma, | ||
| 285 | GFP_KERNEL); | ||
| 286 | |||
| 287 | if (!ipath_port0_rcvhdrtail) { | ||
| 288 | ret = -ENOMEM; | ||
| 289 | goto bail; | ||
| 290 | } | ||
| 291 | } | ||
| 292 | port0_rcvhdrtail_refs++; | ||
| 293 | ret = 0; | ||
| 294 | |||
| 295 | bail: | ||
| 296 | mutex_unlock(&ipath_mutex); | ||
| 297 | |||
| 298 | return ret; | ||
| 299 | } | ||
| 300 | |||
| 301 | static void cleanup_port0_rcvhdrtail(struct pci_dev *pdev) | ||
| 302 | { | ||
| 303 | mutex_lock(&ipath_mutex); | ||
| 304 | |||
| 305 | if (!--port0_rcvhdrtail_refs) { | ||
| 306 | dma_free_coherent(&pdev->dev, IPATH_PORT0_RCVHDRTAIL_SIZE, | ||
| 307 | (void *) ipath_port0_rcvhdrtail, | ||
| 308 | ipath_port0_rcvhdrtail_dma); | ||
| 309 | ipath_port0_rcvhdrtail = NULL; | ||
| 310 | } | ||
| 311 | |||
| 312 | mutex_unlock(&ipath_mutex); | ||
| 313 | } | ||
| 314 | |||
| 315 | /* | 263 | /* |
| 316 | * These next two routines are placeholders in case we don't have per-arch | 264 | * These next two routines are placeholders in case we don't have per-arch |
| 317 | * code for controlling write combining. If explicit control of write | 265 | * code for controlling write combining. If explicit control of write |
| @@ -336,20 +284,12 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
| 336 | u32 bar0 = 0, bar1 = 0; | 284 | u32 bar0 = 0, bar1 = 0; |
| 337 | u8 rev; | 285 | u8 rev; |
| 338 | 286 | ||
| 339 | ret = init_port0_rcvhdrtail(pdev); | ||
| 340 | if (ret < 0) { | ||
| 341 | printk(KERN_ERR IPATH_DRV_NAME | ||
| 342 | ": Could not allocate port0_rcvhdrtail: error %d\n", | ||
| 343 | -ret); | ||
| 344 | goto bail; | ||
| 345 | } | ||
| 346 | |||
| 347 | dd = ipath_alloc_devdata(pdev); | 287 | dd = ipath_alloc_devdata(pdev); |
| 348 | if (IS_ERR(dd)) { | 288 | if (IS_ERR(dd)) { |
| 349 | ret = PTR_ERR(dd); | 289 | ret = PTR_ERR(dd); |
| 350 | printk(KERN_ERR IPATH_DRV_NAME | 290 | printk(KERN_ERR IPATH_DRV_NAME |
| 351 | ": Could not allocate devdata: error %d\n", -ret); | 291 | ": Could not allocate devdata: error %d\n", -ret); |
| 352 | goto bail_rcvhdrtail; | 292 | goto bail; |
| 353 | } | 293 | } |
| 354 | 294 | ||
| 355 | ipath_cdbg(VERBOSE, "initializing unit #%u\n", dd->ipath_unit); | 295 | ipath_cdbg(VERBOSE, "initializing unit #%u\n", dd->ipath_unit); |
| @@ -424,12 +364,29 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
| 424 | */ | 364 | */ |
| 425 | ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 365 | ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK); |
| 426 | if (ret) { | 366 | if (ret) { |
| 427 | dev_info(&pdev->dev, "pci_set_dma_mask unit %u " | 367 | dev_info(&pdev->dev, |
| 428 | "fails: %d\n", dd->ipath_unit, ret); | 368 | "Unable to set DMA mask for unit %u: %d\n", |
| 369 | dd->ipath_unit, ret); | ||
| 429 | goto bail_regions; | 370 | goto bail_regions; |
| 430 | } | 371 | } |
| 431 | else | 372 | else { |
| 432 | ipath_dbg("No 64bit DMA mask, used 32 bit mask\n"); | 373 | ipath_dbg("No 64bit DMA mask, used 32 bit mask\n"); |
| 374 | ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | ||
| 375 | if (ret) | ||
| 376 | dev_info(&pdev->dev, | ||
| 377 | "Unable to set DMA consistent mask " | ||
| 378 | "for unit %u: %d\n", | ||
| 379 | dd->ipath_unit, ret); | ||
| 380 | |||
| 381 | } | ||
| 382 | } | ||
| 383 | else { | ||
| 384 | ret = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); | ||
| 385 | if (ret) | ||
| 386 | dev_info(&pdev->dev, | ||
| 387 | "Unable to set DMA consistent mask " | ||
| 388 | "for unit %u: %d\n", | ||
| 389 | dd->ipath_unit, ret); | ||
| 433 | } | 390 | } |
| 434 | 391 | ||
| 435 | pci_set_master(pdev); | 392 | pci_set_master(pdev); |
| @@ -452,7 +409,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
| 452 | ipath_init_pe800_funcs(dd); | 409 | ipath_init_pe800_funcs(dd); |
| 453 | break; | 410 | break; |
| 454 | default: | 411 | default: |
| 455 | ipath_dev_err(dd, "Found unknown PathScale deviceid 0x%x, " | 412 | ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, " |
| 456 | "failing\n", ent->device); | 413 | "failing\n", ent->device); |
| 457 | return -ENODEV; | 414 | return -ENODEV; |
| 458 | } | 415 | } |
| @@ -495,16 +452,16 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
| 495 | ((void __iomem *)dd->ipath_kregbase + len); | 452 | ((void __iomem *)dd->ipath_kregbase + len); |
| 496 | dd->ipath_physaddr = addr; /* used for io_remap, etc. */ | 453 | dd->ipath_physaddr = addr; /* used for io_remap, etc. */ |
| 497 | /* for user mmap */ | 454 | /* for user mmap */ |
| 498 | dd->ipath_kregvirt = (u64 __iomem *) phys_to_virt(addr); | 455 | ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p\n", |
| 499 | ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p " | 456 | addr, dd->ipath_kregbase); |
| 500 | "kregvirt %p\n", addr, dd->ipath_kregbase, | ||
| 501 | dd->ipath_kregvirt); | ||
| 502 | 457 | ||
| 503 | /* | 458 | /* |
| 504 | * clear ipath_flags here instead of in ipath_init_chip as it is set | 459 | * clear ipath_flags here instead of in ipath_init_chip as it is set |
| 505 | * by ipath_setup_htconfig. | 460 | * by ipath_setup_htconfig. |
| 506 | */ | 461 | */ |
| 507 | dd->ipath_flags = 0; | 462 | dd->ipath_flags = 0; |
| 463 | dd->ipath_lli_counter = 0; | ||
| 464 | dd->ipath_lli_errors = 0; | ||
| 508 | 465 | ||
| 509 | if (dd->ipath_f_bus(dd, pdev)) | 466 | if (dd->ipath_f_bus(dd, pdev)) |
| 510 | ipath_dev_err(dd, "Failed to setup config space; " | 467 | ipath_dev_err(dd, "Failed to setup config space; " |
| @@ -545,6 +502,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
| 545 | ipath_device_create_group(&pdev->dev, dd); | 502 | ipath_device_create_group(&pdev->dev, dd); |
| 546 | ipathfs_add_device(dd); | 503 | ipathfs_add_device(dd); |
| 547 | ipath_user_add(dd); | 504 | ipath_user_add(dd); |
| 505 | ipath_diag_add(dd); | ||
| 548 | ipath_layer_add(dd); | 506 | ipath_layer_add(dd); |
| 549 | 507 | ||
| 550 | goto bail; | 508 | goto bail; |
| @@ -561,9 +519,6 @@ bail_disable: | |||
| 561 | bail_devdata: | 519 | bail_devdata: |
| 562 | ipath_free_devdata(pdev, dd); | 520 | ipath_free_devdata(pdev, dd); |
| 563 | 521 | ||
| 564 | bail_rcvhdrtail: | ||
| 565 | cleanup_port0_rcvhdrtail(pdev); | ||
| 566 | |||
| 567 | bail: | 522 | bail: |
| 568 | return ret; | 523 | return ret; |
| 569 | } | 524 | } |
| @@ -577,8 +532,9 @@ static void __devexit ipath_remove_one(struct pci_dev *pdev) | |||
| 577 | return; | 532 | return; |
| 578 | 533 | ||
| 579 | dd = pci_get_drvdata(pdev); | 534 | dd = pci_get_drvdata(pdev); |
| 580 | ipath_layer_del(dd); | 535 | ipath_layer_remove(dd); |
| 581 | ipath_user_del(dd); | 536 | ipath_diag_remove(dd); |
| 537 | ipath_user_remove(dd); | ||
| 582 | ipathfs_remove_device(dd); | 538 | ipathfs_remove_device(dd); |
| 583 | ipath_device_remove_group(&pdev->dev, dd); | 539 | ipath_device_remove_group(&pdev->dev, dd); |
| 584 | ipath_cdbg(VERBOSE, "Releasing pci memory regions, dd %p, " | 540 | ipath_cdbg(VERBOSE, "Releasing pci memory regions, dd %p, " |
| @@ -594,7 +550,6 @@ static void __devexit ipath_remove_one(struct pci_dev *pdev) | |||
| 594 | pci_disable_device(pdev); | 550 | pci_disable_device(pdev); |
| 595 | 551 | ||
| 596 | ipath_free_devdata(pdev, dd); | 552 | ipath_free_devdata(pdev, dd); |
| 597 | cleanup_port0_rcvhdrtail(pdev); | ||
| 598 | } | 553 | } |
| 599 | 554 | ||
| 600 | /* general driver use */ | 555 | /* general driver use */ |
| @@ -868,7 +823,8 @@ static void ipath_rcv_layer(struct ipath_devdata *dd, u32 etail, | |||
| 868 | u8 pad, *bthbytes; | 823 | u8 pad, *bthbytes; |
| 869 | struct sk_buff *skb, *nskb; | 824 | struct sk_buff *skb, *nskb; |
| 870 | 825 | ||
| 871 | if (dd->ipath_port0_skbs && hdr->sub_opcode == OPCODE_ENCAP) { | 826 | if (dd->ipath_port0_skbs && |
| 827 | hdr->sub_opcode == IPATH_ITH4X_OPCODE_ENCAP) { | ||
| 872 | /* | 828 | /* |
| 873 | * Allocate a new sk_buff to replace the one we give | 829 | * Allocate a new sk_buff to replace the one we give |
| 874 | * to the network stack. | 830 | * to the network stack. |
| @@ -899,7 +855,7 @@ static void ipath_rcv_layer(struct ipath_devdata *dd, u32 etail, | |||
| 899 | /* another ether packet received */ | 855 | /* another ether packet received */ |
| 900 | ipath_stats.sps_ether_rpkts++; | 856 | ipath_stats.sps_ether_rpkts++; |
| 901 | } | 857 | } |
| 902 | else if (hdr->sub_opcode == OPCODE_LID_ARP) | 858 | else if (hdr->sub_opcode == IPATH_ITH4X_OPCODE_LID_ARP) |
| 903 | __ipath_layer_rcv_lid(dd, hdr); | 859 | __ipath_layer_rcv_lid(dd, hdr); |
| 904 | } | 860 | } |
| 905 | 861 | ||
| @@ -916,8 +872,8 @@ void ipath_kreceive(struct ipath_devdata *dd) | |||
| 916 | const u32 rsize = dd->ipath_rcvhdrentsize; /* words */ | 872 | const u32 rsize = dd->ipath_rcvhdrentsize; /* words */ |
| 917 | const u32 maxcnt = dd->ipath_rcvhdrcnt * rsize; /* words */ | 873 | const u32 maxcnt = dd->ipath_rcvhdrcnt * rsize; /* words */ |
| 918 | u32 etail = -1, l, hdrqtail; | 874 | u32 etail = -1, l, hdrqtail; |
| 919 | struct ips_message_header *hdr; | 875 | struct ipath_message_header *hdr; |
| 920 | u32 eflags, i, etype, tlen, pkttot = 0; | 876 | u32 eflags, i, etype, tlen, pkttot = 0, updegr=0, reloop=0; |
| 921 | static u64 totcalls; /* stats, may eventually remove */ | 877 | static u64 totcalls; /* stats, may eventually remove */ |
| 922 | char emsg[128]; | 878 | char emsg[128]; |
| 923 | 879 | ||
| @@ -931,24 +887,18 @@ void ipath_kreceive(struct ipath_devdata *dd) | |||
| 931 | if (test_and_set_bit(0, &dd->ipath_rcv_pending)) | 887 | if (test_and_set_bit(0, &dd->ipath_rcv_pending)) |
| 932 | goto bail; | 888 | goto bail; |
| 933 | 889 | ||
| 934 | if (dd->ipath_port0head == | 890 | l = dd->ipath_port0head; |
| 935 | (u32)le64_to_cpu(*dd->ipath_hdrqtailptr)) | 891 | hdrqtail = (u32) le64_to_cpu(*dd->ipath_hdrqtailptr); |
| 892 | if (l == hdrqtail) | ||
| 936 | goto done; | 893 | goto done; |
| 937 | 894 | ||
| 938 | gotmore: | 895 | reloop: |
| 939 | /* | 896 | for (i = 0; l != hdrqtail; i++) { |
| 940 | * read only once at start. If in flood situation, this helps | ||
| 941 | * performance slightly. If more arrive while we are processing, | ||
| 942 | * we'll come back here and do them | ||
| 943 | */ | ||
| 944 | hdrqtail = (u32)le64_to_cpu(*dd->ipath_hdrqtailptr); | ||
| 945 | |||
| 946 | for (i = 0, l = dd->ipath_port0head; l != hdrqtail; i++) { | ||
| 947 | u32 qp; | 897 | u32 qp; |
| 948 | u8 *bthbytes; | 898 | u8 *bthbytes; |
| 949 | 899 | ||
| 950 | rc = (u64 *) (dd->ipath_pd[0]->port_rcvhdrq + (l << 2)); | 900 | rc = (u64 *) (dd->ipath_pd[0]->port_rcvhdrq + (l << 2)); |
| 951 | hdr = (struct ips_message_header *)&rc[1]; | 901 | hdr = (struct ipath_message_header *)&rc[1]; |
| 952 | /* | 902 | /* |
| 953 | * could make a network order version of IPATH_KD_QP, and | 903 | * could make a network order version of IPATH_KD_QP, and |
| 954 | * do the obvious shift before masking to speed this up. | 904 | * do the obvious shift before masking to speed this up. |
| @@ -956,10 +906,10 @@ gotmore: | |||
| 956 | qp = ntohl(hdr->bth[1]) & 0xffffff; | 906 | qp = ntohl(hdr->bth[1]) & 0xffffff; |
| 957 | bthbytes = (u8 *) hdr->bth; | 907 | bthbytes = (u8 *) hdr->bth; |
| 958 | 908 | ||
| 959 | eflags = ips_get_hdr_err_flags((__le32 *) rc); | 909 | eflags = ipath_hdrget_err_flags((__le32 *) rc); |
| 960 | etype = ips_get_rcv_type((__le32 *) rc); | 910 | etype = ipath_hdrget_rcv_type((__le32 *) rc); |
| 961 | /* total length */ | 911 | /* total length */ |
| 962 | tlen = ips_get_length_in_bytes((__le32 *) rc); | 912 | tlen = ipath_hdrget_length_in_bytes((__le32 *) rc); |
| 963 | ebuf = NULL; | 913 | ebuf = NULL; |
| 964 | if (etype != RCVHQ_RCV_TYPE_EXPECTED) { | 914 | if (etype != RCVHQ_RCV_TYPE_EXPECTED) { |
| 965 | /* | 915 | /* |
| @@ -969,7 +919,7 @@ gotmore: | |||
| 969 | * set ebuf (so we try to copy data) unless the | 919 | * set ebuf (so we try to copy data) unless the |
| 970 | * length requires it. | 920 | * length requires it. |
| 971 | */ | 921 | */ |
| 972 | etail = ips_get_index((__le32 *) rc); | 922 | etail = ipath_hdrget_index((__le32 *) rc); |
| 973 | if (tlen > sizeof(*hdr) || | 923 | if (tlen > sizeof(*hdr) || |
| 974 | etype == RCVHQ_RCV_TYPE_NON_KD) | 924 | etype == RCVHQ_RCV_TYPE_NON_KD) |
| 975 | ebuf = ipath_get_egrbuf(dd, etail, 0); | 925 | ebuf = ipath_get_egrbuf(dd, etail, 0); |
| @@ -981,7 +931,7 @@ gotmore: | |||
| 981 | */ | 931 | */ |
| 982 | 932 | ||
| 983 | if (etype != RCVHQ_RCV_TYPE_NON_KD && etype != | 933 | if (etype != RCVHQ_RCV_TYPE_NON_KD && etype != |
| 984 | RCVHQ_RCV_TYPE_ERROR && ips_get_ipath_ver( | 934 | RCVHQ_RCV_TYPE_ERROR && ipath_hdrget_ipath_ver( |
| 985 | hdr->iph.ver_port_tid_offset) != | 935 | hdr->iph.ver_port_tid_offset) != |
| 986 | IPS_PROTO_VERSION) { | 936 | IPS_PROTO_VERSION) { |
| 987 | ipath_cdbg(PKT, "Bad InfiniPath protocol version " | 937 | ipath_cdbg(PKT, "Bad InfiniPath protocol version " |
| @@ -994,7 +944,19 @@ gotmore: | |||
| 994 | ipath_cdbg(PKT, "RHFerrs %x hdrqtail=%x typ=%u " | 944 | ipath_cdbg(PKT, "RHFerrs %x hdrqtail=%x typ=%u " |
| 995 | "tlen=%x opcode=%x egridx=%x: %s\n", | 945 | "tlen=%x opcode=%x egridx=%x: %s\n", |
| 996 | eflags, l, etype, tlen, bthbytes[0], | 946 | eflags, l, etype, tlen, bthbytes[0], |
| 997 | ips_get_index((__le32 *) rc), emsg); | 947 | ipath_hdrget_index((__le32 *) rc), emsg); |
| 948 | /* Count local link integrity errors. */ | ||
| 949 | if (eflags & (INFINIPATH_RHF_H_ICRCERR | | ||
| 950 | INFINIPATH_RHF_H_VCRCERR)) { | ||
| 951 | u8 n = (dd->ipath_ibcctrl >> | ||
| 952 | INFINIPATH_IBCC_PHYERRTHRESHOLD_SHIFT) & | ||
| 953 | INFINIPATH_IBCC_PHYERRTHRESHOLD_MASK; | ||
| 954 | |||
| 955 | if (++dd->ipath_lli_counter > n) { | ||
| 956 | dd->ipath_lli_counter = 0; | ||
| 957 | dd->ipath_lli_errors++; | ||
| 958 | } | ||
| 959 | } | ||
| 998 | } else if (etype == RCVHQ_RCV_TYPE_NON_KD) { | 960 | } else if (etype == RCVHQ_RCV_TYPE_NON_KD) { |
| 999 | int ret = __ipath_verbs_rcv(dd, rc + 1, | 961 | int ret = __ipath_verbs_rcv(dd, rc + 1, |
| 1000 | ebuf, tlen); | 962 | ebuf, tlen); |
| @@ -1002,6 +964,9 @@ gotmore: | |||
| 1002 | ipath_cdbg(VERBOSE, | 964 | ipath_cdbg(VERBOSE, |
| 1003 | "received IB packet, " | 965 | "received IB packet, " |
| 1004 | "not SMA (QP=%x)\n", qp); | 966 | "not SMA (QP=%x)\n", qp); |
| 967 | if (dd->ipath_lli_counter) | ||
| 968 | dd->ipath_lli_counter--; | ||
| 969 | |||
| 1005 | } else if (etype == RCVHQ_RCV_TYPE_EAGER) { | 970 | } else if (etype == RCVHQ_RCV_TYPE_EAGER) { |
| 1006 | if (qp == IPATH_KD_QP && | 971 | if (qp == IPATH_KD_QP && |
| 1007 | bthbytes[0] == ipath_layer_rcv_opcode && | 972 | bthbytes[0] == ipath_layer_rcv_opcode && |
| @@ -1054,25 +1019,49 @@ gotmore: | |||
| 1054 | l += rsize; | 1019 | l += rsize; |
| 1055 | if (l >= maxcnt) | 1020 | if (l >= maxcnt) |
| 1056 | l = 0; | 1021 | l = 0; |
| 1022 | if (etype != RCVHQ_RCV_TYPE_EXPECTED) | ||
| 1023 | updegr = 1; | ||
| 1057 | /* | 1024 | /* |
| 1058 | * update for each packet, to help prevent overflows if we | 1025 | * update head regs on last packet, and every 16 packets. |
| 1059 | * have lots of packets. | 1026 | * Reduce bus traffic, while still trying to prevent |
| 1027 | * rcvhdrq overflows, for when the queue is nearly full | ||
| 1060 | */ | 1028 | */ |
| 1061 | (void)ipath_write_ureg(dd, ur_rcvhdrhead, | 1029 | if (l == hdrqtail || (i && !(i&0xf))) { |
| 1062 | dd->ipath_rhdrhead_intr_off | l, 0); | 1030 | u64 lval; |
| 1063 | if (etype != RCVHQ_RCV_TYPE_EXPECTED) | 1031 | if (l == hdrqtail) /* PE-800 interrupt only on last */ |
| 1064 | (void)ipath_write_ureg(dd, ur_rcvegrindexhead, | 1032 | lval = dd->ipath_rhdrhead_intr_off | l; |
| 1065 | etail, 0); | 1033 | else |
| 1034 | lval = l; | ||
| 1035 | (void)ipath_write_ureg(dd, ur_rcvhdrhead, lval, 0); | ||
| 1036 | if (updegr) { | ||
| 1037 | (void)ipath_write_ureg(dd, ur_rcvegrindexhead, | ||
| 1038 | etail, 0); | ||
| 1039 | updegr = 0; | ||
| 1040 | } | ||
| 1041 | } | ||
| 1042 | } | ||
| 1043 | |||
| 1044 | if (!dd->ipath_rhdrhead_intr_off && !reloop) { | ||
| 1045 | /* HT-400 workaround; we can have a race clearing chip | ||
| 1046 | * interrupt with another interrupt about to be delivered, | ||
| 1047 | * and can clear it before it is delivered on the GPIO | ||
| 1048 | * workaround. By doing the extra check here for the | ||
| 1049 | * in-memory tail register updating while we were doing | ||
| 1050 | * earlier packets, we "almost" guarantee we have covered | ||
| 1051 | * that case. | ||
| 1052 | */ | ||
| 1053 | u32 hqtail = (u32)le64_to_cpu(*dd->ipath_hdrqtailptr); | ||
| 1054 | if (hqtail != hdrqtail) { | ||
| 1055 | hdrqtail = hqtail; | ||
| 1056 | reloop = 1; /* loop 1 extra time at most */ | ||
| 1057 | goto reloop; | ||
| 1058 | } | ||
| 1066 | } | 1059 | } |
| 1067 | 1060 | ||
| 1068 | pkttot += i; | 1061 | pkttot += i; |
| 1069 | 1062 | ||
| 1070 | dd->ipath_port0head = l; | 1063 | dd->ipath_port0head = l; |
| 1071 | 1064 | ||
| 1072 | if (hdrqtail != (u32)le64_to_cpu(*dd->ipath_hdrqtailptr)) | ||
| 1073 | /* more arrived while we handled first batch */ | ||
| 1074 | goto gotmore; | ||
| 1075 | |||
| 1076 | if (pkttot > ipath_stats.sps_maxpkts_call) | 1065 | if (pkttot > ipath_stats.sps_maxpkts_call) |
| 1077 | ipath_stats.sps_maxpkts_call = pkttot; | 1066 | ipath_stats.sps_maxpkts_call = pkttot; |
| 1078 | ipath_stats.sps_port0pkts += pkttot; | 1067 | ipath_stats.sps_port0pkts += pkttot; |
| @@ -1369,26 +1358,20 @@ bail: | |||
| 1369 | * @dd: the infinipath device | 1358 | * @dd: the infinipath device |
| 1370 | * @pd: the port data | 1359 | * @pd: the port data |
| 1371 | * | 1360 | * |
| 1372 | * this *must* be physically contiguous memory, and for now, | 1361 | * this must be contiguous memory (from an i/o perspective), and must be |
| 1373 | * that limits it to what kmalloc can do. | 1362 | * DMA'able (which means for some systems, it will go through an IOMMU, |
| 1363 | * or be forced into a low address range). | ||
| 1374 | */ | 1364 | */ |
| 1375 | int ipath_create_rcvhdrq(struct ipath_devdata *dd, | 1365 | int ipath_create_rcvhdrq(struct ipath_devdata *dd, |
| 1376 | struct ipath_portdata *pd) | 1366 | struct ipath_portdata *pd) |
| 1377 | { | 1367 | { |
| 1378 | int ret = 0, amt; | 1368 | int ret = 0; |
| 1379 | 1369 | ||
| 1380 | amt = ALIGN(dd->ipath_rcvhdrcnt * dd->ipath_rcvhdrentsize * | ||
| 1381 | sizeof(u32), PAGE_SIZE); | ||
| 1382 | if (!pd->port_rcvhdrq) { | 1370 | if (!pd->port_rcvhdrq) { |
| 1383 | /* | 1371 | dma_addr_t phys_hdrqtail; |
| 1384 | * not using REPEAT isn't viable; at 128KB, we can easily | ||
| 1385 | * fail this. The problem with REPEAT is we can block here | ||
| 1386 | * "forever". There isn't an inbetween, unfortunately. We | ||
| 1387 | * could reduce the risk by never freeing the rcvhdrq except | ||
| 1388 | * at unload, but even then, the first time a port is used, | ||
| 1389 | * we could delay for some time... | ||
| 1390 | */ | ||
| 1391 | gfp_t gfp_flags = GFP_USER | __GFP_COMP; | 1372 | gfp_t gfp_flags = GFP_USER | __GFP_COMP; |
| 1373 | int amt = ALIGN(dd->ipath_rcvhdrcnt * dd->ipath_rcvhdrentsize * | ||
| 1374 | sizeof(u32), PAGE_SIZE); | ||
| 1392 | 1375 | ||
| 1393 | pd->port_rcvhdrq = dma_alloc_coherent( | 1376 | pd->port_rcvhdrq = dma_alloc_coherent( |
| 1394 | &dd->pcidev->dev, amt, &pd->port_rcvhdrq_phys, | 1377 | &dd->pcidev->dev, amt, &pd->port_rcvhdrq_phys, |
| @@ -1401,6 +1384,16 @@ int ipath_create_rcvhdrq(struct ipath_devdata *dd, | |||
| 1401 | ret = -ENOMEM; | 1384 | ret = -ENOMEM; |
| 1402 | goto bail; | 1385 | goto bail; |
| 1403 | } | 1386 | } |
| 1387 | pd->port_rcvhdrtail_kvaddr = dma_alloc_coherent( | ||
| 1388 | &dd->pcidev->dev, PAGE_SIZE, &phys_hdrqtail, GFP_KERNEL); | ||
| 1389 | if (!pd->port_rcvhdrtail_kvaddr) { | ||
| 1390 | ipath_dev_err(dd, "attempt to allocate 1 page " | ||
| 1391 | "for port %u rcvhdrqtailaddr failed\n", | ||
| 1392 | pd->port_port); | ||
| 1393 | ret = -ENOMEM; | ||
| 1394 | goto bail; | ||
| 1395 | } | ||
| 1396 | pd->port_rcvhdrqtailaddr_phys = phys_hdrqtail; | ||
| 1404 | 1397 | ||
| 1405 | pd->port_rcvhdrq_size = amt; | 1398 | pd->port_rcvhdrq_size = amt; |
| 1406 | 1399 | ||
| @@ -1410,20 +1403,28 @@ int ipath_create_rcvhdrq(struct ipath_devdata *dd, | |||
| 1410 | (unsigned long) pd->port_rcvhdrq_phys, | 1403 | (unsigned long) pd->port_rcvhdrq_phys, |
| 1411 | (unsigned long) pd->port_rcvhdrq_size, | 1404 | (unsigned long) pd->port_rcvhdrq_size, |
| 1412 | pd->port_port); | 1405 | pd->port_port); |
| 1413 | } else { | 1406 | |
| 1414 | /* | 1407 | ipath_cdbg(VERBOSE, "port %d hdrtailaddr, %llx physical\n", |
| 1415 | * clear for security, sanity, and/or debugging, each | 1408 | pd->port_port, |
| 1416 | * time we reuse | 1409 | (unsigned long long) phys_hdrqtail); |
| 1417 | */ | ||
| 1418 | memset(pd->port_rcvhdrq, 0, amt); | ||
| 1419 | } | 1410 | } |
| 1411 | else | ||
| 1412 | ipath_cdbg(VERBOSE, "reuse port %d rcvhdrq @%p %llx phys; " | ||
| 1413 | "hdrtailaddr@%p %llx physical\n", | ||
| 1414 | pd->port_port, pd->port_rcvhdrq, | ||
| 1415 | pd->port_rcvhdrq_phys, pd->port_rcvhdrtail_kvaddr, | ||
| 1416 | (unsigned long long)pd->port_rcvhdrqtailaddr_phys); | ||
| 1417 | |||
| 1418 | /* clear for security and sanity on each use */ | ||
| 1419 | memset(pd->port_rcvhdrq, 0, pd->port_rcvhdrq_size); | ||
| 1420 | memset((void *)pd->port_rcvhdrtail_kvaddr, 0, PAGE_SIZE); | ||
| 1420 | 1421 | ||
| 1421 | /* | 1422 | /* |
| 1422 | * tell chip each time we init it, even if we are re-using previous | 1423 | * tell chip each time we init it, even if we are re-using previous |
| 1423 | * memory (we zero it at process close) | 1424 | * memory (we zero the register at process close) |
| 1424 | */ | 1425 | */ |
| 1425 | ipath_cdbg(VERBOSE, "writing port %d rcvhdraddr as %lx\n", | 1426 | ipath_write_kreg_port(dd, dd->ipath_kregs->kr_rcvhdrtailaddr, |
| 1426 | pd->port_port, (unsigned long) pd->port_rcvhdrq_phys); | 1427 | pd->port_port, pd->port_rcvhdrqtailaddr_phys); |
| 1427 | ipath_write_kreg_port(dd, dd->ipath_kregs->kr_rcvhdraddr, | 1428 | ipath_write_kreg_port(dd, dd->ipath_kregs->kr_rcvhdraddr, |
| 1428 | pd->port_port, pd->port_rcvhdrq_phys); | 1429 | pd->port_port, pd->port_rcvhdrq_phys); |
| 1429 | 1430 | ||
| @@ -1511,15 +1512,27 @@ void ipath_set_ib_lstate(struct ipath_devdata *dd, int which) | |||
| 1511 | [INFINIPATH_IBCC_LINKCMD_ARMED] = "ARMED", | 1512 | [INFINIPATH_IBCC_LINKCMD_ARMED] = "ARMED", |
| 1512 | [INFINIPATH_IBCC_LINKCMD_ACTIVE] = "ACTIVE" | 1513 | [INFINIPATH_IBCC_LINKCMD_ACTIVE] = "ACTIVE" |
| 1513 | }; | 1514 | }; |
| 1515 | int linkcmd = (which >> INFINIPATH_IBCC_LINKCMD_SHIFT) & | ||
| 1516 | INFINIPATH_IBCC_LINKCMD_MASK; | ||
| 1517 | |||
| 1514 | ipath_cdbg(SMA, "Trying to move unit %u to %s, current ltstate " | 1518 | ipath_cdbg(SMA, "Trying to move unit %u to %s, current ltstate " |
| 1515 | "is %s\n", dd->ipath_unit, | 1519 | "is %s\n", dd->ipath_unit, |
| 1516 | what[(which >> INFINIPATH_IBCC_LINKCMD_SHIFT) & | 1520 | what[linkcmd], |
| 1517 | INFINIPATH_IBCC_LINKCMD_MASK], | ||
| 1518 | ipath_ibcstatus_str[ | 1521 | ipath_ibcstatus_str[ |
| 1519 | (ipath_read_kreg64 | 1522 | (ipath_read_kreg64 |
| 1520 | (dd, dd->ipath_kregs->kr_ibcstatus) >> | 1523 | (dd, dd->ipath_kregs->kr_ibcstatus) >> |
| 1521 | INFINIPATH_IBCS_LINKTRAININGSTATE_SHIFT) & | 1524 | INFINIPATH_IBCS_LINKTRAININGSTATE_SHIFT) & |
| 1522 | INFINIPATH_IBCS_LINKTRAININGSTATE_MASK]); | 1525 | INFINIPATH_IBCS_LINKTRAININGSTATE_MASK]); |
| 1526 | /* flush all queued sends when going to DOWN or INIT, to be sure that | ||
| 1527 | * they don't block SMA and other MAD packets */ | ||
| 1528 | if (!linkcmd || linkcmd == INFINIPATH_IBCC_LINKCMD_INIT) { | ||
| 1529 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, | ||
| 1530 | INFINIPATH_S_ABORT); | ||
| 1531 | ipath_disarm_piobufs(dd, dd->ipath_lastport_piobuf, | ||
| 1532 | (unsigned)(dd->ipath_piobcnt2k + | ||
| 1533 | dd->ipath_piobcnt4k) - | ||
| 1534 | dd->ipath_lastport_piobuf); | ||
| 1535 | } | ||
| 1523 | 1536 | ||
| 1524 | ipath_write_kreg(dd, dd->ipath_kregs->kr_ibcctrl, | 1537 | ipath_write_kreg(dd, dd->ipath_kregs->kr_ibcctrl, |
| 1525 | dd->ipath_ibcctrl | which); | 1538 | dd->ipath_ibcctrl | which); |
| @@ -1638,7 +1651,7 @@ void ipath_shutdown_device(struct ipath_devdata *dd) | |||
| 1638 | /* disable IBC */ | 1651 | /* disable IBC */ |
| 1639 | dd->ipath_control &= ~INFINIPATH_C_LINKENABLE; | 1652 | dd->ipath_control &= ~INFINIPATH_C_LINKENABLE; |
| 1640 | ipath_write_kreg(dd, dd->ipath_kregs->kr_control, | 1653 | ipath_write_kreg(dd, dd->ipath_kregs->kr_control, |
| 1641 | dd->ipath_control); | 1654 | dd->ipath_control | INFINIPATH_C_FREEZEMODE); |
| 1642 | 1655 | ||
| 1643 | /* | 1656 | /* |
| 1644 | * clear SerdesEnable and turn the leds off; do this here because | 1657 | * clear SerdesEnable and turn the leds off; do this here because |
| @@ -1667,60 +1680,54 @@ void ipath_shutdown_device(struct ipath_devdata *dd) | |||
| 1667 | /** | 1680 | /** |
| 1668 | * ipath_free_pddata - free a port's allocated data | 1681 | * ipath_free_pddata - free a port's allocated data |
| 1669 | * @dd: the infinipath device | 1682 | * @dd: the infinipath device |
| 1670 | * @port: the port | 1683 | * @pd: the portdata structure |
| 1671 | * @freehdrq: free the port data structure if true | ||
| 1672 | * | 1684 | * |
| 1673 | * when closing, free up any allocated data for a port, if the | 1685 | * free up any allocated data for a port |
| 1674 | * reference count goes to zero | 1686 | * This should not touch anything that would affect a simultaneous |
| 1675 | * Note: this also optionally frees the portdata itself! | 1687 | * re-allocation of port data, because it is called after ipath_mutex |
| 1676 | * Any changes here have to be matched up with the reinit case | 1688 | * is released (and can be called from reinit as well). |
| 1677 | * of ipath_init_chip(), which calls this routine on reinit after reset. | 1689 | * It should never change any chip state, or global driver state. |
| 1690 | * (The only exception to global state is freeing the port0 port0_skbs.) | ||
| 1678 | */ | 1691 | */ |
| 1679 | void ipath_free_pddata(struct ipath_devdata *dd, u32 port, int freehdrq) | 1692 | void ipath_free_pddata(struct ipath_devdata *dd, struct ipath_portdata *pd) |
| 1680 | { | 1693 | { |
| 1681 | struct ipath_portdata *pd = dd->ipath_pd[port]; | ||
| 1682 | |||
| 1683 | if (!pd) | 1694 | if (!pd) |
| 1684 | return; | 1695 | return; |
| 1685 | if (freehdrq) | 1696 | |
| 1686 | /* | 1697 | if (pd->port_rcvhdrq) { |
| 1687 | * only clear and free portdata if we are going to also | ||
| 1688 | * release the hdrq, otherwise we leak the hdrq on each | ||
| 1689 | * open/close cycle | ||
| 1690 | */ | ||
| 1691 | dd->ipath_pd[port] = NULL; | ||
| 1692 | if (freehdrq && pd->port_rcvhdrq) { | ||
| 1693 | ipath_cdbg(VERBOSE, "free closed port %d rcvhdrq @ %p " | 1698 | ipath_cdbg(VERBOSE, "free closed port %d rcvhdrq @ %p " |
| 1694 | "(size=%lu)\n", pd->port_port, pd->port_rcvhdrq, | 1699 | "(size=%lu)\n", pd->port_port, pd->port_rcvhdrq, |
| 1695 | (unsigned long) pd->port_rcvhdrq_size); | 1700 | (unsigned long) pd->port_rcvhdrq_size); |
| 1696 | dma_free_coherent(&dd->pcidev->dev, pd->port_rcvhdrq_size, | 1701 | dma_free_coherent(&dd->pcidev->dev, pd->port_rcvhdrq_size, |
| 1697 | pd->port_rcvhdrq, pd->port_rcvhdrq_phys); | 1702 | pd->port_rcvhdrq, pd->port_rcvhdrq_phys); |
| 1698 | pd->port_rcvhdrq = NULL; | 1703 | pd->port_rcvhdrq = NULL; |
| 1704 | if (pd->port_rcvhdrtail_kvaddr) { | ||
| 1705 | dma_free_coherent(&dd->pcidev->dev, PAGE_SIZE, | ||
| 1706 | (void *)pd->port_rcvhdrtail_kvaddr, | ||
| 1707 | pd->port_rcvhdrqtailaddr_phys); | ||
| 1708 | pd->port_rcvhdrtail_kvaddr = NULL; | ||
| 1709 | } | ||
| 1699 | } | 1710 | } |
| 1700 | if (port && pd->port_rcvegrbuf) { | 1711 | if (pd->port_port && pd->port_rcvegrbuf) { |
| 1701 | /* always free this */ | 1712 | unsigned e; |
| 1702 | if (pd->port_rcvegrbuf) { | 1713 | |
| 1703 | unsigned e; | 1714 | for (e = 0; e < pd->port_rcvegrbuf_chunks; e++) { |
| 1704 | 1715 | void *base = pd->port_rcvegrbuf[e]; | |
| 1705 | for (e = 0; e < pd->port_rcvegrbuf_chunks; e++) { | 1716 | size_t size = pd->port_rcvegrbuf_size; |
| 1706 | void *base = pd->port_rcvegrbuf[e]; | 1717 | |
| 1707 | size_t size = pd->port_rcvegrbuf_size; | 1718 | ipath_cdbg(VERBOSE, "egrbuf free(%p, %lu), " |
| 1708 | 1719 | "chunk %u/%u\n", base, | |
| 1709 | ipath_cdbg(VERBOSE, "egrbuf free(%p, %lu), " | 1720 | (unsigned long) size, |
| 1710 | "chunk %u/%u\n", base, | 1721 | e, pd->port_rcvegrbuf_chunks); |
| 1711 | (unsigned long) size, | 1722 | dma_free_coherent(&dd->pcidev->dev, size, |
| 1712 | e, pd->port_rcvegrbuf_chunks); | 1723 | base, pd->port_rcvegrbuf_phys[e]); |
| 1713 | dma_free_coherent( | ||
| 1714 | &dd->pcidev->dev, size, base, | ||
| 1715 | pd->port_rcvegrbuf_phys[e]); | ||
| 1716 | } | ||
| 1717 | vfree(pd->port_rcvegrbuf); | ||
| 1718 | pd->port_rcvegrbuf = NULL; | ||
| 1719 | vfree(pd->port_rcvegrbuf_phys); | ||
| 1720 | pd->port_rcvegrbuf_phys = NULL; | ||
| 1721 | } | 1724 | } |
| 1725 | vfree(pd->port_rcvegrbuf); | ||
| 1726 | pd->port_rcvegrbuf = NULL; | ||
| 1727 | vfree(pd->port_rcvegrbuf_phys); | ||
| 1728 | pd->port_rcvegrbuf_phys = NULL; | ||
| 1722 | pd->port_rcvegrbuf_chunks = 0; | 1729 | pd->port_rcvegrbuf_chunks = 0; |
| 1723 | } else if (port == 0 && dd->ipath_port0_skbs) { | 1730 | } else if (pd->port_port == 0 && dd->ipath_port0_skbs) { |
| 1724 | unsigned e; | 1731 | unsigned e; |
| 1725 | struct sk_buff **skbs = dd->ipath_port0_skbs; | 1732 | struct sk_buff **skbs = dd->ipath_port0_skbs; |
| 1726 | 1733 | ||
| @@ -1732,10 +1739,8 @@ void ipath_free_pddata(struct ipath_devdata *dd, u32 port, int freehdrq) | |||
| 1732 | dev_kfree_skb(skbs[e]); | 1739 | dev_kfree_skb(skbs[e]); |
| 1733 | vfree(skbs); | 1740 | vfree(skbs); |
| 1734 | } | 1741 | } |
| 1735 | if (freehdrq) { | 1742 | kfree(pd->port_tid_pg_list); |
| 1736 | kfree(pd->port_tid_pg_list); | 1743 | kfree(pd); |
| 1737 | kfree(pd); | ||
| 1738 | } | ||
| 1739 | } | 1744 | } |
| 1740 | 1745 | ||
| 1741 | static int __init infinipath_init(void) | 1746 | static int __init infinipath_init(void) |
| @@ -1806,7 +1811,6 @@ static void cleanup_device(struct ipath_devdata *dd) | |||
| 1806 | * re-init | 1811 | * re-init |
| 1807 | */ | 1812 | */ |
| 1808 | dd->ipath_kregbase = NULL; | 1813 | dd->ipath_kregbase = NULL; |
| 1809 | dd->ipath_kregvirt = NULL; | ||
| 1810 | dd->ipath_uregbase = 0; | 1814 | dd->ipath_uregbase = 0; |
| 1811 | dd->ipath_sregbase = 0; | 1815 | dd->ipath_sregbase = 0; |
| 1812 | dd->ipath_cregbase = 0; | 1816 | dd->ipath_cregbase = 0; |
| @@ -1821,6 +1825,12 @@ static void cleanup_device(struct ipath_devdata *dd) | |||
| 1821 | dd->ipath_pioavailregs_phys); | 1825 | dd->ipath_pioavailregs_phys); |
| 1822 | dd->ipath_pioavailregs_dma = NULL; | 1826 | dd->ipath_pioavailregs_dma = NULL; |
| 1823 | } | 1827 | } |
| 1828 | if (dd->ipath_dummy_hdrq) { | ||
| 1829 | dma_free_coherent(&dd->pcidev->dev, | ||
| 1830 | dd->ipath_pd[0]->port_rcvhdrq_size, | ||
| 1831 | dd->ipath_dummy_hdrq, dd->ipath_dummy_hdrq_phys); | ||
| 1832 | dd->ipath_dummy_hdrq = NULL; | ||
| 1833 | } | ||
| 1824 | 1834 | ||
| 1825 | if (dd->ipath_pageshadow) { | 1835 | if (dd->ipath_pageshadow) { |
| 1826 | struct page **tmpp = dd->ipath_pageshadow; | 1836 | struct page **tmpp = dd->ipath_pageshadow; |
| @@ -1861,10 +1871,14 @@ static void cleanup_device(struct ipath_devdata *dd) | |||
| 1861 | 1871 | ||
| 1862 | /* | 1872 | /* |
| 1863 | * free any resources still in use (usually just kernel ports) | 1873 | * free any resources still in use (usually just kernel ports) |
| 1864 | * at unload | 1874 | * at unload; we do for portcnt, not cfgports, because cfgports |
| 1875 | * could have changed while we were loaded. | ||
| 1865 | */ | 1876 | */ |
| 1866 | for (port = 0; port < dd->ipath_cfgports; port++) | 1877 | for (port = 0; port < dd->ipath_portcnt; port++) { |
| 1867 | ipath_free_pddata(dd, port, 1); | 1878 | struct ipath_portdata *pd = dd->ipath_pd[port]; |
| 1879 | dd->ipath_pd[port] = NULL; | ||
| 1880 | ipath_free_pddata(dd, pd); | ||
| 1881 | } | ||
| 1868 | kfree(dd->ipath_pd); | 1882 | kfree(dd->ipath_pd); |
| 1869 | /* | 1883 | /* |
| 1870 | * debuggability, in case some cleanup path tries to use it | 1884 | * debuggability, in case some cleanup path tries to use it |
diff --git a/drivers/infiniband/hw/ipath/ipath_eeprom.c b/drivers/infiniband/hw/ipath/ipath_eeprom.c index a2f1ceafcca9..3313356ab93a 100644 --- a/drivers/infiniband/hw/ipath/ipath_eeprom.c +++ b/drivers/infiniband/hw/ipath/ipath_eeprom.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -600,8 +601,31 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd) | |||
| 600 | guid = *(__be64 *) ifp->if_guid; | 601 | guid = *(__be64 *) ifp->if_guid; |
| 601 | dd->ipath_guid = guid; | 602 | dd->ipath_guid = guid; |
| 602 | dd->ipath_nguid = ifp->if_numguid; | 603 | dd->ipath_nguid = ifp->if_numguid; |
| 603 | memcpy(dd->ipath_serial, ifp->if_serial, | 604 | /* |
| 604 | sizeof(ifp->if_serial)); | 605 | * Things are slightly complicated by the desire to transparently |
| 606 | * support both the Pathscale 10-digit serial number and the QLogic | ||
| 607 | * 13-character version. | ||
| 608 | */ | ||
| 609 | if ((ifp->if_fversion > 1) && ifp->if_sprefix[0] | ||
| 610 | && ((u8 *)ifp->if_sprefix)[0] != 0xFF) { | ||
| 611 | /* This board has a Serial-prefix, which is stored | ||
| 612 | * elsewhere for backward-compatibility. | ||
| 613 | */ | ||
| 614 | char *snp = dd->ipath_serial; | ||
| 615 | int len; | ||
| 616 | memcpy(snp, ifp->if_sprefix, sizeof ifp->if_sprefix); | ||
| 617 | snp[sizeof ifp->if_sprefix] = '\0'; | ||
| 618 | len = strlen(snp); | ||
| 619 | snp += len; | ||
| 620 | len = (sizeof dd->ipath_serial) - len; | ||
| 621 | if (len > sizeof ifp->if_serial) { | ||
| 622 | len = sizeof ifp->if_serial; | ||
| 623 | } | ||
| 624 | memcpy(snp, ifp->if_serial, len); | ||
| 625 | } else | ||
| 626 | memcpy(dd->ipath_serial, ifp->if_serial, | ||
| 627 | sizeof ifp->if_serial); | ||
| 628 | |||
| 605 | ipath_cdbg(VERBOSE, "Initted GUID to %llx from eeprom\n", | 629 | ipath_cdbg(VERBOSE, "Initted GUID to %llx from eeprom\n", |
| 606 | (unsigned long long) be64_to_cpu(dd->ipath_guid)); | 630 | (unsigned long long) be64_to_cpu(dd->ipath_guid)); |
| 607 | 631 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c index ada267e41f6c..bbaa70e57db1 100644 --- a/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -38,8 +39,8 @@ | |||
| 38 | #include <asm/pgtable.h> | 39 | #include <asm/pgtable.h> |
| 39 | 40 | ||
| 40 | #include "ipath_kernel.h" | 41 | #include "ipath_kernel.h" |
| 41 | #include "ips_common.h" | ||
| 42 | #include "ipath_layer.h" | 42 | #include "ipath_layer.h" |
| 43 | #include "ipath_common.h" | ||
| 43 | 44 | ||
| 44 | static int ipath_open(struct inode *, struct file *); | 45 | static int ipath_open(struct inode *, struct file *); |
| 45 | static int ipath_close(struct inode *, struct file *); | 46 | static int ipath_close(struct inode *, struct file *); |
| @@ -122,6 +123,7 @@ static int ipath_get_base_info(struct ipath_portdata *pd, | |||
| 122 | * on to yet another method of dealing with this | 123 | * on to yet another method of dealing with this |
| 123 | */ | 124 | */ |
| 124 | kinfo->spi_rcvhdr_base = (u64) pd->port_rcvhdrq_phys; | 125 | kinfo->spi_rcvhdr_base = (u64) pd->port_rcvhdrq_phys; |
| 126 | kinfo->spi_rcvhdr_tailaddr = (u64)pd->port_rcvhdrqtailaddr_phys; | ||
| 125 | kinfo->spi_rcv_egrbufs = (u64) pd->port_rcvegr_phys; | 127 | kinfo->spi_rcv_egrbufs = (u64) pd->port_rcvegr_phys; |
| 126 | kinfo->spi_pioavailaddr = (u64) dd->ipath_pioavailregs_phys; | 128 | kinfo->spi_pioavailaddr = (u64) dd->ipath_pioavailregs_phys; |
| 127 | kinfo->spi_status = (u64) kinfo->spi_pioavailaddr + | 129 | kinfo->spi_status = (u64) kinfo->spi_pioavailaddr + |
| @@ -456,7 +458,7 @@ static int ipath_set_part_key(struct ipath_portdata *pd, u16 key) | |||
| 456 | u16 lkey = key & 0x7FFF; | 458 | u16 lkey = key & 0x7FFF; |
| 457 | int ret; | 459 | int ret; |
| 458 | 460 | ||
| 459 | if (lkey == (IPS_DEFAULT_P_KEY & 0x7FFF)) { | 461 | if (lkey == (IPATH_DEFAULT_P_KEY & 0x7FFF)) { |
| 460 | /* nothing to do; this key always valid */ | 462 | /* nothing to do; this key always valid */ |
| 461 | ret = 0; | 463 | ret = 0; |
| 462 | goto bail; | 464 | goto bail; |
| @@ -704,6 +706,15 @@ static int ipath_create_user_egr(struct ipath_portdata *pd) | |||
| 704 | unsigned e, egrcnt, alloced, egrperchunk, chunk, egrsize, egroff; | 706 | unsigned e, egrcnt, alloced, egrperchunk, chunk, egrsize, egroff; |
| 705 | size_t size; | 707 | size_t size; |
| 706 | int ret; | 708 | int ret; |
| 709 | gfp_t gfp_flags; | ||
| 710 | |||
| 711 | /* | ||
| 712 | * GFP_USER, but without GFP_FS, so buffer cache can be | ||
| 713 | * coalesced (we hope); otherwise, even at order 4, | ||
| 714 | * heavy filesystem activity makes these fail, and we can | ||
| 715 | * use compound pages. | ||
| 716 | */ | ||
| 717 | gfp_flags = __GFP_WAIT | __GFP_IO | __GFP_COMP; | ||
| 707 | 718 | ||
| 708 | egrcnt = dd->ipath_rcvegrcnt; | 719 | egrcnt = dd->ipath_rcvegrcnt; |
| 709 | /* TID number offset for this port */ | 720 | /* TID number offset for this port */ |
| @@ -720,10 +731,8 @@ static int ipath_create_user_egr(struct ipath_portdata *pd) | |||
| 720 | * memory pressure (creating large files and then copying them over | 731 | * memory pressure (creating large files and then copying them over |
| 721 | * NFS while doing lots of MPI jobs), we hit some allocation | 732 | * NFS while doing lots of MPI jobs), we hit some allocation |
| 722 | * failures, even though we can sleep... (2.6.10) Still get | 733 | * failures, even though we can sleep... (2.6.10) Still get |
| 723 | * failures at 64K. 32K is the lowest we can go without waiting | 734 | * failures at 64K. 32K is the lowest we can go without wasting |
| 724 | * more memory again. It seems likely that the coalescing in | 735 | * additional memory. |
| 725 | * free_pages, etc. still has issues (as it has had previously | ||
| 726 | * during 2.6.x development). | ||
| 727 | */ | 736 | */ |
| 728 | size = 0x8000; | 737 | size = 0x8000; |
| 729 | alloced = ALIGN(egrsize * egrcnt, size); | 738 | alloced = ALIGN(egrsize * egrcnt, size); |
| @@ -744,12 +753,6 @@ static int ipath_create_user_egr(struct ipath_portdata *pd) | |||
| 744 | goto bail_rcvegrbuf; | 753 | goto bail_rcvegrbuf; |
| 745 | } | 754 | } |
| 746 | for (e = 0; e < pd->port_rcvegrbuf_chunks; e++) { | 755 | for (e = 0; e < pd->port_rcvegrbuf_chunks; e++) { |
| 747 | /* | ||
| 748 | * GFP_USER, but without GFP_FS, so buffer cache can be | ||
| 749 | * coalesced (we hope); otherwise, even at order 4, | ||
| 750 | * heavy filesystem activity makes these fail | ||
| 751 | */ | ||
| 752 | gfp_t gfp_flags = __GFP_WAIT | __GFP_IO | __GFP_COMP; | ||
| 753 | 756 | ||
| 754 | pd->port_rcvegrbuf[e] = dma_alloc_coherent( | 757 | pd->port_rcvegrbuf[e] = dma_alloc_coherent( |
| 755 | &dd->pcidev->dev, size, &pd->port_rcvegrbuf_phys[e], | 758 | &dd->pcidev->dev, size, &pd->port_rcvegrbuf_phys[e], |
| @@ -783,11 +786,12 @@ static int ipath_create_user_egr(struct ipath_portdata *pd) | |||
| 783 | 786 | ||
| 784 | bail_rcvegrbuf_phys: | 787 | bail_rcvegrbuf_phys: |
| 785 | for (e = 0; e < pd->port_rcvegrbuf_chunks && | 788 | for (e = 0; e < pd->port_rcvegrbuf_chunks && |
| 786 | pd->port_rcvegrbuf[e]; e++) | 789 | pd->port_rcvegrbuf[e]; e++) { |
| 787 | dma_free_coherent(&dd->pcidev->dev, size, | 790 | dma_free_coherent(&dd->pcidev->dev, size, |
| 788 | pd->port_rcvegrbuf[e], | 791 | pd->port_rcvegrbuf[e], |
| 789 | pd->port_rcvegrbuf_phys[e]); | 792 | pd->port_rcvegrbuf_phys[e]); |
| 790 | 793 | ||
| 794 | } | ||
| 791 | vfree(pd->port_rcvegrbuf_phys); | 795 | vfree(pd->port_rcvegrbuf_phys); |
| 792 | pd->port_rcvegrbuf_phys = NULL; | 796 | pd->port_rcvegrbuf_phys = NULL; |
| 793 | bail_rcvegrbuf: | 797 | bail_rcvegrbuf: |
| @@ -802,10 +806,7 @@ static int ipath_do_user_init(struct ipath_portdata *pd, | |||
| 802 | { | 806 | { |
| 803 | int ret = 0; | 807 | int ret = 0; |
| 804 | struct ipath_devdata *dd = pd->port_dd; | 808 | struct ipath_devdata *dd = pd->port_dd; |
| 805 | u64 physaddr, uaddr, off, atmp; | ||
| 806 | struct page *pagep; | ||
| 807 | u32 head32; | 809 | u32 head32; |
| 808 | u64 head; | ||
| 809 | 810 | ||
| 810 | /* for now, if major version is different, bail */ | 811 | /* for now, if major version is different, bail */ |
| 811 | if ((uinfo->spu_userversion >> 16) != IPATH_USER_SWMAJOR) { | 812 | if ((uinfo->spu_userversion >> 16) != IPATH_USER_SWMAJOR) { |
| @@ -830,54 +831,6 @@ static int ipath_do_user_init(struct ipath_portdata *pd, | |||
| 830 | 831 | ||
| 831 | /* for now we do nothing with rcvhdrcnt: uinfo->spu_rcvhdrcnt */ | 832 | /* for now we do nothing with rcvhdrcnt: uinfo->spu_rcvhdrcnt */ |
| 832 | 833 | ||
| 833 | /* set up for the rcvhdr Q tail register writeback to user memory */ | ||
| 834 | if (!uinfo->spu_rcvhdraddr || | ||
| 835 | !access_ok(VERIFY_WRITE, (u64 __user *) (unsigned long) | ||
| 836 | uinfo->spu_rcvhdraddr, sizeof(u64))) { | ||
| 837 | ipath_dbg("Port %d rcvhdrtail addr %llx not valid\n", | ||
| 838 | pd->port_port, | ||
| 839 | (unsigned long long) uinfo->spu_rcvhdraddr); | ||
| 840 | ret = -EINVAL; | ||
| 841 | goto done; | ||
| 842 | } | ||
| 843 | |||
| 844 | off = offset_in_page(uinfo->spu_rcvhdraddr); | ||
| 845 | uaddr = PAGE_MASK & (unsigned long) uinfo->spu_rcvhdraddr; | ||
| 846 | ret = ipath_get_user_pages_nocopy(uaddr, &pagep); | ||
| 847 | if (ret) { | ||
| 848 | dev_info(&dd->pcidev->dev, "Failed to lookup and lock " | ||
| 849 | "address %llx for rcvhdrtail: errno %d\n", | ||
| 850 | (unsigned long long) uinfo->spu_rcvhdraddr, -ret); | ||
| 851 | goto done; | ||
| 852 | } | ||
| 853 | ipath_stats.sps_pagelocks++; | ||
| 854 | pd->port_rcvhdrtail_uaddr = uaddr; | ||
| 855 | pd->port_rcvhdrtail_pagep = pagep; | ||
| 856 | pd->port_rcvhdrtail_kvaddr = | ||
| 857 | page_address(pagep); | ||
| 858 | pd->port_rcvhdrtail_kvaddr += off; | ||
| 859 | physaddr = page_to_phys(pagep) + off; | ||
| 860 | ipath_cdbg(VERBOSE, "port %d user addr %llx hdrtailaddr, %llx " | ||
| 861 | "physical (off=%llx)\n", | ||
| 862 | pd->port_port, | ||
| 863 | (unsigned long long) uinfo->spu_rcvhdraddr, | ||
| 864 | (unsigned long long) physaddr, (unsigned long long) off); | ||
| 865 | ipath_write_kreg_port(dd, dd->ipath_kregs->kr_rcvhdrtailaddr, | ||
| 866 | pd->port_port, physaddr); | ||
| 867 | atmp = ipath_read_kreg64_port(dd, | ||
| 868 | dd->ipath_kregs->kr_rcvhdrtailaddr, | ||
| 869 | pd->port_port); | ||
| 870 | if (physaddr != atmp) { | ||
| 871 | ipath_dev_err(dd, | ||
| 872 | "Catastrophic software error, " | ||
| 873 | "RcvHdrTailAddr%u written as %llx, " | ||
| 874 | "read back as %llx\n", pd->port_port, | ||
| 875 | (unsigned long long) physaddr, | ||
| 876 | (unsigned long long) atmp); | ||
| 877 | ret = -EINVAL; | ||
| 878 | goto done; | ||
| 879 | } | ||
| 880 | |||
| 881 | /* for right now, kernel piobufs are at end, so port 1 is at 0 */ | 834 | /* for right now, kernel piobufs are at end, so port 1 is at 0 */ |
| 882 | pd->port_piobufs = dd->ipath_piobufbase + | 835 | pd->port_piobufs = dd->ipath_piobufbase + |
| 883 | dd->ipath_pbufsport * (pd->port_port - | 836 | dd->ipath_pbufsport * (pd->port_port - |
| @@ -896,26 +849,18 @@ static int ipath_do_user_init(struct ipath_portdata *pd, | |||
| 896 | ret = ipath_create_user_egr(pd); | 849 | ret = ipath_create_user_egr(pd); |
| 897 | if (ret) | 850 | if (ret) |
| 898 | goto done; | 851 | goto done; |
| 899 | /* enable receives now */ | ||
| 900 | /* atomically set enable bit for this port */ | ||
| 901 | set_bit(INFINIPATH_R_PORTENABLE_SHIFT + pd->port_port, | ||
| 902 | &dd->ipath_rcvctrl); | ||
| 903 | 852 | ||
| 904 | /* | 853 | /* |
| 905 | * set the head registers for this port to the current values | 854 | * set the eager head register for this port to the current values |
| 906 | * of the tail pointers, since we don't know if they were | 855 | * of the tail pointers, since we don't know if they were |
| 907 | * updated on last use of the port. | 856 | * updated on last use of the port. |
| 908 | */ | 857 | */ |
| 909 | head32 = ipath_read_ureg32(dd, ur_rcvhdrtail, pd->port_port); | ||
| 910 | head = (u64) head32; | ||
| 911 | ipath_write_ureg(dd, ur_rcvhdrhead, head, pd->port_port); | ||
| 912 | head32 = ipath_read_ureg32(dd, ur_rcvegrindextail, pd->port_port); | 858 | head32 = ipath_read_ureg32(dd, ur_rcvegrindextail, pd->port_port); |
| 913 | ipath_write_ureg(dd, ur_rcvegrindexhead, head32, pd->port_port); | 859 | ipath_write_ureg(dd, ur_rcvegrindexhead, head32, pd->port_port); |
| 914 | dd->ipath_lastegrheads[pd->port_port] = -1; | 860 | dd->ipath_lastegrheads[pd->port_port] = -1; |
| 915 | dd->ipath_lastrcvhdrqtails[pd->port_port] = -1; | 861 | dd->ipath_lastrcvhdrqtails[pd->port_port] = -1; |
| 916 | ipath_cdbg(VERBOSE, "Wrote port%d head %llx, egrhead %x from " | 862 | ipath_cdbg(VERBOSE, "Wrote port%d egrhead %x from tail regs\n", |
| 917 | "tail regs\n", pd->port_port, | 863 | pd->port_port, head32); |
| 918 | (unsigned long long) head, head32); | ||
| 919 | pd->port_tidcursor = 0; /* start at beginning after open */ | 864 | pd->port_tidcursor = 0; /* start at beginning after open */ |
| 920 | /* | 865 | /* |
| 921 | * now enable the port; the tail registers will be written to memory | 866 | * now enable the port; the tail registers will be written to memory |
| @@ -924,24 +869,76 @@ static int ipath_do_user_init(struct ipath_portdata *pd, | |||
| 924 | * transition from 0 to 1, so clear it first, then set it as part of | 869 | * transition from 0 to 1, so clear it first, then set it as part of |
| 925 | * enabling the port. This will (very briefly) affect any other | 870 | * enabling the port. This will (very briefly) affect any other |
| 926 | * open ports, but it shouldn't be long enough to be an issue. | 871 | * open ports, but it shouldn't be long enough to be an issue. |
| 872 | * We explictly set the in-memory copy to 0 beforehand, so we don't | ||
| 873 | * have to wait to be sure the DMA update has happened. | ||
| 927 | */ | 874 | */ |
| 875 | *pd->port_rcvhdrtail_kvaddr = 0ULL; | ||
| 876 | set_bit(INFINIPATH_R_PORTENABLE_SHIFT + pd->port_port, | ||
| 877 | &dd->ipath_rcvctrl); | ||
| 928 | ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl, | 878 | ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl, |
| 929 | dd->ipath_rcvctrl & ~INFINIPATH_R_TAILUPD); | 879 | dd->ipath_rcvctrl & ~INFINIPATH_R_TAILUPD); |
| 930 | ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl, | 880 | ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl, |
| 931 | dd->ipath_rcvctrl); | 881 | dd->ipath_rcvctrl); |
| 932 | |||
| 933 | done: | 882 | done: |
| 934 | return ret; | 883 | return ret; |
| 935 | } | 884 | } |
| 936 | 885 | ||
| 886 | |||
| 887 | /* common code for the mappings on dma_alloc_coherent mem */ | ||
| 888 | static int ipath_mmap_mem(struct vm_area_struct *vma, | ||
| 889 | struct ipath_portdata *pd, unsigned len, | ||
| 890 | int write_ok, dma_addr_t addr, char *what) | ||
| 891 | { | ||
| 892 | struct ipath_devdata *dd = pd->port_dd; | ||
| 893 | unsigned pfn = (unsigned long)addr >> PAGE_SHIFT; | ||
| 894 | int ret; | ||
| 895 | |||
| 896 | if ((vma->vm_end - vma->vm_start) > len) { | ||
| 897 | dev_info(&dd->pcidev->dev, | ||
| 898 | "FAIL on %s: len %lx > %x\n", what, | ||
| 899 | vma->vm_end - vma->vm_start, len); | ||
| 900 | ret = -EFAULT; | ||
| 901 | goto bail; | ||
| 902 | } | ||
| 903 | |||
| 904 | if (!write_ok) { | ||
| 905 | if (vma->vm_flags & VM_WRITE) { | ||
| 906 | dev_info(&dd->pcidev->dev, | ||
| 907 | "%s must be mapped readonly\n", what); | ||
| 908 | ret = -EPERM; | ||
| 909 | goto bail; | ||
| 910 | } | ||
| 911 | |||
| 912 | /* don't allow them to later change with mprotect */ | ||
| 913 | vma->vm_flags &= ~VM_MAYWRITE; | ||
| 914 | } | ||
| 915 | |||
| 916 | ret = remap_pfn_range(vma, vma->vm_start, pfn, | ||
| 917 | len, vma->vm_page_prot); | ||
| 918 | if (ret) | ||
| 919 | dev_info(&dd->pcidev->dev, | ||
| 920 | "%s port%u mmap of %lx, %x bytes r%c failed: %d\n", | ||
| 921 | what, pd->port_port, (unsigned long)addr, len, | ||
| 922 | write_ok?'w':'o', ret); | ||
| 923 | else | ||
| 924 | ipath_cdbg(VERBOSE, "%s port%u mmaped %lx, %x bytes r%c\n", | ||
| 925 | what, pd->port_port, (unsigned long)addr, len, | ||
| 926 | write_ok?'w':'o'); | ||
| 927 | bail: | ||
| 928 | return ret; | ||
| 929 | } | ||
| 930 | |||
| 937 | static int mmap_ureg(struct vm_area_struct *vma, struct ipath_devdata *dd, | 931 | static int mmap_ureg(struct vm_area_struct *vma, struct ipath_devdata *dd, |
| 938 | u64 ureg) | 932 | u64 ureg) |
| 939 | { | 933 | { |
| 940 | unsigned long phys; | 934 | unsigned long phys; |
| 941 | int ret; | 935 | int ret; |
| 942 | 936 | ||
| 943 | /* it's the real hardware, so io_remap works */ | 937 | /* |
| 944 | 938 | * This is real hardware, so use io_remap. This is the mechanism | |
| 939 | * for the user process to update the head registers for their port | ||
| 940 | * in the chip. | ||
| 941 | */ | ||
| 945 | if ((vma->vm_end - vma->vm_start) > PAGE_SIZE) { | 942 | if ((vma->vm_end - vma->vm_start) > PAGE_SIZE) { |
| 946 | dev_info(&dd->pcidev->dev, "FAIL mmap userreg: reqlen " | 943 | dev_info(&dd->pcidev->dev, "FAIL mmap userreg: reqlen " |
| 947 | "%lx > PAGE\n", vma->vm_end - vma->vm_start); | 944 | "%lx > PAGE\n", vma->vm_end - vma->vm_start); |
| @@ -967,10 +964,11 @@ static int mmap_piobufs(struct vm_area_struct *vma, | |||
| 967 | int ret; | 964 | int ret; |
| 968 | 965 | ||
| 969 | /* | 966 | /* |
| 970 | * When we map the PIO buffers, we want to map them as writeonly, no | 967 | * When we map the PIO buffers in the chip, we want to map them as |
| 971 | * read possible. | 968 | * writeonly, no read possible. This prevents access to previous |
| 969 | * process data, and catches users who might try to read the i/o | ||
| 970 | * space due to a bug. | ||
| 972 | */ | 971 | */ |
| 973 | |||
| 974 | if ((vma->vm_end - vma->vm_start) > | 972 | if ((vma->vm_end - vma->vm_start) > |
| 975 | (dd->ipath_pbufsport * dd->ipath_palign)) { | 973 | (dd->ipath_pbufsport * dd->ipath_palign)) { |
| 976 | dev_info(&dd->pcidev->dev, "FAIL mmap piobufs: " | 974 | dev_info(&dd->pcidev->dev, "FAIL mmap piobufs: " |
| @@ -981,11 +979,10 @@ static int mmap_piobufs(struct vm_area_struct *vma, | |||
| 981 | } | 979 | } |
| 982 | 980 | ||
| 983 | phys = dd->ipath_physaddr + pd->port_piobufs; | 981 | phys = dd->ipath_physaddr + pd->port_piobufs; |
| 982 | |||
| 984 | /* | 983 | /* |
| 985 | * Do *NOT* mark this as non-cached (PWT bit), or we don't get the | 984 | * Don't mark this as non-cached, or we don't get the |
| 986 | * write combining behavior we want on the PIO buffers! | 985 | * write combining behavior we want on the PIO buffers! |
| 987 | * vma->vm_page_prot = | ||
| 988 | * pgprot_noncached(vma->vm_page_prot); | ||
| 989 | */ | 986 | */ |
| 990 | 987 | ||
| 991 | if (vma->vm_flags & VM_READ) { | 988 | if (vma->vm_flags & VM_READ) { |
| @@ -997,8 +994,7 @@ static int mmap_piobufs(struct vm_area_struct *vma, | |||
| 997 | } | 994 | } |
| 998 | 995 | ||
| 999 | /* don't allow them to later change to readable with mprotect */ | 996 | /* don't allow them to later change to readable with mprotect */ |
| 1000 | 997 | vma->vm_flags &= ~VM_MAYREAD; | |
| 1001 | vma->vm_flags &= ~VM_MAYWRITE; | ||
| 1002 | vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND; | 998 | vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND; |
| 1003 | 999 | ||
| 1004 | ret = io_remap_pfn_range(vma, vma->vm_start, phys >> PAGE_SHIFT, | 1000 | ret = io_remap_pfn_range(vma, vma->vm_start, phys >> PAGE_SHIFT, |
| @@ -1017,11 +1013,6 @@ static int mmap_rcvegrbufs(struct vm_area_struct *vma, | |||
| 1017 | dma_addr_t *phys; | 1013 | dma_addr_t *phys; |
| 1018 | int ret; | 1014 | int ret; |
| 1019 | 1015 | ||
| 1020 | if (!pd->port_rcvegrbuf) { | ||
| 1021 | ret = -EFAULT; | ||
| 1022 | goto bail; | ||
| 1023 | } | ||
| 1024 | |||
| 1025 | size = pd->port_rcvegrbuf_size; | 1016 | size = pd->port_rcvegrbuf_size; |
| 1026 | total_size = pd->port_rcvegrbuf_chunks * size; | 1017 | total_size = pd->port_rcvegrbuf_chunks * size; |
| 1027 | if ((vma->vm_end - vma->vm_start) > total_size) { | 1018 | if ((vma->vm_end - vma->vm_start) > total_size) { |
| @@ -1039,13 +1030,12 @@ static int mmap_rcvegrbufs(struct vm_area_struct *vma, | |||
| 1039 | ret = -EPERM; | 1030 | ret = -EPERM; |
| 1040 | goto bail; | 1031 | goto bail; |
| 1041 | } | 1032 | } |
| 1033 | /* don't allow them to later change to writeable with mprotect */ | ||
| 1034 | vma->vm_flags &= ~VM_MAYWRITE; | ||
| 1042 | 1035 | ||
| 1043 | start = vma->vm_start; | 1036 | start = vma->vm_start; |
| 1044 | phys = pd->port_rcvegrbuf_phys; | 1037 | phys = pd->port_rcvegrbuf_phys; |
| 1045 | 1038 | ||
| 1046 | /* don't allow them to later change to writeable with mprotect */ | ||
| 1047 | vma->vm_flags &= ~VM_MAYWRITE; | ||
| 1048 | |||
| 1049 | for (i = 0; i < pd->port_rcvegrbuf_chunks; i++, start += size) { | 1039 | for (i = 0; i < pd->port_rcvegrbuf_chunks; i++, start += size) { |
| 1050 | ret = remap_pfn_range(vma, start, phys[i] >> PAGE_SHIFT, | 1040 | ret = remap_pfn_range(vma, start, phys[i] >> PAGE_SHIFT, |
| 1051 | size, vma->vm_page_prot); | 1041 | size, vma->vm_page_prot); |
| @@ -1058,78 +1048,6 @@ bail: | |||
| 1058 | return ret; | 1048 | return ret; |
| 1059 | } | 1049 | } |
| 1060 | 1050 | ||
| 1061 | static int mmap_rcvhdrq(struct vm_area_struct *vma, | ||
| 1062 | struct ipath_portdata *pd) | ||
| 1063 | { | ||
| 1064 | struct ipath_devdata *dd = pd->port_dd; | ||
| 1065 | size_t total_size; | ||
| 1066 | int ret; | ||
| 1067 | |||
| 1068 | /* | ||
| 1069 | * kmalloc'ed memory, physically contiguous; this is from | ||
| 1070 | * spi_rcvhdr_base; we allow user to map read-write so they can | ||
| 1071 | * write hdrq entries to allow protocol code to directly poll | ||
| 1072 | * whether a hdrq entry has been written. | ||
| 1073 | */ | ||
| 1074 | total_size = ALIGN(dd->ipath_rcvhdrcnt * dd->ipath_rcvhdrentsize * | ||
| 1075 | sizeof(u32), PAGE_SIZE); | ||
| 1076 | if ((vma->vm_end - vma->vm_start) > total_size) { | ||
| 1077 | dev_info(&dd->pcidev->dev, | ||
| 1078 | "FAIL on rcvhdrq: reqlen %lx > actual %lx\n", | ||
| 1079 | vma->vm_end - vma->vm_start, | ||
| 1080 | (unsigned long) total_size); | ||
| 1081 | ret = -EFAULT; | ||
| 1082 | goto bail; | ||
| 1083 | } | ||
| 1084 | |||
| 1085 | ret = remap_pfn_range(vma, vma->vm_start, | ||
| 1086 | pd->port_rcvhdrq_phys >> PAGE_SHIFT, | ||
| 1087 | vma->vm_end - vma->vm_start, | ||
| 1088 | vma->vm_page_prot); | ||
| 1089 | bail: | ||
| 1090 | return ret; | ||
| 1091 | } | ||
| 1092 | |||
| 1093 | static int mmap_pioavailregs(struct vm_area_struct *vma, | ||
| 1094 | struct ipath_portdata *pd) | ||
| 1095 | { | ||
| 1096 | struct ipath_devdata *dd = pd->port_dd; | ||
| 1097 | int ret; | ||
| 1098 | |||
| 1099 | /* | ||
| 1100 | * when we map the PIO bufferavail registers, we want to map them as | ||
| 1101 | * readonly, no write possible. | ||
| 1102 | * | ||
| 1103 | * kmalloc'ed memory, physically contiguous, one page only, readonly | ||
| 1104 | */ | ||
| 1105 | |||
| 1106 | if ((vma->vm_end - vma->vm_start) > PAGE_SIZE) { | ||
| 1107 | dev_info(&dd->pcidev->dev, "FAIL on pioavailregs_dma: " | ||
| 1108 | "reqlen %lx > actual %lx\n", | ||
| 1109 | vma->vm_end - vma->vm_start, | ||
| 1110 | (unsigned long) PAGE_SIZE); | ||
| 1111 | ret = -EFAULT; | ||
| 1112 | goto bail; | ||
| 1113 | } | ||
| 1114 | |||
| 1115 | if (vma->vm_flags & VM_WRITE) { | ||
| 1116 | dev_info(&dd->pcidev->dev, | ||
| 1117 | "Can't map pioavailregs as writable (flags=%lx)\n", | ||
| 1118 | vma->vm_flags); | ||
| 1119 | ret = -EPERM; | ||
| 1120 | goto bail; | ||
| 1121 | } | ||
| 1122 | |||
| 1123 | /* don't allow them to later change with mprotect */ | ||
| 1124 | vma->vm_flags &= ~VM_MAYWRITE; | ||
| 1125 | |||
| 1126 | ret = remap_pfn_range(vma, vma->vm_start, | ||
| 1127 | dd->ipath_pioavailregs_phys >> PAGE_SHIFT, | ||
| 1128 | PAGE_SIZE, vma->vm_page_prot); | ||
| 1129 | bail: | ||
| 1130 | return ret; | ||
| 1131 | } | ||
| 1132 | |||
| 1133 | /** | 1051 | /** |
| 1134 | * ipath_mmap - mmap various structures into user space | 1052 | * ipath_mmap - mmap various structures into user space |
| 1135 | * @fp: the file pointer | 1053 | * @fp: the file pointer |
| @@ -1149,6 +1067,7 @@ static int ipath_mmap(struct file *fp, struct vm_area_struct *vma) | |||
| 1149 | 1067 | ||
| 1150 | pd = port_fp(fp); | 1068 | pd = port_fp(fp); |
| 1151 | dd = pd->port_dd; | 1069 | dd = pd->port_dd; |
| 1070 | |||
| 1152 | /* | 1071 | /* |
| 1153 | * This is the ipath_do_user_init() code, mapping the shared buffers | 1072 | * This is the ipath_do_user_init() code, mapping the shared buffers |
| 1154 | * into the user process. The address referred to by vm_pgoff is the | 1073 | * into the user process. The address referred to by vm_pgoff is the |
| @@ -1158,28 +1077,59 @@ static int ipath_mmap(struct file *fp, struct vm_area_struct *vma) | |||
| 1158 | pgaddr = vma->vm_pgoff << PAGE_SHIFT; | 1077 | pgaddr = vma->vm_pgoff << PAGE_SHIFT; |
| 1159 | 1078 | ||
| 1160 | /* | 1079 | /* |
| 1161 | * note that ureg does *NOT* have the kregvirt as part of it, to be | 1080 | * Must fit in 40 bits for our hardware; some checked elsewhere, |
| 1162 | * sure that for 32 bit programs, we don't end up trying to map a > | 1081 | * but we'll be paranoid. Check for 0 is mostly in case one of the |
| 1163 | * 44 address. Has to match ipath_get_base_info() code that sets | 1082 | * allocations failed, but user called mmap anyway. We want to catch |
| 1164 | * __spi_uregbase | 1083 | * that before it can match. |
| 1165 | */ | 1084 | */ |
| 1085 | if (!pgaddr || pgaddr >= (1ULL<<40)) { | ||
| 1086 | ipath_dev_err(dd, "Bad phys addr %llx, start %lx, end %lx\n", | ||
| 1087 | (unsigned long long)pgaddr, vma->vm_start, vma->vm_end); | ||
| 1088 | return -EINVAL; | ||
| 1089 | } | ||
| 1166 | 1090 | ||
| 1091 | /* just the offset of the port user registers, not physical addr */ | ||
| 1167 | ureg = dd->ipath_uregbase + dd->ipath_palign * pd->port_port; | 1092 | ureg = dd->ipath_uregbase + dd->ipath_palign * pd->port_port; |
| 1168 | 1093 | ||
| 1169 | ipath_cdbg(MM, "ushare: pgaddr %llx vm_start=%lx, vmlen %lx\n", | 1094 | ipath_cdbg(MM, "ushare: pgaddr %llx vm_start=%lx, vmlen %lx\n", |
| 1170 | (unsigned long long) pgaddr, vma->vm_start, | 1095 | (unsigned long long) pgaddr, vma->vm_start, |
| 1171 | vma->vm_end - vma->vm_start); | 1096 | vma->vm_end - vma->vm_start); |
| 1172 | 1097 | ||
| 1173 | if (pgaddr == ureg) | 1098 | if (vma->vm_start & (PAGE_SIZE-1)) { |
| 1099 | ipath_dev_err(dd, | ||
| 1100 | "vm_start not aligned: %lx, end=%lx phys %lx\n", | ||
| 1101 | vma->vm_start, vma->vm_end, (unsigned long)pgaddr); | ||
| 1102 | ret = -EINVAL; | ||
| 1103 | } | ||
| 1104 | else if (pgaddr == ureg) | ||
| 1174 | ret = mmap_ureg(vma, dd, ureg); | 1105 | ret = mmap_ureg(vma, dd, ureg); |
| 1175 | else if (pgaddr == pd->port_piobufs) | 1106 | else if (pgaddr == pd->port_piobufs) |
| 1176 | ret = mmap_piobufs(vma, dd, pd); | 1107 | ret = mmap_piobufs(vma, dd, pd); |
| 1177 | else if (pgaddr == (u64) pd->port_rcvegr_phys) | 1108 | else if (pgaddr == (u64) pd->port_rcvegr_phys) |
| 1178 | ret = mmap_rcvegrbufs(vma, pd); | 1109 | ret = mmap_rcvegrbufs(vma, pd); |
| 1179 | else if (pgaddr == (u64) pd->port_rcvhdrq_phys) | 1110 | else if (pgaddr == (u64) pd->port_rcvhdrq_phys) { |
| 1180 | ret = mmap_rcvhdrq(vma, pd); | 1111 | /* |
| 1112 | * The rcvhdrq itself; readonly except on HT-400 (so have | ||
| 1113 | * to allow writable mapping), multiple pages, contiguous | ||
| 1114 | * from an i/o perspective. | ||
| 1115 | */ | ||
| 1116 | unsigned total_size = | ||
| 1117 | ALIGN(dd->ipath_rcvhdrcnt * dd->ipath_rcvhdrentsize | ||
| 1118 | * sizeof(u32), PAGE_SIZE); | ||
| 1119 | ret = ipath_mmap_mem(vma, pd, total_size, 1, | ||
| 1120 | pd->port_rcvhdrq_phys, | ||
| 1121 | "rcvhdrq"); | ||
| 1122 | } | ||
| 1123 | else if (pgaddr == (u64)pd->port_rcvhdrqtailaddr_phys) | ||
| 1124 | /* in-memory copy of rcvhdrq tail register */ | ||
| 1125 | ret = ipath_mmap_mem(vma, pd, PAGE_SIZE, 0, | ||
| 1126 | pd->port_rcvhdrqtailaddr_phys, | ||
| 1127 | "rcvhdrq tail"); | ||
| 1181 | else if (pgaddr == dd->ipath_pioavailregs_phys) | 1128 | else if (pgaddr == dd->ipath_pioavailregs_phys) |
| 1182 | ret = mmap_pioavailregs(vma, pd); | 1129 | /* in-memory copy of pioavail registers */ |
| 1130 | ret = ipath_mmap_mem(vma, pd, PAGE_SIZE, 0, | ||
| 1131 | dd->ipath_pioavailregs_phys, | ||
| 1132 | "pioavail registers"); | ||
| 1183 | else | 1133 | else |
| 1184 | ret = -EINVAL; | 1134 | ret = -EINVAL; |
| 1185 | 1135 | ||
| @@ -1442,16 +1392,16 @@ done: | |||
| 1442 | 1392 | ||
| 1443 | static int ipath_open(struct inode *in, struct file *fp) | 1393 | static int ipath_open(struct inode *in, struct file *fp) |
| 1444 | { | 1394 | { |
| 1445 | int ret, minor; | 1395 | int ret, user_minor; |
| 1446 | 1396 | ||
| 1447 | mutex_lock(&ipath_mutex); | 1397 | mutex_lock(&ipath_mutex); |
| 1448 | 1398 | ||
| 1449 | minor = iminor(in); | 1399 | user_minor = iminor(in) - IPATH_USER_MINOR_BASE; |
| 1450 | ipath_cdbg(VERBOSE, "open on dev %lx (minor %d)\n", | 1400 | ipath_cdbg(VERBOSE, "open on dev %lx (minor %d)\n", |
| 1451 | (long)in->i_rdev, minor); | 1401 | (long)in->i_rdev, user_minor); |
| 1452 | 1402 | ||
| 1453 | if (minor) | 1403 | if (user_minor) |
| 1454 | ret = find_free_port(minor - 1, fp); | 1404 | ret = find_free_port(user_minor - 1, fp); |
| 1455 | else | 1405 | else |
| 1456 | ret = find_best_unit(fp); | 1406 | ret = find_best_unit(fp); |
| 1457 | 1407 | ||
| @@ -1536,53 +1486,54 @@ static int ipath_close(struct inode *in, struct file *fp) | |||
| 1536 | } | 1486 | } |
| 1537 | 1487 | ||
| 1538 | if (dd->ipath_kregbase) { | 1488 | if (dd->ipath_kregbase) { |
| 1539 | if (pd->port_rcvhdrtail_uaddr) { | 1489 | int i; |
| 1540 | pd->port_rcvhdrtail_uaddr = 0; | 1490 | /* atomically clear receive enable port. */ |
| 1541 | pd->port_rcvhdrtail_kvaddr = NULL; | 1491 | clear_bit(INFINIPATH_R_PORTENABLE_SHIFT + port, |
| 1542 | ipath_release_user_pages_on_close( | 1492 | &dd->ipath_rcvctrl); |
| 1543 | &pd->port_rcvhdrtail_pagep, 1); | 1493 | ipath_write_kreg( dd, dd->ipath_kregs->kr_rcvctrl, |
| 1544 | pd->port_rcvhdrtail_pagep = NULL; | 1494 | dd->ipath_rcvctrl); |
| 1545 | ipath_stats.sps_pageunlocks++; | 1495 | /* and read back from chip to be sure that nothing |
| 1546 | } | 1496 | * else is in flight when we do the rest */ |
| 1547 | ipath_write_kreg_port( | 1497 | (void)ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch); |
| 1548 | dd, dd->ipath_kregs->kr_rcvhdrtailaddr, | ||
| 1549 | port, 0ULL); | ||
| 1550 | ipath_write_kreg_port( | ||
| 1551 | dd, dd->ipath_kregs->kr_rcvhdraddr, | ||
| 1552 | pd->port_port, 0); | ||
| 1553 | 1498 | ||
| 1554 | /* clean up the pkeys for this port user */ | 1499 | /* clean up the pkeys for this port user */ |
| 1555 | ipath_clean_part_key(pd, dd); | 1500 | ipath_clean_part_key(pd, dd); |
| 1556 | 1501 | ||
| 1557 | if (port < dd->ipath_cfgports) { | ||
| 1558 | int i = dd->ipath_pbufsport * (port - 1); | ||
| 1559 | ipath_disarm_piobufs(dd, i, dd->ipath_pbufsport); | ||
| 1560 | 1502 | ||
| 1561 | /* atomically clear receive enable port. */ | 1503 | /* |
| 1562 | clear_bit(INFINIPATH_R_PORTENABLE_SHIFT + port, | 1504 | * be paranoid, and never write 0's to these, just use an |
| 1563 | &dd->ipath_rcvctrl); | 1505 | * unused part of the port 0 tail page. Of course, |
| 1564 | ipath_write_kreg( | 1506 | * rcvhdraddr points to a large chunk of memory, so this |
| 1565 | dd, | 1507 | * could still trash things, but at least it won't trash |
| 1566 | dd->ipath_kregs->kr_rcvctrl, | 1508 | * page 0, and by disabling the port, it should stop "soon", |
| 1567 | dd->ipath_rcvctrl); | 1509 | * even if a packet or two is in already in flight after we |
| 1568 | 1510 | * disabled the port. | |
| 1569 | if (dd->ipath_pageshadow) | 1511 | */ |
| 1570 | unlock_expected_tids(pd); | 1512 | ipath_write_kreg_port(dd, |
| 1571 | ipath_stats.sps_ports--; | 1513 | dd->ipath_kregs->kr_rcvhdrtailaddr, port, |
| 1572 | ipath_cdbg(PROC, "%s[%u] closed port %u:%u\n", | 1514 | dd->ipath_dummy_hdrq_phys); |
| 1573 | pd->port_comm, pd->port_pid, | 1515 | ipath_write_kreg_port(dd, dd->ipath_kregs->kr_rcvhdraddr, |
| 1574 | dd->ipath_unit, port); | 1516 | pd->port_port, dd->ipath_dummy_hdrq_phys); |
| 1575 | } | 1517 | |
| 1518 | i = dd->ipath_pbufsport * (port - 1); | ||
| 1519 | ipath_disarm_piobufs(dd, i, dd->ipath_pbufsport); | ||
| 1520 | |||
| 1521 | if (dd->ipath_pageshadow) | ||
| 1522 | unlock_expected_tids(pd); | ||
| 1523 | ipath_stats.sps_ports--; | ||
| 1524 | ipath_cdbg(PROC, "%s[%u] closed port %u:%u\n", | ||
| 1525 | pd->port_comm, pd->port_pid, | ||
| 1526 | dd->ipath_unit, port); | ||
| 1527 | |||
| 1528 | dd->ipath_f_clear_tids(dd, pd->port_port); | ||
| 1576 | } | 1529 | } |
| 1577 | 1530 | ||
| 1578 | pd->port_cnt = 0; | 1531 | pd->port_cnt = 0; |
| 1579 | pd->port_pid = 0; | 1532 | pd->port_pid = 0; |
| 1580 | 1533 | ||
| 1581 | dd->ipath_f_clear_tids(dd, pd->port_port); | 1534 | dd->ipath_pd[pd->port_port] = NULL; /* before releasing mutex */ |
| 1582 | |||
| 1583 | ipath_free_pddata(dd, pd->port_port, 0); | ||
| 1584 | |||
| 1585 | mutex_unlock(&ipath_mutex); | 1535 | mutex_unlock(&ipath_mutex); |
| 1536 | ipath_free_pddata(dd, pd); /* after releasing the mutex */ | ||
| 1586 | 1537 | ||
| 1587 | return ret; | 1538 | return ret; |
| 1588 | } | 1539 | } |
| @@ -1859,19 +1810,12 @@ int ipath_user_add(struct ipath_devdata *dd) | |||
| 1859 | "error %d\n", -ret); | 1810 | "error %d\n", -ret); |
| 1860 | goto bail; | 1811 | goto bail; |
| 1861 | } | 1812 | } |
| 1862 | ret = ipath_diag_init(); | ||
| 1863 | if (ret < 0) { | ||
| 1864 | ipath_dev_err(dd, "Unable to set up diag support: " | ||
| 1865 | "error %d\n", -ret); | ||
| 1866 | goto bail_sma; | ||
| 1867 | } | ||
| 1868 | |||
| 1869 | ret = init_cdev(0, "ipath", &ipath_file_ops, &wildcard_cdev, | 1813 | ret = init_cdev(0, "ipath", &ipath_file_ops, &wildcard_cdev, |
| 1870 | &wildcard_class_dev); | 1814 | &wildcard_class_dev); |
| 1871 | if (ret < 0) { | 1815 | if (ret < 0) { |
| 1872 | ipath_dev_err(dd, "Could not create wildcard " | 1816 | ipath_dev_err(dd, "Could not create wildcard " |
| 1873 | "minor: error %d\n", -ret); | 1817 | "minor: error %d\n", -ret); |
| 1874 | goto bail_diag; | 1818 | goto bail_sma; |
| 1875 | } | 1819 | } |
| 1876 | 1820 | ||
| 1877 | atomic_set(&user_setup, 1); | 1821 | atomic_set(&user_setup, 1); |
| @@ -1880,31 +1824,28 @@ int ipath_user_add(struct ipath_devdata *dd) | |||
| 1880 | snprintf(name, sizeof(name), "ipath%d", dd->ipath_unit); | 1824 | snprintf(name, sizeof(name), "ipath%d", dd->ipath_unit); |
| 1881 | 1825 | ||
| 1882 | ret = init_cdev(dd->ipath_unit + 1, name, &ipath_file_ops, | 1826 | ret = init_cdev(dd->ipath_unit + 1, name, &ipath_file_ops, |
| 1883 | &dd->cdev, &dd->class_dev); | 1827 | &dd->user_cdev, &dd->user_class_dev); |
| 1884 | if (ret < 0) | 1828 | if (ret < 0) |
| 1885 | ipath_dev_err(dd, "Could not create user minor %d, %s\n", | 1829 | ipath_dev_err(dd, "Could not create user minor %d, %s\n", |
| 1886 | dd->ipath_unit + 1, name); | 1830 | dd->ipath_unit + 1, name); |
| 1887 | 1831 | ||
| 1888 | goto bail; | 1832 | goto bail; |
| 1889 | 1833 | ||
| 1890 | bail_diag: | ||
| 1891 | ipath_diag_cleanup(); | ||
| 1892 | bail_sma: | 1834 | bail_sma: |
| 1893 | user_cleanup(); | 1835 | user_cleanup(); |
| 1894 | bail: | 1836 | bail: |
| 1895 | return ret; | 1837 | return ret; |
| 1896 | } | 1838 | } |
| 1897 | 1839 | ||
| 1898 | void ipath_user_del(struct ipath_devdata *dd) | 1840 | void ipath_user_remove(struct ipath_devdata *dd) |
| 1899 | { | 1841 | { |
| 1900 | cleanup_cdev(&dd->cdev, &dd->class_dev); | 1842 | cleanup_cdev(&dd->user_cdev, &dd->user_class_dev); |
| 1901 | 1843 | ||
| 1902 | if (atomic_dec_return(&user_count) == 0) { | 1844 | if (atomic_dec_return(&user_count) == 0) { |
| 1903 | if (atomic_read(&user_setup) == 0) | 1845 | if (atomic_read(&user_setup) == 0) |
| 1904 | goto bail; | 1846 | goto bail; |
| 1905 | 1847 | ||
| 1906 | cleanup_cdev(&wildcard_cdev, &wildcard_class_dev); | 1848 | cleanup_cdev(&wildcard_cdev, &wildcard_class_dev); |
| 1907 | ipath_diag_cleanup(); | ||
| 1908 | user_cleanup(); | 1849 | user_cleanup(); |
| 1909 | 1850 | ||
| 1910 | atomic_set(&user_setup, 0); | 1851 | atomic_set(&user_setup, 0); |
| @@ -1912,3 +1853,4 @@ void ipath_user_del(struct ipath_devdata *dd) | |||
| 1912 | bail: | 1853 | bail: |
| 1913 | return; | 1854 | return; |
| 1914 | } | 1855 | } |
| 1856 | |||
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index 63de3046aff3..0936d8e8d704 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -31,7 +32,6 @@ | |||
| 31 | */ | 32 | */ |
| 32 | 33 | ||
| 33 | #include <linux/version.h> | 34 | #include <linux/version.h> |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/fs.h> | 36 | #include <linux/fs.h> |
| 37 | #include <linux/mount.h> | 37 | #include <linux/mount.h> |
diff --git a/drivers/infiniband/hw/ipath/ipath_ht400.c b/drivers/infiniband/hw/ipath/ipath_ht400.c index fac0a2b74de2..3db015da6e77 100644 --- a/drivers/infiniband/hw/ipath/ipath_ht400.c +++ b/drivers/infiniband/hw/ipath/ipath_ht400.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -1572,7 +1573,6 @@ void ipath_init_ht400_funcs(struct ipath_devdata *dd) | |||
| 1572 | dd->ipath_f_reset = ipath_setup_ht_reset; | 1573 | dd->ipath_f_reset = ipath_setup_ht_reset; |
| 1573 | dd->ipath_f_get_boardname = ipath_ht_boardname; | 1574 | dd->ipath_f_get_boardname = ipath_ht_boardname; |
| 1574 | dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors; | 1575 | dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors; |
| 1575 | dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors; | ||
| 1576 | dd->ipath_f_early_init = ipath_ht_early_init; | 1576 | dd->ipath_f_early_init = ipath_ht_early_init; |
| 1577 | dd->ipath_f_handle_hwerrors = ipath_ht_handle_hwerrors; | 1577 | dd->ipath_f_handle_hwerrors = ipath_ht_handle_hwerrors; |
| 1578 | dd->ipath_f_quiet_serdes = ipath_ht_quiet_serdes; | 1578 | dd->ipath_f_quiet_serdes = ipath_ht_quiet_serdes; |
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c index dc83250d26a6..414cdd1d80a6 100644 --- a/drivers/infiniband/hw/ipath/ipath_init_chip.c +++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -35,7 +36,7 @@ | |||
| 35 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
| 36 | 37 | ||
| 37 | #include "ipath_kernel.h" | 38 | #include "ipath_kernel.h" |
| 38 | #include "ips_common.h" | 39 | #include "ipath_common.h" |
| 39 | 40 | ||
| 40 | /* | 41 | /* |
| 41 | * min buffers we want to have per port, after driver | 42 | * min buffers we want to have per port, after driver |
| @@ -114,6 +115,7 @@ static int create_port0_egr(struct ipath_devdata *dd) | |||
| 114 | "eager TID %u\n", e); | 115 | "eager TID %u\n", e); |
| 115 | while (e != 0) | 116 | while (e != 0) |
| 116 | dev_kfree_skb(skbs[--e]); | 117 | dev_kfree_skb(skbs[--e]); |
| 118 | vfree(skbs); | ||
| 117 | ret = -ENOMEM; | 119 | ret = -ENOMEM; |
| 118 | goto bail; | 120 | goto bail; |
| 119 | } | 121 | } |
| @@ -275,7 +277,7 @@ static int init_chip_first(struct ipath_devdata *dd, | |||
| 275 | pd->port_port = 0; | 277 | pd->port_port = 0; |
| 276 | pd->port_cnt = 1; | 278 | pd->port_cnt = 1; |
| 277 | /* The port 0 pkey table is used by the layer interface. */ | 279 | /* The port 0 pkey table is used by the layer interface. */ |
| 278 | pd->port_pkeys[0] = IPS_DEFAULT_P_KEY; | 280 | pd->port_pkeys[0] = IPATH_DEFAULT_P_KEY; |
| 279 | dd->ipath_rcvtidcnt = | 281 | dd->ipath_rcvtidcnt = |
| 280 | ipath_read_kreg32(dd, dd->ipath_kregs->kr_rcvtidcnt); | 282 | ipath_read_kreg32(dd, dd->ipath_kregs->kr_rcvtidcnt); |
| 281 | dd->ipath_rcvtidbase = | 283 | dd->ipath_rcvtidbase = |
| @@ -409,17 +411,8 @@ static int init_pioavailregs(struct ipath_devdata *dd) | |||
| 409 | /* and its length */ | 411 | /* and its length */ |
| 410 | dd->ipath_freezelen = L1_CACHE_BYTES - sizeof(dd->ipath_statusp[0]); | 412 | dd->ipath_freezelen = L1_CACHE_BYTES - sizeof(dd->ipath_statusp[0]); |
| 411 | 413 | ||
| 412 | if (dd->ipath_unit * 64 > (IPATH_PORT0_RCVHDRTAIL_SIZE - 64)) { | 414 | ret = 0; |
| 413 | ipath_dev_err(dd, "unit %u too large for port 0 " | ||
| 414 | "rcvhdrtail buffer size\n", dd->ipath_unit); | ||
| 415 | ret = -ENODEV; | ||
| 416 | } | ||
| 417 | else | ||
| 418 | ret = 0; | ||
| 419 | 415 | ||
| 420 | /* so we can get current tail in ipath_kreceive(), per chip */ | ||
| 421 | dd->ipath_hdrqtailptr = &ipath_port0_rcvhdrtail[ | ||
| 422 | dd->ipath_unit * (64 / sizeof(*ipath_port0_rcvhdrtail))]; | ||
| 423 | done: | 416 | done: |
| 424 | return ret; | 417 | return ret; |
| 425 | } | 418 | } |
| @@ -652,8 +645,9 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) | |||
| 652 | { | 645 | { |
| 653 | int ret = 0, i; | 646 | int ret = 0, i; |
| 654 | u32 val32, kpiobufs; | 647 | u32 val32, kpiobufs; |
| 655 | u64 val, atmp; | 648 | u64 val; |
| 656 | struct ipath_portdata *pd = NULL; /* keep gcc4 happy */ | 649 | struct ipath_portdata *pd = NULL; /* keep gcc4 happy */ |
| 650 | gfp_t gfp_flags = GFP_USER | __GFP_COMP; | ||
| 657 | 651 | ||
| 658 | ret = init_housekeeping(dd, &pd, reinit); | 652 | ret = init_housekeeping(dd, &pd, reinit); |
| 659 | if (ret) | 653 | if (ret) |
| @@ -775,24 +769,6 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) | |||
| 775 | goto done; | 769 | goto done; |
| 776 | } | 770 | } |
| 777 | 771 | ||
| 778 | val = ipath_port0_rcvhdrtail_dma + dd->ipath_unit * 64; | ||
| 779 | |||
| 780 | /* verify that the alignment requirement was met */ | ||
| 781 | ipath_write_kreg_port(dd, dd->ipath_kregs->kr_rcvhdrtailaddr, | ||
| 782 | 0, val); | ||
| 783 | atmp = ipath_read_kreg64_port( | ||
| 784 | dd, dd->ipath_kregs->kr_rcvhdrtailaddr, 0); | ||
| 785 | if (val != atmp) { | ||
| 786 | ipath_dev_err(dd, "Catastrophic software error, " | ||
| 787 | "RcvHdrTailAddr0 written as %llx, " | ||
| 788 | "read back as %llx from %x\n", | ||
| 789 | (unsigned long long) val, | ||
| 790 | (unsigned long long) atmp, | ||
| 791 | dd->ipath_kregs->kr_rcvhdrtailaddr); | ||
| 792 | ret = -EINVAL; | ||
| 793 | goto done; | ||
| 794 | } | ||
| 795 | |||
| 796 | ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvbthqp, IPATH_KD_QP); | 772 | ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvbthqp, IPATH_KD_QP); |
| 797 | 773 | ||
| 798 | /* | 774 | /* |
| @@ -836,25 +812,45 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) | |||
| 836 | /* clear any interrups up to this point (ints still not enabled) */ | 812 | /* clear any interrups up to this point (ints still not enabled) */ |
| 837 | ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, -1LL); | 813 | ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, -1LL); |
| 838 | 814 | ||
| 839 | ipath_stats.sps_lid[dd->ipath_unit] = dd->ipath_lid; | ||
| 840 | |||
| 841 | /* | 815 | /* |
| 842 | * Set up the port 0 (kernel) rcvhdr q and egr TIDs. If doing | 816 | * Set up the port 0 (kernel) rcvhdr q and egr TIDs. If doing |
| 843 | * re-init, the simplest way to handle this is to free | 817 | * re-init, the simplest way to handle this is to free |
| 844 | * existing, and re-allocate. | 818 | * existing, and re-allocate. |
| 845 | */ | 819 | */ |
| 846 | if (reinit) | 820 | if (reinit) { |
| 847 | ipath_free_pddata(dd, 0, 0); | 821 | struct ipath_portdata *pd = dd->ipath_pd[0]; |
| 822 | dd->ipath_pd[0] = NULL; | ||
| 823 | ipath_free_pddata(dd, pd); | ||
| 824 | } | ||
| 848 | dd->ipath_f_tidtemplate(dd); | 825 | dd->ipath_f_tidtemplate(dd); |
| 849 | ret = ipath_create_rcvhdrq(dd, pd); | 826 | ret = ipath_create_rcvhdrq(dd, pd); |
| 850 | if (!ret) | 827 | if (!ret) { |
| 828 | dd->ipath_hdrqtailptr = | ||
| 829 | (volatile __le64 *)pd->port_rcvhdrtail_kvaddr; | ||
| 851 | ret = create_port0_egr(dd); | 830 | ret = create_port0_egr(dd); |
| 831 | } | ||
| 852 | if (ret) | 832 | if (ret) |
| 853 | ipath_dev_err(dd, "failed to allocate port 0 (kernel) " | 833 | ipath_dev_err(dd, "failed to allocate port 0 (kernel) " |
| 854 | "rcvhdrq and/or egr bufs\n"); | 834 | "rcvhdrq and/or egr bufs\n"); |
| 855 | else | 835 | else |
| 856 | enable_chip(dd, pd, reinit); | 836 | enable_chip(dd, pd, reinit); |
| 857 | 837 | ||
| 838 | |||
| 839 | if (!ret && !reinit) { | ||
| 840 | /* used when we close a port, for DMA already in flight at close */ | ||
| 841 | dd->ipath_dummy_hdrq = dma_alloc_coherent( | ||
| 842 | &dd->pcidev->dev, pd->port_rcvhdrq_size, | ||
| 843 | &dd->ipath_dummy_hdrq_phys, | ||
| 844 | gfp_flags); | ||
| 845 | if (!dd->ipath_dummy_hdrq ) { | ||
| 846 | dev_info(&dd->pcidev->dev, | ||
| 847 | "Couldn't allocate 0x%lx bytes for dummy hdrq\n", | ||
| 848 | pd->port_rcvhdrq_size); | ||
| 849 | /* fallback to just 0'ing */ | ||
| 850 | dd->ipath_dummy_hdrq_phys = 0UL; | ||
| 851 | } | ||
| 852 | } | ||
| 853 | |||
| 858 | /* | 854 | /* |
| 859 | * cause retrigger of pending interrupts ignored during init, | 855 | * cause retrigger of pending interrupts ignored during init, |
| 860 | * even if we had errors | 856 | * even if we had errors |
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c index 3e72a1fe3d73..280e732660a1 100644 --- a/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/drivers/infiniband/hw/ipath/ipath_intr.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -33,9 +34,10 @@ | |||
| 33 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 34 | 35 | ||
| 35 | #include "ipath_kernel.h" | 36 | #include "ipath_kernel.h" |
| 36 | #include "ips_common.h" | ||
| 37 | #include "ipath_layer.h" | 37 | #include "ipath_layer.h" |
| 38 | #include "ipath_common.h" | ||
| 38 | 39 | ||
| 40 | /* These are all rcv-related errors which we want to count for stats */ | ||
| 39 | #define E_SUM_PKTERRS \ | 41 | #define E_SUM_PKTERRS \ |
| 40 | (INFINIPATH_E_RHDRLEN | INFINIPATH_E_RBADTID | \ | 42 | (INFINIPATH_E_RHDRLEN | INFINIPATH_E_RBADTID | \ |
| 41 | INFINIPATH_E_RBADVERSION | INFINIPATH_E_RHDR | \ | 43 | INFINIPATH_E_RBADVERSION | INFINIPATH_E_RHDR | \ |
| @@ -44,6 +46,7 @@ | |||
| 44 | INFINIPATH_E_RFORMATERR | INFINIPATH_E_RUNSUPVL | \ | 46 | INFINIPATH_E_RFORMATERR | INFINIPATH_E_RUNSUPVL | \ |
| 45 | INFINIPATH_E_RUNEXPCHAR | INFINIPATH_E_REBP) | 47 | INFINIPATH_E_RUNEXPCHAR | INFINIPATH_E_REBP) |
| 46 | 48 | ||
| 49 | /* These are all send-related errors which we want to count for stats */ | ||
| 47 | #define E_SUM_ERRS \ | 50 | #define E_SUM_ERRS \ |
| 48 | (INFINIPATH_E_SPIOARMLAUNCH | INFINIPATH_E_SUNEXPERRPKTNUM | \ | 51 | (INFINIPATH_E_SPIOARMLAUNCH | INFINIPATH_E_SUNEXPERRPKTNUM | \ |
| 49 | INFINIPATH_E_SDROPPEDDATAPKT | INFINIPATH_E_SDROPPEDSMPPKT | \ | 52 | INFINIPATH_E_SDROPPEDDATAPKT | INFINIPATH_E_SDROPPEDSMPPKT | \ |
| @@ -51,6 +54,18 @@ | |||
| 51 | INFINIPATH_E_SMINPKTLEN | INFINIPATH_E_SPKTLEN | \ | 54 | INFINIPATH_E_SMINPKTLEN | INFINIPATH_E_SPKTLEN | \ |
| 52 | INFINIPATH_E_INVALIDADDR) | 55 | INFINIPATH_E_INVALIDADDR) |
| 53 | 56 | ||
| 57 | /* | ||
| 58 | * these are errors that can occur when the link changes state while | ||
| 59 | * a packet is being sent or received. This doesn't cover things | ||
| 60 | * like EBP or VCRC that can be the result of a sending having the | ||
| 61 | * link change state, so we receive a "known bad" packet. | ||
| 62 | */ | ||
| 63 | #define E_SUM_LINK_PKTERRS \ | ||
| 64 | (INFINIPATH_E_SDROPPEDDATAPKT | INFINIPATH_E_SDROPPEDSMPPKT | \ | ||
| 65 | INFINIPATH_E_SMINPKTLEN | INFINIPATH_E_SPKTLEN | \ | ||
| 66 | INFINIPATH_E_RSHORTPKTLEN | INFINIPATH_E_RMINPKTLEN | \ | ||
| 67 | INFINIPATH_E_RUNEXPCHAR) | ||
| 68 | |||
| 54 | static u64 handle_e_sum_errs(struct ipath_devdata *dd, ipath_err_t errs) | 69 | static u64 handle_e_sum_errs(struct ipath_devdata *dd, ipath_err_t errs) |
| 55 | { | 70 | { |
| 56 | unsigned long sbuf[4]; | 71 | unsigned long sbuf[4]; |
| @@ -100,9 +115,7 @@ static u64 handle_e_sum_errs(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 100 | if (ipath_debug & __IPATH_PKTDBG) | 115 | if (ipath_debug & __IPATH_PKTDBG) |
| 101 | printk("\n"); | 116 | printk("\n"); |
| 102 | } | 117 | } |
| 103 | if ((errs & (INFINIPATH_E_SDROPPEDDATAPKT | | 118 | if ((errs & E_SUM_LINK_PKTERRS) && |
| 104 | INFINIPATH_E_SDROPPEDSMPPKT | | ||
| 105 | INFINIPATH_E_SMINPKTLEN)) && | ||
| 106 | !(dd->ipath_flags & IPATH_LINKACTIVE)) { | 119 | !(dd->ipath_flags & IPATH_LINKACTIVE)) { |
| 107 | /* | 120 | /* |
| 108 | * This can happen when SMA is trying to bring the link | 121 | * This can happen when SMA is trying to bring the link |
| @@ -111,11 +124,9 @@ static u64 handle_e_sum_errs(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 111 | * valid. We don't want to confuse people, so we just | 124 | * valid. We don't want to confuse people, so we just |
| 112 | * don't print them, except at debug | 125 | * don't print them, except at debug |
| 113 | */ | 126 | */ |
| 114 | ipath_dbg("Ignoring pktsend errors %llx, because not " | 127 | ipath_dbg("Ignoring packet errors %llx, because link not " |
| 115 | "yet active\n", (unsigned long long) errs); | 128 | "ACTIVE\n", (unsigned long long) errs); |
| 116 | ignore_this_time = INFINIPATH_E_SDROPPEDDATAPKT | | 129 | ignore_this_time = errs & E_SUM_LINK_PKTERRS; |
| 117 | INFINIPATH_E_SDROPPEDSMPPKT | | ||
| 118 | INFINIPATH_E_SMINPKTLEN; | ||
| 119 | } | 130 | } |
| 120 | 131 | ||
| 121 | return ignore_this_time; | 132 | return ignore_this_time; |
| @@ -156,7 +167,29 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd, | |||
| 156 | */ | 167 | */ |
| 157 | val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_ibcstatus); | 168 | val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_ibcstatus); |
| 158 | lstate = val & IPATH_IBSTATE_MASK; | 169 | lstate = val & IPATH_IBSTATE_MASK; |
| 159 | if (lstate == IPATH_IBSTATE_INIT || lstate == IPATH_IBSTATE_ARM || | 170 | |
| 171 | /* | ||
| 172 | * this is confusing enough when it happens that I want to always put it | ||
| 173 | * on the console and in the logs. If it was a requested state change, | ||
| 174 | * we'll have already cleared the flags, so we won't print this warning | ||
| 175 | */ | ||
| 176 | if ((lstate != IPATH_IBSTATE_ARM && lstate != IPATH_IBSTATE_ACTIVE) | ||
| 177 | && (dd->ipath_flags & (IPATH_LINKARMED | IPATH_LINKACTIVE))) { | ||
| 178 | dev_info(&dd->pcidev->dev, "Link state changed from %s to %s\n", | ||
| 179 | (dd->ipath_flags & IPATH_LINKARMED) ? "ARM" : "ACTIVE", | ||
| 180 | ib_linkstate(lstate)); | ||
| 181 | /* | ||
| 182 | * Flush all queued sends when link went to DOWN or INIT, | ||
| 183 | * to be sure that they don't block SMA and other MAD packets | ||
| 184 | */ | ||
| 185 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, | ||
| 186 | INFINIPATH_S_ABORT); | ||
| 187 | ipath_disarm_piobufs(dd, dd->ipath_lastport_piobuf, | ||
| 188 | (unsigned)(dd->ipath_piobcnt2k + | ||
| 189 | dd->ipath_piobcnt4k) - | ||
| 190 | dd->ipath_lastport_piobuf); | ||
| 191 | } | ||
| 192 | else if (lstate == IPATH_IBSTATE_INIT || lstate == IPATH_IBSTATE_ARM || | ||
| 160 | lstate == IPATH_IBSTATE_ACTIVE) { | 193 | lstate == IPATH_IBSTATE_ACTIVE) { |
| 161 | /* | 194 | /* |
| 162 | * only print at SMA if there is a change, debug if not | 195 | * only print at SMA if there is a change, debug if not |
| @@ -229,6 +262,7 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd, | |||
| 229 | | IPATH_LINKACTIVE | | 262 | | IPATH_LINKACTIVE | |
| 230 | IPATH_LINKARMED); | 263 | IPATH_LINKARMED); |
| 231 | *dd->ipath_statusp &= ~IPATH_STATUS_IB_READY; | 264 | *dd->ipath_statusp &= ~IPATH_STATUS_IB_READY; |
| 265 | dd->ipath_lli_counter = 0; | ||
| 232 | if (!noprint) { | 266 | if (!noprint) { |
| 233 | if (((dd->ipath_lastibcstat >> | 267 | if (((dd->ipath_lastibcstat >> |
| 234 | INFINIPATH_IBCS_LINKSTATE_SHIFT) & | 268 | INFINIPATH_IBCS_LINKSTATE_SHIFT) & |
| @@ -350,7 +384,7 @@ static unsigned handle_frequent_errors(struct ipath_devdata *dd, | |||
| 350 | return supp_msgs; | 384 | return supp_msgs; |
| 351 | } | 385 | } |
| 352 | 386 | ||
| 353 | static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs) | 387 | static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs) |
| 354 | { | 388 | { |
| 355 | char msg[512]; | 389 | char msg[512]; |
| 356 | u64 ignore_this_time = 0; | 390 | u64 ignore_this_time = 0; |
| @@ -379,6 +413,19 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 379 | 413 | ||
| 380 | if (errs & E_SUM_ERRS) | 414 | if (errs & E_SUM_ERRS) |
| 381 | ignore_this_time = handle_e_sum_errs(dd, errs); | 415 | ignore_this_time = handle_e_sum_errs(dd, errs); |
| 416 | else if ((errs & E_SUM_LINK_PKTERRS) && | ||
| 417 | !(dd->ipath_flags & IPATH_LINKACTIVE)) { | ||
| 418 | /* | ||
| 419 | * This can happen when SMA is trying to bring the link | ||
| 420 | * up, but the IB link changes state at the "wrong" time. | ||
| 421 | * The IB logic then complains that the packet isn't | ||
| 422 | * valid. We don't want to confuse people, so we just | ||
| 423 | * don't print them, except at debug | ||
| 424 | */ | ||
| 425 | ipath_dbg("Ignoring packet errors %llx, because link not " | ||
| 426 | "ACTIVE\n", (unsigned long long) errs); | ||
| 427 | ignore_this_time = errs & E_SUM_LINK_PKTERRS; | ||
| 428 | } | ||
| 382 | 429 | ||
| 383 | if (supp_msgs == 250000) { | 430 | if (supp_msgs == 250000) { |
| 384 | /* | 431 | /* |
| @@ -397,7 +444,7 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 397 | if ((dd->ipath_maskederrs & ~dd->ipath_ignorederrs) & | 444 | if ((dd->ipath_maskederrs & ~dd->ipath_ignorederrs) & |
| 398 | ~(INFINIPATH_E_RRCVEGRFULL | INFINIPATH_E_RRCVHDRFULL)) | 445 | ~(INFINIPATH_E_RRCVEGRFULL | INFINIPATH_E_RRCVHDRFULL)) |
| 399 | ipath_dev_err(dd, "Disabling error(s) %llx because " | 446 | ipath_dev_err(dd, "Disabling error(s) %llx because " |
| 400 | "occuring too frequently (%s)\n", | 447 | "occurring too frequently (%s)\n", |
| 401 | (unsigned long long) | 448 | (unsigned long long) |
| 402 | (dd->ipath_maskederrs & | 449 | (dd->ipath_maskederrs & |
| 403 | ~dd->ipath_ignorederrs), msg); | 450 | ~dd->ipath_ignorederrs), msg); |
| @@ -434,7 +481,7 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 434 | INFINIPATH_E_IBSTATUSCHANGED); | 481 | INFINIPATH_E_IBSTATUSCHANGED); |
| 435 | } | 482 | } |
| 436 | if (!errs) | 483 | if (!errs) |
| 437 | return; | 484 | return 0; |
| 438 | 485 | ||
| 439 | if (!noprint) | 486 | if (!noprint) |
| 440 | /* | 487 | /* |
| @@ -493,10 +540,10 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 493 | continue; | 540 | continue; |
| 494 | if (hd == (tl + 1) || | 541 | if (hd == (tl + 1) || |
| 495 | (!hd && tl == dd->ipath_hdrqlast)) { | 542 | (!hd && tl == dd->ipath_hdrqlast)) { |
| 496 | dd->ipath_lastrcvhdrqtails[i] = tl; | ||
| 497 | pd->port_hdrqfull++; | ||
| 498 | if (i == 0) | 543 | if (i == 0) |
| 499 | chkerrpkts = 1; | 544 | chkerrpkts = 1; |
| 545 | dd->ipath_lastrcvhdrqtails[i] = tl; | ||
| 546 | pd->port_hdrqfull++; | ||
| 500 | } | 547 | } |
| 501 | } | 548 | } |
| 502 | } | 549 | } |
| @@ -558,9 +605,7 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 558 | wake_up_interruptible(&ipath_sma_state_wait); | 605 | wake_up_interruptible(&ipath_sma_state_wait); |
| 559 | } | 606 | } |
| 560 | 607 | ||
| 561 | if (chkerrpkts) | 608 | return chkerrpkts; |
| 562 | /* process possible error packets in hdrq */ | ||
| 563 | ipath_kreceive(dd); | ||
| 564 | } | 609 | } |
| 565 | 610 | ||
| 566 | /* this is separate to allow for better optimization of ipath_intr() */ | 611 | /* this is separate to allow for better optimization of ipath_intr() */ |
| @@ -678,7 +723,12 @@ set: | |||
| 678 | dd->ipath_sendctrl); | 723 | dd->ipath_sendctrl); |
| 679 | } | 724 | } |
| 680 | 725 | ||
| 681 | static void handle_rcv(struct ipath_devdata *dd, u32 istat) | 726 | /* |
| 727 | * Handle receive interrupts for user ports; this means a user | ||
| 728 | * process was waiting for a packet to arrive, and didn't want | ||
| 729 | * to poll | ||
| 730 | */ | ||
| 731 | static void handle_urcv(struct ipath_devdata *dd, u32 istat) | ||
| 682 | { | 732 | { |
| 683 | u64 portr; | 733 | u64 portr; |
| 684 | int i; | 734 | int i; |
| @@ -688,22 +738,17 @@ static void handle_rcv(struct ipath_devdata *dd, u32 istat) | |||
| 688 | infinipath_i_rcvavail_mask) | 738 | infinipath_i_rcvavail_mask) |
| 689 | | ((istat >> INFINIPATH_I_RCVURG_SHIFT) & | 739 | | ((istat >> INFINIPATH_I_RCVURG_SHIFT) & |
| 690 | infinipath_i_rcvurg_mask); | 740 | infinipath_i_rcvurg_mask); |
| 691 | for (i = 0; i < dd->ipath_cfgports; i++) { | 741 | for (i = 1; i < dd->ipath_cfgports; i++) { |
| 692 | struct ipath_portdata *pd = dd->ipath_pd[i]; | 742 | struct ipath_portdata *pd = dd->ipath_pd[i]; |
| 693 | if (portr & (1 << i) && pd && | 743 | if (portr & (1 << i) && pd && pd->port_cnt && |
| 694 | pd->port_cnt) { | 744 | test_bit(IPATH_PORT_WAITING_RCV, &pd->port_flag)) { |
| 695 | if (i == 0) | 745 | int rcbit; |
| 696 | ipath_kreceive(dd); | 746 | clear_bit(IPATH_PORT_WAITING_RCV, |
| 697 | else if (test_bit(IPATH_PORT_WAITING_RCV, | 747 | &pd->port_flag); |
| 698 | &pd->port_flag)) { | 748 | rcbit = i + INFINIPATH_R_INTRAVAIL_SHIFT; |
| 699 | int rcbit; | 749 | clear_bit(1UL << rcbit, &dd->ipath_rcvctrl); |
| 700 | clear_bit(IPATH_PORT_WAITING_RCV, | 750 | wake_up_interruptible(&pd->port_wait); |
| 701 | &pd->port_flag); | 751 | rcvdint = 1; |
| 702 | rcbit = i + INFINIPATH_R_INTRAVAIL_SHIFT; | ||
| 703 | clear_bit(1UL << rcbit, &dd->ipath_rcvctrl); | ||
| 704 | wake_up_interruptible(&pd->port_wait); | ||
| 705 | rcvdint = 1; | ||
| 706 | } | ||
| 707 | } | 752 | } |
| 708 | } | 753 | } |
| 709 | if (rcvdint) { | 754 | if (rcvdint) { |
| @@ -719,16 +764,19 @@ static void handle_rcv(struct ipath_devdata *dd, u32 istat) | |||
| 719 | irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) | 764 | irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) |
| 720 | { | 765 | { |
| 721 | struct ipath_devdata *dd = data; | 766 | struct ipath_devdata *dd = data; |
| 722 | u32 istat; | 767 | u32 istat, chk0rcv = 0; |
| 723 | ipath_err_t estat = 0; | 768 | ipath_err_t estat = 0; |
| 724 | static unsigned unexpected = 0; | ||
| 725 | irqreturn_t ret; | 769 | irqreturn_t ret; |
| 770 | u32 oldhead, curtail; | ||
| 771 | static unsigned unexpected = 0; | ||
| 772 | static const u32 port0rbits = (1U<<INFINIPATH_I_RCVAVAIL_SHIFT) | | ||
| 773 | (1U<<INFINIPATH_I_RCVURG_SHIFT); | ||
| 774 | |||
| 775 | ipath_stats.sps_ints++; | ||
| 726 | 776 | ||
| 727 | if(!(dd->ipath_flags & IPATH_PRESENT)) { | 777 | if (!(dd->ipath_flags & IPATH_PRESENT)) { |
| 728 | /* this is mostly so we don't try to touch the chip while | ||
| 729 | * it is being reset */ | ||
| 730 | /* | 778 | /* |
| 731 | * This return value is perhaps odd, but we do not want the | 779 | * This return value is not great, but we do not want the |
| 732 | * interrupt core code to remove our interrupt handler | 780 | * interrupt core code to remove our interrupt handler |
| 733 | * because we don't appear to be handling an interrupt | 781 | * because we don't appear to be handling an interrupt |
| 734 | * during a chip reset. | 782 | * during a chip reset. |
| @@ -736,7 +784,51 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) | |||
| 736 | return IRQ_HANDLED; | 784 | return IRQ_HANDLED; |
| 737 | } | 785 | } |
| 738 | 786 | ||
| 787 | /* | ||
| 788 | * this needs to be flags&initted, not statusp, so we keep | ||
| 789 | * taking interrupts even after link goes down, etc. | ||
| 790 | * Also, we *must* clear the interrupt at some point, or we won't | ||
| 791 | * take it again, which can be real bad for errors, etc... | ||
| 792 | */ | ||
| 793 | |||
| 794 | if (!(dd->ipath_flags & IPATH_INITTED)) { | ||
| 795 | ipath_bad_intr(dd, &unexpected); | ||
| 796 | ret = IRQ_NONE; | ||
| 797 | goto bail; | ||
| 798 | } | ||
| 799 | |||
| 800 | /* | ||
| 801 | * We try to avoid reading the interrupt status register, since | ||
| 802 | * that's a PIO read, and stalls the processor for up to about | ||
| 803 | * ~0.25 usec. The idea is that if we processed a port0 packet, | ||
| 804 | * we blindly clear the port 0 receive interrupt bits, and nothing | ||
| 805 | * else, then return. If other interrupts are pending, the chip | ||
| 806 | * will re-interrupt us as soon as we write the intclear register. | ||
| 807 | * We then won't process any more kernel packets (if not the 2nd | ||
| 808 | * time, then the 3rd or 4th) and we'll then handle the other | ||
| 809 | * interrupts. We clear the interrupts first so that we don't | ||
| 810 | * lose intr for later packets that arrive while we are processing. | ||
| 811 | */ | ||
| 812 | oldhead = dd->ipath_port0head; | ||
| 813 | curtail = (u32)le64_to_cpu(*dd->ipath_hdrqtailptr); | ||
| 814 | if (oldhead != curtail) { | ||
| 815 | if (dd->ipath_flags & IPATH_GPIO_INTR) { | ||
| 816 | ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_clear, | ||
| 817 | (u64) (1 << 2)); | ||
| 818 | istat = port0rbits | INFINIPATH_I_GPIO; | ||
| 819 | } | ||
| 820 | else | ||
| 821 | istat = port0rbits; | ||
| 822 | ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, istat); | ||
| 823 | ipath_kreceive(dd); | ||
| 824 | if (oldhead != dd->ipath_port0head) { | ||
| 825 | ipath_stats.sps_fastrcvint++; | ||
| 826 | goto done; | ||
| 827 | } | ||
| 828 | } | ||
| 829 | |||
| 739 | istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus); | 830 | istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus); |
| 831 | |||
| 740 | if (unlikely(!istat)) { | 832 | if (unlikely(!istat)) { |
| 741 | ipath_stats.sps_nullintr++; | 833 | ipath_stats.sps_nullintr++; |
| 742 | ret = IRQ_NONE; /* not our interrupt, or already handled */ | 834 | ret = IRQ_NONE; /* not our interrupt, or already handled */ |
| @@ -749,31 +841,17 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) | |||
| 749 | goto bail; | 841 | goto bail; |
| 750 | } | 842 | } |
| 751 | 843 | ||
| 752 | ipath_stats.sps_ints++; | ||
| 753 | |||
| 754 | /* | ||
| 755 | * this needs to be flags&initted, not statusp, so we keep | ||
| 756 | * taking interrupts even after link goes down, etc. | ||
| 757 | * Also, we *must* clear the interrupt at some point, or we won't | ||
| 758 | * take it again, which can be real bad for errors, etc... | ||
| 759 | */ | ||
| 760 | |||
| 761 | if (!(dd->ipath_flags & IPATH_INITTED)) { | ||
| 762 | ipath_bad_intr(dd, &unexpected); | ||
| 763 | ret = IRQ_NONE; | ||
| 764 | goto bail; | ||
| 765 | } | ||
| 766 | if (unexpected) | 844 | if (unexpected) |
| 767 | unexpected = 0; | 845 | unexpected = 0; |
| 768 | 846 | ||
| 769 | ipath_cdbg(VERBOSE, "intr stat=0x%x\n", istat); | 847 | if (unlikely(istat & ~infinipath_i_bitsextant)) |
| 770 | |||
| 771 | if (istat & ~infinipath_i_bitsextant) | ||
| 772 | ipath_dev_err(dd, | 848 | ipath_dev_err(dd, |
| 773 | "interrupt with unknown interrupts %x set\n", | 849 | "interrupt with unknown interrupts %x set\n", |
| 774 | istat & (u32) ~ infinipath_i_bitsextant); | 850 | istat & (u32) ~ infinipath_i_bitsextant); |
| 851 | else | ||
| 852 | ipath_cdbg(VERBOSE, "intr stat=0x%x\n", istat); | ||
| 775 | 853 | ||
| 776 | if (istat & INFINIPATH_I_ERROR) { | 854 | if (unlikely(istat & INFINIPATH_I_ERROR)) { |
| 777 | ipath_stats.sps_errints++; | 855 | ipath_stats.sps_errints++; |
| 778 | estat = ipath_read_kreg64(dd, | 856 | estat = ipath_read_kreg64(dd, |
| 779 | dd->ipath_kregs->kr_errorstatus); | 857 | dd->ipath_kregs->kr_errorstatus); |
| @@ -788,10 +866,18 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) | |||
| 788 | ipath_dev_err(dd, "Read of error status failed " | 866 | ipath_dev_err(dd, "Read of error status failed " |
| 789 | "(all bits set); ignoring\n"); | 867 | "(all bits set); ignoring\n"); |
| 790 | else | 868 | else |
| 791 | handle_errors(dd, estat); | 869 | if (handle_errors(dd, estat)) |
| 870 | /* force calling ipath_kreceive() */ | ||
| 871 | chk0rcv = 1; | ||
| 792 | } | 872 | } |
| 793 | 873 | ||
| 794 | if (istat & INFINIPATH_I_GPIO) { | 874 | if (istat & INFINIPATH_I_GPIO) { |
| 875 | /* | ||
| 876 | * Packets are available in the port 0 rcv queue. | ||
| 877 | * Eventually this needs to be generalized to check | ||
| 878 | * IPATH_GPIO_INTR, and the specific GPIO bit, if | ||
| 879 | * GPIO interrupts are used for anything else. | ||
| 880 | */ | ||
| 795 | if (unlikely(!(dd->ipath_flags & IPATH_GPIO_INTR))) { | 881 | if (unlikely(!(dd->ipath_flags & IPATH_GPIO_INTR))) { |
| 796 | u32 gpiostatus; | 882 | u32 gpiostatus; |
| 797 | gpiostatus = ipath_read_kreg32( | 883 | gpiostatus = ipath_read_kreg32( |
| @@ -804,27 +890,39 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) | |||
| 804 | else { | 890 | else { |
| 805 | /* Clear GPIO status bit 2 */ | 891 | /* Clear GPIO status bit 2 */ |
| 806 | ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_clear, | 892 | ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_clear, |
| 807 | (u64) (1 << 2)); | 893 | (u64) (1 << 2)); |
| 808 | 894 | chk0rcv = 1; | |
| 809 | /* | ||
| 810 | * Packets are available in the port 0 rcv queue. | ||
| 811 | * Eventually this needs to be generalized to check | ||
| 812 | * IPATH_GPIO_INTR, and the specific GPIO bit, if | ||
| 813 | * GPIO interrupts are used for anything else. | ||
| 814 | */ | ||
| 815 | ipath_kreceive(dd); | ||
| 816 | } | 895 | } |
| 817 | } | 896 | } |
| 897 | chk0rcv |= istat & port0rbits; | ||
| 818 | 898 | ||
| 819 | /* | 899 | /* |
| 820 | * clear the ones we will deal with on this round | 900 | * Clear the interrupt bits we found set, unless they are receive |
| 821 | * We clear it early, mostly for receive interrupts, so we | 901 | * related, in which case we already cleared them above, and don't |
| 822 | * know the chip will have seen this by the time we process | 902 | * want to clear them again, because we might lose an interrupt. |
| 823 | * the queue, and will re-interrupt if necessary. The processor | 903 | * Clear it early, so we "know" know the chip will have seen this by |
| 824 | * itself won't take the interrupt again until we return. | 904 | * the time we process the queue, and will re-interrupt if necessary. |
| 905 | * The processor itself won't take the interrupt again until we return. | ||
| 825 | */ | 906 | */ |
| 826 | ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, istat); | 907 | ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, istat); |
| 827 | 908 | ||
| 909 | /* | ||
| 910 | * handle port0 receive before checking for pio buffers available, | ||
| 911 | * since receives can overflow; piobuf waiters can afford a few | ||
| 912 | * extra cycles, since they were waiting anyway, and user's waiting | ||
| 913 | * for receive are at the bottom. | ||
| 914 | */ | ||
| 915 | if (chk0rcv) { | ||
| 916 | ipath_kreceive(dd); | ||
| 917 | istat &= ~port0rbits; | ||
| 918 | } | ||
| 919 | |||
| 920 | if (istat & ((infinipath_i_rcvavail_mask << | ||
| 921 | INFINIPATH_I_RCVAVAIL_SHIFT) | ||
| 922 | | (infinipath_i_rcvurg_mask << | ||
| 923 | INFINIPATH_I_RCVURG_SHIFT))) | ||
| 924 | handle_urcv(dd, istat); | ||
| 925 | |||
| 828 | if (istat & INFINIPATH_I_SPIOBUFAVAIL) { | 926 | if (istat & INFINIPATH_I_SPIOBUFAVAIL) { |
| 829 | clear_bit(IPATH_S_PIOINTBUFAVAIL, &dd->ipath_sendctrl); | 927 | clear_bit(IPATH_S_PIOINTBUFAVAIL, &dd->ipath_sendctrl); |
| 830 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, | 928 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, |
| @@ -836,17 +934,7 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs) | |||
| 836 | handle_layer_pioavail(dd); | 934 | handle_layer_pioavail(dd); |
| 837 | } | 935 | } |
| 838 | 936 | ||
| 839 | /* | 937 | done: |
| 840 | * we check for both transition from empty to non-empty, and urgent | ||
| 841 | * packets (those with the interrupt bit set in the header) | ||
| 842 | */ | ||
| 843 | |||
| 844 | if (istat & ((infinipath_i_rcvavail_mask << | ||
| 845 | INFINIPATH_I_RCVAVAIL_SHIFT) | ||
| 846 | | (infinipath_i_rcvurg_mask << | ||
| 847 | INFINIPATH_I_RCVURG_SHIFT))) | ||
| 848 | handle_rcv(dd, istat); | ||
| 849 | |||
| 850 | ret = IRQ_HANDLED; | 938 | ret = IRQ_HANDLED; |
| 851 | 939 | ||
| 852 | bail: | 940 | bail: |
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h index 5d92d57b6f54..e9f374fb641e 100644 --- a/drivers/infiniband/hw/ipath/ipath_kernel.h +++ b/drivers/infiniband/hw/ipath/ipath_kernel.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _IPATH_KERNEL_H | 1 | #ifndef _IPATH_KERNEL_H |
| 2 | #define _IPATH_KERNEL_H | 2 | #define _IPATH_KERNEL_H |
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 4 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 5 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 5 | * | 6 | * |
| 6 | * This software is available to you under a choice of one of two | 7 | * This software is available to you under a choice of one of two |
| @@ -61,9 +62,7 @@ struct ipath_portdata { | |||
| 61 | /* rcvhdrq base, needs mmap before useful */ | 62 | /* rcvhdrq base, needs mmap before useful */ |
| 62 | void *port_rcvhdrq; | 63 | void *port_rcvhdrq; |
| 63 | /* kernel virtual address where hdrqtail is updated */ | 64 | /* kernel virtual address where hdrqtail is updated */ |
| 64 | u64 *port_rcvhdrtail_kvaddr; | 65 | volatile __le64 *port_rcvhdrtail_kvaddr; |
| 65 | /* page * used for uaddr */ | ||
| 66 | struct page *port_rcvhdrtail_pagep; | ||
| 67 | /* | 66 | /* |
| 68 | * temp buffer for expected send setup, allocated at open, instead | 67 | * temp buffer for expected send setup, allocated at open, instead |
| 69 | * of each setup call | 68 | * of each setup call |
| @@ -78,11 +77,7 @@ struct ipath_portdata { | |||
| 78 | dma_addr_t port_rcvegr_phys; | 77 | dma_addr_t port_rcvegr_phys; |
| 79 | /* mmap of hdrq, must fit in 44 bits */ | 78 | /* mmap of hdrq, must fit in 44 bits */ |
| 80 | dma_addr_t port_rcvhdrq_phys; | 79 | dma_addr_t port_rcvhdrq_phys; |
| 81 | /* | 80 | dma_addr_t port_rcvhdrqtailaddr_phys; |
| 82 | * the actual user address that we ipath_mlock'ed, so we can | ||
| 83 | * ipath_munlock it at close | ||
| 84 | */ | ||
| 85 | unsigned long port_rcvhdrtail_uaddr; | ||
| 86 | /* | 81 | /* |
| 87 | * number of opens on this instance (0 or 1; ignoring forks, dup, | 82 | * number of opens on this instance (0 or 1; ignoring forks, dup, |
| 88 | * etc. for now) | 83 | * etc. for now) |
| @@ -158,16 +153,10 @@ struct ipath_devdata { | |||
| 158 | /* base of memory alloced for ipath_kregbase, for free */ | 153 | /* base of memory alloced for ipath_kregbase, for free */ |
| 159 | u64 *ipath_kregalloc; | 154 | u64 *ipath_kregalloc; |
| 160 | /* | 155 | /* |
| 161 | * version of kregbase that doesn't have high bits set (for 32 bit | ||
| 162 | * programs, so mmap64 44 bit works) | ||
| 163 | */ | ||
| 164 | u64 __iomem *ipath_kregvirt; | ||
| 165 | /* | ||
| 166 | * virtual address where port0 rcvhdrqtail updated for this unit. | 156 | * virtual address where port0 rcvhdrqtail updated for this unit. |
| 167 | * only written to by the chip, not the driver. | 157 | * only written to by the chip, not the driver. |
| 168 | */ | 158 | */ |
| 169 | volatile __le64 *ipath_hdrqtailptr; | 159 | volatile __le64 *ipath_hdrqtailptr; |
| 170 | dma_addr_t ipath_dma_addr; | ||
| 171 | /* ipath_cfgports pointers */ | 160 | /* ipath_cfgports pointers */ |
| 172 | struct ipath_portdata **ipath_pd; | 161 | struct ipath_portdata **ipath_pd; |
| 173 | /* sk_buffs used by port 0 eager receive queue */ | 162 | /* sk_buffs used by port 0 eager receive queue */ |
| @@ -354,13 +343,17 @@ struct ipath_devdata { | |||
| 354 | char *ipath_freezemsg; | 343 | char *ipath_freezemsg; |
| 355 | /* pci access data structure */ | 344 | /* pci access data structure */ |
| 356 | struct pci_dev *pcidev; | 345 | struct pci_dev *pcidev; |
| 357 | struct cdev *cdev; | 346 | struct cdev *user_cdev; |
| 358 | struct class_device *class_dev; | 347 | struct cdev *diag_cdev; |
| 348 | struct class_device *user_class_dev; | ||
| 349 | struct class_device *diag_class_dev; | ||
| 359 | /* timer used to prevent stats overflow, error throttling, etc. */ | 350 | /* timer used to prevent stats overflow, error throttling, etc. */ |
| 360 | struct timer_list ipath_stats_timer; | 351 | struct timer_list ipath_stats_timer; |
| 361 | /* check for stale messages in rcv queue */ | 352 | /* check for stale messages in rcv queue */ |
| 362 | /* only allow one intr at a time. */ | 353 | /* only allow one intr at a time. */ |
| 363 | unsigned long ipath_rcv_pending; | 354 | unsigned long ipath_rcv_pending; |
| 355 | void *ipath_dummy_hdrq; /* used after port close */ | ||
| 356 | dma_addr_t ipath_dummy_hdrq_phys; | ||
| 364 | 357 | ||
| 365 | /* | 358 | /* |
| 366 | * Shadow copies of registers; size indicates read access size. | 359 | * Shadow copies of registers; size indicates read access size. |
| @@ -500,8 +493,11 @@ struct ipath_devdata { | |||
| 500 | u16 ipath_lid; | 493 | u16 ipath_lid; |
| 501 | /* list of pkeys programmed; 0 if not set */ | 494 | /* list of pkeys programmed; 0 if not set */ |
| 502 | u16 ipath_pkeys[4]; | 495 | u16 ipath_pkeys[4]; |
| 503 | /* ASCII serial number, from flash */ | 496 | /* |
| 504 | u8 ipath_serial[12]; | 497 | * ASCII serial number, from flash, large enough for original |
| 498 | * all digit strings, and longer QLogic serial number format | ||
| 499 | */ | ||
| 500 | u8 ipath_serial[16]; | ||
| 505 | /* human readable board version */ | 501 | /* human readable board version */ |
| 506 | u8 ipath_boardversion[80]; | 502 | u8 ipath_boardversion[80]; |
| 507 | /* chip major rev, from ipath_revision */ | 503 | /* chip major rev, from ipath_revision */ |
| @@ -516,12 +512,12 @@ struct ipath_devdata { | |||
| 516 | u8 ipath_pci_cacheline; | 512 | u8 ipath_pci_cacheline; |
| 517 | /* LID mask control */ | 513 | /* LID mask control */ |
| 518 | u8 ipath_lmc; | 514 | u8 ipath_lmc; |
| 519 | }; | ||
| 520 | |||
| 521 | extern volatile __le64 *ipath_port0_rcvhdrtail; | ||
| 522 | extern dma_addr_t ipath_port0_rcvhdrtail_dma; | ||
| 523 | 515 | ||
| 524 | #define IPATH_PORT0_RCVHDRTAIL_SIZE PAGE_SIZE | 516 | /* local link integrity counter */ |
| 517 | u32 ipath_lli_counter; | ||
| 518 | /* local link integrity errors */ | ||
| 519 | u32 ipath_lli_errors; | ||
| 520 | }; | ||
| 525 | 521 | ||
| 526 | extern struct list_head ipath_dev_list; | 522 | extern struct list_head ipath_dev_list; |
| 527 | extern spinlock_t ipath_devs_lock; | 523 | extern spinlock_t ipath_devs_lock; |
| @@ -537,7 +533,7 @@ extern int __ipath_verbs_piobufavail(struct ipath_devdata *); | |||
| 537 | extern int __ipath_verbs_rcv(struct ipath_devdata *, void *, void *, u32); | 533 | extern int __ipath_verbs_rcv(struct ipath_devdata *, void *, void *, u32); |
| 538 | 534 | ||
| 539 | void ipath_layer_add(struct ipath_devdata *); | 535 | void ipath_layer_add(struct ipath_devdata *); |
| 540 | void ipath_layer_del(struct ipath_devdata *); | 536 | void ipath_layer_remove(struct ipath_devdata *); |
| 541 | 537 | ||
| 542 | int ipath_init_chip(struct ipath_devdata *, int); | 538 | int ipath_init_chip(struct ipath_devdata *, int); |
| 543 | int ipath_enable_wc(struct ipath_devdata *dd); | 539 | int ipath_enable_wc(struct ipath_devdata *dd); |
| @@ -551,14 +547,14 @@ int ipath_cdev_init(int minor, char *name, struct file_operations *fops, | |||
| 551 | void ipath_cdev_cleanup(struct cdev **cdevp, | 547 | void ipath_cdev_cleanup(struct cdev **cdevp, |
| 552 | struct class_device **class_devp); | 548 | struct class_device **class_devp); |
| 553 | 549 | ||
| 554 | int ipath_diag_init(void); | 550 | int ipath_diag_add(struct ipath_devdata *); |
| 555 | void ipath_diag_cleanup(void); | 551 | void ipath_diag_remove(struct ipath_devdata *); |
| 556 | void ipath_diag_bringup_link(struct ipath_devdata *); | 552 | void ipath_diag_bringup_link(struct ipath_devdata *); |
| 557 | 553 | ||
| 558 | extern wait_queue_head_t ipath_sma_state_wait; | 554 | extern wait_queue_head_t ipath_sma_state_wait; |
| 559 | 555 | ||
| 560 | int ipath_user_add(struct ipath_devdata *dd); | 556 | int ipath_user_add(struct ipath_devdata *dd); |
| 561 | void ipath_user_del(struct ipath_devdata *dd); | 557 | void ipath_user_remove(struct ipath_devdata *dd); |
| 562 | 558 | ||
| 563 | struct sk_buff *ipath_alloc_skb(struct ipath_devdata *dd, gfp_t); | 559 | struct sk_buff *ipath_alloc_skb(struct ipath_devdata *dd, gfp_t); |
| 564 | 560 | ||
| @@ -582,7 +578,7 @@ void ipath_disarm_piobufs(struct ipath_devdata *, unsigned first, | |||
| 582 | unsigned cnt); | 578 | unsigned cnt); |
| 583 | 579 | ||
| 584 | int ipath_create_rcvhdrq(struct ipath_devdata *, struct ipath_portdata *); | 580 | int ipath_create_rcvhdrq(struct ipath_devdata *, struct ipath_portdata *); |
| 585 | void ipath_free_pddata(struct ipath_devdata *, u32, int); | 581 | void ipath_free_pddata(struct ipath_devdata *, struct ipath_portdata *); |
| 586 | 582 | ||
| 587 | int ipath_parse_ushort(const char *str, unsigned short *valp); | 583 | int ipath_parse_ushort(const char *str, unsigned short *valp); |
| 588 | 584 | ||
| @@ -720,13 +716,8 @@ u64 ipath_read_kreg64_port(const struct ipath_devdata *, ipath_kreg, | |||
| 720 | * @port: port number | 716 | * @port: port number |
| 721 | * | 717 | * |
| 722 | * Return the contents of a register that is virtualized to be per port. | 718 | * Return the contents of a register that is virtualized to be per port. |
| 723 | * Prints a debug message and returns -1 on errors (not distinguishable from | 719 | * Returns -1 on errors (not distinguishable from valid contents at |
| 724 | * valid contents at runtime; we may add a separate error variable at some | 720 | * runtime; we may add a separate error variable at some point). |
| 725 | * point). | ||
| 726 | * | ||
| 727 | * This is normally not used by the kernel, but may be for debugging, and | ||
| 728 | * has a different implementation than user mode, which is why it's not in | ||
| 729 | * _common.h. | ||
| 730 | */ | 721 | */ |
| 731 | static inline u32 ipath_read_ureg32(const struct ipath_devdata *dd, | 722 | static inline u32 ipath_read_ureg32(const struct ipath_devdata *dd, |
| 732 | ipath_ureg regno, int port) | 723 | ipath_ureg regno, int port) |
| @@ -842,9 +833,10 @@ extern struct mutex ipath_mutex; | |||
| 842 | 833 | ||
| 843 | #define IPATH_DRV_NAME "ipath_core" | 834 | #define IPATH_DRV_NAME "ipath_core" |
| 844 | #define IPATH_MAJOR 233 | 835 | #define IPATH_MAJOR 233 |
| 836 | #define IPATH_USER_MINOR_BASE 0 | ||
| 845 | #define IPATH_SMA_MINOR 128 | 837 | #define IPATH_SMA_MINOR 128 |
| 846 | #define IPATH_DIAG_MINOR 129 | 838 | #define IPATH_DIAG_MINOR_BASE 129 |
| 847 | #define IPATH_NMINORS 130 | 839 | #define IPATH_NMINORS 255 |
| 848 | 840 | ||
| 849 | #define ipath_dev_err(dd,fmt,...) \ | 841 | #define ipath_dev_err(dd,fmt,...) \ |
| 850 | do { \ | 842 | do { \ |
diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c index 5ae8761f9dd2..46773c673a1a 100644 --- a/drivers/infiniband/hw/ipath/ipath_keys.c +++ b/drivers/infiniband/hw/ipath/ipath_keys.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -120,6 +121,7 @@ int ipath_lkey_ok(struct ipath_lkey_table *rkt, struct ipath_sge *isge, | |||
| 120 | struct ib_sge *sge, int acc) | 121 | struct ib_sge *sge, int acc) |
| 121 | { | 122 | { |
| 122 | struct ipath_mregion *mr; | 123 | struct ipath_mregion *mr; |
| 124 | unsigned n, m; | ||
| 123 | size_t off; | 125 | size_t off; |
| 124 | int ret; | 126 | int ret; |
| 125 | 127 | ||
| @@ -151,20 +153,22 @@ int ipath_lkey_ok(struct ipath_lkey_table *rkt, struct ipath_sge *isge, | |||
| 151 | } | 153 | } |
| 152 | 154 | ||
| 153 | off += mr->offset; | 155 | off += mr->offset; |
| 154 | isge->mr = mr; | 156 | m = 0; |
| 155 | isge->m = 0; | 157 | n = 0; |
| 156 | isge->n = 0; | 158 | while (off >= mr->map[m]->segs[n].length) { |
| 157 | while (off >= mr->map[isge->m]->segs[isge->n].length) { | 159 | off -= mr->map[m]->segs[n].length; |
| 158 | off -= mr->map[isge->m]->segs[isge->n].length; | 160 | n++; |
| 159 | isge->n++; | 161 | if (n >= IPATH_SEGSZ) { |
| 160 | if (isge->n >= IPATH_SEGSZ) { | 162 | m++; |
| 161 | isge->m++; | 163 | n = 0; |
| 162 | isge->n = 0; | ||
| 163 | } | 164 | } |
| 164 | } | 165 | } |
| 165 | isge->vaddr = mr->map[isge->m]->segs[isge->n].vaddr + off; | 166 | isge->mr = mr; |
| 166 | isge->length = mr->map[isge->m]->segs[isge->n].length - off; | 167 | isge->vaddr = mr->map[m]->segs[n].vaddr + off; |
| 168 | isge->length = mr->map[m]->segs[n].length - off; | ||
| 167 | isge->sge_length = sge->length; | 169 | isge->sge_length = sge->length; |
| 170 | isge->m = m; | ||
| 171 | isge->n = n; | ||
| 168 | 172 | ||
| 169 | ret = 1; | 173 | ret = 1; |
| 170 | 174 | ||
| @@ -189,6 +193,7 @@ int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss, | |||
| 189 | struct ipath_lkey_table *rkt = &dev->lk_table; | 193 | struct ipath_lkey_table *rkt = &dev->lk_table; |
| 190 | struct ipath_sge *sge = &ss->sge; | 194 | struct ipath_sge *sge = &ss->sge; |
| 191 | struct ipath_mregion *mr; | 195 | struct ipath_mregion *mr; |
| 196 | unsigned n, m; | ||
| 192 | size_t off; | 197 | size_t off; |
| 193 | int ret; | 198 | int ret; |
| 194 | 199 | ||
| @@ -206,20 +211,22 @@ int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss, | |||
| 206 | } | 211 | } |
| 207 | 212 | ||
| 208 | off += mr->offset; | 213 | off += mr->offset; |
| 209 | sge->mr = mr; | 214 | m = 0; |
| 210 | sge->m = 0; | 215 | n = 0; |
| 211 | sge->n = 0; | 216 | while (off >= mr->map[m]->segs[n].length) { |
| 212 | while (off >= mr->map[sge->m]->segs[sge->n].length) { | 217 | off -= mr->map[m]->segs[n].length; |
| 213 | off -= mr->map[sge->m]->segs[sge->n].length; | 218 | n++; |
| 214 | sge->n++; | 219 | if (n >= IPATH_SEGSZ) { |
| 215 | if (sge->n >= IPATH_SEGSZ) { | 220 | m++; |
| 216 | sge->m++; | 221 | n = 0; |
| 217 | sge->n = 0; | ||
| 218 | } | 222 | } |
| 219 | } | 223 | } |
| 220 | sge->vaddr = mr->map[sge->m]->segs[sge->n].vaddr + off; | 224 | sge->mr = mr; |
| 221 | sge->length = mr->map[sge->m]->segs[sge->n].length - off; | 225 | sge->vaddr = mr->map[m]->segs[n].vaddr + off; |
| 226 | sge->length = mr->map[m]->segs[n].length - off; | ||
| 222 | sge->sge_length = len; | 227 | sge->sge_length = len; |
| 228 | sge->m = m; | ||
| 229 | sge->n = n; | ||
| 223 | ss->sg_list = NULL; | 230 | ss->sg_list = NULL; |
| 224 | ss->num_sge = 1; | 231 | ss->num_sge = 1; |
| 225 | 232 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_layer.c b/drivers/infiniband/hw/ipath/ipath_layer.c index 9ec4ac77b87f..b28c6f81c731 100644 --- a/drivers/infiniband/hw/ipath/ipath_layer.c +++ b/drivers/infiniband/hw/ipath/ipath_layer.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -40,8 +41,8 @@ | |||
| 40 | #include <asm/byteorder.h> | 41 | #include <asm/byteorder.h> |
| 41 | 42 | ||
| 42 | #include "ipath_kernel.h" | 43 | #include "ipath_kernel.h" |
| 43 | #include "ips_common.h" | ||
| 44 | #include "ipath_layer.h" | 44 | #include "ipath_layer.h" |
| 45 | #include "ipath_common.h" | ||
| 45 | 46 | ||
| 46 | /* Acquire before ipath_devs_lock. */ | 47 | /* Acquire before ipath_devs_lock. */ |
| 47 | static DEFINE_MUTEX(ipath_layer_mutex); | 48 | static DEFINE_MUTEX(ipath_layer_mutex); |
| @@ -299,9 +300,8 @@ bail: | |||
| 299 | 300 | ||
| 300 | EXPORT_SYMBOL_GPL(ipath_layer_set_mtu); | 301 | EXPORT_SYMBOL_GPL(ipath_layer_set_mtu); |
| 301 | 302 | ||
| 302 | int ipath_set_sps_lid(struct ipath_devdata *dd, u32 arg, u8 lmc) | 303 | int ipath_set_lid(struct ipath_devdata *dd, u32 arg, u8 lmc) |
| 303 | { | 304 | { |
| 304 | ipath_stats.sps_lid[dd->ipath_unit] = arg; | ||
| 305 | dd->ipath_lid = arg; | 305 | dd->ipath_lid = arg; |
| 306 | dd->ipath_lmc = lmc; | 306 | dd->ipath_lmc = lmc; |
| 307 | 307 | ||
| @@ -315,7 +315,7 @@ int ipath_set_sps_lid(struct ipath_devdata *dd, u32 arg, u8 lmc) | |||
| 315 | return 0; | 315 | return 0; |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | EXPORT_SYMBOL_GPL(ipath_set_sps_lid); | 318 | EXPORT_SYMBOL_GPL(ipath_set_lid); |
| 319 | 319 | ||
| 320 | int ipath_layer_set_guid(struct ipath_devdata *dd, __be64 guid) | 320 | int ipath_layer_set_guid(struct ipath_devdata *dd, __be64 guid) |
| 321 | { | 321 | { |
| @@ -340,18 +340,26 @@ u32 ipath_layer_get_nguid(struct ipath_devdata *dd) | |||
| 340 | 340 | ||
| 341 | EXPORT_SYMBOL_GPL(ipath_layer_get_nguid); | 341 | EXPORT_SYMBOL_GPL(ipath_layer_get_nguid); |
| 342 | 342 | ||
| 343 | int ipath_layer_query_device(struct ipath_devdata *dd, u32 * vendor, | 343 | u32 ipath_layer_get_majrev(struct ipath_devdata *dd) |
| 344 | u32 * boardrev, u32 * majrev, u32 * minrev) | ||
| 345 | { | 344 | { |
| 346 | *vendor = dd->ipath_vendorid; | 345 | return dd->ipath_majrev; |
| 347 | *boardrev = dd->ipath_boardrev; | 346 | } |
| 348 | *majrev = dd->ipath_majrev; | ||
| 349 | *minrev = dd->ipath_minrev; | ||
| 350 | 347 | ||
| 351 | return 0; | 348 | EXPORT_SYMBOL_GPL(ipath_layer_get_majrev); |
| 349 | |||
| 350 | u32 ipath_layer_get_minrev(struct ipath_devdata *dd) | ||
| 351 | { | ||
| 352 | return dd->ipath_minrev; | ||
| 353 | } | ||
| 354 | |||
| 355 | EXPORT_SYMBOL_GPL(ipath_layer_get_minrev); | ||
| 356 | |||
| 357 | u32 ipath_layer_get_pcirev(struct ipath_devdata *dd) | ||
| 358 | { | ||
| 359 | return dd->ipath_pcirev; | ||
| 352 | } | 360 | } |
| 353 | 361 | ||
| 354 | EXPORT_SYMBOL_GPL(ipath_layer_query_device); | 362 | EXPORT_SYMBOL_GPL(ipath_layer_get_pcirev); |
| 355 | 363 | ||
| 356 | u32 ipath_layer_get_flags(struct ipath_devdata *dd) | 364 | u32 ipath_layer_get_flags(struct ipath_devdata *dd) |
| 357 | { | 365 | { |
| @@ -374,6 +382,13 @@ u16 ipath_layer_get_deviceid(struct ipath_devdata *dd) | |||
| 374 | 382 | ||
| 375 | EXPORT_SYMBOL_GPL(ipath_layer_get_deviceid); | 383 | EXPORT_SYMBOL_GPL(ipath_layer_get_deviceid); |
| 376 | 384 | ||
| 385 | u32 ipath_layer_get_vendorid(struct ipath_devdata *dd) | ||
| 386 | { | ||
| 387 | return dd->ipath_vendorid; | ||
| 388 | } | ||
| 389 | |||
| 390 | EXPORT_SYMBOL_GPL(ipath_layer_get_vendorid); | ||
| 391 | |||
| 377 | u64 ipath_layer_get_lastibcstat(struct ipath_devdata *dd) | 392 | u64 ipath_layer_get_lastibcstat(struct ipath_devdata *dd) |
| 378 | { | 393 | { |
| 379 | return dd->ipath_lastibcstat; | 394 | return dd->ipath_lastibcstat; |
| @@ -403,7 +418,7 @@ void ipath_layer_add(struct ipath_devdata *dd) | |||
| 403 | mutex_unlock(&ipath_layer_mutex); | 418 | mutex_unlock(&ipath_layer_mutex); |
| 404 | } | 419 | } |
| 405 | 420 | ||
| 406 | void ipath_layer_del(struct ipath_devdata *dd) | 421 | void ipath_layer_remove(struct ipath_devdata *dd) |
| 407 | { | 422 | { |
| 408 | mutex_lock(&ipath_layer_mutex); | 423 | mutex_lock(&ipath_layer_mutex); |
| 409 | 424 | ||
| @@ -607,7 +622,7 @@ int ipath_layer_open(struct ipath_devdata *dd, u32 * pktmax) | |||
| 607 | goto bail; | 622 | goto bail; |
| 608 | } | 623 | } |
| 609 | 624 | ||
| 610 | ret = ipath_setrcvhdrsize(dd, NUM_OF_EXTRA_WORDS_IN_HEADER_QUEUE); | 625 | ret = ipath_setrcvhdrsize(dd, IPATH_HEADER_QUEUE_WORDS); |
| 611 | 626 | ||
| 612 | if (ret < 0) | 627 | if (ret < 0) |
| 613 | goto bail; | 628 | goto bail; |
| @@ -616,9 +631,9 @@ int ipath_layer_open(struct ipath_devdata *dd, u32 * pktmax) | |||
| 616 | 631 | ||
| 617 | if (*dd->ipath_statusp & IPATH_STATUS_IB_READY) | 632 | if (*dd->ipath_statusp & IPATH_STATUS_IB_READY) |
| 618 | intval |= IPATH_LAYER_INT_IF_UP; | 633 | intval |= IPATH_LAYER_INT_IF_UP; |
| 619 | if (ipath_stats.sps_lid[dd->ipath_unit]) | 634 | if (dd->ipath_lid) |
| 620 | intval |= IPATH_LAYER_INT_LID; | 635 | intval |= IPATH_LAYER_INT_LID; |
| 621 | if (ipath_stats.sps_mlid[dd->ipath_unit]) | 636 | if (dd->ipath_mlid) |
| 622 | intval |= IPATH_LAYER_INT_BCAST; | 637 | intval |= IPATH_LAYER_INT_BCAST; |
| 623 | /* | 638 | /* |
| 624 | * do this on open, in case low level is already up and | 639 | * do this on open, in case low level is already up and |
| @@ -884,7 +899,7 @@ static void copy_io(u32 __iomem *piobuf, struct ipath_sge_state *ss, | |||
| 884 | /** | 899 | /** |
| 885 | * ipath_verbs_send - send a packet from the verbs layer | 900 | * ipath_verbs_send - send a packet from the verbs layer |
| 886 | * @dd: the infinipath device | 901 | * @dd: the infinipath device |
| 887 | * @hdrwords: the number of works in the header | 902 | * @hdrwords: the number of words in the header |
| 888 | * @hdr: the packet header | 903 | * @hdr: the packet header |
| 889 | * @len: the length of the packet in bytes | 904 | * @len: the length of the packet in bytes |
| 890 | * @ss: the SGE to send | 905 | * @ss: the SGE to send |
| @@ -1016,19 +1031,22 @@ int ipath_layer_get_counters(struct ipath_devdata *dd, | |||
| 1016 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_ibsymbolerrcnt); | 1031 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_ibsymbolerrcnt); |
| 1017 | cntrs->link_error_recovery_counter = | 1032 | cntrs->link_error_recovery_counter = |
| 1018 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_iblinkerrrecovcnt); | 1033 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_iblinkerrrecovcnt); |
| 1034 | /* | ||
| 1035 | * The link downed counter counts when the other side downs the | ||
| 1036 | * connection. We add in the number of times we downed the link | ||
| 1037 | * due to local link integrity errors to compensate. | ||
| 1038 | */ | ||
| 1019 | cntrs->link_downed_counter = | 1039 | cntrs->link_downed_counter = |
| 1020 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_iblinkdowncnt); | 1040 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_iblinkdowncnt); |
| 1021 | cntrs->port_rcv_errors = | 1041 | cntrs->port_rcv_errors = |
| 1022 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_rxdroppktcnt) + | 1042 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_rxdroppktcnt) + |
| 1023 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_rcvovflcnt) + | 1043 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_rcvovflcnt) + |
| 1024 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_portovflcnt) + | 1044 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_portovflcnt) + |
| 1025 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_errrcvflowctrlcnt) + | ||
| 1026 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_err_rlencnt) + | 1045 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_err_rlencnt) + |
| 1027 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_invalidrlencnt) + | 1046 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_invalidrlencnt) + |
| 1028 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_erricrccnt) + | 1047 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_erricrccnt) + |
| 1029 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_errvcrccnt) + | 1048 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_errvcrccnt) + |
| 1030 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_errlpcrccnt) + | 1049 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_errlpcrccnt) + |
| 1031 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_errlinkcnt) + | ||
| 1032 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_badformatcnt); | 1050 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_badformatcnt); |
| 1033 | cntrs->port_rcv_remphys_errors = | 1051 | cntrs->port_rcv_remphys_errors = |
| 1034 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_rcvebpcnt); | 1052 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_rcvebpcnt); |
| @@ -1042,6 +1060,8 @@ int ipath_layer_get_counters(struct ipath_devdata *dd, | |||
| 1042 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_pktsendcnt); | 1060 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_pktsendcnt); |
| 1043 | cntrs->port_rcv_packets = | 1061 | cntrs->port_rcv_packets = |
| 1044 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_pktrcvcnt); | 1062 | ipath_snap_cntr(dd, dd->ipath_cregs->cr_pktrcvcnt); |
| 1063 | cntrs->local_link_integrity_errors = dd->ipath_lli_errors; | ||
| 1064 | cntrs->excessive_buffer_overrun_errors = 0; /* XXX */ | ||
| 1045 | 1065 | ||
| 1046 | ret = 0; | 1066 | ret = 0; |
| 1047 | 1067 | ||
| @@ -1086,10 +1106,10 @@ int ipath_layer_send_hdr(struct ipath_devdata *dd, struct ether_header *hdr) | |||
| 1086 | } | 1106 | } |
| 1087 | 1107 | ||
| 1088 | vlsllnh = *((__be16 *) hdr); | 1108 | vlsllnh = *((__be16 *) hdr); |
| 1089 | if (vlsllnh != htons(IPS_LRH_BTH)) { | 1109 | if (vlsllnh != htons(IPATH_LRH_BTH)) { |
| 1090 | ipath_dbg("Warning: lrh[0] wrong (%x, not %x); " | 1110 | ipath_dbg("Warning: lrh[0] wrong (%x, not %x); " |
| 1091 | "not sending\n", be16_to_cpu(vlsllnh), | 1111 | "not sending\n", be16_to_cpu(vlsllnh), |
| 1092 | IPS_LRH_BTH); | 1112 | IPATH_LRH_BTH); |
| 1093 | ret = -EINVAL; | 1113 | ret = -EINVAL; |
| 1094 | } | 1114 | } |
| 1095 | if (ret) | 1115 | if (ret) |
diff --git a/drivers/infiniband/hw/ipath/ipath_layer.h b/drivers/infiniband/hw/ipath/ipath_layer.h index 6fefd15bd2da..71485096fcac 100644 --- a/drivers/infiniband/hw/ipath/ipath_layer.h +++ b/drivers/infiniband/hw/ipath/ipath_layer.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -54,6 +55,8 @@ struct ipath_layer_counters { | |||
| 54 | u64 port_rcv_data; | 55 | u64 port_rcv_data; |
| 55 | u64 port_xmit_packets; | 56 | u64 port_xmit_packets; |
| 56 | u64 port_rcv_packets; | 57 | u64 port_rcv_packets; |
| 58 | u32 local_link_integrity_errors; | ||
| 59 | u32 excessive_buffer_overrun_errors; | ||
| 57 | }; | 60 | }; |
| 58 | 61 | ||
| 59 | /* | 62 | /* |
| @@ -126,7 +129,7 @@ u16 ipath_layer_get_bcast(struct ipath_devdata *dd); | |||
| 126 | u32 ipath_layer_get_cr_errpkey(struct ipath_devdata *dd); | 129 | u32 ipath_layer_get_cr_errpkey(struct ipath_devdata *dd); |
| 127 | int ipath_layer_set_linkstate(struct ipath_devdata *dd, u8 state); | 130 | int ipath_layer_set_linkstate(struct ipath_devdata *dd, u8 state); |
| 128 | int ipath_layer_set_mtu(struct ipath_devdata *, u16); | 131 | int ipath_layer_set_mtu(struct ipath_devdata *, u16); |
| 129 | int ipath_set_sps_lid(struct ipath_devdata *, u32, u8); | 132 | int ipath_set_lid(struct ipath_devdata *, u32, u8); |
| 130 | int ipath_layer_send_hdr(struct ipath_devdata *dd, | 133 | int ipath_layer_send_hdr(struct ipath_devdata *dd, |
| 131 | struct ether_header *hdr); | 134 | struct ether_header *hdr); |
| 132 | int ipath_verbs_send(struct ipath_devdata *dd, u32 hdrwords, | 135 | int ipath_verbs_send(struct ipath_devdata *dd, u32 hdrwords, |
| @@ -143,11 +146,13 @@ int ipath_layer_want_buffer(struct ipath_devdata *dd); | |||
| 143 | int ipath_layer_set_guid(struct ipath_devdata *, __be64 guid); | 146 | int ipath_layer_set_guid(struct ipath_devdata *, __be64 guid); |
| 144 | __be64 ipath_layer_get_guid(struct ipath_devdata *); | 147 | __be64 ipath_layer_get_guid(struct ipath_devdata *); |
| 145 | u32 ipath_layer_get_nguid(struct ipath_devdata *); | 148 | u32 ipath_layer_get_nguid(struct ipath_devdata *); |
| 146 | int ipath_layer_query_device(struct ipath_devdata *, u32 * vendor, | 149 | u32 ipath_layer_get_majrev(struct ipath_devdata *); |
| 147 | u32 * boardrev, u32 * majrev, u32 * minrev); | 150 | u32 ipath_layer_get_minrev(struct ipath_devdata *); |
| 151 | u32 ipath_layer_get_pcirev(struct ipath_devdata *); | ||
| 148 | u32 ipath_layer_get_flags(struct ipath_devdata *dd); | 152 | u32 ipath_layer_get_flags(struct ipath_devdata *dd); |
| 149 | struct device *ipath_layer_get_device(struct ipath_devdata *dd); | 153 | struct device *ipath_layer_get_device(struct ipath_devdata *dd); |
| 150 | u16 ipath_layer_get_deviceid(struct ipath_devdata *dd); | 154 | u16 ipath_layer_get_deviceid(struct ipath_devdata *dd); |
| 155 | u32 ipath_layer_get_vendorid(struct ipath_devdata *); | ||
| 151 | u64 ipath_layer_get_lastibcstat(struct ipath_devdata *dd); | 156 | u64 ipath_layer_get_lastibcstat(struct ipath_devdata *dd); |
| 152 | u32 ipath_layer_get_ibmtu(struct ipath_devdata *dd); | 157 | u32 ipath_layer_get_ibmtu(struct ipath_devdata *dd); |
| 153 | int ipath_layer_enable_timer(struct ipath_devdata *dd); | 158 | int ipath_layer_enable_timer(struct ipath_devdata *dd); |
diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c index 1a9d0a2c33c3..d3402341b7d0 100644 --- a/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/drivers/infiniband/hw/ipath/ipath_mad.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -34,7 +35,7 @@ | |||
| 34 | 35 | ||
| 35 | #include "ipath_kernel.h" | 36 | #include "ipath_kernel.h" |
| 36 | #include "ipath_verbs.h" | 37 | #include "ipath_verbs.h" |
| 37 | #include "ips_common.h" | 38 | #include "ipath_common.h" |
| 38 | 39 | ||
| 39 | #define IB_SMP_UNSUP_VERSION __constant_htons(0x0004) | 40 | #define IB_SMP_UNSUP_VERSION __constant_htons(0x0004) |
| 40 | #define IB_SMP_UNSUP_METHOD __constant_htons(0x0008) | 41 | #define IB_SMP_UNSUP_METHOD __constant_htons(0x0008) |
| @@ -84,7 +85,7 @@ static int recv_subn_get_nodeinfo(struct ib_smp *smp, | |||
| 84 | { | 85 | { |
| 85 | struct nodeinfo *nip = (struct nodeinfo *)&smp->data; | 86 | struct nodeinfo *nip = (struct nodeinfo *)&smp->data; |
| 86 | struct ipath_devdata *dd = to_idev(ibdev)->dd; | 87 | struct ipath_devdata *dd = to_idev(ibdev)->dd; |
| 87 | u32 vendor, boardid, majrev, minrev; | 88 | u32 vendor, majrev, minrev; |
| 88 | 89 | ||
| 89 | if (smp->attr_mod) | 90 | if (smp->attr_mod) |
| 90 | smp->status |= IB_SMP_INVALID_FIELD; | 91 | smp->status |= IB_SMP_INVALID_FIELD; |
| @@ -104,9 +105,11 @@ static int recv_subn_get_nodeinfo(struct ib_smp *smp, | |||
| 104 | nip->port_guid = nip->sys_guid; | 105 | nip->port_guid = nip->sys_guid; |
| 105 | nip->partition_cap = cpu_to_be16(ipath_layer_get_npkeys(dd)); | 106 | nip->partition_cap = cpu_to_be16(ipath_layer_get_npkeys(dd)); |
| 106 | nip->device_id = cpu_to_be16(ipath_layer_get_deviceid(dd)); | 107 | nip->device_id = cpu_to_be16(ipath_layer_get_deviceid(dd)); |
| 107 | ipath_layer_query_device(dd, &vendor, &boardid, &majrev, &minrev); | 108 | majrev = ipath_layer_get_majrev(dd); |
| 109 | minrev = ipath_layer_get_minrev(dd); | ||
| 108 | nip->revision = cpu_to_be32((majrev << 16) | minrev); | 110 | nip->revision = cpu_to_be32((majrev << 16) | minrev); |
| 109 | nip->local_port_num = port; | 111 | nip->local_port_num = port; |
| 112 | vendor = ipath_layer_get_vendorid(dd); | ||
| 110 | nip->vendor_id[0] = 0; | 113 | nip->vendor_id[0] = 0; |
| 111 | nip->vendor_id[1] = vendor >> 8; | 114 | nip->vendor_id[1] = vendor >> 8; |
| 112 | nip->vendor_id[2] = vendor; | 115 | nip->vendor_id[2] = vendor; |
| @@ -215,7 +218,7 @@ static int recv_subn_get_portinfo(struct ib_smp *smp, | |||
| 215 | /* P_KeyViolations are counted by hardware. */ | 218 | /* P_KeyViolations are counted by hardware. */ |
| 216 | pip->pkey_violations = | 219 | pip->pkey_violations = |
| 217 | cpu_to_be16((ipath_layer_get_cr_errpkey(dev->dd) - | 220 | cpu_to_be16((ipath_layer_get_cr_errpkey(dev->dd) - |
| 218 | dev->n_pkey_violations) & 0xFFFF); | 221 | dev->z_pkey_violations) & 0xFFFF); |
| 219 | pip->qkey_violations = cpu_to_be16(dev->qkey_violations); | 222 | pip->qkey_violations = cpu_to_be16(dev->qkey_violations); |
| 220 | /* Only the hardware GUID is supported for now */ | 223 | /* Only the hardware GUID is supported for now */ |
| 221 | pip->guid_cap = 1; | 224 | pip->guid_cap = 1; |
| @@ -303,9 +306,9 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, | |||
| 303 | lid = be16_to_cpu(pip->lid); | 306 | lid = be16_to_cpu(pip->lid); |
| 304 | if (lid != ipath_layer_get_lid(dev->dd)) { | 307 | if (lid != ipath_layer_get_lid(dev->dd)) { |
| 305 | /* Must be a valid unicast LID address. */ | 308 | /* Must be a valid unicast LID address. */ |
| 306 | if (lid == 0 || lid >= IPS_MULTICAST_LID_BASE) | 309 | if (lid == 0 || lid >= IPATH_MULTICAST_LID_BASE) |
| 307 | goto err; | 310 | goto err; |
| 308 | ipath_set_sps_lid(dev->dd, lid, pip->mkeyprot_resv_lmc & 7); | 311 | ipath_set_lid(dev->dd, lid, pip->mkeyprot_resv_lmc & 7); |
| 309 | event.event = IB_EVENT_LID_CHANGE; | 312 | event.event = IB_EVENT_LID_CHANGE; |
| 310 | ib_dispatch_event(&event); | 313 | ib_dispatch_event(&event); |
| 311 | } | 314 | } |
| @@ -313,7 +316,7 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, | |||
| 313 | smlid = be16_to_cpu(pip->sm_lid); | 316 | smlid = be16_to_cpu(pip->sm_lid); |
| 314 | if (smlid != dev->sm_lid) { | 317 | if (smlid != dev->sm_lid) { |
| 315 | /* Must be a valid unicast LID address. */ | 318 | /* Must be a valid unicast LID address. */ |
| 316 | if (smlid == 0 || smlid >= IPS_MULTICAST_LID_BASE) | 319 | if (smlid == 0 || smlid >= IPATH_MULTICAST_LID_BASE) |
| 317 | goto err; | 320 | goto err; |
| 318 | dev->sm_lid = smlid; | 321 | dev->sm_lid = smlid; |
| 319 | event.event = IB_EVENT_SM_CHANGE; | 322 | event.event = IB_EVENT_SM_CHANGE; |
| @@ -389,7 +392,7 @@ static int recv_subn_set_portinfo(struct ib_smp *smp, | |||
| 389 | * later. | 392 | * later. |
| 390 | */ | 393 | */ |
| 391 | if (pip->pkey_violations == 0) | 394 | if (pip->pkey_violations == 0) |
| 392 | dev->n_pkey_violations = | 395 | dev->z_pkey_violations = |
| 393 | ipath_layer_get_cr_errpkey(dev->dd); | 396 | ipath_layer_get_cr_errpkey(dev->dd); |
| 394 | 397 | ||
| 395 | if (pip->qkey_violations == 0) | 398 | if (pip->qkey_violations == 0) |
| @@ -610,6 +613,9 @@ struct ib_pma_portcounters { | |||
| 610 | #define IB_PMA_SEL_PORT_RCV_ERRORS __constant_htons(0x0008) | 613 | #define IB_PMA_SEL_PORT_RCV_ERRORS __constant_htons(0x0008) |
| 611 | #define IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS __constant_htons(0x0010) | 614 | #define IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS __constant_htons(0x0010) |
| 612 | #define IB_PMA_SEL_PORT_XMIT_DISCARDS __constant_htons(0x0040) | 615 | #define IB_PMA_SEL_PORT_XMIT_DISCARDS __constant_htons(0x0040) |
| 616 | #define IB_PMA_SEL_LOCAL_LINK_INTEGRITY_ERRORS __constant_htons(0x0200) | ||
| 617 | #define IB_PMA_SEL_EXCESSIVE_BUFFER_OVERRUNS __constant_htons(0x0400) | ||
| 618 | #define IB_PMA_SEL_PORT_VL15_DROPPED __constant_htons(0x0800) | ||
| 613 | #define IB_PMA_SEL_PORT_XMIT_DATA __constant_htons(0x1000) | 619 | #define IB_PMA_SEL_PORT_XMIT_DATA __constant_htons(0x1000) |
| 614 | #define IB_PMA_SEL_PORT_RCV_DATA __constant_htons(0x2000) | 620 | #define IB_PMA_SEL_PORT_RCV_DATA __constant_htons(0x2000) |
| 615 | #define IB_PMA_SEL_PORT_XMIT_PACKETS __constant_htons(0x4000) | 621 | #define IB_PMA_SEL_PORT_XMIT_PACKETS __constant_htons(0x4000) |
| @@ -844,18 +850,22 @@ static int recv_pma_get_portcounters(struct ib_perf *pmp, | |||
| 844 | ipath_layer_get_counters(dev->dd, &cntrs); | 850 | ipath_layer_get_counters(dev->dd, &cntrs); |
| 845 | 851 | ||
| 846 | /* Adjust counters for any resets done. */ | 852 | /* Adjust counters for any resets done. */ |
| 847 | cntrs.symbol_error_counter -= dev->n_symbol_error_counter; | 853 | cntrs.symbol_error_counter -= dev->z_symbol_error_counter; |
| 848 | cntrs.link_error_recovery_counter -= | 854 | cntrs.link_error_recovery_counter -= |
| 849 | dev->n_link_error_recovery_counter; | 855 | dev->z_link_error_recovery_counter; |
| 850 | cntrs.link_downed_counter -= dev->n_link_downed_counter; | 856 | cntrs.link_downed_counter -= dev->z_link_downed_counter; |
| 851 | cntrs.port_rcv_errors += dev->rcv_errors; | 857 | cntrs.port_rcv_errors += dev->rcv_errors; |
| 852 | cntrs.port_rcv_errors -= dev->n_port_rcv_errors; | 858 | cntrs.port_rcv_errors -= dev->z_port_rcv_errors; |
| 853 | cntrs.port_rcv_remphys_errors -= dev->n_port_rcv_remphys_errors; | 859 | cntrs.port_rcv_remphys_errors -= dev->z_port_rcv_remphys_errors; |
| 854 | cntrs.port_xmit_discards -= dev->n_port_xmit_discards; | 860 | cntrs.port_xmit_discards -= dev->z_port_xmit_discards; |
| 855 | cntrs.port_xmit_data -= dev->n_port_xmit_data; | 861 | cntrs.port_xmit_data -= dev->z_port_xmit_data; |
| 856 | cntrs.port_rcv_data -= dev->n_port_rcv_data; | 862 | cntrs.port_rcv_data -= dev->z_port_rcv_data; |
| 857 | cntrs.port_xmit_packets -= dev->n_port_xmit_packets; | 863 | cntrs.port_xmit_packets -= dev->z_port_xmit_packets; |
| 858 | cntrs.port_rcv_packets -= dev->n_port_rcv_packets; | 864 | cntrs.port_rcv_packets -= dev->z_port_rcv_packets; |
| 865 | cntrs.local_link_integrity_errors -= | ||
| 866 | dev->z_local_link_integrity_errors; | ||
| 867 | cntrs.excessive_buffer_overrun_errors -= | ||
| 868 | dev->z_excessive_buffer_overrun_errors; | ||
| 859 | 869 | ||
| 860 | memset(pmp->data, 0, sizeof(pmp->data)); | 870 | memset(pmp->data, 0, sizeof(pmp->data)); |
| 861 | 871 | ||
| @@ -893,6 +903,16 @@ static int recv_pma_get_portcounters(struct ib_perf *pmp, | |||
| 893 | else | 903 | else |
| 894 | p->port_xmit_discards = | 904 | p->port_xmit_discards = |
| 895 | cpu_to_be16((u16)cntrs.port_xmit_discards); | 905 | cpu_to_be16((u16)cntrs.port_xmit_discards); |
| 906 | if (cntrs.local_link_integrity_errors > 0xFUL) | ||
| 907 | cntrs.local_link_integrity_errors = 0xFUL; | ||
| 908 | if (cntrs.excessive_buffer_overrun_errors > 0xFUL) | ||
| 909 | cntrs.excessive_buffer_overrun_errors = 0xFUL; | ||
| 910 | p->lli_ebor_errors = (cntrs.local_link_integrity_errors << 4) | | ||
| 911 | cntrs.excessive_buffer_overrun_errors; | ||
| 912 | if (dev->n_vl15_dropped > 0xFFFFUL) | ||
| 913 | p->vl15_dropped = __constant_cpu_to_be16(0xFFFF); | ||
| 914 | else | ||
| 915 | p->vl15_dropped = cpu_to_be16((u16)dev->n_vl15_dropped); | ||
| 896 | if (cntrs.port_xmit_data > 0xFFFFFFFFUL) | 916 | if (cntrs.port_xmit_data > 0xFFFFFFFFUL) |
| 897 | p->port_xmit_data = __constant_cpu_to_be32(0xFFFFFFFF); | 917 | p->port_xmit_data = __constant_cpu_to_be32(0xFFFFFFFF); |
| 898 | else | 918 | else |
| @@ -928,10 +948,10 @@ static int recv_pma_get_portcounters_ext(struct ib_perf *pmp, | |||
| 928 | &rpkts, &xwait); | 948 | &rpkts, &xwait); |
| 929 | 949 | ||
| 930 | /* Adjust counters for any resets done. */ | 950 | /* Adjust counters for any resets done. */ |
| 931 | swords -= dev->n_port_xmit_data; | 951 | swords -= dev->z_port_xmit_data; |
| 932 | rwords -= dev->n_port_rcv_data; | 952 | rwords -= dev->z_port_rcv_data; |
| 933 | spkts -= dev->n_port_xmit_packets; | 953 | spkts -= dev->z_port_xmit_packets; |
| 934 | rpkts -= dev->n_port_rcv_packets; | 954 | rpkts -= dev->z_port_rcv_packets; |
| 935 | 955 | ||
| 936 | memset(pmp->data, 0, sizeof(pmp->data)); | 956 | memset(pmp->data, 0, sizeof(pmp->data)); |
| 937 | 957 | ||
| @@ -967,37 +987,48 @@ static int recv_pma_set_portcounters(struct ib_perf *pmp, | |||
| 967 | ipath_layer_get_counters(dev->dd, &cntrs); | 987 | ipath_layer_get_counters(dev->dd, &cntrs); |
| 968 | 988 | ||
| 969 | if (p->counter_select & IB_PMA_SEL_SYMBOL_ERROR) | 989 | if (p->counter_select & IB_PMA_SEL_SYMBOL_ERROR) |
| 970 | dev->n_symbol_error_counter = cntrs.symbol_error_counter; | 990 | dev->z_symbol_error_counter = cntrs.symbol_error_counter; |
| 971 | 991 | ||
| 972 | if (p->counter_select & IB_PMA_SEL_LINK_ERROR_RECOVERY) | 992 | if (p->counter_select & IB_PMA_SEL_LINK_ERROR_RECOVERY) |
| 973 | dev->n_link_error_recovery_counter = | 993 | dev->z_link_error_recovery_counter = |
| 974 | cntrs.link_error_recovery_counter; | 994 | cntrs.link_error_recovery_counter; |
| 975 | 995 | ||
| 976 | if (p->counter_select & IB_PMA_SEL_LINK_DOWNED) | 996 | if (p->counter_select & IB_PMA_SEL_LINK_DOWNED) |
| 977 | dev->n_link_downed_counter = cntrs.link_downed_counter; | 997 | dev->z_link_downed_counter = cntrs.link_downed_counter; |
| 978 | 998 | ||
| 979 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_ERRORS) | 999 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_ERRORS) |
| 980 | dev->n_port_rcv_errors = | 1000 | dev->z_port_rcv_errors = |
| 981 | cntrs.port_rcv_errors + dev->rcv_errors; | 1001 | cntrs.port_rcv_errors + dev->rcv_errors; |
| 982 | 1002 | ||
| 983 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS) | 1003 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS) |
| 984 | dev->n_port_rcv_remphys_errors = | 1004 | dev->z_port_rcv_remphys_errors = |
| 985 | cntrs.port_rcv_remphys_errors; | 1005 | cntrs.port_rcv_remphys_errors; |
| 986 | 1006 | ||
| 987 | if (p->counter_select & IB_PMA_SEL_PORT_XMIT_DISCARDS) | 1007 | if (p->counter_select & IB_PMA_SEL_PORT_XMIT_DISCARDS) |
| 988 | dev->n_port_xmit_discards = cntrs.port_xmit_discards; | 1008 | dev->z_port_xmit_discards = cntrs.port_xmit_discards; |
| 1009 | |||
| 1010 | if (p->counter_select & IB_PMA_SEL_LOCAL_LINK_INTEGRITY_ERRORS) | ||
| 1011 | dev->z_local_link_integrity_errors = | ||
| 1012 | cntrs.local_link_integrity_errors; | ||
| 1013 | |||
| 1014 | if (p->counter_select & IB_PMA_SEL_EXCESSIVE_BUFFER_OVERRUNS) | ||
| 1015 | dev->z_excessive_buffer_overrun_errors = | ||
| 1016 | cntrs.excessive_buffer_overrun_errors; | ||
| 1017 | |||
| 1018 | if (p->counter_select & IB_PMA_SEL_PORT_VL15_DROPPED) | ||
| 1019 | dev->n_vl15_dropped = 0; | ||
| 989 | 1020 | ||
| 990 | if (p->counter_select & IB_PMA_SEL_PORT_XMIT_DATA) | 1021 | if (p->counter_select & IB_PMA_SEL_PORT_XMIT_DATA) |
| 991 | dev->n_port_xmit_data = cntrs.port_xmit_data; | 1022 | dev->z_port_xmit_data = cntrs.port_xmit_data; |
| 992 | 1023 | ||
| 993 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_DATA) | 1024 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_DATA) |
| 994 | dev->n_port_rcv_data = cntrs.port_rcv_data; | 1025 | dev->z_port_rcv_data = cntrs.port_rcv_data; |
| 995 | 1026 | ||
| 996 | if (p->counter_select & IB_PMA_SEL_PORT_XMIT_PACKETS) | 1027 | if (p->counter_select & IB_PMA_SEL_PORT_XMIT_PACKETS) |
| 997 | dev->n_port_xmit_packets = cntrs.port_xmit_packets; | 1028 | dev->z_port_xmit_packets = cntrs.port_xmit_packets; |
| 998 | 1029 | ||
| 999 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_PACKETS) | 1030 | if (p->counter_select & IB_PMA_SEL_PORT_RCV_PACKETS) |
| 1000 | dev->n_port_rcv_packets = cntrs.port_rcv_packets; | 1031 | dev->z_port_rcv_packets = cntrs.port_rcv_packets; |
| 1001 | 1032 | ||
| 1002 | return recv_pma_get_portcounters(pmp, ibdev, port); | 1033 | return recv_pma_get_portcounters(pmp, ibdev, port); |
| 1003 | } | 1034 | } |
| @@ -1014,16 +1045,16 @@ static int recv_pma_set_portcounters_ext(struct ib_perf *pmp, | |||
| 1014 | &rpkts, &xwait); | 1045 | &rpkts, &xwait); |
| 1015 | 1046 | ||
| 1016 | if (p->counter_select & IB_PMA_SELX_PORT_XMIT_DATA) | 1047 | if (p->counter_select & IB_PMA_SELX_PORT_XMIT_DATA) |
| 1017 | dev->n_port_xmit_data = swords; | 1048 | dev->z_port_xmit_data = swords; |
| 1018 | 1049 | ||
| 1019 | if (p->counter_select & IB_PMA_SELX_PORT_RCV_DATA) | 1050 | if (p->counter_select & IB_PMA_SELX_PORT_RCV_DATA) |
| 1020 | dev->n_port_rcv_data = rwords; | 1051 | dev->z_port_rcv_data = rwords; |
| 1021 | 1052 | ||
| 1022 | if (p->counter_select & IB_PMA_SELX_PORT_XMIT_PACKETS) | 1053 | if (p->counter_select & IB_PMA_SELX_PORT_XMIT_PACKETS) |
| 1023 | dev->n_port_xmit_packets = spkts; | 1054 | dev->z_port_xmit_packets = spkts; |
| 1024 | 1055 | ||
| 1025 | if (p->counter_select & IB_PMA_SELX_PORT_RCV_PACKETS) | 1056 | if (p->counter_select & IB_PMA_SELX_PORT_RCV_PACKETS) |
| 1026 | dev->n_port_rcv_packets = rpkts; | 1057 | dev->z_port_rcv_packets = rpkts; |
| 1027 | 1058 | ||
| 1028 | if (p->counter_select & IB_PMA_SELX_PORT_UNI_XMIT_PACKETS) | 1059 | if (p->counter_select & IB_PMA_SELX_PORT_UNI_XMIT_PACKETS) |
| 1029 | dev->n_unicast_xmit = 0; | 1060 | dev->n_unicast_xmit = 0; |
| @@ -1272,32 +1303,8 @@ int ipath_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, | |||
| 1272 | struct ib_wc *in_wc, struct ib_grh *in_grh, | 1303 | struct ib_wc *in_wc, struct ib_grh *in_grh, |
| 1273 | struct ib_mad *in_mad, struct ib_mad *out_mad) | 1304 | struct ib_mad *in_mad, struct ib_mad *out_mad) |
| 1274 | { | 1305 | { |
| 1275 | struct ipath_ibdev *dev = to_idev(ibdev); | ||
| 1276 | int ret; | 1306 | int ret; |
| 1277 | 1307 | ||
| 1278 | /* | ||
| 1279 | * Snapshot current HW counters to "clear" them. | ||
| 1280 | * This should be done when the driver is loaded except that for | ||
| 1281 | * some reason we get a zillion errors when brining up the link. | ||
| 1282 | */ | ||
| 1283 | if (dev->rcv_errors == 0) { | ||
| 1284 | struct ipath_layer_counters cntrs; | ||
| 1285 | |||
| 1286 | ipath_layer_get_counters(to_idev(ibdev)->dd, &cntrs); | ||
| 1287 | dev->rcv_errors++; | ||
| 1288 | dev->n_symbol_error_counter = cntrs.symbol_error_counter; | ||
| 1289 | dev->n_link_error_recovery_counter = | ||
| 1290 | cntrs.link_error_recovery_counter; | ||
| 1291 | dev->n_link_downed_counter = cntrs.link_downed_counter; | ||
| 1292 | dev->n_port_rcv_errors = cntrs.port_rcv_errors + 1; | ||
| 1293 | dev->n_port_rcv_remphys_errors = | ||
| 1294 | cntrs.port_rcv_remphys_errors; | ||
| 1295 | dev->n_port_xmit_discards = cntrs.port_xmit_discards; | ||
| 1296 | dev->n_port_xmit_data = cntrs.port_xmit_data; | ||
| 1297 | dev->n_port_rcv_data = cntrs.port_rcv_data; | ||
| 1298 | dev->n_port_xmit_packets = cntrs.port_xmit_packets; | ||
| 1299 | dev->n_port_rcv_packets = cntrs.port_rcv_packets; | ||
| 1300 | } | ||
| 1301 | switch (in_mad->mad_hdr.mgmt_class) { | 1308 | switch (in_mad->mad_hdr.mgmt_class) { |
| 1302 | case IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE: | 1309 | case IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE: |
| 1303 | case IB_MGMT_CLASS_SUBN_LID_ROUTED: | 1310 | case IB_MGMT_CLASS_SUBN_LID_ROUTED: |
diff --git a/drivers/infiniband/hw/ipath/ipath_mr.c b/drivers/infiniband/hw/ipath/ipath_mr.c index 69ffec66d45d..4ac31a5da330 100644 --- a/drivers/infiniband/hw/ipath/ipath_mr.c +++ b/drivers/infiniband/hw/ipath/ipath_mr.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -169,6 +170,11 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, struct ib_umem *region, | |||
| 169 | int n, m, i; | 170 | int n, m, i; |
| 170 | struct ib_mr *ret; | 171 | struct ib_mr *ret; |
| 171 | 172 | ||
| 173 | if (region->length == 0) { | ||
| 174 | ret = ERR_PTR(-EINVAL); | ||
| 175 | goto bail; | ||
| 176 | } | ||
| 177 | |||
| 172 | n = 0; | 178 | n = 0; |
| 173 | list_for_each_entry(chunk, ®ion->chunk_list, list) | 179 | list_for_each_entry(chunk, ®ion->chunk_list, list) |
| 174 | n += chunk->nents; | 180 | n += chunk->nents; |
diff --git a/drivers/infiniband/hw/ipath/ipath_pe800.c b/drivers/infiniband/hw/ipath/ipath_pe800.c index 02e8c75b24f6..b83f66d8262c 100644 --- a/drivers/infiniband/hw/ipath/ipath_pe800.c +++ b/drivers/infiniband/hw/ipath/ipath_pe800.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -44,7 +45,7 @@ | |||
| 44 | 45 | ||
| 45 | /* | 46 | /* |
| 46 | * This file contains all the chip-specific register information and | 47 | * This file contains all the chip-specific register information and |
| 47 | * access functions for the PathScale PE800, the PCI-Express chip. | 48 | * access functions for the QLogic InfiniPath PE800, the PCI-Express chip. |
| 48 | * | 49 | * |
| 49 | * This lists the InfiniPath PE800 registers, in the actual chip layout. | 50 | * This lists the InfiniPath PE800 registers, in the actual chip layout. |
| 50 | * This structure should never be directly accessed. | 51 | * This structure should never be directly accessed. |
| @@ -532,7 +533,7 @@ static int ipath_pe_boardname(struct ipath_devdata *dd, char *name, | |||
| 532 | if (n) | 533 | if (n) |
| 533 | snprintf(name, namelen, "%s", n); | 534 | snprintf(name, namelen, "%s", n); |
| 534 | 535 | ||
| 535 | if (dd->ipath_majrev != 4 || dd->ipath_minrev != 1) { | 536 | if (dd->ipath_majrev != 4 || !dd->ipath_minrev || dd->ipath_minrev>2) { |
| 536 | ipath_dev_err(dd, "Unsupported PE-800 revision %u.%u!\n", | 537 | ipath_dev_err(dd, "Unsupported PE-800 revision %u.%u!\n", |
| 537 | dd->ipath_majrev, dd->ipath_minrev); | 538 | dd->ipath_majrev, dd->ipath_minrev); |
| 538 | ret = 1; | 539 | ret = 1; |
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c index 9f8855d970c8..83e557be591e 100644 --- a/drivers/infiniband/hw/ipath/ipath_qp.c +++ b/drivers/infiniband/hw/ipath/ipath_qp.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -34,7 +35,7 @@ | |||
| 34 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 35 | 36 | ||
| 36 | #include "ipath_verbs.h" | 37 | #include "ipath_verbs.h" |
| 37 | #include "ips_common.h" | 38 | #include "ipath_common.h" |
| 38 | 39 | ||
| 39 | #define BITS_PER_PAGE (PAGE_SIZE*BITS_PER_BYTE) | 40 | #define BITS_PER_PAGE (PAGE_SIZE*BITS_PER_BYTE) |
| 40 | #define BITS_PER_PAGE_MASK (BITS_PER_PAGE-1) | 41 | #define BITS_PER_PAGE_MASK (BITS_PER_PAGE-1) |
| @@ -332,10 +333,11 @@ static void ipath_reset_qp(struct ipath_qp *qp) | |||
| 332 | qp->remote_qpn = 0; | 333 | qp->remote_qpn = 0; |
| 333 | qp->qkey = 0; | 334 | qp->qkey = 0; |
| 334 | qp->qp_access_flags = 0; | 335 | qp->qp_access_flags = 0; |
| 336 | clear_bit(IPATH_S_BUSY, &qp->s_flags); | ||
| 335 | qp->s_hdrwords = 0; | 337 | qp->s_hdrwords = 0; |
| 336 | qp->s_psn = 0; | 338 | qp->s_psn = 0; |
| 337 | qp->r_psn = 0; | 339 | qp->r_psn = 0; |
| 338 | atomic_set(&qp->msn, 0); | 340 | qp->r_msn = 0; |
| 339 | if (qp->ibqp.qp_type == IB_QPT_RC) { | 341 | if (qp->ibqp.qp_type == IB_QPT_RC) { |
| 340 | qp->s_state = IB_OPCODE_RC_SEND_LAST; | 342 | qp->s_state = IB_OPCODE_RC_SEND_LAST; |
| 341 | qp->r_state = IB_OPCODE_RC_SEND_LAST; | 343 | qp->r_state = IB_OPCODE_RC_SEND_LAST; |
| @@ -344,7 +346,8 @@ static void ipath_reset_qp(struct ipath_qp *qp) | |||
| 344 | qp->r_state = IB_OPCODE_UC_SEND_LAST; | 346 | qp->r_state = IB_OPCODE_UC_SEND_LAST; |
| 345 | } | 347 | } |
| 346 | qp->s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE; | 348 | qp->s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE; |
| 347 | qp->s_nak_state = 0; | 349 | qp->r_ack_state = IB_OPCODE_RC_ACKNOWLEDGE; |
| 350 | qp->r_nak_state = 0; | ||
| 348 | qp->s_rnr_timeout = 0; | 351 | qp->s_rnr_timeout = 0; |
| 349 | qp->s_head = 0; | 352 | qp->s_head = 0; |
| 350 | qp->s_tail = 0; | 353 | qp->s_tail = 0; |
| @@ -362,10 +365,10 @@ static void ipath_reset_qp(struct ipath_qp *qp) | |||
| 362 | * @qp: the QP to put into an error state | 365 | * @qp: the QP to put into an error state |
| 363 | * | 366 | * |
| 364 | * Flushes both send and receive work queues. | 367 | * Flushes both send and receive work queues. |
| 365 | * QP r_rq.lock and s_lock should be held. | 368 | * QP s_lock should be held and interrupts disabled. |
| 366 | */ | 369 | */ |
| 367 | 370 | ||
| 368 | static void ipath_error_qp(struct ipath_qp *qp) | 371 | void ipath_error_qp(struct ipath_qp *qp) |
| 369 | { | 372 | { |
| 370 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); | 373 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); |
| 371 | struct ib_wc wc; | 374 | struct ib_wc wc; |
| @@ -408,12 +411,14 @@ static void ipath_error_qp(struct ipath_qp *qp) | |||
| 408 | qp->s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE; | 411 | qp->s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE; |
| 409 | 412 | ||
| 410 | wc.opcode = IB_WC_RECV; | 413 | wc.opcode = IB_WC_RECV; |
| 414 | spin_lock(&qp->r_rq.lock); | ||
| 411 | while (qp->r_rq.tail != qp->r_rq.head) { | 415 | while (qp->r_rq.tail != qp->r_rq.head) { |
| 412 | wc.wr_id = get_rwqe_ptr(&qp->r_rq, qp->r_rq.tail)->wr_id; | 416 | wc.wr_id = get_rwqe_ptr(&qp->r_rq, qp->r_rq.tail)->wr_id; |
| 413 | if (++qp->r_rq.tail >= qp->r_rq.size) | 417 | if (++qp->r_rq.tail >= qp->r_rq.size) |
| 414 | qp->r_rq.tail = 0; | 418 | qp->r_rq.tail = 0; |
| 415 | ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1); | 419 | ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1); |
| 416 | } | 420 | } |
| 421 | spin_unlock(&qp->r_rq.lock); | ||
| 417 | } | 422 | } |
| 418 | 423 | ||
| 419 | /** | 424 | /** |
| @@ -433,8 +438,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, | |||
| 433 | unsigned long flags; | 438 | unsigned long flags; |
| 434 | int ret; | 439 | int ret; |
| 435 | 440 | ||
| 436 | spin_lock_irqsave(&qp->r_rq.lock, flags); | 441 | spin_lock_irqsave(&qp->s_lock, flags); |
| 437 | spin_lock(&qp->s_lock); | ||
| 438 | 442 | ||
| 439 | cur_state = attr_mask & IB_QP_CUR_STATE ? | 443 | cur_state = attr_mask & IB_QP_CUR_STATE ? |
| 440 | attr->cur_qp_state : qp->state; | 444 | attr->cur_qp_state : qp->state; |
| @@ -446,7 +450,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, | |||
| 446 | 450 | ||
| 447 | if (attr_mask & IB_QP_AV) | 451 | if (attr_mask & IB_QP_AV) |
| 448 | if (attr->ah_attr.dlid == 0 || | 452 | if (attr->ah_attr.dlid == 0 || |
| 449 | attr->ah_attr.dlid >= IPS_MULTICAST_LID_BASE) | 453 | attr->ah_attr.dlid >= IPATH_MULTICAST_LID_BASE) |
| 450 | goto inval; | 454 | goto inval; |
| 451 | 455 | ||
| 452 | if (attr_mask & IB_QP_PKEY_INDEX) | 456 | if (attr_mask & IB_QP_PKEY_INDEX) |
| @@ -505,34 +509,19 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, | |||
| 505 | } | 509 | } |
| 506 | 510 | ||
| 507 | if (attr_mask & IB_QP_MIN_RNR_TIMER) | 511 | if (attr_mask & IB_QP_MIN_RNR_TIMER) |
| 508 | qp->s_min_rnr_timer = attr->min_rnr_timer; | 512 | qp->r_min_rnr_timer = attr->min_rnr_timer; |
| 509 | 513 | ||
| 510 | if (attr_mask & IB_QP_QKEY) | 514 | if (attr_mask & IB_QP_QKEY) |
| 511 | qp->qkey = attr->qkey; | 515 | qp->qkey = attr->qkey; |
| 512 | 516 | ||
| 513 | if (attr_mask & IB_QP_PKEY_INDEX) | ||
| 514 | qp->s_pkey_index = attr->pkey_index; | ||
| 515 | |||
| 516 | qp->state = new_state; | 517 | qp->state = new_state; |
| 517 | spin_unlock(&qp->s_lock); | 518 | spin_unlock_irqrestore(&qp->s_lock, flags); |
| 518 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 519 | |||
| 520 | /* | ||
| 521 | * If QP1 changed to the RTS state, try to move to the link to INIT | ||
| 522 | * even if it was ACTIVE so the SM will reinitialize the SMA's | ||
| 523 | * state. | ||
| 524 | */ | ||
| 525 | if (qp->ibqp.qp_num == 1 && new_state == IB_QPS_RTS) { | ||
| 526 | struct ipath_ibdev *dev = to_idev(ibqp->device); | ||
| 527 | 519 | ||
| 528 | ipath_layer_set_linkstate(dev->dd, IPATH_IB_LINKDOWN); | ||
| 529 | } | ||
| 530 | ret = 0; | 520 | ret = 0; |
| 531 | goto bail; | 521 | goto bail; |
| 532 | 522 | ||
| 533 | inval: | 523 | inval: |
| 534 | spin_unlock(&qp->s_lock); | 524 | spin_unlock_irqrestore(&qp->s_lock, flags); |
| 535 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 536 | ret = -EINVAL; | 525 | ret = -EINVAL; |
| 537 | 526 | ||
| 538 | bail: | 527 | bail: |
| @@ -566,7 +555,7 @@ int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, | |||
| 566 | attr->sq_draining = 0; | 555 | attr->sq_draining = 0; |
| 567 | attr->max_rd_atomic = 1; | 556 | attr->max_rd_atomic = 1; |
| 568 | attr->max_dest_rd_atomic = 1; | 557 | attr->max_dest_rd_atomic = 1; |
| 569 | attr->min_rnr_timer = qp->s_min_rnr_timer; | 558 | attr->min_rnr_timer = qp->r_min_rnr_timer; |
| 570 | attr->port_num = 1; | 559 | attr->port_num = 1; |
| 571 | attr->timeout = 0; | 560 | attr->timeout = 0; |
| 572 | attr->retry_cnt = qp->s_retry_cnt; | 561 | attr->retry_cnt = qp->s_retry_cnt; |
| @@ -593,21 +582,17 @@ int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, | |||
| 593 | * @qp: the queue pair to compute the AETH for | 582 | * @qp: the queue pair to compute the AETH for |
| 594 | * | 583 | * |
| 595 | * Returns the AETH. | 584 | * Returns the AETH. |
| 596 | * | ||
| 597 | * The QP s_lock should be held. | ||
| 598 | */ | 585 | */ |
| 599 | __be32 ipath_compute_aeth(struct ipath_qp *qp) | 586 | __be32 ipath_compute_aeth(struct ipath_qp *qp) |
| 600 | { | 587 | { |
| 601 | u32 aeth = atomic_read(&qp->msn) & IPS_MSN_MASK; | 588 | u32 aeth = qp->r_msn & IPATH_MSN_MASK; |
| 602 | 589 | ||
| 603 | if (qp->s_nak_state) { | 590 | if (qp->ibqp.srq) { |
| 604 | aeth |= qp->s_nak_state << IPS_AETH_CREDIT_SHIFT; | ||
| 605 | } else if (qp->ibqp.srq) { | ||
| 606 | /* | 591 | /* |
| 607 | * Shared receive queues don't generate credits. | 592 | * Shared receive queues don't generate credits. |
| 608 | * Set the credit field to the invalid value. | 593 | * Set the credit field to the invalid value. |
| 609 | */ | 594 | */ |
| 610 | aeth |= IPS_AETH_CREDIT_INVAL << IPS_AETH_CREDIT_SHIFT; | 595 | aeth |= IPATH_AETH_CREDIT_INVAL << IPATH_AETH_CREDIT_SHIFT; |
| 611 | } else { | 596 | } else { |
| 612 | u32 min, max, x; | 597 | u32 min, max, x; |
| 613 | u32 credits; | 598 | u32 credits; |
| @@ -637,7 +622,7 @@ __be32 ipath_compute_aeth(struct ipath_qp *qp) | |||
| 637 | else | 622 | else |
| 638 | min = x; | 623 | min = x; |
| 639 | } | 624 | } |
| 640 | aeth |= x << IPS_AETH_CREDIT_SHIFT; | 625 | aeth |= x << IPATH_AETH_CREDIT_SHIFT; |
| 641 | } | 626 | } |
| 642 | return cpu_to_be32(aeth); | 627 | return cpu_to_be32(aeth); |
| 643 | } | 628 | } |
| @@ -663,12 +648,22 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, | |||
| 663 | size_t sz; | 648 | size_t sz; |
| 664 | struct ib_qp *ret; | 649 | struct ib_qp *ret; |
| 665 | 650 | ||
| 666 | if (init_attr->cap.max_send_sge > 255 || | 651 | if (init_attr->cap.max_send_sge > ib_ipath_max_sges || |
| 667 | init_attr->cap.max_recv_sge > 255) { | 652 | init_attr->cap.max_recv_sge > ib_ipath_max_sges || |
| 653 | init_attr->cap.max_send_wr > ib_ipath_max_qp_wrs || | ||
| 654 | init_attr->cap.max_recv_wr > ib_ipath_max_qp_wrs) { | ||
| 668 | ret = ERR_PTR(-ENOMEM); | 655 | ret = ERR_PTR(-ENOMEM); |
| 669 | goto bail; | 656 | goto bail; |
| 670 | } | 657 | } |
| 671 | 658 | ||
| 659 | if (init_attr->cap.max_send_sge + | ||
| 660 | init_attr->cap.max_recv_sge + | ||
| 661 | init_attr->cap.max_send_wr + | ||
| 662 | init_attr->cap.max_recv_wr == 0) { | ||
| 663 | ret = ERR_PTR(-EINVAL); | ||
| 664 | goto bail; | ||
| 665 | } | ||
| 666 | |||
| 672 | switch (init_attr->qp_type) { | 667 | switch (init_attr->qp_type) { |
| 673 | case IB_QPT_UC: | 668 | case IB_QPT_UC: |
| 674 | case IB_QPT_RC: | 669 | case IB_QPT_RC: |
| @@ -686,18 +681,26 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, | |||
| 686 | case IB_QPT_GSI: | 681 | case IB_QPT_GSI: |
| 687 | qp = kmalloc(sizeof(*qp), GFP_KERNEL); | 682 | qp = kmalloc(sizeof(*qp), GFP_KERNEL); |
| 688 | if (!qp) { | 683 | if (!qp) { |
| 684 | vfree(swq); | ||
| 689 | ret = ERR_PTR(-ENOMEM); | 685 | ret = ERR_PTR(-ENOMEM); |
| 690 | goto bail; | 686 | goto bail; |
| 691 | } | 687 | } |
| 692 | qp->r_rq.size = init_attr->cap.max_recv_wr + 1; | 688 | if (init_attr->srq) { |
| 693 | sz = sizeof(struct ipath_sge) * | 689 | qp->r_rq.size = 0; |
| 694 | init_attr->cap.max_recv_sge + | 690 | qp->r_rq.max_sge = 0; |
| 695 | sizeof(struct ipath_rwqe); | 691 | qp->r_rq.wq = NULL; |
| 696 | qp->r_rq.wq = vmalloc(qp->r_rq.size * sz); | 692 | } else { |
| 697 | if (!qp->r_rq.wq) { | 693 | qp->r_rq.size = init_attr->cap.max_recv_wr + 1; |
| 698 | kfree(qp); | 694 | qp->r_rq.max_sge = init_attr->cap.max_recv_sge; |
| 699 | ret = ERR_PTR(-ENOMEM); | 695 | sz = (sizeof(struct ipath_sge) * qp->r_rq.max_sge) + |
| 700 | goto bail; | 696 | sizeof(struct ipath_rwqe); |
| 697 | qp->r_rq.wq = vmalloc(qp->r_rq.size * sz); | ||
| 698 | if (!qp->r_rq.wq) { | ||
| 699 | kfree(qp); | ||
| 700 | vfree(swq); | ||
| 701 | ret = ERR_PTR(-ENOMEM); | ||
| 702 | goto bail; | ||
| 703 | } | ||
| 701 | } | 704 | } |
| 702 | 705 | ||
| 703 | /* | 706 | /* |
| @@ -708,9 +711,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, | |||
| 708 | spin_lock_init(&qp->r_rq.lock); | 711 | spin_lock_init(&qp->r_rq.lock); |
| 709 | atomic_set(&qp->refcount, 0); | 712 | atomic_set(&qp->refcount, 0); |
| 710 | init_waitqueue_head(&qp->wait); | 713 | init_waitqueue_head(&qp->wait); |
| 711 | tasklet_init(&qp->s_task, | 714 | tasklet_init(&qp->s_task, ipath_do_ruc_send, |
| 712 | init_attr->qp_type == IB_QPT_RC ? | ||
| 713 | ipath_do_rc_send : ipath_do_uc_send, | ||
| 714 | (unsigned long)qp); | 715 | (unsigned long)qp); |
| 715 | INIT_LIST_HEAD(&qp->piowait); | 716 | INIT_LIST_HEAD(&qp->piowait); |
| 716 | INIT_LIST_HEAD(&qp->timerwait); | 717 | INIT_LIST_HEAD(&qp->timerwait); |
| @@ -718,7 +719,6 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, | |||
| 718 | qp->s_wq = swq; | 719 | qp->s_wq = swq; |
| 719 | qp->s_size = init_attr->cap.max_send_wr + 1; | 720 | qp->s_size = init_attr->cap.max_send_wr + 1; |
| 720 | qp->s_max_sge = init_attr->cap.max_send_sge; | 721 | qp->s_max_sge = init_attr->cap.max_send_sge; |
| 721 | qp->r_rq.max_sge = init_attr->cap.max_recv_sge; | ||
| 722 | qp->s_flags = init_attr->sq_sig_type == IB_SIGNAL_REQ_WR ? | 722 | qp->s_flags = init_attr->sq_sig_type == IB_SIGNAL_REQ_WR ? |
| 723 | 1 << IPATH_S_SIGNAL_REQ_WR : 0; | 723 | 1 << IPATH_S_SIGNAL_REQ_WR : 0; |
| 724 | dev = to_idev(ibpd->device); | 724 | dev = to_idev(ibpd->device); |
| @@ -888,18 +888,18 @@ void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc) | |||
| 888 | */ | 888 | */ |
| 889 | void ipath_get_credit(struct ipath_qp *qp, u32 aeth) | 889 | void ipath_get_credit(struct ipath_qp *qp, u32 aeth) |
| 890 | { | 890 | { |
| 891 | u32 credit = (aeth >> IPS_AETH_CREDIT_SHIFT) & IPS_AETH_CREDIT_MASK; | 891 | u32 credit = (aeth >> IPATH_AETH_CREDIT_SHIFT) & IPATH_AETH_CREDIT_MASK; |
| 892 | 892 | ||
| 893 | /* | 893 | /* |
| 894 | * If the credit is invalid, we can send | 894 | * If the credit is invalid, we can send |
| 895 | * as many packets as we like. Otherwise, we have to | 895 | * as many packets as we like. Otherwise, we have to |
| 896 | * honor the credit field. | 896 | * honor the credit field. |
| 897 | */ | 897 | */ |
| 898 | if (credit == IPS_AETH_CREDIT_INVAL) { | 898 | if (credit == IPATH_AETH_CREDIT_INVAL) |
| 899 | qp->s_lsn = (u32) -1; | 899 | qp->s_lsn = (u32) -1; |
| 900 | } else if (qp->s_lsn != (u32) -1) { | 900 | else if (qp->s_lsn != (u32) -1) { |
| 901 | /* Compute new LSN (i.e., MSN + credit) */ | 901 | /* Compute new LSN (i.e., MSN + credit) */ |
| 902 | credit = (aeth + credit_table[credit]) & IPS_MSN_MASK; | 902 | credit = (aeth + credit_table[credit]) & IPATH_MSN_MASK; |
| 903 | if (ipath_cmp24(credit, qp->s_lsn) > 0) | 903 | if (ipath_cmp24(credit, qp->s_lsn) > 0) |
| 904 | qp->s_lsn = credit; | 904 | qp->s_lsn = credit; |
| 905 | } | 905 | } |
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c index 493b1821a934..774d1615ce2f 100644 --- a/drivers/infiniband/hw/ipath/ipath_rc.c +++ b/drivers/infiniband/hw/ipath/ipath_rc.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -31,7 +32,7 @@ | |||
| 31 | */ | 32 | */ |
| 32 | 33 | ||
| 33 | #include "ipath_verbs.h" | 34 | #include "ipath_verbs.h" |
| 34 | #include "ips_common.h" | 35 | #include "ipath_common.h" |
| 35 | 36 | ||
| 36 | /* cut down ridiculously long IB macro names */ | 37 | /* cut down ridiculously long IB macro names */ |
| 37 | #define OP(x) IB_OPCODE_RC_##x | 38 | #define OP(x) IB_OPCODE_RC_##x |
| @@ -41,14 +42,14 @@ | |||
| 41 | * @qp: the QP who's SGE we're restarting | 42 | * @qp: the QP who's SGE we're restarting |
| 42 | * @wqe: the work queue to initialize the QP's SGE from | 43 | * @wqe: the work queue to initialize the QP's SGE from |
| 43 | * | 44 | * |
| 44 | * The QP s_lock should be held. | 45 | * The QP s_lock should be held and interrupts disabled. |
| 45 | */ | 46 | */ |
| 46 | static void ipath_init_restart(struct ipath_qp *qp, struct ipath_swqe *wqe) | 47 | static void ipath_init_restart(struct ipath_qp *qp, struct ipath_swqe *wqe) |
| 47 | { | 48 | { |
| 48 | struct ipath_ibdev *dev; | 49 | struct ipath_ibdev *dev; |
| 49 | u32 len; | 50 | u32 len; |
| 50 | 51 | ||
| 51 | len = ((qp->s_psn - wqe->psn) & IPS_PSN_MASK) * | 52 | len = ((qp->s_psn - wqe->psn) & IPATH_PSN_MASK) * |
| 52 | ib_mtu_enum_to_int(qp->path_mtu); | 53 | ib_mtu_enum_to_int(qp->path_mtu); |
| 53 | qp->s_sge.sge = wqe->sg_list[0]; | 54 | qp->s_sge.sge = wqe->sg_list[0]; |
| 54 | qp->s_sge.sg_list = wqe->sg_list + 1; | 55 | qp->s_sge.sg_list = wqe->sg_list + 1; |
| @@ -72,11 +73,10 @@ static void ipath_init_restart(struct ipath_qp *qp, struct ipath_swqe *wqe) | |||
| 72 | * Return bth0 if constructed; otherwise, return 0. | 73 | * Return bth0 if constructed; otherwise, return 0. |
| 73 | * Note the QP s_lock must be held. | 74 | * Note the QP s_lock must be held. |
| 74 | */ | 75 | */ |
| 75 | static inline u32 ipath_make_rc_ack(struct ipath_qp *qp, | 76 | u32 ipath_make_rc_ack(struct ipath_qp *qp, |
| 76 | struct ipath_other_headers *ohdr, | 77 | struct ipath_other_headers *ohdr, |
| 77 | u32 pmtu) | 78 | u32 pmtu) |
| 78 | { | 79 | { |
| 79 | struct ipath_sge_state *ss; | ||
| 80 | u32 hwords; | 80 | u32 hwords; |
| 81 | u32 len; | 81 | u32 len; |
| 82 | u32 bth0; | 82 | u32 bth0; |
| @@ -90,13 +90,12 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp, | |||
| 90 | */ | 90 | */ |
| 91 | switch (qp->s_ack_state) { | 91 | switch (qp->s_ack_state) { |
| 92 | case OP(RDMA_READ_REQUEST): | 92 | case OP(RDMA_READ_REQUEST): |
| 93 | ss = &qp->s_rdma_sge; | 93 | qp->s_cur_sge = &qp->s_rdma_sge; |
| 94 | len = qp->s_rdma_len; | 94 | len = qp->s_rdma_len; |
| 95 | if (len > pmtu) { | 95 | if (len > pmtu) { |
| 96 | len = pmtu; | 96 | len = pmtu; |
| 97 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_FIRST); | 97 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_FIRST); |
| 98 | } | 98 | } else |
| 99 | else | ||
| 100 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_ONLY); | 99 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_ONLY); |
| 101 | qp->s_rdma_len -= len; | 100 | qp->s_rdma_len -= len; |
| 102 | bth0 = qp->s_ack_state << 24; | 101 | bth0 = qp->s_ack_state << 24; |
| @@ -108,7 +107,7 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp, | |||
| 108 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_MIDDLE); | 107 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_MIDDLE); |
| 109 | /* FALLTHROUGH */ | 108 | /* FALLTHROUGH */ |
| 110 | case OP(RDMA_READ_RESPONSE_MIDDLE): | 109 | case OP(RDMA_READ_RESPONSE_MIDDLE): |
| 111 | ss = &qp->s_rdma_sge; | 110 | qp->s_cur_sge = &qp->s_rdma_sge; |
| 112 | len = qp->s_rdma_len; | 111 | len = qp->s_rdma_len; |
| 113 | if (len > pmtu) | 112 | if (len > pmtu) |
| 114 | len = pmtu; | 113 | len = pmtu; |
| @@ -127,41 +126,50 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp, | |||
| 127 | * We have to prevent new requests from changing | 126 | * We have to prevent new requests from changing |
| 128 | * the r_sge state while a ipath_verbs_send() | 127 | * the r_sge state while a ipath_verbs_send() |
| 129 | * is in progress. | 128 | * is in progress. |
| 130 | * Changing r_state allows the receiver | ||
| 131 | * to continue processing new packets. | ||
| 132 | * We do it here now instead of above so | ||
| 133 | * that we are sure the packet was sent before | ||
| 134 | * changing the state. | ||
| 135 | */ | 129 | */ |
| 136 | qp->r_state = OP(RDMA_READ_RESPONSE_LAST); | ||
| 137 | qp->s_ack_state = OP(ACKNOWLEDGE); | 130 | qp->s_ack_state = OP(ACKNOWLEDGE); |
| 138 | return 0; | 131 | bth0 = 0; |
| 132 | goto bail; | ||
| 139 | 133 | ||
| 140 | case OP(COMPARE_SWAP): | 134 | case OP(COMPARE_SWAP): |
| 141 | case OP(FETCH_ADD): | 135 | case OP(FETCH_ADD): |
| 142 | ss = NULL; | 136 | qp->s_cur_sge = NULL; |
| 143 | len = 0; | 137 | len = 0; |
| 144 | qp->r_state = OP(SEND_LAST); | 138 | /* |
| 145 | qp->s_ack_state = OP(ACKNOWLEDGE); | 139 | * Set the s_ack_state so the receive interrupt handler |
| 146 | bth0 = IB_OPCODE_ATOMIC_ACKNOWLEDGE << 24; | 140 | * won't try to send an ACK (out of order) until this one |
| 141 | * is actually sent. | ||
| 142 | */ | ||
| 143 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_LAST); | ||
| 144 | bth0 = OP(ATOMIC_ACKNOWLEDGE) << 24; | ||
| 147 | ohdr->u.at.aeth = ipath_compute_aeth(qp); | 145 | ohdr->u.at.aeth = ipath_compute_aeth(qp); |
| 148 | ohdr->u.at.atomic_ack_eth = cpu_to_be64(qp->s_ack_atomic); | 146 | ohdr->u.at.atomic_ack_eth = cpu_to_be64(qp->r_atomic_data); |
| 149 | hwords += sizeof(ohdr->u.at) / 4; | 147 | hwords += sizeof(ohdr->u.at) / 4; |
| 150 | break; | 148 | break; |
| 151 | 149 | ||
| 152 | default: | 150 | default: |
| 153 | /* Send a regular ACK. */ | 151 | /* Send a regular ACK. */ |
| 154 | ss = NULL; | 152 | qp->s_cur_sge = NULL; |
| 155 | len = 0; | 153 | len = 0; |
| 156 | qp->s_ack_state = OP(ACKNOWLEDGE); | 154 | /* |
| 157 | bth0 = qp->s_ack_state << 24; | 155 | * Set the s_ack_state so the receive interrupt handler |
| 158 | ohdr->u.aeth = ipath_compute_aeth(qp); | 156 | * won't try to send an ACK (out of order) until this one |
| 157 | * is actually sent. | ||
| 158 | */ | ||
| 159 | qp->s_ack_state = OP(RDMA_READ_RESPONSE_LAST); | ||
| 160 | bth0 = OP(ACKNOWLEDGE) << 24; | ||
| 161 | if (qp->s_nak_state) | ||
| 162 | ohdr->u.aeth = cpu_to_be32((qp->r_msn & IPATH_MSN_MASK) | | ||
| 163 | (qp->s_nak_state << | ||
| 164 | IPATH_AETH_CREDIT_SHIFT)); | ||
| 165 | else | ||
| 166 | ohdr->u.aeth = ipath_compute_aeth(qp); | ||
| 159 | hwords++; | 167 | hwords++; |
| 160 | } | 168 | } |
| 161 | qp->s_hdrwords = hwords; | 169 | qp->s_hdrwords = hwords; |
| 162 | qp->s_cur_sge = ss; | ||
| 163 | qp->s_cur_size = len; | 170 | qp->s_cur_size = len; |
| 164 | 171 | ||
| 172 | bail: | ||
| 165 | return bth0; | 173 | return bth0; |
| 166 | } | 174 | } |
| 167 | 175 | ||
| @@ -174,11 +182,11 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp, | |||
| 174 | * @bth2p: pointer to the BTH PSN word | 182 | * @bth2p: pointer to the BTH PSN word |
| 175 | * | 183 | * |
| 176 | * Return 1 if constructed; otherwise, return 0. | 184 | * Return 1 if constructed; otherwise, return 0. |
| 177 | * Note the QP s_lock must be held. | 185 | * Note the QP s_lock must be held and interrupts disabled. |
| 178 | */ | 186 | */ |
| 179 | static inline int ipath_make_rc_req(struct ipath_qp *qp, | 187 | int ipath_make_rc_req(struct ipath_qp *qp, |
| 180 | struct ipath_other_headers *ohdr, | 188 | struct ipath_other_headers *ohdr, |
| 181 | u32 pmtu, u32 *bth0p, u32 *bth2p) | 189 | u32 pmtu, u32 *bth0p, u32 *bth2p) |
| 182 | { | 190 | { |
| 183 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); | 191 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); |
| 184 | struct ipath_sge_state *ss; | 192 | struct ipath_sge_state *ss; |
| @@ -257,7 +265,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 257 | break; | 265 | break; |
| 258 | 266 | ||
| 259 | case IB_WR_RDMA_WRITE: | 267 | case IB_WR_RDMA_WRITE: |
| 260 | if (newreq) | 268 | if (newreq && qp->s_lsn != (u32) -1) |
| 261 | qp->s_lsn++; | 269 | qp->s_lsn++; |
| 262 | /* FALLTHROUGH */ | 270 | /* FALLTHROUGH */ |
| 263 | case IB_WR_RDMA_WRITE_WITH_IMM: | 271 | case IB_WR_RDMA_WRITE_WITH_IMM: |
| @@ -283,8 +291,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 283 | else { | 291 | else { |
| 284 | qp->s_state = | 292 | qp->s_state = |
| 285 | OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE); | 293 | OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE); |
| 286 | /* Immediate data comes | 294 | /* Immediate data comes after RETH */ |
| 287 | * after RETH */ | ||
| 288 | ohdr->u.rc.imm_data = wqe->wr.imm_data; | 295 | ohdr->u.rc.imm_data = wqe->wr.imm_data; |
| 289 | hwords += 1; | 296 | hwords += 1; |
| 290 | if (wqe->wr.send_flags & IB_SEND_SOLICITED) | 297 | if (wqe->wr.send_flags & IB_SEND_SOLICITED) |
| @@ -304,7 +311,8 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 304 | qp->s_state = OP(RDMA_READ_REQUEST); | 311 | qp->s_state = OP(RDMA_READ_REQUEST); |
| 305 | hwords += sizeof(ohdr->u.rc.reth) / 4; | 312 | hwords += sizeof(ohdr->u.rc.reth) / 4; |
| 306 | if (newreq) { | 313 | if (newreq) { |
| 307 | qp->s_lsn++; | 314 | if (qp->s_lsn != (u32) -1) |
| 315 | qp->s_lsn++; | ||
| 308 | /* | 316 | /* |
| 309 | * Adjust s_next_psn to count the | 317 | * Adjust s_next_psn to count the |
| 310 | * expected number of responses. | 318 | * expected number of responses. |
| @@ -335,7 +343,8 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 335 | wqe->wr.wr.atomic.compare_add); | 343 | wqe->wr.wr.atomic.compare_add); |
| 336 | hwords += sizeof(struct ib_atomic_eth) / 4; | 344 | hwords += sizeof(struct ib_atomic_eth) / 4; |
| 337 | if (newreq) { | 345 | if (newreq) { |
| 338 | qp->s_lsn++; | 346 | if (qp->s_lsn != (u32) -1) |
| 347 | qp->s_lsn++; | ||
| 339 | wqe->lpsn = wqe->psn; | 348 | wqe->lpsn = wqe->psn; |
| 340 | } | 349 | } |
| 341 | if (++qp->s_cur == qp->s_size) | 350 | if (++qp->s_cur == qp->s_size) |
| @@ -352,9 +361,14 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 352 | if (qp->s_tail >= qp->s_size) | 361 | if (qp->s_tail >= qp->s_size) |
| 353 | qp->s_tail = 0; | 362 | qp->s_tail = 0; |
| 354 | } | 363 | } |
| 355 | bth2 |= qp->s_psn++ & IPS_PSN_MASK; | 364 | bth2 |= qp->s_psn++ & IPATH_PSN_MASK; |
| 356 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) | 365 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) |
| 357 | qp->s_next_psn = qp->s_psn; | 366 | qp->s_next_psn = qp->s_psn; |
| 367 | /* | ||
| 368 | * Put the QP on the pending list so lost ACKs will cause | ||
| 369 | * a retry. More than one request can be pending so the | ||
| 370 | * QP may already be on the dev->pending list. | ||
| 371 | */ | ||
| 358 | spin_lock(&dev->pending_lock); | 372 | spin_lock(&dev->pending_lock); |
| 359 | if (list_empty(&qp->timerwait)) | 373 | if (list_empty(&qp->timerwait)) |
| 360 | list_add_tail(&qp->timerwait, | 374 | list_add_tail(&qp->timerwait, |
| @@ -364,8 +378,8 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 364 | 378 | ||
| 365 | case OP(RDMA_READ_RESPONSE_FIRST): | 379 | case OP(RDMA_READ_RESPONSE_FIRST): |
| 366 | /* | 380 | /* |
| 367 | * This case can only happen if a send is restarted. See | 381 | * This case can only happen if a send is restarted. |
| 368 | * ipath_restart_rc(). | 382 | * See ipath_restart_rc(). |
| 369 | */ | 383 | */ |
| 370 | ipath_init_restart(qp, wqe); | 384 | ipath_init_restart(qp, wqe); |
| 371 | /* FALLTHROUGH */ | 385 | /* FALLTHROUGH */ |
| @@ -373,7 +387,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 373 | qp->s_state = OP(SEND_MIDDLE); | 387 | qp->s_state = OP(SEND_MIDDLE); |
| 374 | /* FALLTHROUGH */ | 388 | /* FALLTHROUGH */ |
| 375 | case OP(SEND_MIDDLE): | 389 | case OP(SEND_MIDDLE): |
| 376 | bth2 = qp->s_psn++ & IPS_PSN_MASK; | 390 | bth2 = qp->s_psn++ & IPATH_PSN_MASK; |
| 377 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) | 391 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) |
| 378 | qp->s_next_psn = qp->s_psn; | 392 | qp->s_next_psn = qp->s_psn; |
| 379 | ss = &qp->s_sge; | 393 | ss = &qp->s_sge; |
| @@ -415,7 +429,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 415 | qp->s_state = OP(RDMA_WRITE_MIDDLE); | 429 | qp->s_state = OP(RDMA_WRITE_MIDDLE); |
| 416 | /* FALLTHROUGH */ | 430 | /* FALLTHROUGH */ |
| 417 | case OP(RDMA_WRITE_MIDDLE): | 431 | case OP(RDMA_WRITE_MIDDLE): |
| 418 | bth2 = qp->s_psn++ & IPS_PSN_MASK; | 432 | bth2 = qp->s_psn++ & IPATH_PSN_MASK; |
| 419 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) | 433 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) |
| 420 | qp->s_next_psn = qp->s_psn; | 434 | qp->s_next_psn = qp->s_psn; |
| 421 | ss = &qp->s_sge; | 435 | ss = &qp->s_sge; |
| @@ -452,7 +466,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 452 | * See ipath_restart_rc(). | 466 | * See ipath_restart_rc(). |
| 453 | */ | 467 | */ |
| 454 | ipath_init_restart(qp, wqe); | 468 | ipath_init_restart(qp, wqe); |
| 455 | len = ((qp->s_psn - wqe->psn) & IPS_PSN_MASK) * pmtu; | 469 | len = ((qp->s_psn - wqe->psn) & IPATH_PSN_MASK) * pmtu; |
| 456 | ohdr->u.rc.reth.vaddr = | 470 | ohdr->u.rc.reth.vaddr = |
| 457 | cpu_to_be64(wqe->wr.wr.rdma.remote_addr + len); | 471 | cpu_to_be64(wqe->wr.wr.rdma.remote_addr + len); |
| 458 | ohdr->u.rc.reth.rkey = | 472 | ohdr->u.rc.reth.rkey = |
| @@ -460,7 +474,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp, | |||
| 460 | ohdr->u.rc.reth.length = cpu_to_be32(qp->s_len); | 474 | ohdr->u.rc.reth.length = cpu_to_be32(qp->s_len); |
| 461 | qp->s_state = OP(RDMA_READ_REQUEST); | 475 | qp->s_state = OP(RDMA_READ_REQUEST); |
| 462 | hwords += sizeof(ohdr->u.rc.reth) / 4; | 476 | hwords += sizeof(ohdr->u.rc.reth) / 4; |
| 463 | bth2 = qp->s_psn++ & IPS_PSN_MASK; | 477 | bth2 = qp->s_psn++ & IPATH_PSN_MASK; |
| 464 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) | 478 | if ((int)(qp->s_psn - qp->s_next_psn) > 0) |
| 465 | qp->s_next_psn = qp->s_psn; | 479 | qp->s_next_psn = qp->s_psn; |
| 466 | ss = NULL; | 480 | ss = NULL; |
| @@ -496,189 +510,169 @@ done: | |||
| 496 | return 0; | 510 | return 0; |
| 497 | } | 511 | } |
| 498 | 512 | ||
| 499 | static inline void ipath_make_rc_grh(struct ipath_qp *qp, | ||
| 500 | struct ib_global_route *grh, | ||
| 501 | u32 nwords) | ||
| 502 | { | ||
| 503 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); | ||
| 504 | |||
| 505 | /* GRH header size in 32-bit words. */ | ||
| 506 | qp->s_hdrwords += 10; | ||
| 507 | qp->s_hdr.u.l.grh.version_tclass_flow = | ||
| 508 | cpu_to_be32((6 << 28) | | ||
| 509 | (grh->traffic_class << 20) | | ||
| 510 | grh->flow_label); | ||
| 511 | qp->s_hdr.u.l.grh.paylen = | ||
| 512 | cpu_to_be16(((qp->s_hdrwords - 12) + nwords + | ||
| 513 | SIZE_OF_CRC) << 2); | ||
| 514 | /* next_hdr is defined by C8-7 in ch. 8.4.1 */ | ||
| 515 | qp->s_hdr.u.l.grh.next_hdr = 0x1B; | ||
| 516 | qp->s_hdr.u.l.grh.hop_limit = grh->hop_limit; | ||
| 517 | /* The SGID is 32-bit aligned. */ | ||
| 518 | qp->s_hdr.u.l.grh.sgid.global.subnet_prefix = dev->gid_prefix; | ||
| 519 | qp->s_hdr.u.l.grh.sgid.global.interface_id = | ||
| 520 | ipath_layer_get_guid(dev->dd); | ||
| 521 | qp->s_hdr.u.l.grh.dgid = grh->dgid; | ||
| 522 | } | ||
| 523 | |||
| 524 | /** | 513 | /** |
| 525 | * ipath_do_rc_send - perform a send on an RC QP | 514 | * send_rc_ack - Construct an ACK packet and send it |
| 526 | * @data: contains a pointer to the QP | 515 | * @qp: a pointer to the QP |
| 527 | * | 516 | * |
| 528 | * Process entries in the send work queue until credit or queue is | 517 | * This is called from ipath_rc_rcv() and only uses the receive |
| 529 | * exhausted. Only allow one CPU to send a packet per QP (tasklet). | 518 | * side QP state. |
| 530 | * Otherwise, after we drop the QP s_lock, two threads could send | 519 | * Note that RDMA reads are handled in the send side QP state and tasklet. |
| 531 | * packets out of order. | ||
| 532 | */ | 520 | */ |
| 533 | void ipath_do_rc_send(unsigned long data) | 521 | static void send_rc_ack(struct ipath_qp *qp) |
| 534 | { | 522 | { |
| 535 | struct ipath_qp *qp = (struct ipath_qp *)data; | ||
| 536 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); | 523 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); |
| 537 | unsigned long flags; | ||
| 538 | u16 lrh0; | 524 | u16 lrh0; |
| 539 | u32 nwords; | ||
| 540 | u32 extra_bytes; | ||
| 541 | u32 bth0; | 525 | u32 bth0; |
| 542 | u32 bth2; | 526 | u32 hwords; |
| 543 | u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu); | 527 | struct ipath_ib_header hdr; |
| 544 | struct ipath_other_headers *ohdr; | 528 | struct ipath_other_headers *ohdr; |
| 545 | 529 | ||
| 546 | if (test_and_set_bit(IPATH_S_BUSY, &qp->s_flags)) | ||
| 547 | goto bail; | ||
| 548 | |||
| 549 | if (unlikely(qp->remote_ah_attr.dlid == | ||
| 550 | ipath_layer_get_lid(dev->dd))) { | ||
| 551 | struct ib_wc wc; | ||
| 552 | |||
| 553 | /* | ||
| 554 | * Pass in an uninitialized ib_wc to be consistent with | ||
| 555 | * other places where ipath_ruc_loopback() is called. | ||
| 556 | */ | ||
| 557 | ipath_ruc_loopback(qp, &wc); | ||
| 558 | goto clear; | ||
| 559 | } | ||
| 560 | |||
| 561 | ohdr = &qp->s_hdr.u.oth; | ||
| 562 | if (qp->remote_ah_attr.ah_flags & IB_AH_GRH) | ||
| 563 | ohdr = &qp->s_hdr.u.l.oth; | ||
| 564 | |||
| 565 | again: | ||
| 566 | /* Check for a constructed packet to be sent. */ | ||
| 567 | if (qp->s_hdrwords != 0) { | ||
| 568 | /* | ||
| 569 | * If no PIO bufs are available, return. An interrupt will | ||
| 570 | * call ipath_ib_piobufavail() when one is available. | ||
| 571 | */ | ||
| 572 | _VERBS_INFO("h %u %p\n", qp->s_hdrwords, &qp->s_hdr); | ||
| 573 | _VERBS_INFO("d %u %p %u %p %u %u %u %u\n", qp->s_cur_size, | ||
| 574 | qp->s_cur_sge->sg_list, | ||
| 575 | qp->s_cur_sge->num_sge, | ||
| 576 | qp->s_cur_sge->sge.vaddr, | ||
| 577 | qp->s_cur_sge->sge.sge_length, | ||
| 578 | qp->s_cur_sge->sge.length, | ||
| 579 | qp->s_cur_sge->sge.m, | ||
| 580 | qp->s_cur_sge->sge.n); | ||
| 581 | if (ipath_verbs_send(dev->dd, qp->s_hdrwords, | ||
| 582 | (u32 *) &qp->s_hdr, qp->s_cur_size, | ||
| 583 | qp->s_cur_sge)) { | ||
| 584 | ipath_no_bufs_available(qp, dev); | ||
| 585 | goto bail; | ||
| 586 | } | ||
| 587 | dev->n_unicast_xmit++; | ||
| 588 | /* Record that we sent the packet and s_hdr is empty. */ | ||
| 589 | qp->s_hdrwords = 0; | ||
| 590 | } | ||
| 591 | |||
| 592 | /* | ||
| 593 | * The lock is needed to synchronize between setting | ||
| 594 | * qp->s_ack_state, resend timer, and post_send(). | ||
| 595 | */ | ||
| 596 | spin_lock_irqsave(&qp->s_lock, flags); | ||
| 597 | |||
| 598 | /* Sending responses has higher priority over sending requests. */ | ||
| 599 | if (qp->s_ack_state != OP(ACKNOWLEDGE) && | ||
| 600 | (bth0 = ipath_make_rc_ack(qp, ohdr, pmtu)) != 0) | ||
| 601 | bth2 = qp->s_ack_psn++ & IPS_PSN_MASK; | ||
| 602 | else if (!ipath_make_rc_req(qp, ohdr, pmtu, &bth0, &bth2)) | ||
| 603 | goto done; | ||
| 604 | |||
| 605 | spin_unlock_irqrestore(&qp->s_lock, flags); | ||
| 606 | |||
| 607 | /* Construct the header. */ | 530 | /* Construct the header. */ |
| 608 | extra_bytes = (4 - qp->s_cur_size) & 3; | 531 | ohdr = &hdr.u.oth; |
| 609 | nwords = (qp->s_cur_size + extra_bytes) >> 2; | 532 | lrh0 = IPATH_LRH_BTH; |
| 610 | lrh0 = IPS_LRH_BTH; | 533 | /* header size in 32-bit words LRH+BTH+AETH = (8+12+4)/4. */ |
| 534 | hwords = 6; | ||
| 611 | if (unlikely(qp->remote_ah_attr.ah_flags & IB_AH_GRH)) { | 535 | if (unlikely(qp->remote_ah_attr.ah_flags & IB_AH_GRH)) { |
| 612 | ipath_make_rc_grh(qp, &qp->remote_ah_attr.grh, nwords); | 536 | hwords += ipath_make_grh(dev, &hdr.u.l.grh, |
| 613 | lrh0 = IPS_LRH_GRH; | 537 | &qp->remote_ah_attr.grh, |
| 538 | hwords, 0); | ||
| 539 | ohdr = &hdr.u.l.oth; | ||
| 540 | lrh0 = IPATH_LRH_GRH; | ||
| 614 | } | 541 | } |
| 542 | /* read pkey_index w/o lock (its atomic) */ | ||
| 543 | bth0 = ipath_layer_get_pkey(dev->dd, qp->s_pkey_index); | ||
| 544 | if (qp->r_nak_state) | ||
| 545 | ohdr->u.aeth = cpu_to_be32((qp->r_msn & IPATH_MSN_MASK) | | ||
| 546 | (qp->r_nak_state << | ||
| 547 | IPATH_AETH_CREDIT_SHIFT)); | ||
| 548 | else | ||
| 549 | ohdr->u.aeth = ipath_compute_aeth(qp); | ||
| 550 | if (qp->r_ack_state >= OP(COMPARE_SWAP)) { | ||
| 551 | bth0 |= OP(ATOMIC_ACKNOWLEDGE) << 24; | ||
| 552 | ohdr->u.at.atomic_ack_eth = cpu_to_be64(qp->r_atomic_data); | ||
| 553 | hwords += sizeof(ohdr->u.at.atomic_ack_eth) / 4; | ||
| 554 | } else | ||
| 555 | bth0 |= OP(ACKNOWLEDGE) << 24; | ||
| 615 | lrh0 |= qp->remote_ah_attr.sl << 4; | 556 | lrh0 |= qp->remote_ah_attr.sl << 4; |
| 616 | qp->s_hdr.lrh[0] = cpu_to_be16(lrh0); | 557 | hdr.lrh[0] = cpu_to_be16(lrh0); |
| 617 | qp->s_hdr.lrh[1] = cpu_to_be16(qp->remote_ah_attr.dlid); | 558 | hdr.lrh[1] = cpu_to_be16(qp->remote_ah_attr.dlid); |
| 618 | qp->s_hdr.lrh[2] = cpu_to_be16(qp->s_hdrwords + nwords + | 559 | hdr.lrh[2] = cpu_to_be16(hwords + SIZE_OF_CRC); |
| 619 | SIZE_OF_CRC); | 560 | hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev->dd)); |
| 620 | qp->s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev->dd)); | ||
| 621 | bth0 |= ipath_layer_get_pkey(dev->dd, qp->s_pkey_index); | ||
| 622 | bth0 |= extra_bytes << 20; | ||
| 623 | ohdr->bth[0] = cpu_to_be32(bth0); | 561 | ohdr->bth[0] = cpu_to_be32(bth0); |
| 624 | ohdr->bth[1] = cpu_to_be32(qp->remote_qpn); | 562 | ohdr->bth[1] = cpu_to_be32(qp->remote_qpn); |
| 625 | ohdr->bth[2] = cpu_to_be32(bth2); | 563 | ohdr->bth[2] = cpu_to_be32(qp->r_ack_psn & IPATH_PSN_MASK); |
| 626 | 564 | ||
| 627 | /* Check for more work to do. */ | 565 | /* |
| 628 | goto again; | 566 | * If we can send the ACK, clear the ACK state. |
| 567 | */ | ||
| 568 | if (ipath_verbs_send(dev->dd, hwords, (u32 *) &hdr, 0, NULL) == 0) { | ||
| 569 | qp->r_ack_state = OP(ACKNOWLEDGE); | ||
| 570 | dev->n_unicast_xmit++; | ||
| 571 | } else { | ||
| 572 | /* | ||
| 573 | * We are out of PIO buffers at the moment. | ||
| 574 | * Pass responsibility for sending the ACK to the | ||
| 575 | * send tasklet so that when a PIO buffer becomes | ||
| 576 | * available, the ACK is sent ahead of other outgoing | ||
| 577 | * packets. | ||
| 578 | */ | ||
| 579 | dev->n_rc_qacks++; | ||
| 580 | spin_lock_irq(&qp->s_lock); | ||
| 581 | /* Don't coalesce if a RDMA read or atomic is pending. */ | ||
| 582 | if (qp->s_ack_state == OP(ACKNOWLEDGE) || | ||
| 583 | qp->s_ack_state < OP(RDMA_READ_REQUEST)) { | ||
| 584 | qp->s_ack_state = qp->r_ack_state; | ||
| 585 | qp->s_nak_state = qp->r_nak_state; | ||
| 586 | qp->s_ack_psn = qp->r_ack_psn; | ||
| 587 | qp->r_ack_state = OP(ACKNOWLEDGE); | ||
| 588 | } | ||
| 589 | spin_unlock_irq(&qp->s_lock); | ||
| 629 | 590 | ||
| 630 | done: | 591 | /* Call ipath_do_rc_send() in another thread. */ |
| 631 | spin_unlock_irqrestore(&qp->s_lock, flags); | 592 | tasklet_hi_schedule(&qp->s_task); |
| 632 | clear: | 593 | } |
| 633 | clear_bit(IPATH_S_BUSY, &qp->s_flags); | ||
| 634 | bail: | ||
| 635 | return; | ||
| 636 | } | 594 | } |
| 637 | 595 | ||
| 638 | static void send_rc_ack(struct ipath_qp *qp) | 596 | /** |
| 597 | * reset_psn - reset the QP state to send starting from PSN | ||
| 598 | * @qp: the QP | ||
| 599 | * @psn: the packet sequence number to restart at | ||
| 600 | * | ||
| 601 | * This is called from ipath_rc_rcv() to process an incoming RC ACK | ||
| 602 | * for the given QP. | ||
| 603 | * Called at interrupt level with the QP s_lock held. | ||
| 604 | */ | ||
| 605 | static void reset_psn(struct ipath_qp *qp, u32 psn) | ||
| 639 | { | 606 | { |
| 640 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); | 607 | u32 n = qp->s_last; |
| 641 | u16 lrh0; | 608 | struct ipath_swqe *wqe = get_swqe_ptr(qp, n); |
| 642 | u32 bth0; | 609 | u32 opcode; |
| 643 | struct ipath_other_headers *ohdr; | ||
| 644 | 610 | ||
| 645 | /* Construct the header. */ | 611 | qp->s_cur = n; |
| 646 | ohdr = &qp->s_hdr.u.oth; | 612 | |
| 647 | lrh0 = IPS_LRH_BTH; | 613 | /* |
| 648 | /* header size in 32-bit words LRH+BTH+AETH = (8+12+4)/4. */ | 614 | * If we are starting the request from the beginning, |
| 649 | qp->s_hdrwords = 6; | 615 | * let the normal send code handle initialization. |
| 650 | if (unlikely(qp->remote_ah_attr.ah_flags & IB_AH_GRH)) { | 616 | */ |
| 651 | ipath_make_rc_grh(qp, &qp->remote_ah_attr.grh, 0); | 617 | if (ipath_cmp24(psn, wqe->psn) <= 0) { |
| 652 | ohdr = &qp->s_hdr.u.l.oth; | 618 | qp->s_state = OP(SEND_LAST); |
| 653 | lrh0 = IPS_LRH_GRH; | 619 | goto done; |
| 654 | } | 620 | } |
| 655 | bth0 = ipath_layer_get_pkey(dev->dd, qp->s_pkey_index); | 621 | |
| 656 | ohdr->u.aeth = ipath_compute_aeth(qp); | 622 | /* Find the work request opcode corresponding to the given PSN. */ |
| 657 | if (qp->s_ack_state >= OP(COMPARE_SWAP)) { | 623 | opcode = wqe->wr.opcode; |
| 658 | bth0 |= IB_OPCODE_ATOMIC_ACKNOWLEDGE << 24; | 624 | for (;;) { |
| 659 | ohdr->u.at.atomic_ack_eth = cpu_to_be64(qp->s_ack_atomic); | 625 | int diff; |
| 660 | qp->s_hdrwords += sizeof(ohdr->u.at.atomic_ack_eth) / 4; | 626 | |
| 627 | if (++n == qp->s_size) | ||
| 628 | n = 0; | ||
| 629 | if (n == qp->s_tail) | ||
| 630 | break; | ||
| 631 | wqe = get_swqe_ptr(qp, n); | ||
| 632 | diff = ipath_cmp24(psn, wqe->psn); | ||
| 633 | if (diff < 0) | ||
| 634 | break; | ||
| 635 | qp->s_cur = n; | ||
| 636 | /* | ||
| 637 | * If we are starting the request from the beginning, | ||
| 638 | * let the normal send code handle initialization. | ||
| 639 | */ | ||
| 640 | if (diff == 0) { | ||
| 641 | qp->s_state = OP(SEND_LAST); | ||
| 642 | goto done; | ||
| 643 | } | ||
| 644 | opcode = wqe->wr.opcode; | ||
| 661 | } | 645 | } |
| 662 | else | ||
| 663 | bth0 |= OP(ACKNOWLEDGE) << 24; | ||
| 664 | lrh0 |= qp->remote_ah_attr.sl << 4; | ||
| 665 | qp->s_hdr.lrh[0] = cpu_to_be16(lrh0); | ||
| 666 | qp->s_hdr.lrh[1] = cpu_to_be16(qp->remote_ah_attr.dlid); | ||
| 667 | qp->s_hdr.lrh[2] = cpu_to_be16(qp->s_hdrwords + SIZE_OF_CRC); | ||
| 668 | qp->s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev->dd)); | ||
| 669 | ohdr->bth[0] = cpu_to_be32(bth0); | ||
| 670 | ohdr->bth[1] = cpu_to_be32(qp->remote_qpn); | ||
| 671 | ohdr->bth[2] = cpu_to_be32(qp->s_ack_psn & IPS_PSN_MASK); | ||
| 672 | 646 | ||
| 673 | /* | 647 | /* |
| 674 | * If we can send the ACK, clear the ACK state. | 648 | * Set the state to restart in the middle of a request. |
| 649 | * Don't change the s_sge, s_cur_sge, or s_cur_size. | ||
| 650 | * See ipath_do_rc_send(). | ||
| 675 | */ | 651 | */ |
| 676 | if (ipath_verbs_send(dev->dd, qp->s_hdrwords, (u32 *) &qp->s_hdr, | 652 | switch (opcode) { |
| 677 | 0, NULL) == 0) { | 653 | case IB_WR_SEND: |
| 678 | qp->s_ack_state = OP(ACKNOWLEDGE); | 654 | case IB_WR_SEND_WITH_IMM: |
| 679 | dev->n_rc_qacks++; | 655 | qp->s_state = OP(RDMA_READ_RESPONSE_FIRST); |
| 680 | dev->n_unicast_xmit++; | 656 | break; |
| 657 | |||
| 658 | case IB_WR_RDMA_WRITE: | ||
| 659 | case IB_WR_RDMA_WRITE_WITH_IMM: | ||
| 660 | qp->s_state = OP(RDMA_READ_RESPONSE_LAST); | ||
| 661 | break; | ||
| 662 | |||
| 663 | case IB_WR_RDMA_READ: | ||
| 664 | qp->s_state = OP(RDMA_READ_RESPONSE_MIDDLE); | ||
| 665 | break; | ||
| 666 | |||
| 667 | default: | ||
| 668 | /* | ||
| 669 | * This case shouldn't happen since its only | ||
| 670 | * one PSN per req. | ||
| 671 | */ | ||
| 672 | qp->s_state = OP(SEND_LAST); | ||
| 681 | } | 673 | } |
| 674 | done: | ||
| 675 | qp->s_psn = psn; | ||
| 682 | } | 676 | } |
| 683 | 677 | ||
| 684 | /** | 678 | /** |
| @@ -687,13 +681,12 @@ static void send_rc_ack(struct ipath_qp *qp) | |||
| 687 | * @psn: packet sequence number for the request | 681 | * @psn: packet sequence number for the request |
| 688 | * @wc: the work completion request | 682 | * @wc: the work completion request |
| 689 | * | 683 | * |
| 690 | * The QP s_lock should be held. | 684 | * The QP s_lock should be held and interrupts disabled. |
| 691 | */ | 685 | */ |
| 692 | void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc) | 686 | void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc) |
| 693 | { | 687 | { |
| 694 | struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last); | 688 | struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last); |
| 695 | struct ipath_ibdev *dev; | 689 | struct ipath_ibdev *dev; |
| 696 | u32 n; | ||
| 697 | 690 | ||
| 698 | /* | 691 | /* |
| 699 | * If there are no requests pending, we are done. | 692 | * If there are no requests pending, we are done. |
| @@ -735,62 +728,7 @@ void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc) | |||
| 735 | else | 728 | else |
| 736 | dev->n_rc_resends += (int)qp->s_psn - (int)psn; | 729 | dev->n_rc_resends += (int)qp->s_psn - (int)psn; |
| 737 | 730 | ||
| 738 | /* | 731 | reset_psn(qp, psn); |
| 739 | * If we are starting the request from the beginning, let the normal | ||
| 740 | * send code handle initialization. | ||
| 741 | */ | ||
| 742 | qp->s_cur = qp->s_last; | ||
| 743 | if (ipath_cmp24(psn, wqe->psn) <= 0) { | ||
| 744 | qp->s_state = OP(SEND_LAST); | ||
| 745 | qp->s_psn = wqe->psn; | ||
| 746 | } else { | ||
| 747 | n = qp->s_cur; | ||
| 748 | for (;;) { | ||
| 749 | if (++n == qp->s_size) | ||
| 750 | n = 0; | ||
| 751 | if (n == qp->s_tail) { | ||
| 752 | if (ipath_cmp24(psn, qp->s_next_psn) >= 0) { | ||
| 753 | qp->s_cur = n; | ||
| 754 | wqe = get_swqe_ptr(qp, n); | ||
| 755 | } | ||
| 756 | break; | ||
| 757 | } | ||
| 758 | wqe = get_swqe_ptr(qp, n); | ||
| 759 | if (ipath_cmp24(psn, wqe->psn) < 0) | ||
| 760 | break; | ||
| 761 | qp->s_cur = n; | ||
| 762 | } | ||
| 763 | qp->s_psn = psn; | ||
| 764 | |||
| 765 | /* | ||
| 766 | * Reset the state to restart in the middle of a request. | ||
| 767 | * Don't change the s_sge, s_cur_sge, or s_cur_size. | ||
| 768 | * See ipath_do_rc_send(). | ||
| 769 | */ | ||
| 770 | switch (wqe->wr.opcode) { | ||
| 771 | case IB_WR_SEND: | ||
| 772 | case IB_WR_SEND_WITH_IMM: | ||
| 773 | qp->s_state = OP(RDMA_READ_RESPONSE_FIRST); | ||
| 774 | break; | ||
| 775 | |||
| 776 | case IB_WR_RDMA_WRITE: | ||
| 777 | case IB_WR_RDMA_WRITE_WITH_IMM: | ||
| 778 | qp->s_state = OP(RDMA_READ_RESPONSE_LAST); | ||
| 779 | break; | ||
| 780 | |||
| 781 | case IB_WR_RDMA_READ: | ||
| 782 | qp->s_state = | ||
| 783 | OP(RDMA_READ_RESPONSE_MIDDLE); | ||
| 784 | break; | ||
| 785 | |||
| 786 | default: | ||
| 787 | /* | ||
| 788 | * This case shouldn't happen since its only | ||
| 789 | * one PSN per req. | ||
| 790 | */ | ||
| 791 | qp->s_state = OP(SEND_LAST); | ||
| 792 | } | ||
| 793 | } | ||
| 794 | 732 | ||
| 795 | done: | 733 | done: |
| 796 | tasklet_hi_schedule(&qp->s_task); | 734 | tasklet_hi_schedule(&qp->s_task); |
| @@ -800,76 +738,14 @@ bail: | |||
| 800 | } | 738 | } |
| 801 | 739 | ||
| 802 | /** | 740 | /** |
| 803 | * reset_psn - reset the QP state to send starting from PSN | ||
| 804 | * @qp: the QP | ||
| 805 | * @psn: the packet sequence number to restart at | ||
| 806 | * | ||
| 807 | * This is called from ipath_rc_rcv() to process an incoming RC ACK | ||
| 808 | * for the given QP. | ||
| 809 | * Called at interrupt level with the QP s_lock held. | ||
| 810 | */ | ||
| 811 | static void reset_psn(struct ipath_qp *qp, u32 psn) | ||
| 812 | { | ||
| 813 | struct ipath_swqe *wqe; | ||
| 814 | u32 n; | ||
| 815 | |||
| 816 | n = qp->s_cur; | ||
| 817 | wqe = get_swqe_ptr(qp, n); | ||
| 818 | for (;;) { | ||
| 819 | if (++n == qp->s_size) | ||
| 820 | n = 0; | ||
| 821 | if (n == qp->s_tail) { | ||
| 822 | if (ipath_cmp24(psn, qp->s_next_psn) >= 0) { | ||
| 823 | qp->s_cur = n; | ||
| 824 | wqe = get_swqe_ptr(qp, n); | ||
| 825 | } | ||
| 826 | break; | ||
| 827 | } | ||
| 828 | wqe = get_swqe_ptr(qp, n); | ||
| 829 | if (ipath_cmp24(psn, wqe->psn) < 0) | ||
| 830 | break; | ||
| 831 | qp->s_cur = n; | ||
| 832 | } | ||
| 833 | qp->s_psn = psn; | ||
| 834 | |||
| 835 | /* | ||
| 836 | * Set the state to restart in the middle of a | ||
| 837 | * request. Don't change the s_sge, s_cur_sge, or | ||
| 838 | * s_cur_size. See ipath_do_rc_send(). | ||
| 839 | */ | ||
| 840 | switch (wqe->wr.opcode) { | ||
| 841 | case IB_WR_SEND: | ||
| 842 | case IB_WR_SEND_WITH_IMM: | ||
| 843 | qp->s_state = OP(RDMA_READ_RESPONSE_FIRST); | ||
| 844 | break; | ||
| 845 | |||
| 846 | case IB_WR_RDMA_WRITE: | ||
| 847 | case IB_WR_RDMA_WRITE_WITH_IMM: | ||
| 848 | qp->s_state = OP(RDMA_READ_RESPONSE_LAST); | ||
| 849 | break; | ||
| 850 | |||
| 851 | case IB_WR_RDMA_READ: | ||
| 852 | qp->s_state = OP(RDMA_READ_RESPONSE_MIDDLE); | ||
| 853 | break; | ||
| 854 | |||
| 855 | default: | ||
| 856 | /* | ||
| 857 | * This case shouldn't happen since its only | ||
| 858 | * one PSN per req. | ||
| 859 | */ | ||
| 860 | qp->s_state = OP(SEND_LAST); | ||
| 861 | } | ||
| 862 | } | ||
| 863 | |||
| 864 | /** | ||
| 865 | * do_rc_ack - process an incoming RC ACK | 741 | * do_rc_ack - process an incoming RC ACK |
| 866 | * @qp: the QP the ACK came in on | 742 | * @qp: the QP the ACK came in on |
| 867 | * @psn: the packet sequence number of the ACK | 743 | * @psn: the packet sequence number of the ACK |
| 868 | * @opcode: the opcode of the request that resulted in the ACK | 744 | * @opcode: the opcode of the request that resulted in the ACK |
| 869 | * | 745 | * |
| 870 | * This is called from ipath_rc_rcv() to process an incoming RC ACK | 746 | * This is called from ipath_rc_rcv_resp() to process an incoming RC ACK |
| 871 | * for the given QP. | 747 | * for the given QP. |
| 872 | * Called at interrupt level with the QP s_lock held. | 748 | * Called at interrupt level with the QP s_lock held and interrupts disabled. |
| 873 | * Returns 1 if OK, 0 if current operation should be aborted (NAK). | 749 | * Returns 1 if OK, 0 if current operation should be aborted (NAK). |
| 874 | */ | 750 | */ |
| 875 | static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode) | 751 | static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode) |
| @@ -1006,26 +882,16 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode) | |||
| 1006 | if (qp->s_last == qp->s_tail) | 882 | if (qp->s_last == qp->s_tail) |
| 1007 | goto bail; | 883 | goto bail; |
| 1008 | 884 | ||
| 1009 | /* The last valid PSN seen is the previous request's. */ | 885 | /* The last valid PSN is the previous PSN. */ |
| 1010 | qp->s_last_psn = wqe->psn - 1; | 886 | qp->s_last_psn = psn - 1; |
| 1011 | 887 | ||
| 1012 | dev->n_rc_resends += (int)qp->s_psn - (int)psn; | 888 | dev->n_rc_resends += (int)qp->s_psn - (int)psn; |
| 1013 | 889 | ||
| 1014 | /* | 890 | reset_psn(qp, psn); |
| 1015 | * If we are starting the request from the beginning, let | ||
| 1016 | * the normal send code handle initialization. | ||
| 1017 | */ | ||
| 1018 | qp->s_cur = qp->s_last; | ||
| 1019 | wqe = get_swqe_ptr(qp, qp->s_cur); | ||
| 1020 | if (ipath_cmp24(psn, wqe->psn) <= 0) { | ||
| 1021 | qp->s_state = OP(SEND_LAST); | ||
| 1022 | qp->s_psn = wqe->psn; | ||
| 1023 | } else | ||
| 1024 | reset_psn(qp, psn); | ||
| 1025 | 891 | ||
| 1026 | qp->s_rnr_timeout = | 892 | qp->s_rnr_timeout = |
| 1027 | ib_ipath_rnr_table[(aeth >> IPS_AETH_CREDIT_SHIFT) & | 893 | ib_ipath_rnr_table[(aeth >> IPATH_AETH_CREDIT_SHIFT) & |
| 1028 | IPS_AETH_CREDIT_MASK]; | 894 | IPATH_AETH_CREDIT_MASK]; |
| 1029 | ipath_insert_rnr_queue(qp); | 895 | ipath_insert_rnr_queue(qp); |
| 1030 | goto bail; | 896 | goto bail; |
| 1031 | 897 | ||
| @@ -1033,8 +899,8 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode) | |||
| 1033 | /* The last valid PSN seen is the previous request's. */ | 899 | /* The last valid PSN seen is the previous request's. */ |
| 1034 | if (qp->s_last != qp->s_tail) | 900 | if (qp->s_last != qp->s_tail) |
| 1035 | qp->s_last_psn = wqe->psn - 1; | 901 | qp->s_last_psn = wqe->psn - 1; |
| 1036 | switch ((aeth >> IPS_AETH_CREDIT_SHIFT) & | 902 | switch ((aeth >> IPATH_AETH_CREDIT_SHIFT) & |
| 1037 | IPS_AETH_CREDIT_MASK) { | 903 | IPATH_AETH_CREDIT_MASK) { |
| 1038 | case 0: /* PSN sequence error */ | 904 | case 0: /* PSN sequence error */ |
| 1039 | dev->n_seq_naks++; | 905 | dev->n_seq_naks++; |
| 1040 | /* | 906 | /* |
| @@ -1182,32 +1048,33 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev, | |||
| 1182 | goto ack_done; | 1048 | goto ack_done; |
| 1183 | } | 1049 | } |
| 1184 | rdma_read: | 1050 | rdma_read: |
| 1185 | if (unlikely(qp->s_state != OP(RDMA_READ_REQUEST))) | 1051 | if (unlikely(qp->s_state != OP(RDMA_READ_REQUEST))) |
| 1186 | goto ack_done; | 1052 | goto ack_done; |
| 1187 | if (unlikely(tlen != (hdrsize + pmtu + 4))) | 1053 | if (unlikely(tlen != (hdrsize + pmtu + 4))) |
| 1188 | goto ack_done; | 1054 | goto ack_done; |
| 1189 | if (unlikely(pmtu >= qp->s_len)) | 1055 | if (unlikely(pmtu >= qp->s_len)) |
| 1190 | goto ack_done; | 1056 | goto ack_done; |
| 1191 | /* We got a response so update the timeout. */ | 1057 | /* We got a response so update the timeout. */ |
| 1192 | if (unlikely(qp->s_last == qp->s_tail || | 1058 | if (unlikely(qp->s_last == qp->s_tail || |
| 1193 | get_swqe_ptr(qp, qp->s_last)->wr.opcode != | 1059 | get_swqe_ptr(qp, qp->s_last)->wr.opcode != |
| 1194 | IB_WR_RDMA_READ)) | 1060 | IB_WR_RDMA_READ)) |
| 1195 | goto ack_done; | 1061 | goto ack_done; |
| 1196 | spin_lock(&dev->pending_lock); | 1062 | spin_lock(&dev->pending_lock); |
| 1197 | if (qp->s_rnr_timeout == 0 && !list_empty(&qp->timerwait)) | 1063 | if (qp->s_rnr_timeout == 0 && !list_empty(&qp->timerwait)) |
| 1198 | list_move_tail(&qp->timerwait, | 1064 | list_move_tail(&qp->timerwait, |
| 1199 | &dev->pending[dev->pending_index]); | 1065 | &dev->pending[dev->pending_index]); |
| 1200 | spin_unlock(&dev->pending_lock); | 1066 | spin_unlock(&dev->pending_lock); |
| 1201 | /* | 1067 | /* |
| 1202 | * Update the RDMA receive state but do the copy w/o holding the | 1068 | * Update the RDMA receive state but do the copy w/o |
| 1203 | * locks and blocking interrupts. XXX Yet another place that | 1069 | * holding the locks and blocking interrupts. |
| 1204 | * affects relaxed RDMA order since we don't want s_sge modified. | 1070 | * XXX Yet another place that affects relaxed RDMA order |
| 1205 | */ | 1071 | * since we don't want s_sge modified. |
| 1206 | qp->s_len -= pmtu; | 1072 | */ |
| 1207 | qp->s_last_psn = psn; | 1073 | qp->s_len -= pmtu; |
| 1208 | spin_unlock_irqrestore(&qp->s_lock, flags); | 1074 | qp->s_last_psn = psn; |
| 1209 | ipath_copy_sge(&qp->s_sge, data, pmtu); | 1075 | spin_unlock_irqrestore(&qp->s_lock, flags); |
| 1210 | goto bail; | 1076 | ipath_copy_sge(&qp->s_sge, data, pmtu); |
| 1077 | goto bail; | ||
| 1211 | 1078 | ||
| 1212 | case OP(RDMA_READ_RESPONSE_LAST): | 1079 | case OP(RDMA_READ_RESPONSE_LAST): |
| 1213 | /* ACKs READ req. */ | 1080 | /* ACKs READ req. */ |
| @@ -1230,18 +1097,12 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev, | |||
| 1230 | * ICRC (4). | 1097 | * ICRC (4). |
| 1231 | */ | 1098 | */ |
| 1232 | if (unlikely(tlen <= (hdrsize + pad + 8))) { | 1099 | if (unlikely(tlen <= (hdrsize + pad + 8))) { |
| 1233 | /* | 1100 | /* XXX Need to generate an error CQ entry. */ |
| 1234 | * XXX Need to generate an error CQ | ||
| 1235 | * entry. | ||
| 1236 | */ | ||
| 1237 | goto ack_done; | 1101 | goto ack_done; |
| 1238 | } | 1102 | } |
| 1239 | tlen -= hdrsize + pad + 8; | 1103 | tlen -= hdrsize + pad + 8; |
| 1240 | if (unlikely(tlen != qp->s_len)) { | 1104 | if (unlikely(tlen != qp->s_len)) { |
| 1241 | /* | 1105 | /* XXX Need to generate an error CQ entry. */ |
| 1242 | * XXX Need to generate an error CQ | ||
| 1243 | * entry. | ||
| 1244 | */ | ||
| 1245 | goto ack_done; | 1106 | goto ack_done; |
| 1246 | } | 1107 | } |
| 1247 | if (!header_in_data) | 1108 | if (!header_in_data) |
| @@ -1254,9 +1115,12 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev, | |||
| 1254 | if (do_rc_ack(qp, aeth, psn, OP(RDMA_READ_RESPONSE_LAST))) { | 1115 | if (do_rc_ack(qp, aeth, psn, OP(RDMA_READ_RESPONSE_LAST))) { |
| 1255 | /* | 1116 | /* |
| 1256 | * Change the state so we contimue | 1117 | * Change the state so we contimue |
| 1257 | * processing new requests. | 1118 | * processing new requests and wake up the |
| 1119 | * tasklet if there are posted sends. | ||
| 1258 | */ | 1120 | */ |
| 1259 | qp->s_state = OP(SEND_LAST); | 1121 | qp->s_state = OP(SEND_LAST); |
| 1122 | if (qp->s_tail != qp->s_head) | ||
| 1123 | tasklet_hi_schedule(&qp->s_task); | ||
| 1260 | } | 1124 | } |
| 1261 | goto ack_done; | 1125 | goto ack_done; |
| 1262 | } | 1126 | } |
| @@ -1302,18 +1166,16 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev, | |||
| 1302 | * Don't queue the NAK if a RDMA read, atomic, or | 1166 | * Don't queue the NAK if a RDMA read, atomic, or |
| 1303 | * NAK is pending though. | 1167 | * NAK is pending though. |
| 1304 | */ | 1168 | */ |
| 1305 | spin_lock(&qp->s_lock); | 1169 | if (qp->s_ack_state != OP(ACKNOWLEDGE) || |
| 1306 | if ((qp->s_ack_state >= OP(RDMA_READ_REQUEST) && | 1170 | qp->r_nak_state != 0) |
| 1307 | qp->s_ack_state != IB_OPCODE_ACKNOWLEDGE) || | ||
| 1308 | qp->s_nak_state != 0) { | ||
| 1309 | spin_unlock(&qp->s_lock); | ||
| 1310 | goto done; | 1171 | goto done; |
| 1172 | if (qp->r_ack_state < OP(COMPARE_SWAP)) { | ||
| 1173 | qp->r_ack_state = OP(SEND_ONLY); | ||
| 1174 | qp->r_nak_state = IB_NAK_PSN_ERROR; | ||
| 1175 | /* Use the expected PSN. */ | ||
| 1176 | qp->r_ack_psn = qp->r_psn; | ||
| 1311 | } | 1177 | } |
| 1312 | qp->s_ack_state = OP(SEND_ONLY); | 1178 | goto send_ack; |
| 1313 | qp->s_nak_state = IB_NAK_PSN_ERROR; | ||
| 1314 | /* Use the expected PSN. */ | ||
| 1315 | qp->s_ack_psn = qp->r_psn; | ||
| 1316 | goto resched; | ||
| 1317 | } | 1179 | } |
| 1318 | 1180 | ||
| 1319 | /* | 1181 | /* |
| @@ -1327,27 +1189,7 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev, | |||
| 1327 | * send the earliest so that RDMA reads can be restarted at | 1189 | * send the earliest so that RDMA reads can be restarted at |
| 1328 | * the requester's expected PSN. | 1190 | * the requester's expected PSN. |
| 1329 | */ | 1191 | */ |
| 1330 | spin_lock(&qp->s_lock); | 1192 | if (opcode == OP(RDMA_READ_REQUEST)) { |
| 1331 | if (qp->s_ack_state != IB_OPCODE_ACKNOWLEDGE && | ||
| 1332 | ipath_cmp24(psn, qp->s_ack_psn) >= 0) { | ||
| 1333 | if (qp->s_ack_state < IB_OPCODE_RDMA_READ_REQUEST) | ||
| 1334 | qp->s_ack_psn = psn; | ||
| 1335 | spin_unlock(&qp->s_lock); | ||
| 1336 | goto done; | ||
| 1337 | } | ||
| 1338 | switch (opcode) { | ||
| 1339 | case OP(RDMA_READ_REQUEST): | ||
| 1340 | /* | ||
| 1341 | * We have to be careful to not change s_rdma_sge | ||
| 1342 | * while ipath_do_rc_send() is using it and not | ||
| 1343 | * holding the s_lock. | ||
| 1344 | */ | ||
| 1345 | if (qp->s_ack_state != OP(ACKNOWLEDGE) && | ||
| 1346 | qp->s_ack_state >= IB_OPCODE_RDMA_READ_REQUEST) { | ||
| 1347 | spin_unlock(&qp->s_lock); | ||
| 1348 | dev->n_rdma_dup_busy++; | ||
| 1349 | goto done; | ||
| 1350 | } | ||
| 1351 | /* RETH comes after BTH */ | 1193 | /* RETH comes after BTH */ |
| 1352 | if (!header_in_data) | 1194 | if (!header_in_data) |
| 1353 | reth = &ohdr->u.rc.reth; | 1195 | reth = &ohdr->u.rc.reth; |
| @@ -1355,6 +1197,22 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev, | |||
| 1355 | reth = (struct ib_reth *)data; | 1197 | reth = (struct ib_reth *)data; |
| 1356 | data += sizeof(*reth); | 1198 | data += sizeof(*reth); |
| 1357 | } | 1199 | } |
| 1200 | /* | ||
| 1201 | * If we receive a duplicate RDMA request, it means the | ||
| 1202 | * requester saw a sequence error and needs to restart | ||
| 1203 | * from an earlier point. We can abort the current | ||
| 1204 | * RDMA read send in that case. | ||
| 1205 | */ | ||
| 1206 | spin_lock_irq(&qp->s_lock); | ||
| 1207 | if (qp->s_ack_state != OP(ACKNOWLEDGE) && | ||
| 1208 | (qp->s_hdrwords || ipath_cmp24(psn, qp->s_ack_psn) >= 0)) { | ||
| 1209 | /* | ||
| 1210 | * We are already sending earlier requested data. | ||
| 1211 | * Don't abort it to send later out of sequence data. | ||
| 1212 | */ | ||
| 1213 | spin_unlock_irq(&qp->s_lock); | ||
| 1214 | goto done; | ||
| 1215 | } | ||
| 1358 | qp->s_rdma_len = be32_to_cpu(reth->length); | 1216 | qp->s_rdma_len = be32_to_cpu(reth->length); |
| 1359 | if (qp->s_rdma_len != 0) { | 1217 | if (qp->s_rdma_len != 0) { |
| 1360 | u32 rkey = be32_to_cpu(reth->rkey); | 1218 | u32 rkey = be32_to_cpu(reth->rkey); |
| @@ -1368,8 +1226,10 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev, | |||
| 1368 | ok = ipath_rkey_ok(dev, &qp->s_rdma_sge, | 1226 | ok = ipath_rkey_ok(dev, &qp->s_rdma_sge, |
| 1369 | qp->s_rdma_len, vaddr, rkey, | 1227 | qp->s_rdma_len, vaddr, rkey, |
| 1370 | IB_ACCESS_REMOTE_READ); | 1228 | IB_ACCESS_REMOTE_READ); |
| 1371 | if (unlikely(!ok)) | 1229 | if (unlikely(!ok)) { |
| 1230 | spin_unlock_irq(&qp->s_lock); | ||
| 1372 | goto done; | 1231 | goto done; |
| 1232 | } | ||
| 1373 | } else { | 1233 | } else { |
| 1374 | qp->s_rdma_sge.sg_list = NULL; | 1234 | qp->s_rdma_sge.sg_list = NULL; |
| 1375 | qp->s_rdma_sge.num_sge = 0; | 1235 | qp->s_rdma_sge.num_sge = 0; |
| @@ -1378,25 +1238,44 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev, | |||
| 1378 | qp->s_rdma_sge.sge.length = 0; | 1238 | qp->s_rdma_sge.sge.length = 0; |
| 1379 | qp->s_rdma_sge.sge.sge_length = 0; | 1239 | qp->s_rdma_sge.sge.sge_length = 0; |
| 1380 | } | 1240 | } |
| 1381 | break; | 1241 | qp->s_ack_state = opcode; |
| 1242 | qp->s_ack_psn = psn; | ||
| 1243 | spin_unlock_irq(&qp->s_lock); | ||
| 1244 | tasklet_hi_schedule(&qp->s_task); | ||
| 1245 | goto send_ack; | ||
| 1246 | } | ||
| 1247 | |||
| 1248 | /* | ||
| 1249 | * A pending RDMA read will ACK anything before it so | ||
| 1250 | * ignore earlier duplicate requests. | ||
| 1251 | */ | ||
| 1252 | if (qp->s_ack_state != OP(ACKNOWLEDGE)) | ||
| 1253 | goto done; | ||
| 1382 | 1254 | ||
| 1255 | /* | ||
| 1256 | * If an ACK is pending, don't replace the pending ACK | ||
| 1257 | * with an earlier one since the later one will ACK the earlier. | ||
| 1258 | * Also, if we already have a pending atomic, send it. | ||
| 1259 | */ | ||
| 1260 | if (qp->r_ack_state != OP(ACKNOWLEDGE) && | ||
| 1261 | (ipath_cmp24(psn, qp->r_ack_psn) <= 0 || | ||
| 1262 | qp->r_ack_state >= OP(COMPARE_SWAP))) | ||
| 1263 | goto send_ack; | ||
| 1264 | switch (opcode) { | ||
| 1383 | case OP(COMPARE_SWAP): | 1265 | case OP(COMPARE_SWAP): |
| 1384 | case OP(FETCH_ADD): | 1266 | case OP(FETCH_ADD): |
| 1385 | /* | 1267 | /* |
| 1386 | * Check for the PSN of the last atomic operations | 1268 | * Check for the PSN of the last atomic operation |
| 1387 | * performed and resend the result if found. | 1269 | * performed and resend the result if found. |
| 1388 | */ | 1270 | */ |
| 1389 | if ((psn & IPS_PSN_MASK) != qp->r_atomic_psn) { | 1271 | if ((psn & IPATH_PSN_MASK) != qp->r_atomic_psn) |
| 1390 | spin_unlock(&qp->s_lock); | ||
| 1391 | goto done; | 1272 | goto done; |
| 1392 | } | ||
| 1393 | qp->s_ack_atomic = qp->r_atomic_data; | ||
| 1394 | break; | 1273 | break; |
| 1395 | } | 1274 | } |
| 1396 | qp->s_ack_state = opcode; | 1275 | qp->r_ack_state = opcode; |
| 1397 | qp->s_nak_state = 0; | 1276 | qp->r_nak_state = 0; |
| 1398 | qp->s_ack_psn = psn; | 1277 | qp->r_ack_psn = psn; |
| 1399 | resched: | 1278 | send_ack: |
| 1400 | return 0; | 1279 | return 0; |
| 1401 | 1280 | ||
| 1402 | done: | 1281 | done: |
| @@ -1424,7 +1303,6 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1424 | u32 hdrsize; | 1303 | u32 hdrsize; |
| 1425 | u32 psn; | 1304 | u32 psn; |
| 1426 | u32 pad; | 1305 | u32 pad; |
| 1427 | unsigned long flags; | ||
| 1428 | struct ib_wc wc; | 1306 | struct ib_wc wc; |
| 1429 | u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu); | 1307 | u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu); |
| 1430 | int diff; | 1308 | int diff; |
| @@ -1453,11 +1331,6 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1453 | } else | 1331 | } else |
| 1454 | psn = be32_to_cpu(ohdr->bth[2]); | 1332 | psn = be32_to_cpu(ohdr->bth[2]); |
| 1455 | } | 1333 | } |
| 1456 | /* | ||
| 1457 | * The opcode is in the low byte when its in network order | ||
| 1458 | * (top byte when in host order). | ||
| 1459 | */ | ||
| 1460 | opcode = be32_to_cpu(ohdr->bth[0]) >> 24; | ||
| 1461 | 1334 | ||
| 1462 | /* | 1335 | /* |
| 1463 | * Process responses (ACKs) before anything else. Note that the | 1336 | * Process responses (ACKs) before anything else. Note that the |
| @@ -1465,22 +1338,21 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1465 | * queue rather than the expected receive packet sequence number. | 1338 | * queue rather than the expected receive packet sequence number. |
| 1466 | * In other words, this QP is the requester. | 1339 | * In other words, this QP is the requester. |
| 1467 | */ | 1340 | */ |
| 1341 | opcode = be32_to_cpu(ohdr->bth[0]) >> 24; | ||
| 1468 | if (opcode >= OP(RDMA_READ_RESPONSE_FIRST) && | 1342 | if (opcode >= OP(RDMA_READ_RESPONSE_FIRST) && |
| 1469 | opcode <= OP(ATOMIC_ACKNOWLEDGE)) { | 1343 | opcode <= OP(ATOMIC_ACKNOWLEDGE)) { |
| 1470 | ipath_rc_rcv_resp(dev, ohdr, data, tlen, qp, opcode, psn, | 1344 | ipath_rc_rcv_resp(dev, ohdr, data, tlen, qp, opcode, psn, |
| 1471 | hdrsize, pmtu, header_in_data); | 1345 | hdrsize, pmtu, header_in_data); |
| 1472 | goto bail; | 1346 | goto done; |
| 1473 | } | 1347 | } |
| 1474 | 1348 | ||
| 1475 | spin_lock_irqsave(&qp->r_rq.lock, flags); | ||
| 1476 | |||
| 1477 | /* Compute 24 bits worth of difference. */ | 1349 | /* Compute 24 bits worth of difference. */ |
| 1478 | diff = ipath_cmp24(psn, qp->r_psn); | 1350 | diff = ipath_cmp24(psn, qp->r_psn); |
| 1479 | if (unlikely(diff)) { | 1351 | if (unlikely(diff)) { |
| 1480 | if (ipath_rc_rcv_error(dev, ohdr, data, qp, opcode, | 1352 | if (ipath_rc_rcv_error(dev, ohdr, data, qp, opcode, |
| 1481 | psn, diff, header_in_data)) | 1353 | psn, diff, header_in_data)) |
| 1482 | goto done; | 1354 | goto done; |
| 1483 | goto resched; | 1355 | goto send_ack; |
| 1484 | } | 1356 | } |
| 1485 | 1357 | ||
| 1486 | /* Check for opcode sequence errors. */ | 1358 | /* Check for opcode sequence errors. */ |
| @@ -1492,22 +1364,19 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1492 | opcode == OP(SEND_LAST_WITH_IMMEDIATE)) | 1364 | opcode == OP(SEND_LAST_WITH_IMMEDIATE)) |
| 1493 | break; | 1365 | break; |
| 1494 | nack_inv: | 1366 | nack_inv: |
| 1495 | /* | 1367 | /* |
| 1496 | * A NAK will ACK earlier sends and RDMA writes. Don't queue the | 1368 | * A NAK will ACK earlier sends and RDMA writes. |
| 1497 | * NAK if a RDMA read, atomic, or NAK is pending though. | 1369 | * Don't queue the NAK if a RDMA read, atomic, or NAK |
| 1498 | */ | 1370 | * is pending though. |
| 1499 | spin_lock(&qp->s_lock); | 1371 | */ |
| 1500 | if (qp->s_ack_state >= OP(RDMA_READ_REQUEST) && | 1372 | if (qp->r_ack_state >= OP(COMPARE_SWAP)) |
| 1501 | qp->s_ack_state != IB_OPCODE_ACKNOWLEDGE) { | 1373 | goto send_ack; |
| 1502 | spin_unlock(&qp->s_lock); | 1374 | /* XXX Flush WQEs */ |
| 1503 | goto done; | 1375 | qp->state = IB_QPS_ERR; |
| 1504 | } | 1376 | qp->r_ack_state = OP(SEND_ONLY); |
| 1505 | /* XXX Flush WQEs */ | 1377 | qp->r_nak_state = IB_NAK_INVALID_REQUEST; |
| 1506 | qp->state = IB_QPS_ERR; | 1378 | qp->r_ack_psn = qp->r_psn; |
| 1507 | qp->s_ack_state = OP(SEND_ONLY); | 1379 | goto send_ack; |
| 1508 | qp->s_nak_state = IB_NAK_INVALID_REQUEST; | ||
| 1509 | qp->s_ack_psn = qp->r_psn; | ||
| 1510 | goto resched; | ||
| 1511 | 1380 | ||
| 1512 | case OP(RDMA_WRITE_FIRST): | 1381 | case OP(RDMA_WRITE_FIRST): |
| 1513 | case OP(RDMA_WRITE_MIDDLE): | 1382 | case OP(RDMA_WRITE_MIDDLE): |
| @@ -1517,20 +1386,6 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1517 | break; | 1386 | break; |
| 1518 | goto nack_inv; | 1387 | goto nack_inv; |
| 1519 | 1388 | ||
| 1520 | case OP(RDMA_READ_REQUEST): | ||
| 1521 | case OP(COMPARE_SWAP): | ||
| 1522 | case OP(FETCH_ADD): | ||
| 1523 | /* | ||
| 1524 | * Drop all new requests until a response has been sent. A | ||
| 1525 | * new request then ACKs the RDMA response we sent. Relaxed | ||
| 1526 | * ordering would allow new requests to be processed but we | ||
| 1527 | * would need to keep a queue of rwqe's for all that are in | ||
| 1528 | * progress. Note that we can't RNR NAK this request since | ||
| 1529 | * the RDMA READ or atomic response is already queued to be | ||
| 1530 | * sent (unless we implement a response send queue). | ||
| 1531 | */ | ||
| 1532 | goto done; | ||
| 1533 | |||
| 1534 | default: | 1389 | default: |
| 1535 | if (opcode == OP(SEND_MIDDLE) || | 1390 | if (opcode == OP(SEND_MIDDLE) || |
| 1536 | opcode == OP(SEND_LAST) || | 1391 | opcode == OP(SEND_LAST) || |
| @@ -1539,6 +1394,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1539 | opcode == OP(RDMA_WRITE_LAST) || | 1394 | opcode == OP(RDMA_WRITE_LAST) || |
| 1540 | opcode == OP(RDMA_WRITE_LAST_WITH_IMMEDIATE)) | 1395 | opcode == OP(RDMA_WRITE_LAST_WITH_IMMEDIATE)) |
| 1541 | goto nack_inv; | 1396 | goto nack_inv; |
| 1397 | /* | ||
| 1398 | * Note that it is up to the requester to not send a new | ||
| 1399 | * RDMA read or atomic operation before receiving an ACK | ||
| 1400 | * for the previous operation. | ||
| 1401 | */ | ||
| 1542 | break; | 1402 | break; |
| 1543 | } | 1403 | } |
| 1544 | 1404 | ||
| @@ -1555,17 +1415,12 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1555 | * Don't queue the NAK if a RDMA read or atomic | 1415 | * Don't queue the NAK if a RDMA read or atomic |
| 1556 | * is pending though. | 1416 | * is pending though. |
| 1557 | */ | 1417 | */ |
| 1558 | spin_lock(&qp->s_lock); | 1418 | if (qp->r_ack_state >= OP(COMPARE_SWAP)) |
| 1559 | if (qp->s_ack_state >= | 1419 | goto send_ack; |
| 1560 | OP(RDMA_READ_REQUEST) && | 1420 | qp->r_ack_state = OP(SEND_ONLY); |
| 1561 | qp->s_ack_state != IB_OPCODE_ACKNOWLEDGE) { | 1421 | qp->r_nak_state = IB_RNR_NAK | qp->r_min_rnr_timer; |
| 1562 | spin_unlock(&qp->s_lock); | 1422 | qp->r_ack_psn = qp->r_psn; |
| 1563 | goto done; | 1423 | goto send_ack; |
| 1564 | } | ||
| 1565 | qp->s_ack_state = OP(SEND_ONLY); | ||
| 1566 | qp->s_nak_state = IB_RNR_NAK | qp->s_min_rnr_timer; | ||
| 1567 | qp->s_ack_psn = qp->r_psn; | ||
| 1568 | goto resched; | ||
| 1569 | } | 1424 | } |
| 1570 | qp->r_rcv_len = 0; | 1425 | qp->r_rcv_len = 0; |
| 1571 | /* FALLTHROUGH */ | 1426 | /* FALLTHROUGH */ |
| @@ -1622,7 +1477,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1622 | if (unlikely(wc.byte_len > qp->r_len)) | 1477 | if (unlikely(wc.byte_len > qp->r_len)) |
| 1623 | goto nack_inv; | 1478 | goto nack_inv; |
| 1624 | ipath_copy_sge(&qp->r_sge, data, tlen); | 1479 | ipath_copy_sge(&qp->r_sge, data, tlen); |
| 1625 | atomic_inc(&qp->msn); | 1480 | qp->r_msn++; |
| 1626 | if (opcode == OP(RDMA_WRITE_LAST) || | 1481 | if (opcode == OP(RDMA_WRITE_LAST) || |
| 1627 | opcode == OP(RDMA_WRITE_ONLY)) | 1482 | opcode == OP(RDMA_WRITE_ONLY)) |
| 1628 | break; | 1483 | break; |
| @@ -1666,29 +1521,8 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1666 | ok = ipath_rkey_ok(dev, &qp->r_sge, | 1521 | ok = ipath_rkey_ok(dev, &qp->r_sge, |
| 1667 | qp->r_len, vaddr, rkey, | 1522 | qp->r_len, vaddr, rkey, |
| 1668 | IB_ACCESS_REMOTE_WRITE); | 1523 | IB_ACCESS_REMOTE_WRITE); |
| 1669 | if (unlikely(!ok)) { | 1524 | if (unlikely(!ok)) |
| 1670 | nack_acc: | 1525 | goto nack_acc; |
| 1671 | /* | ||
| 1672 | * A NAK will ACK earlier sends and RDMA | ||
| 1673 | * writes. Don't queue the NAK if a RDMA | ||
| 1674 | * read, atomic, or NAK is pending though. | ||
| 1675 | */ | ||
| 1676 | spin_lock(&qp->s_lock); | ||
| 1677 | if (qp->s_ack_state >= | ||
| 1678 | OP(RDMA_READ_REQUEST) && | ||
| 1679 | qp->s_ack_state != | ||
| 1680 | IB_OPCODE_ACKNOWLEDGE) { | ||
| 1681 | spin_unlock(&qp->s_lock); | ||
| 1682 | goto done; | ||
| 1683 | } | ||
| 1684 | /* XXX Flush WQEs */ | ||
| 1685 | qp->state = IB_QPS_ERR; | ||
| 1686 | qp->s_ack_state = OP(RDMA_WRITE_ONLY); | ||
| 1687 | qp->s_nak_state = | ||
| 1688 | IB_NAK_REMOTE_ACCESS_ERROR; | ||
| 1689 | qp->s_ack_psn = qp->r_psn; | ||
| 1690 | goto resched; | ||
| 1691 | } | ||
| 1692 | } else { | 1526 | } else { |
| 1693 | qp->r_sge.sg_list = NULL; | 1527 | qp->r_sge.sg_list = NULL; |
| 1694 | qp->r_sge.sge.mr = NULL; | 1528 | qp->r_sge.sge.mr = NULL; |
| @@ -1715,12 +1549,10 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1715 | reth = (struct ib_reth *)data; | 1549 | reth = (struct ib_reth *)data; |
| 1716 | data += sizeof(*reth); | 1550 | data += sizeof(*reth); |
| 1717 | } | 1551 | } |
| 1718 | spin_lock(&qp->s_lock); | 1552 | if (unlikely(!(qp->qp_access_flags & |
| 1719 | if (qp->s_ack_state != OP(ACKNOWLEDGE) && | 1553 | IB_ACCESS_REMOTE_READ))) |
| 1720 | qp->s_ack_state >= IB_OPCODE_RDMA_READ_REQUEST) { | 1554 | goto nack_acc; |
| 1721 | spin_unlock(&qp->s_lock); | 1555 | spin_lock_irq(&qp->s_lock); |
| 1722 | goto done; | ||
| 1723 | } | ||
| 1724 | qp->s_rdma_len = be32_to_cpu(reth->length); | 1556 | qp->s_rdma_len = be32_to_cpu(reth->length); |
| 1725 | if (qp->s_rdma_len != 0) { | 1557 | if (qp->s_rdma_len != 0) { |
| 1726 | u32 rkey = be32_to_cpu(reth->rkey); | 1558 | u32 rkey = be32_to_cpu(reth->rkey); |
| @@ -1732,7 +1564,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1732 | qp->s_rdma_len, vaddr, rkey, | 1564 | qp->s_rdma_len, vaddr, rkey, |
| 1733 | IB_ACCESS_REMOTE_READ); | 1565 | IB_ACCESS_REMOTE_READ); |
| 1734 | if (unlikely(!ok)) { | 1566 | if (unlikely(!ok)) { |
| 1735 | spin_unlock(&qp->s_lock); | 1567 | spin_unlock_irq(&qp->s_lock); |
| 1736 | goto nack_acc; | 1568 | goto nack_acc; |
| 1737 | } | 1569 | } |
| 1738 | /* | 1570 | /* |
| @@ -1749,21 +1581,25 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1749 | qp->s_rdma_sge.sge.length = 0; | 1581 | qp->s_rdma_sge.sge.length = 0; |
| 1750 | qp->s_rdma_sge.sge.sge_length = 0; | 1582 | qp->s_rdma_sge.sge.sge_length = 0; |
| 1751 | } | 1583 | } |
| 1752 | if (unlikely(!(qp->qp_access_flags & | ||
| 1753 | IB_ACCESS_REMOTE_READ))) | ||
| 1754 | goto nack_acc; | ||
| 1755 | /* | 1584 | /* |
| 1756 | * We need to increment the MSN here instead of when we | 1585 | * We need to increment the MSN here instead of when we |
| 1757 | * finish sending the result since a duplicate request would | 1586 | * finish sending the result since a duplicate request would |
| 1758 | * increment it more than once. | 1587 | * increment it more than once. |
| 1759 | */ | 1588 | */ |
| 1760 | atomic_inc(&qp->msn); | 1589 | qp->r_msn++; |
| 1590 | |||
| 1761 | qp->s_ack_state = opcode; | 1591 | qp->s_ack_state = opcode; |
| 1762 | qp->s_nak_state = 0; | ||
| 1763 | qp->s_ack_psn = psn; | 1592 | qp->s_ack_psn = psn; |
| 1593 | spin_unlock_irq(&qp->s_lock); | ||
| 1594 | |||
| 1764 | qp->r_psn++; | 1595 | qp->r_psn++; |
| 1765 | qp->r_state = opcode; | 1596 | qp->r_state = opcode; |
| 1766 | goto rdmadone; | 1597 | qp->r_nak_state = 0; |
| 1598 | |||
| 1599 | /* Call ipath_do_rc_send() in another thread. */ | ||
| 1600 | tasklet_hi_schedule(&qp->s_task); | ||
| 1601 | |||
| 1602 | goto done; | ||
| 1767 | 1603 | ||
| 1768 | case OP(COMPARE_SWAP): | 1604 | case OP(COMPARE_SWAP): |
| 1769 | case OP(FETCH_ADD): { | 1605 | case OP(FETCH_ADD): { |
| @@ -1792,7 +1628,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1792 | goto nack_acc; | 1628 | goto nack_acc; |
| 1793 | /* Perform atomic OP and save result. */ | 1629 | /* Perform atomic OP and save result. */ |
| 1794 | sdata = be64_to_cpu(ateth->swap_data); | 1630 | sdata = be64_to_cpu(ateth->swap_data); |
| 1795 | spin_lock(&dev->pending_lock); | 1631 | spin_lock_irq(&dev->pending_lock); |
| 1796 | qp->r_atomic_data = *(u64 *) qp->r_sge.sge.vaddr; | 1632 | qp->r_atomic_data = *(u64 *) qp->r_sge.sge.vaddr; |
| 1797 | if (opcode == OP(FETCH_ADD)) | 1633 | if (opcode == OP(FETCH_ADD)) |
| 1798 | *(u64 *) qp->r_sge.sge.vaddr = | 1634 | *(u64 *) qp->r_sge.sge.vaddr = |
| @@ -1800,9 +1636,9 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1800 | else if (qp->r_atomic_data == | 1636 | else if (qp->r_atomic_data == |
| 1801 | be64_to_cpu(ateth->compare_data)) | 1637 | be64_to_cpu(ateth->compare_data)) |
| 1802 | *(u64 *) qp->r_sge.sge.vaddr = sdata; | 1638 | *(u64 *) qp->r_sge.sge.vaddr = sdata; |
| 1803 | spin_unlock(&dev->pending_lock); | 1639 | spin_unlock_irq(&dev->pending_lock); |
| 1804 | atomic_inc(&qp->msn); | 1640 | qp->r_msn++; |
| 1805 | qp->r_atomic_psn = psn & IPS_PSN_MASK; | 1641 | qp->r_atomic_psn = psn & IPATH_PSN_MASK; |
| 1806 | psn |= 1 << 31; | 1642 | psn |= 1 << 31; |
| 1807 | break; | 1643 | break; |
| 1808 | } | 1644 | } |
| @@ -1813,44 +1649,39 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 1813 | } | 1649 | } |
| 1814 | qp->r_psn++; | 1650 | qp->r_psn++; |
| 1815 | qp->r_state = opcode; | 1651 | qp->r_state = opcode; |
| 1652 | qp->r_nak_state = 0; | ||
| 1816 | /* Send an ACK if requested or required. */ | 1653 | /* Send an ACK if requested or required. */ |
| 1817 | if (psn & (1 << 31)) { | 1654 | if (psn & (1 << 31)) { |
| 1818 | /* | 1655 | /* |
| 1819 | * Coalesce ACKs unless there is a RDMA READ or | 1656 | * Coalesce ACKs unless there is a RDMA READ or |
| 1820 | * ATOMIC pending. | 1657 | * ATOMIC pending. |
| 1821 | */ | 1658 | */ |
| 1822 | spin_lock(&qp->s_lock); | 1659 | if (qp->r_ack_state < OP(COMPARE_SWAP)) { |
| 1823 | if (qp->s_ack_state == OP(ACKNOWLEDGE) || | 1660 | qp->r_ack_state = opcode; |
| 1824 | qp->s_ack_state < IB_OPCODE_RDMA_READ_REQUEST) { | 1661 | qp->r_ack_psn = psn; |
| 1825 | qp->s_ack_state = opcode; | ||
| 1826 | qp->s_nak_state = 0; | ||
| 1827 | qp->s_ack_psn = psn; | ||
| 1828 | qp->s_ack_atomic = qp->r_atomic_data; | ||
| 1829 | goto resched; | ||
| 1830 | } | 1662 | } |
| 1831 | spin_unlock(&qp->s_lock); | 1663 | goto send_ack; |
| 1832 | } | 1664 | } |
| 1833 | done: | 1665 | goto done; |
| 1834 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 1835 | goto bail; | ||
| 1836 | 1666 | ||
| 1837 | resched: | 1667 | nack_acc: |
| 1838 | /* | 1668 | /* |
| 1839 | * Try to send ACK right away but not if ipath_do_rc_send() is | 1669 | * A NAK will ACK earlier sends and RDMA writes. |
| 1840 | * active. | 1670 | * Don't queue the NAK if a RDMA read, atomic, or NAK |
| 1671 | * is pending though. | ||
| 1841 | */ | 1672 | */ |
| 1842 | if (qp->s_hdrwords == 0 && | 1673 | if (qp->r_ack_state < OP(COMPARE_SWAP)) { |
| 1843 | (qp->s_ack_state < IB_OPCODE_RDMA_READ_REQUEST || | 1674 | /* XXX Flush WQEs */ |
| 1844 | qp->s_ack_state >= IB_OPCODE_COMPARE_SWAP)) | 1675 | qp->state = IB_QPS_ERR; |
| 1676 | qp->r_ack_state = OP(RDMA_WRITE_ONLY); | ||
| 1677 | qp->r_nak_state = IB_NAK_REMOTE_ACCESS_ERROR; | ||
| 1678 | qp->r_ack_psn = qp->r_psn; | ||
| 1679 | } | ||
| 1680 | send_ack: | ||
| 1681 | /* Send ACK right away unless the send tasklet has a pending ACK. */ | ||
| 1682 | if (qp->s_ack_state == OP(ACKNOWLEDGE)) | ||
| 1845 | send_rc_ack(qp); | 1683 | send_rc_ack(qp); |
| 1846 | 1684 | ||
| 1847 | rdmadone: | 1685 | done: |
| 1848 | spin_unlock(&qp->s_lock); | ||
| 1849 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 1850 | |||
| 1851 | /* Call ipath_do_rc_send() in another thread. */ | ||
| 1852 | tasklet_hi_schedule(&qp->s_task); | ||
| 1853 | |||
| 1854 | bail: | ||
| 1855 | return; | 1686 | return; |
| 1856 | } | 1687 | } |
diff --git a/drivers/infiniband/hw/ipath/ipath_registers.h b/drivers/infiniband/hw/ipath/ipath_registers.h index 402126eb79c9..89df8f5ea998 100644 --- a/drivers/infiniband/hw/ipath/ipath_registers.h +++ b/drivers/infiniband/hw/ipath/ipath_registers.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c index d38f4f3cfd1d..772bc59fb85c 100644 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -31,6 +32,7 @@ | |||
| 31 | */ | 32 | */ |
| 32 | 33 | ||
| 33 | #include "ipath_verbs.h" | 34 | #include "ipath_verbs.h" |
| 35 | #include "ipath_common.h" | ||
| 34 | 36 | ||
| 35 | /* | 37 | /* |
| 36 | * Convert the AETH RNR timeout code into the number of milliseconds. | 38 | * Convert the AETH RNR timeout code into the number of milliseconds. |
| @@ -111,20 +113,23 @@ void ipath_insert_rnr_queue(struct ipath_qp *qp) | |||
| 111 | * | 113 | * |
| 112 | * Return 0 if no RWQE is available, otherwise return 1. | 114 | * Return 0 if no RWQE is available, otherwise return 1. |
| 113 | * | 115 | * |
| 114 | * Called at interrupt level with the QP r_rq.lock held. | 116 | * Can be called from interrupt level. |
| 115 | */ | 117 | */ |
| 116 | int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only) | 118 | int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only) |
| 117 | { | 119 | { |
| 120 | unsigned long flags; | ||
| 118 | struct ipath_rq *rq; | 121 | struct ipath_rq *rq; |
| 119 | struct ipath_srq *srq; | 122 | struct ipath_srq *srq; |
| 120 | struct ipath_rwqe *wqe; | 123 | struct ipath_rwqe *wqe; |
| 121 | int ret; | 124 | int ret = 1; |
| 122 | 125 | ||
| 123 | if (!qp->ibqp.srq) { | 126 | if (!qp->ibqp.srq) { |
| 124 | rq = &qp->r_rq; | 127 | rq = &qp->r_rq; |
| 128 | spin_lock_irqsave(&rq->lock, flags); | ||
| 129 | |||
| 125 | if (unlikely(rq->tail == rq->head)) { | 130 | if (unlikely(rq->tail == rq->head)) { |
| 126 | ret = 0; | 131 | ret = 0; |
| 127 | goto bail; | 132 | goto done; |
| 128 | } | 133 | } |
| 129 | wqe = get_rwqe_ptr(rq, rq->tail); | 134 | wqe = get_rwqe_ptr(rq, rq->tail); |
| 130 | qp->r_wr_id = wqe->wr_id; | 135 | qp->r_wr_id = wqe->wr_id; |
| @@ -136,17 +141,16 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only) | |||
| 136 | } | 141 | } |
| 137 | if (++rq->tail >= rq->size) | 142 | if (++rq->tail >= rq->size) |
| 138 | rq->tail = 0; | 143 | rq->tail = 0; |
| 139 | ret = 1; | 144 | goto done; |
| 140 | goto bail; | ||
| 141 | } | 145 | } |
| 142 | 146 | ||
| 143 | srq = to_isrq(qp->ibqp.srq); | 147 | srq = to_isrq(qp->ibqp.srq); |
| 144 | rq = &srq->rq; | 148 | rq = &srq->rq; |
| 145 | spin_lock(&rq->lock); | 149 | spin_lock_irqsave(&rq->lock, flags); |
| 150 | |||
| 146 | if (unlikely(rq->tail == rq->head)) { | 151 | if (unlikely(rq->tail == rq->head)) { |
| 147 | spin_unlock(&rq->lock); | ||
| 148 | ret = 0; | 152 | ret = 0; |
| 149 | goto bail; | 153 | goto done; |
| 150 | } | 154 | } |
| 151 | wqe = get_rwqe_ptr(rq, rq->tail); | 155 | wqe = get_rwqe_ptr(rq, rq->tail); |
| 152 | qp->r_wr_id = wqe->wr_id; | 156 | qp->r_wr_id = wqe->wr_id; |
| @@ -168,18 +172,18 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only) | |||
| 168 | n = rq->head - rq->tail; | 172 | n = rq->head - rq->tail; |
| 169 | if (n < srq->limit) { | 173 | if (n < srq->limit) { |
| 170 | srq->limit = 0; | 174 | srq->limit = 0; |
| 171 | spin_unlock(&rq->lock); | 175 | spin_unlock_irqrestore(&rq->lock, flags); |
| 172 | ev.device = qp->ibqp.device; | 176 | ev.device = qp->ibqp.device; |
| 173 | ev.element.srq = qp->ibqp.srq; | 177 | ev.element.srq = qp->ibqp.srq; |
| 174 | ev.event = IB_EVENT_SRQ_LIMIT_REACHED; | 178 | ev.event = IB_EVENT_SRQ_LIMIT_REACHED; |
| 175 | srq->ibsrq.event_handler(&ev, | 179 | srq->ibsrq.event_handler(&ev, |
| 176 | srq->ibsrq.srq_context); | 180 | srq->ibsrq.srq_context); |
| 177 | } else | 181 | goto bail; |
| 178 | spin_unlock(&rq->lock); | 182 | } |
| 179 | } else | 183 | } |
| 180 | spin_unlock(&rq->lock); | ||
| 181 | ret = 1; | ||
| 182 | 184 | ||
| 185 | done: | ||
| 186 | spin_unlock_irqrestore(&rq->lock, flags); | ||
| 183 | bail: | 187 | bail: |
| 184 | return ret; | 188 | return ret; |
| 185 | } | 189 | } |
| @@ -187,7 +191,6 @@ bail: | |||
| 187 | /** | 191 | /** |
| 188 | * ipath_ruc_loopback - handle UC and RC lookback requests | 192 | * ipath_ruc_loopback - handle UC and RC lookback requests |
| 189 | * @sqp: the loopback QP | 193 | * @sqp: the loopback QP |
| 190 | * @wc: the work completion entry | ||
| 191 | * | 194 | * |
| 192 | * This is called from ipath_do_uc_send() or ipath_do_rc_send() to | 195 | * This is called from ipath_do_uc_send() or ipath_do_rc_send() to |
| 193 | * forward a WQE addressed to the same HCA. | 196 | * forward a WQE addressed to the same HCA. |
| @@ -196,13 +199,14 @@ bail: | |||
| 196 | * receive interrupts since this is a connected protocol and all packets | 199 | * receive interrupts since this is a connected protocol and all packets |
| 197 | * will pass through here. | 200 | * will pass through here. |
| 198 | */ | 201 | */ |
| 199 | void ipath_ruc_loopback(struct ipath_qp *sqp, struct ib_wc *wc) | 202 | static void ipath_ruc_loopback(struct ipath_qp *sqp) |
| 200 | { | 203 | { |
| 201 | struct ipath_ibdev *dev = to_idev(sqp->ibqp.device); | 204 | struct ipath_ibdev *dev = to_idev(sqp->ibqp.device); |
| 202 | struct ipath_qp *qp; | 205 | struct ipath_qp *qp; |
| 203 | struct ipath_swqe *wqe; | 206 | struct ipath_swqe *wqe; |
| 204 | struct ipath_sge *sge; | 207 | struct ipath_sge *sge; |
| 205 | unsigned long flags; | 208 | unsigned long flags; |
| 209 | struct ib_wc wc; | ||
| 206 | u64 sdata; | 210 | u64 sdata; |
| 207 | 211 | ||
| 208 | qp = ipath_lookup_qpn(&dev->qp_table, sqp->remote_qpn); | 212 | qp = ipath_lookup_qpn(&dev->qp_table, sqp->remote_qpn); |
| @@ -233,8 +237,8 @@ again: | |||
| 233 | wqe = get_swqe_ptr(sqp, sqp->s_last); | 237 | wqe = get_swqe_ptr(sqp, sqp->s_last); |
| 234 | spin_unlock_irqrestore(&sqp->s_lock, flags); | 238 | spin_unlock_irqrestore(&sqp->s_lock, flags); |
| 235 | 239 | ||
| 236 | wc->wc_flags = 0; | 240 | wc.wc_flags = 0; |
| 237 | wc->imm_data = 0; | 241 | wc.imm_data = 0; |
| 238 | 242 | ||
| 239 | sqp->s_sge.sge = wqe->sg_list[0]; | 243 | sqp->s_sge.sge = wqe->sg_list[0]; |
| 240 | sqp->s_sge.sg_list = wqe->sg_list + 1; | 244 | sqp->s_sge.sg_list = wqe->sg_list + 1; |
| @@ -242,39 +246,34 @@ again: | |||
| 242 | sqp->s_len = wqe->length; | 246 | sqp->s_len = wqe->length; |
| 243 | switch (wqe->wr.opcode) { | 247 | switch (wqe->wr.opcode) { |
| 244 | case IB_WR_SEND_WITH_IMM: | 248 | case IB_WR_SEND_WITH_IMM: |
| 245 | wc->wc_flags = IB_WC_WITH_IMM; | 249 | wc.wc_flags = IB_WC_WITH_IMM; |
| 246 | wc->imm_data = wqe->wr.imm_data; | 250 | wc.imm_data = wqe->wr.imm_data; |
| 247 | /* FALLTHROUGH */ | 251 | /* FALLTHROUGH */ |
| 248 | case IB_WR_SEND: | 252 | case IB_WR_SEND: |
| 249 | spin_lock_irqsave(&qp->r_rq.lock, flags); | ||
| 250 | if (!ipath_get_rwqe(qp, 0)) { | 253 | if (!ipath_get_rwqe(qp, 0)) { |
| 251 | rnr_nak: | 254 | rnr_nak: |
| 252 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 253 | /* Handle RNR NAK */ | 255 | /* Handle RNR NAK */ |
| 254 | if (qp->ibqp.qp_type == IB_QPT_UC) | 256 | if (qp->ibqp.qp_type == IB_QPT_UC) |
| 255 | goto send_comp; | 257 | goto send_comp; |
| 256 | if (sqp->s_rnr_retry == 0) { | 258 | if (sqp->s_rnr_retry == 0) { |
| 257 | wc->status = IB_WC_RNR_RETRY_EXC_ERR; | 259 | wc.status = IB_WC_RNR_RETRY_EXC_ERR; |
| 258 | goto err; | 260 | goto err; |
| 259 | } | 261 | } |
| 260 | if (sqp->s_rnr_retry_cnt < 7) | 262 | if (sqp->s_rnr_retry_cnt < 7) |
| 261 | sqp->s_rnr_retry--; | 263 | sqp->s_rnr_retry--; |
| 262 | dev->n_rnr_naks++; | 264 | dev->n_rnr_naks++; |
| 263 | sqp->s_rnr_timeout = | 265 | sqp->s_rnr_timeout = |
| 264 | ib_ipath_rnr_table[sqp->s_min_rnr_timer]; | 266 | ib_ipath_rnr_table[sqp->r_min_rnr_timer]; |
| 265 | ipath_insert_rnr_queue(sqp); | 267 | ipath_insert_rnr_queue(sqp); |
| 266 | goto done; | 268 | goto done; |
| 267 | } | 269 | } |
| 268 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 269 | break; | 270 | break; |
| 270 | 271 | ||
| 271 | case IB_WR_RDMA_WRITE_WITH_IMM: | 272 | case IB_WR_RDMA_WRITE_WITH_IMM: |
| 272 | wc->wc_flags = IB_WC_WITH_IMM; | 273 | wc.wc_flags = IB_WC_WITH_IMM; |
| 273 | wc->imm_data = wqe->wr.imm_data; | 274 | wc.imm_data = wqe->wr.imm_data; |
| 274 | spin_lock_irqsave(&qp->r_rq.lock, flags); | ||
| 275 | if (!ipath_get_rwqe(qp, 1)) | 275 | if (!ipath_get_rwqe(qp, 1)) |
| 276 | goto rnr_nak; | 276 | goto rnr_nak; |
| 277 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 278 | /* FALLTHROUGH */ | 277 | /* FALLTHROUGH */ |
| 279 | case IB_WR_RDMA_WRITE: | 278 | case IB_WR_RDMA_WRITE: |
| 280 | if (wqe->length == 0) | 279 | if (wqe->length == 0) |
| @@ -284,20 +283,20 @@ again: | |||
| 284 | wqe->wr.wr.rdma.rkey, | 283 | wqe->wr.wr.rdma.rkey, |
| 285 | IB_ACCESS_REMOTE_WRITE))) { | 284 | IB_ACCESS_REMOTE_WRITE))) { |
| 286 | acc_err: | 285 | acc_err: |
| 287 | wc->status = IB_WC_REM_ACCESS_ERR; | 286 | wc.status = IB_WC_REM_ACCESS_ERR; |
| 288 | err: | 287 | err: |
| 289 | wc->wr_id = wqe->wr.wr_id; | 288 | wc.wr_id = wqe->wr.wr_id; |
| 290 | wc->opcode = ib_ipath_wc_opcode[wqe->wr.opcode]; | 289 | wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode]; |
| 291 | wc->vendor_err = 0; | 290 | wc.vendor_err = 0; |
| 292 | wc->byte_len = 0; | 291 | wc.byte_len = 0; |
| 293 | wc->qp_num = sqp->ibqp.qp_num; | 292 | wc.qp_num = sqp->ibqp.qp_num; |
| 294 | wc->src_qp = sqp->remote_qpn; | 293 | wc.src_qp = sqp->remote_qpn; |
| 295 | wc->pkey_index = 0; | 294 | wc.pkey_index = 0; |
| 296 | wc->slid = sqp->remote_ah_attr.dlid; | 295 | wc.slid = sqp->remote_ah_attr.dlid; |
| 297 | wc->sl = sqp->remote_ah_attr.sl; | 296 | wc.sl = sqp->remote_ah_attr.sl; |
| 298 | wc->dlid_path_bits = 0; | 297 | wc.dlid_path_bits = 0; |
| 299 | wc->port_num = 0; | 298 | wc.port_num = 0; |
| 300 | ipath_sqerror_qp(sqp, wc); | 299 | ipath_sqerror_qp(sqp, &wc); |
| 301 | goto done; | 300 | goto done; |
| 302 | } | 301 | } |
| 303 | break; | 302 | break; |
| @@ -373,22 +372,22 @@ again: | |||
| 373 | goto send_comp; | 372 | goto send_comp; |
| 374 | 373 | ||
| 375 | if (wqe->wr.opcode == IB_WR_RDMA_WRITE_WITH_IMM) | 374 | if (wqe->wr.opcode == IB_WR_RDMA_WRITE_WITH_IMM) |
| 376 | wc->opcode = IB_WC_RECV_RDMA_WITH_IMM; | 375 | wc.opcode = IB_WC_RECV_RDMA_WITH_IMM; |
| 377 | else | 376 | else |
| 378 | wc->opcode = IB_WC_RECV; | 377 | wc.opcode = IB_WC_RECV; |
| 379 | wc->wr_id = qp->r_wr_id; | 378 | wc.wr_id = qp->r_wr_id; |
| 380 | wc->status = IB_WC_SUCCESS; | 379 | wc.status = IB_WC_SUCCESS; |
| 381 | wc->vendor_err = 0; | 380 | wc.vendor_err = 0; |
| 382 | wc->byte_len = wqe->length; | 381 | wc.byte_len = wqe->length; |
| 383 | wc->qp_num = qp->ibqp.qp_num; | 382 | wc.qp_num = qp->ibqp.qp_num; |
| 384 | wc->src_qp = qp->remote_qpn; | 383 | wc.src_qp = qp->remote_qpn; |
| 385 | /* XXX do we know which pkey matched? Only needed for GSI. */ | 384 | /* XXX do we know which pkey matched? Only needed for GSI. */ |
| 386 | wc->pkey_index = 0; | 385 | wc.pkey_index = 0; |
| 387 | wc->slid = qp->remote_ah_attr.dlid; | 386 | wc.slid = qp->remote_ah_attr.dlid; |
| 388 | wc->sl = qp->remote_ah_attr.sl; | 387 | wc.sl = qp->remote_ah_attr.sl; |
| 389 | wc->dlid_path_bits = 0; | 388 | wc.dlid_path_bits = 0; |
| 390 | /* Signal completion event if the solicited bit is set. */ | 389 | /* Signal completion event if the solicited bit is set. */ |
| 391 | ipath_cq_enter(to_icq(qp->ibqp.recv_cq), wc, | 390 | ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, |
| 392 | wqe->wr.send_flags & IB_SEND_SOLICITED); | 391 | wqe->wr.send_flags & IB_SEND_SOLICITED); |
| 393 | 392 | ||
| 394 | send_comp: | 393 | send_comp: |
| @@ -396,19 +395,19 @@ send_comp: | |||
| 396 | 395 | ||
| 397 | if (!test_bit(IPATH_S_SIGNAL_REQ_WR, &sqp->s_flags) || | 396 | if (!test_bit(IPATH_S_SIGNAL_REQ_WR, &sqp->s_flags) || |
| 398 | (wqe->wr.send_flags & IB_SEND_SIGNALED)) { | 397 | (wqe->wr.send_flags & IB_SEND_SIGNALED)) { |
| 399 | wc->wr_id = wqe->wr.wr_id; | 398 | wc.wr_id = wqe->wr.wr_id; |
| 400 | wc->status = IB_WC_SUCCESS; | 399 | wc.status = IB_WC_SUCCESS; |
| 401 | wc->opcode = ib_ipath_wc_opcode[wqe->wr.opcode]; | 400 | wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode]; |
| 402 | wc->vendor_err = 0; | 401 | wc.vendor_err = 0; |
| 403 | wc->byte_len = wqe->length; | 402 | wc.byte_len = wqe->length; |
| 404 | wc->qp_num = sqp->ibqp.qp_num; | 403 | wc.qp_num = sqp->ibqp.qp_num; |
| 405 | wc->src_qp = 0; | 404 | wc.src_qp = 0; |
| 406 | wc->pkey_index = 0; | 405 | wc.pkey_index = 0; |
| 407 | wc->slid = 0; | 406 | wc.slid = 0; |
| 408 | wc->sl = 0; | 407 | wc.sl = 0; |
| 409 | wc->dlid_path_bits = 0; | 408 | wc.dlid_path_bits = 0; |
| 410 | wc->port_num = 0; | 409 | wc.port_num = 0; |
| 411 | ipath_cq_enter(to_icq(sqp->ibqp.send_cq), wc, 0); | 410 | ipath_cq_enter(to_icq(sqp->ibqp.send_cq), &wc, 0); |
| 412 | } | 411 | } |
| 413 | 412 | ||
| 414 | /* Update s_last now that we are finished with the SWQE */ | 413 | /* Update s_last now that we are finished with the SWQE */ |
| @@ -454,11 +453,11 @@ void ipath_no_bufs_available(struct ipath_qp *qp, struct ipath_ibdev *dev) | |||
| 454 | } | 453 | } |
| 455 | 454 | ||
| 456 | /** | 455 | /** |
| 457 | * ipath_post_rc_send - post RC and UC sends | 456 | * ipath_post_ruc_send - post RC and UC sends |
| 458 | * @qp: the QP to post on | 457 | * @qp: the QP to post on |
| 459 | * @wr: the work request to send | 458 | * @wr: the work request to send |
| 460 | */ | 459 | */ |
| 461 | int ipath_post_rc_send(struct ipath_qp *qp, struct ib_send_wr *wr) | 460 | int ipath_post_ruc_send(struct ipath_qp *qp, struct ib_send_wr *wr) |
| 462 | { | 461 | { |
| 463 | struct ipath_swqe *wqe; | 462 | struct ipath_swqe *wqe; |
| 464 | unsigned long flags; | 463 | unsigned long flags; |
| @@ -533,13 +532,149 @@ int ipath_post_rc_send(struct ipath_qp *qp, struct ib_send_wr *wr) | |||
| 533 | qp->s_head = next; | 532 | qp->s_head = next; |
| 534 | spin_unlock_irqrestore(&qp->s_lock, flags); | 533 | spin_unlock_irqrestore(&qp->s_lock, flags); |
| 535 | 534 | ||
| 536 | if (qp->ibqp.qp_type == IB_QPT_UC) | 535 | ipath_do_ruc_send((unsigned long) qp); |
| 537 | ipath_do_uc_send((unsigned long) qp); | ||
| 538 | else | ||
| 539 | ipath_do_rc_send((unsigned long) qp); | ||
| 540 | 536 | ||
| 541 | ret = 0; | 537 | ret = 0; |
| 542 | 538 | ||
| 543 | bail: | 539 | bail: |
| 544 | return ret; | 540 | return ret; |
| 545 | } | 541 | } |
| 542 | |||
| 543 | /** | ||
| 544 | * ipath_make_grh - construct a GRH header | ||
| 545 | * @dev: a pointer to the ipath device | ||
| 546 | * @hdr: a pointer to the GRH header being constructed | ||
| 547 | * @grh: the global route address to send to | ||
| 548 | * @hwords: the number of 32 bit words of header being sent | ||
| 549 | * @nwords: the number of 32 bit words of data being sent | ||
| 550 | * | ||
| 551 | * Return the size of the header in 32 bit words. | ||
| 552 | */ | ||
| 553 | u32 ipath_make_grh(struct ipath_ibdev *dev, struct ib_grh *hdr, | ||
| 554 | struct ib_global_route *grh, u32 hwords, u32 nwords) | ||
| 555 | { | ||
| 556 | hdr->version_tclass_flow = | ||
| 557 | cpu_to_be32((6 << 28) | | ||
| 558 | (grh->traffic_class << 20) | | ||
| 559 | grh->flow_label); | ||
| 560 | hdr->paylen = cpu_to_be16((hwords - 2 + nwords + SIZE_OF_CRC) << 2); | ||
| 561 | /* next_hdr is defined by C8-7 in ch. 8.4.1 */ | ||
| 562 | hdr->next_hdr = 0x1B; | ||
| 563 | hdr->hop_limit = grh->hop_limit; | ||
| 564 | /* The SGID is 32-bit aligned. */ | ||
| 565 | hdr->sgid.global.subnet_prefix = dev->gid_prefix; | ||
| 566 | hdr->sgid.global.interface_id = ipath_layer_get_guid(dev->dd); | ||
| 567 | hdr->dgid = grh->dgid; | ||
| 568 | |||
| 569 | /* GRH header size in 32-bit words. */ | ||
| 570 | return sizeof(struct ib_grh) / sizeof(u32); | ||
| 571 | } | ||
| 572 | |||
| 573 | /** | ||
| 574 | * ipath_do_ruc_send - perform a send on an RC or UC QP | ||
| 575 | * @data: contains a pointer to the QP | ||
| 576 | * | ||
| 577 | * Process entries in the send work queue until credit or queue is | ||
| 578 | * exhausted. Only allow one CPU to send a packet per QP (tasklet). | ||
| 579 | * Otherwise, after we drop the QP s_lock, two threads could send | ||
| 580 | * packets out of order. | ||
| 581 | */ | ||
| 582 | void ipath_do_ruc_send(unsigned long data) | ||
| 583 | { | ||
| 584 | struct ipath_qp *qp = (struct ipath_qp *)data; | ||
| 585 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); | ||
| 586 | unsigned long flags; | ||
| 587 | u16 lrh0; | ||
| 588 | u32 nwords; | ||
| 589 | u32 extra_bytes; | ||
| 590 | u32 bth0; | ||
| 591 | u32 bth2; | ||
| 592 | u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu); | ||
| 593 | struct ipath_other_headers *ohdr; | ||
| 594 | |||
| 595 | if (test_and_set_bit(IPATH_S_BUSY, &qp->s_flags)) | ||
| 596 | goto bail; | ||
| 597 | |||
| 598 | if (unlikely(qp->remote_ah_attr.dlid == | ||
| 599 | ipath_layer_get_lid(dev->dd))) { | ||
| 600 | ipath_ruc_loopback(qp); | ||
| 601 | goto clear; | ||
| 602 | } | ||
| 603 | |||
| 604 | ohdr = &qp->s_hdr.u.oth; | ||
| 605 | if (qp->remote_ah_attr.ah_flags & IB_AH_GRH) | ||
| 606 | ohdr = &qp->s_hdr.u.l.oth; | ||
| 607 | |||
| 608 | again: | ||
| 609 | /* Check for a constructed packet to be sent. */ | ||
| 610 | if (qp->s_hdrwords != 0) { | ||
| 611 | /* | ||
| 612 | * If no PIO bufs are available, return. An interrupt will | ||
| 613 | * call ipath_ib_piobufavail() when one is available. | ||
| 614 | */ | ||
| 615 | if (ipath_verbs_send(dev->dd, qp->s_hdrwords, | ||
| 616 | (u32 *) &qp->s_hdr, qp->s_cur_size, | ||
| 617 | qp->s_cur_sge)) { | ||
| 618 | ipath_no_bufs_available(qp, dev); | ||
| 619 | goto bail; | ||
| 620 | } | ||
| 621 | dev->n_unicast_xmit++; | ||
| 622 | /* Record that we sent the packet and s_hdr is empty. */ | ||
| 623 | qp->s_hdrwords = 0; | ||
| 624 | } | ||
| 625 | |||
| 626 | /* | ||
| 627 | * The lock is needed to synchronize between setting | ||
| 628 | * qp->s_ack_state, resend timer, and post_send(). | ||
| 629 | */ | ||
| 630 | spin_lock_irqsave(&qp->s_lock, flags); | ||
| 631 | |||
| 632 | /* Sending responses has higher priority over sending requests. */ | ||
| 633 | if (qp->s_ack_state != IB_OPCODE_RC_ACKNOWLEDGE && | ||
| 634 | (bth0 = ipath_make_rc_ack(qp, ohdr, pmtu)) != 0) | ||
| 635 | bth2 = qp->s_ack_psn++ & IPATH_PSN_MASK; | ||
| 636 | else if (!((qp->ibqp.qp_type == IB_QPT_RC) ? | ||
| 637 | ipath_make_rc_req(qp, ohdr, pmtu, &bth0, &bth2) : | ||
| 638 | ipath_make_uc_req(qp, ohdr, pmtu, &bth0, &bth2))) { | ||
| 639 | /* | ||
| 640 | * Clear the busy bit before unlocking to avoid races with | ||
| 641 | * adding new work queue items and then failing to process | ||
| 642 | * them. | ||
| 643 | */ | ||
| 644 | clear_bit(IPATH_S_BUSY, &qp->s_flags); | ||
| 645 | spin_unlock_irqrestore(&qp->s_lock, flags); | ||
| 646 | goto bail; | ||
| 647 | } | ||
| 648 | |||
| 649 | spin_unlock_irqrestore(&qp->s_lock, flags); | ||
| 650 | |||
| 651 | /* Construct the header. */ | ||
| 652 | extra_bytes = (4 - qp->s_cur_size) & 3; | ||
| 653 | nwords = (qp->s_cur_size + extra_bytes) >> 2; | ||
| 654 | lrh0 = IPATH_LRH_BTH; | ||
| 655 | if (unlikely(qp->remote_ah_attr.ah_flags & IB_AH_GRH)) { | ||
| 656 | qp->s_hdrwords += ipath_make_grh(dev, &qp->s_hdr.u.l.grh, | ||
| 657 | &qp->remote_ah_attr.grh, | ||
| 658 | qp->s_hdrwords, nwords); | ||
| 659 | lrh0 = IPATH_LRH_GRH; | ||
| 660 | } | ||
| 661 | lrh0 |= qp->remote_ah_attr.sl << 4; | ||
| 662 | qp->s_hdr.lrh[0] = cpu_to_be16(lrh0); | ||
| 663 | qp->s_hdr.lrh[1] = cpu_to_be16(qp->remote_ah_attr.dlid); | ||
| 664 | qp->s_hdr.lrh[2] = cpu_to_be16(qp->s_hdrwords + nwords + | ||
| 665 | SIZE_OF_CRC); | ||
| 666 | qp->s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev->dd)); | ||
| 667 | bth0 |= ipath_layer_get_pkey(dev->dd, qp->s_pkey_index); | ||
| 668 | bth0 |= extra_bytes << 20; | ||
| 669 | ohdr->bth[0] = cpu_to_be32(bth0); | ||
| 670 | ohdr->bth[1] = cpu_to_be32(qp->remote_qpn); | ||
| 671 | ohdr->bth[2] = cpu_to_be32(bth2); | ||
| 672 | |||
| 673 | /* Check for more work to do. */ | ||
| 674 | goto again; | ||
| 675 | |||
| 676 | clear: | ||
| 677 | clear_bit(IPATH_S_BUSY, &qp->s_flags); | ||
| 678 | bail: | ||
| 679 | return; | ||
| 680 | } | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/infiniband/hw/ipath/ipath_srq.c index 01c4c6c56118..f760434660bd 100644 --- a/drivers/infiniband/hw/ipath/ipath_srq.c +++ b/drivers/infiniband/hw/ipath/ipath_srq.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -125,11 +126,23 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd, | |||
| 125 | struct ib_srq_init_attr *srq_init_attr, | 126 | struct ib_srq_init_attr *srq_init_attr, |
| 126 | struct ib_udata *udata) | 127 | struct ib_udata *udata) |
| 127 | { | 128 | { |
| 129 | struct ipath_ibdev *dev = to_idev(ibpd->device); | ||
| 128 | struct ipath_srq *srq; | 130 | struct ipath_srq *srq; |
| 129 | u32 sz; | 131 | u32 sz; |
| 130 | struct ib_srq *ret; | 132 | struct ib_srq *ret; |
| 131 | 133 | ||
| 132 | if (srq_init_attr->attr.max_sge < 1) { | 134 | if (dev->n_srqs_allocated == ib_ipath_max_srqs) { |
| 135 | ret = ERR_PTR(-ENOMEM); | ||
| 136 | goto bail; | ||
| 137 | } | ||
| 138 | |||
| 139 | if (srq_init_attr->attr.max_wr == 0) { | ||
| 140 | ret = ERR_PTR(-EINVAL); | ||
| 141 | goto bail; | ||
| 142 | } | ||
| 143 | |||
| 144 | if ((srq_init_attr->attr.max_sge > ib_ipath_max_srq_sges) || | ||
| 145 | (srq_init_attr->attr.max_wr > ib_ipath_max_srq_wrs)) { | ||
| 133 | ret = ERR_PTR(-EINVAL); | 146 | ret = ERR_PTR(-EINVAL); |
| 134 | goto bail; | 147 | goto bail; |
| 135 | } | 148 | } |
| @@ -164,6 +177,8 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd, | |||
| 164 | 177 | ||
| 165 | ret = &srq->ibsrq; | 178 | ret = &srq->ibsrq; |
| 166 | 179 | ||
| 180 | dev->n_srqs_allocated++; | ||
| 181 | |||
| 167 | bail: | 182 | bail: |
| 168 | return ret; | 183 | return ret; |
| 169 | } | 184 | } |
| @@ -181,24 +196,26 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, | |||
| 181 | unsigned long flags; | 196 | unsigned long flags; |
| 182 | int ret; | 197 | int ret; |
| 183 | 198 | ||
| 184 | if (attr_mask & IB_SRQ_LIMIT) { | 199 | if (attr_mask & IB_SRQ_MAX_WR) |
| 185 | spin_lock_irqsave(&srq->rq.lock, flags); | 200 | if ((attr->max_wr > ib_ipath_max_srq_wrs) || |
| 186 | srq->limit = attr->srq_limit; | 201 | (attr->max_sge > srq->rq.max_sge)) { |
| 187 | spin_unlock_irqrestore(&srq->rq.lock, flags); | 202 | ret = -EINVAL; |
| 188 | } | 203 | goto bail; |
| 189 | if (attr_mask & IB_SRQ_MAX_WR) { | 204 | } |
| 190 | u32 size = attr->max_wr + 1; | ||
| 191 | struct ipath_rwqe *wq, *p; | ||
| 192 | u32 n; | ||
| 193 | u32 sz; | ||
| 194 | 205 | ||
| 195 | if (attr->max_sge < srq->rq.max_sge) { | 206 | if (attr_mask & IB_SRQ_LIMIT) |
| 207 | if (attr->srq_limit >= srq->rq.size) { | ||
| 196 | ret = -EINVAL; | 208 | ret = -EINVAL; |
| 197 | goto bail; | 209 | goto bail; |
| 198 | } | 210 | } |
| 199 | 211 | ||
| 212 | if (attr_mask & IB_SRQ_MAX_WR) { | ||
| 213 | struct ipath_rwqe *wq, *p; | ||
| 214 | u32 sz, size, n; | ||
| 215 | |||
| 200 | sz = sizeof(struct ipath_rwqe) + | 216 | sz = sizeof(struct ipath_rwqe) + |
| 201 | attr->max_sge * sizeof(struct ipath_sge); | 217 | attr->max_sge * sizeof(struct ipath_sge); |
| 218 | size = attr->max_wr + 1; | ||
| 202 | wq = vmalloc(size * sz); | 219 | wq = vmalloc(size * sz); |
| 203 | if (!wq) { | 220 | if (!wq) { |
| 204 | ret = -ENOMEM; | 221 | ret = -ENOMEM; |
| @@ -242,6 +259,11 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, | |||
| 242 | spin_unlock_irqrestore(&srq->rq.lock, flags); | 259 | spin_unlock_irqrestore(&srq->rq.lock, flags); |
| 243 | } | 260 | } |
| 244 | 261 | ||
| 262 | if (attr_mask & IB_SRQ_LIMIT) { | ||
| 263 | spin_lock_irqsave(&srq->rq.lock, flags); | ||
| 264 | srq->limit = attr->srq_limit; | ||
| 265 | spin_unlock_irqrestore(&srq->rq.lock, flags); | ||
| 266 | } | ||
| 245 | ret = 0; | 267 | ret = 0; |
| 246 | 268 | ||
| 247 | bail: | 269 | bail: |
| @@ -265,7 +287,9 @@ int ipath_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr) | |||
| 265 | int ipath_destroy_srq(struct ib_srq *ibsrq) | 287 | int ipath_destroy_srq(struct ib_srq *ibsrq) |
| 266 | { | 288 | { |
| 267 | struct ipath_srq *srq = to_isrq(ibsrq); | 289 | struct ipath_srq *srq = to_isrq(ibsrq); |
| 290 | struct ipath_ibdev *dev = to_idev(ibsrq->device); | ||
| 268 | 291 | ||
| 292 | dev->n_srqs_allocated--; | ||
| 269 | vfree(srq->rq.wq); | 293 | vfree(srq->rq.wq); |
| 270 | kfree(srq); | 294 | kfree(srq); |
| 271 | 295 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_stats.c b/drivers/infiniband/hw/ipath/ipath_stats.c index fe209137ee74..70351b7e35c0 100644 --- a/drivers/infiniband/hw/ipath/ipath_stats.c +++ b/drivers/infiniband/hw/ipath/ipath_stats.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -185,7 +186,6 @@ static void ipath_qcheck(struct ipath_devdata *dd) | |||
| 185 | dd->ipath_port0head, | 186 | dd->ipath_port0head, |
| 186 | (unsigned long long) | 187 | (unsigned long long) |
| 187 | ipath_stats.sps_port0pkts); | 188 | ipath_stats.sps_port0pkts); |
| 188 | ipath_kreceive(dd); | ||
| 189 | } | 189 | } |
| 190 | dd->ipath_lastport0rcv_cnt = ipath_stats.sps_port0pkts; | 190 | dd->ipath_lastport0rcv_cnt = ipath_stats.sps_port0pkts; |
| 191 | } | 191 | } |
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c index f323791cc495..b98821d7801d 100644 --- a/drivers/infiniband/hw/ipath/ipath_sysfs.c +++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -34,8 +35,8 @@ | |||
| 34 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 35 | 36 | ||
| 36 | #include "ipath_kernel.h" | 37 | #include "ipath_kernel.h" |
| 37 | #include "ips_common.h" | ||
| 38 | #include "ipath_layer.h" | 38 | #include "ipath_layer.h" |
| 39 | #include "ipath_common.h" | ||
| 39 | 40 | ||
| 40 | /** | 41 | /** |
| 41 | * ipath_parse_ushort - parse an unsigned short value in an arbitrary base | 42 | * ipath_parse_ushort - parse an unsigned short value in an arbitrary base |
| @@ -84,99 +85,6 @@ static ssize_t show_num_units(struct device_driver *dev, char *buf) | |||
| 84 | ipath_count_units(NULL, NULL, NULL)); | 85 | ipath_count_units(NULL, NULL, NULL)); |
| 85 | } | 86 | } |
| 86 | 87 | ||
| 87 | #define DRIVER_STAT(name, attr) \ | ||
| 88 | static ssize_t show_stat_##name(struct device_driver *dev, \ | ||
| 89 | char *buf) \ | ||
| 90 | { \ | ||
| 91 | return scnprintf( \ | ||
| 92 | buf, PAGE_SIZE, "%llu\n", \ | ||
| 93 | (unsigned long long) ipath_stats.sps_ ##attr); \ | ||
| 94 | } \ | ||
| 95 | static DRIVER_ATTR(name, S_IRUGO, show_stat_##name, NULL) | ||
| 96 | |||
| 97 | DRIVER_STAT(intrs, ints); | ||
| 98 | DRIVER_STAT(err_intrs, errints); | ||
| 99 | DRIVER_STAT(errs, errs); | ||
| 100 | DRIVER_STAT(pkt_errs, pkterrs); | ||
| 101 | DRIVER_STAT(crc_errs, crcerrs); | ||
| 102 | DRIVER_STAT(hw_errs, hwerrs); | ||
| 103 | DRIVER_STAT(ib_link, iblink); | ||
| 104 | DRIVER_STAT(port0_pkts, port0pkts); | ||
| 105 | DRIVER_STAT(ether_spkts, ether_spkts); | ||
| 106 | DRIVER_STAT(ether_rpkts, ether_rpkts); | ||
| 107 | DRIVER_STAT(sma_spkts, sma_spkts); | ||
| 108 | DRIVER_STAT(sma_rpkts, sma_rpkts); | ||
| 109 | DRIVER_STAT(hdrq_full, hdrqfull); | ||
| 110 | DRIVER_STAT(etid_full, etidfull); | ||
| 111 | DRIVER_STAT(no_piobufs, nopiobufs); | ||
| 112 | DRIVER_STAT(ports, ports); | ||
| 113 | DRIVER_STAT(pkey0, pkeys[0]); | ||
| 114 | DRIVER_STAT(pkey1, pkeys[1]); | ||
| 115 | DRIVER_STAT(pkey2, pkeys[2]); | ||
| 116 | DRIVER_STAT(pkey3, pkeys[3]); | ||
| 117 | /* XXX fix the following when dynamic table of devices used */ | ||
| 118 | DRIVER_STAT(lid0, lid[0]); | ||
| 119 | DRIVER_STAT(lid1, lid[1]); | ||
| 120 | DRIVER_STAT(lid2, lid[2]); | ||
| 121 | DRIVER_STAT(lid3, lid[3]); | ||
| 122 | |||
| 123 | DRIVER_STAT(nports, nports); | ||
| 124 | DRIVER_STAT(null_intr, nullintr); | ||
| 125 | DRIVER_STAT(max_pkts_call, maxpkts_call); | ||
| 126 | DRIVER_STAT(avg_pkts_call, avgpkts_call); | ||
| 127 | DRIVER_STAT(page_locks, pagelocks); | ||
| 128 | DRIVER_STAT(page_unlocks, pageunlocks); | ||
| 129 | DRIVER_STAT(krdrops, krdrops); | ||
| 130 | /* XXX fix the following when dynamic table of devices used */ | ||
| 131 | DRIVER_STAT(mlid0, mlid[0]); | ||
| 132 | DRIVER_STAT(mlid1, mlid[1]); | ||
| 133 | DRIVER_STAT(mlid2, mlid[2]); | ||
| 134 | DRIVER_STAT(mlid3, mlid[3]); | ||
| 135 | |||
| 136 | static struct attribute *driver_stat_attributes[] = { | ||
| 137 | &driver_attr_intrs.attr, | ||
| 138 | &driver_attr_err_intrs.attr, | ||
| 139 | &driver_attr_errs.attr, | ||
| 140 | &driver_attr_pkt_errs.attr, | ||
| 141 | &driver_attr_crc_errs.attr, | ||
| 142 | &driver_attr_hw_errs.attr, | ||
| 143 | &driver_attr_ib_link.attr, | ||
| 144 | &driver_attr_port0_pkts.attr, | ||
| 145 | &driver_attr_ether_spkts.attr, | ||
| 146 | &driver_attr_ether_rpkts.attr, | ||
| 147 | &driver_attr_sma_spkts.attr, | ||
| 148 | &driver_attr_sma_rpkts.attr, | ||
| 149 | &driver_attr_hdrq_full.attr, | ||
| 150 | &driver_attr_etid_full.attr, | ||
| 151 | &driver_attr_no_piobufs.attr, | ||
| 152 | &driver_attr_ports.attr, | ||
| 153 | &driver_attr_pkey0.attr, | ||
| 154 | &driver_attr_pkey1.attr, | ||
| 155 | &driver_attr_pkey2.attr, | ||
| 156 | &driver_attr_pkey3.attr, | ||
| 157 | &driver_attr_lid0.attr, | ||
| 158 | &driver_attr_lid1.attr, | ||
| 159 | &driver_attr_lid2.attr, | ||
| 160 | &driver_attr_lid3.attr, | ||
| 161 | &driver_attr_nports.attr, | ||
| 162 | &driver_attr_null_intr.attr, | ||
| 163 | &driver_attr_max_pkts_call.attr, | ||
| 164 | &driver_attr_avg_pkts_call.attr, | ||
| 165 | &driver_attr_page_locks.attr, | ||
| 166 | &driver_attr_page_unlocks.attr, | ||
| 167 | &driver_attr_krdrops.attr, | ||
| 168 | &driver_attr_mlid0.attr, | ||
| 169 | &driver_attr_mlid1.attr, | ||
| 170 | &driver_attr_mlid2.attr, | ||
| 171 | &driver_attr_mlid3.attr, | ||
| 172 | NULL | ||
| 173 | }; | ||
| 174 | |||
| 175 | static struct attribute_group driver_stat_attr_group = { | ||
| 176 | .name = "stats", | ||
| 177 | .attrs = driver_stat_attributes | ||
| 178 | }; | ||
| 179 | |||
| 180 | static ssize_t show_status(struct device *dev, | 88 | static ssize_t show_status(struct device *dev, |
| 181 | struct device_attribute *attr, | 89 | struct device_attribute *attr, |
| 182 | char *buf) | 90 | char *buf) |
| @@ -272,23 +180,23 @@ static ssize_t store_lid(struct device *dev, | |||
| 272 | size_t count) | 180 | size_t count) |
| 273 | { | 181 | { |
| 274 | struct ipath_devdata *dd = dev_get_drvdata(dev); | 182 | struct ipath_devdata *dd = dev_get_drvdata(dev); |
| 275 | u16 lid; | 183 | u16 lid = 0; |
| 276 | int ret; | 184 | int ret; |
| 277 | 185 | ||
| 278 | ret = ipath_parse_ushort(buf, &lid); | 186 | ret = ipath_parse_ushort(buf, &lid); |
| 279 | if (ret < 0) | 187 | if (ret < 0) |
| 280 | goto invalid; | 188 | goto invalid; |
| 281 | 189 | ||
| 282 | if (lid == 0 || lid >= 0xc000) { | 190 | if (lid == 0 || lid >= IPATH_MULTICAST_LID_BASE) { |
| 283 | ret = -EINVAL; | 191 | ret = -EINVAL; |
| 284 | goto invalid; | 192 | goto invalid; |
| 285 | } | 193 | } |
| 286 | 194 | ||
| 287 | ipath_set_sps_lid(dd, lid, 0); | 195 | ipath_set_lid(dd, lid, 0); |
| 288 | 196 | ||
| 289 | goto bail; | 197 | goto bail; |
| 290 | invalid: | 198 | invalid: |
| 291 | ipath_dev_err(dd, "attempt to set invalid LID\n"); | 199 | ipath_dev_err(dd, "attempt to set invalid LID 0x%x\n", lid); |
| 292 | bail: | 200 | bail: |
| 293 | return ret; | 201 | return ret; |
| 294 | } | 202 | } |
| @@ -313,13 +221,12 @@ static ssize_t store_mlid(struct device *dev, | |||
| 313 | int ret; | 221 | int ret; |
| 314 | 222 | ||
| 315 | ret = ipath_parse_ushort(buf, &mlid); | 223 | ret = ipath_parse_ushort(buf, &mlid); |
| 316 | if (ret < 0) | 224 | if (ret < 0 || mlid < IPATH_MULTICAST_LID_BASE) |
| 317 | goto invalid; | 225 | goto invalid; |
| 318 | 226 | ||
| 319 | unit = dd->ipath_unit; | 227 | unit = dd->ipath_unit; |
| 320 | 228 | ||
| 321 | dd->ipath_mlid = mlid; | 229 | dd->ipath_mlid = mlid; |
| 322 | ipath_stats.sps_mlid[unit] = mlid; | ||
| 323 | ipath_layer_intr(dd, IPATH_LAYER_INT_BCAST); | 230 | ipath_layer_intr(dd, IPATH_LAYER_INT_BCAST); |
| 324 | 231 | ||
| 325 | goto bail; | 232 | goto bail; |
| @@ -734,20 +641,12 @@ int ipath_driver_create_group(struct device_driver *drv) | |||
| 734 | int ret; | 641 | int ret; |
| 735 | 642 | ||
| 736 | ret = sysfs_create_group(&drv->kobj, &driver_attr_group); | 643 | ret = sysfs_create_group(&drv->kobj, &driver_attr_group); |
| 737 | if (ret) | ||
| 738 | goto bail; | ||
| 739 | 644 | ||
| 740 | ret = sysfs_create_group(&drv->kobj, &driver_stat_attr_group); | ||
| 741 | if (ret) | ||
| 742 | sysfs_remove_group(&drv->kobj, &driver_attr_group); | ||
| 743 | |||
| 744 | bail: | ||
| 745 | return ret; | 645 | return ret; |
| 746 | } | 646 | } |
| 747 | 647 | ||
| 748 | void ipath_driver_remove_group(struct device_driver *drv) | 648 | void ipath_driver_remove_group(struct device_driver *drv) |
| 749 | { | 649 | { |
| 750 | sysfs_remove_group(&drv->kobj, &driver_stat_attr_group); | ||
| 751 | sysfs_remove_group(&drv->kobj, &driver_attr_group); | 650 | sysfs_remove_group(&drv->kobj, &driver_attr_group); |
| 752 | } | 651 | } |
| 753 | 652 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_uc.c b/drivers/infiniband/hw/ipath/ipath_uc.c index 0d6dbc0a541e..c33abea2d5a7 100644 --- a/drivers/infiniband/hw/ipath/ipath_uc.c +++ b/drivers/infiniband/hw/ipath/ipath_uc.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -31,7 +32,7 @@ | |||
| 31 | */ | 32 | */ |
| 32 | 33 | ||
| 33 | #include "ipath_verbs.h" | 34 | #include "ipath_verbs.h" |
| 34 | #include "ips_common.h" | 35 | #include "ipath_common.h" |
| 35 | 36 | ||
| 36 | /* cut down ridiculously long IB macro names */ | 37 | /* cut down ridiculously long IB macro names */ |
| 37 | #define OP(x) IB_OPCODE_UC_##x | 38 | #define OP(x) IB_OPCODE_UC_##x |
| @@ -61,90 +62,40 @@ static void complete_last_send(struct ipath_qp *qp, struct ipath_swqe *wqe, | |||
| 61 | } | 62 | } |
| 62 | 63 | ||
| 63 | /** | 64 | /** |
| 64 | * ipath_do_uc_send - do a send on a UC queue | 65 | * ipath_make_uc_req - construct a request packet (SEND, RDMA write) |
| 65 | * @data: contains a pointer to the QP to send on | 66 | * @qp: a pointer to the QP |
| 67 | * @ohdr: a pointer to the IB header being constructed | ||
| 68 | * @pmtu: the path MTU | ||
| 69 | * @bth0p: pointer to the BTH opcode word | ||
| 70 | * @bth2p: pointer to the BTH PSN word | ||
| 66 | * | 71 | * |
| 67 | * Process entries in the send work queue until the queue is exhausted. | 72 | * Return 1 if constructed; otherwise, return 0. |
| 68 | * Only allow one CPU to send a packet per QP (tasklet). | 73 | * Note the QP s_lock must be held and interrupts disabled. |
| 69 | * Otherwise, after we drop the QP lock, two threads could send | ||
| 70 | * packets out of order. | ||
| 71 | * This is similar to ipath_do_rc_send() below except we don't have | ||
| 72 | * timeouts or resends. | ||
| 73 | */ | 74 | */ |
| 74 | void ipath_do_uc_send(unsigned long data) | 75 | int ipath_make_uc_req(struct ipath_qp *qp, |
| 76 | struct ipath_other_headers *ohdr, | ||
| 77 | u32 pmtu, u32 *bth0p, u32 *bth2p) | ||
| 75 | { | 78 | { |
| 76 | struct ipath_qp *qp = (struct ipath_qp *)data; | ||
| 77 | struct ipath_ibdev *dev = to_idev(qp->ibqp.device); | ||
| 78 | struct ipath_swqe *wqe; | 79 | struct ipath_swqe *wqe; |
| 79 | unsigned long flags; | ||
| 80 | u16 lrh0; | ||
| 81 | u32 hwords; | 80 | u32 hwords; |
| 82 | u32 nwords; | ||
| 83 | u32 extra_bytes; | ||
| 84 | u32 bth0; | 81 | u32 bth0; |
| 85 | u32 bth2; | ||
| 86 | u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu); | ||
| 87 | u32 len; | 82 | u32 len; |
| 88 | struct ipath_other_headers *ohdr; | ||
| 89 | struct ib_wc wc; | 83 | struct ib_wc wc; |
| 90 | 84 | ||
| 91 | if (test_and_set_bit(IPATH_S_BUSY, &qp->s_flags)) | ||
| 92 | goto bail; | ||
| 93 | |||
| 94 | if (unlikely(qp->remote_ah_attr.dlid == | ||
| 95 | ipath_layer_get_lid(dev->dd))) { | ||
| 96 | /* Pass in an uninitialized ib_wc to save stack space. */ | ||
| 97 | ipath_ruc_loopback(qp, &wc); | ||
| 98 | clear_bit(IPATH_S_BUSY, &qp->s_flags); | ||
| 99 | goto bail; | ||
| 100 | } | ||
| 101 | |||
| 102 | ohdr = &qp->s_hdr.u.oth; | ||
| 103 | if (qp->remote_ah_attr.ah_flags & IB_AH_GRH) | ||
| 104 | ohdr = &qp->s_hdr.u.l.oth; | ||
| 105 | |||
| 106 | again: | ||
| 107 | /* Check for a constructed packet to be sent. */ | ||
| 108 | if (qp->s_hdrwords != 0) { | ||
| 109 | /* | ||
| 110 | * If no PIO bufs are available, return. | ||
| 111 | * An interrupt will call ipath_ib_piobufavail() | ||
| 112 | * when one is available. | ||
| 113 | */ | ||
| 114 | if (ipath_verbs_send(dev->dd, qp->s_hdrwords, | ||
| 115 | (u32 *) &qp->s_hdr, | ||
| 116 | qp->s_cur_size, | ||
| 117 | qp->s_cur_sge)) { | ||
| 118 | ipath_no_bufs_available(qp, dev); | ||
| 119 | goto bail; | ||
| 120 | } | ||
| 121 | dev->n_unicast_xmit++; | ||
| 122 | /* Record that we sent the packet and s_hdr is empty. */ | ||
| 123 | qp->s_hdrwords = 0; | ||
| 124 | } | ||
| 125 | |||
| 126 | lrh0 = IPS_LRH_BTH; | ||
| 127 | /* header size in 32-bit words LRH+BTH = (8+12)/4. */ | ||
| 128 | hwords = 5; | ||
| 129 | |||
| 130 | /* | ||
| 131 | * The lock is needed to synchronize between | ||
| 132 | * setting qp->s_ack_state and post_send(). | ||
| 133 | */ | ||
| 134 | spin_lock_irqsave(&qp->s_lock, flags); | ||
| 135 | |||
| 136 | if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK)) | 85 | if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK)) |
| 137 | goto done; | 86 | goto done; |
| 138 | 87 | ||
| 139 | bth0 = ipath_layer_get_pkey(dev->dd, qp->s_pkey_index); | 88 | /* header size in 32-bit words LRH+BTH = (8+12)/4. */ |
| 89 | hwords = 5; | ||
| 90 | bth0 = 0; | ||
| 140 | 91 | ||
| 141 | /* Send a request. */ | 92 | /* Get the next send request. */ |
| 142 | wqe = get_swqe_ptr(qp, qp->s_last); | 93 | wqe = get_swqe_ptr(qp, qp->s_last); |
| 143 | switch (qp->s_state) { | 94 | switch (qp->s_state) { |
| 144 | default: | 95 | default: |
| 145 | /* | 96 | /* |
| 146 | * Signal the completion of the last send (if there is | 97 | * Signal the completion of the last send |
| 147 | * one). | 98 | * (if there is one). |
| 148 | */ | 99 | */ |
| 149 | if (qp->s_last != qp->s_tail) | 100 | if (qp->s_last != qp->s_tail) |
| 150 | complete_last_send(qp, wqe, &wc); | 101 | complete_last_send(qp, wqe, &wc); |
| @@ -257,61 +208,16 @@ again: | |||
| 257 | } | 208 | } |
| 258 | break; | 209 | break; |
| 259 | } | 210 | } |
| 260 | bth2 = qp->s_next_psn++ & IPS_PSN_MASK; | ||
| 261 | qp->s_len -= len; | 211 | qp->s_len -= len; |
| 262 | bth0 |= qp->s_state << 24; | ||
| 263 | |||
| 264 | spin_unlock_irqrestore(&qp->s_lock, flags); | ||
| 265 | |||
| 266 | /* Construct the header. */ | ||
| 267 | extra_bytes = (4 - len) & 3; | ||
| 268 | nwords = (len + extra_bytes) >> 2; | ||
| 269 | if (unlikely(qp->remote_ah_attr.ah_flags & IB_AH_GRH)) { | ||
| 270 | /* Header size in 32-bit words. */ | ||
| 271 | hwords += 10; | ||
| 272 | lrh0 = IPS_LRH_GRH; | ||
| 273 | qp->s_hdr.u.l.grh.version_tclass_flow = | ||
| 274 | cpu_to_be32((6 << 28) | | ||
| 275 | (qp->remote_ah_attr.grh.traffic_class | ||
| 276 | << 20) | | ||
| 277 | qp->remote_ah_attr.grh.flow_label); | ||
| 278 | qp->s_hdr.u.l.grh.paylen = | ||
| 279 | cpu_to_be16(((hwords - 12) + nwords + | ||
| 280 | SIZE_OF_CRC) << 2); | ||
| 281 | /* next_hdr is defined by C8-7 in ch. 8.4.1 */ | ||
| 282 | qp->s_hdr.u.l.grh.next_hdr = 0x1B; | ||
| 283 | qp->s_hdr.u.l.grh.hop_limit = | ||
| 284 | qp->remote_ah_attr.grh.hop_limit; | ||
| 285 | /* The SGID is 32-bit aligned. */ | ||
| 286 | qp->s_hdr.u.l.grh.sgid.global.subnet_prefix = | ||
| 287 | dev->gid_prefix; | ||
| 288 | qp->s_hdr.u.l.grh.sgid.global.interface_id = | ||
| 289 | ipath_layer_get_guid(dev->dd); | ||
| 290 | qp->s_hdr.u.l.grh.dgid = qp->remote_ah_attr.grh.dgid; | ||
| 291 | } | ||
| 292 | qp->s_hdrwords = hwords; | 212 | qp->s_hdrwords = hwords; |
| 293 | qp->s_cur_sge = &qp->s_sge; | 213 | qp->s_cur_sge = &qp->s_sge; |
| 294 | qp->s_cur_size = len; | 214 | qp->s_cur_size = len; |
| 295 | lrh0 |= qp->remote_ah_attr.sl << 4; | 215 | *bth0p = bth0 | (qp->s_state << 24); |
| 296 | qp->s_hdr.lrh[0] = cpu_to_be16(lrh0); | 216 | *bth2p = qp->s_next_psn++ & IPATH_PSN_MASK; |
| 297 | /* DEST LID */ | 217 | return 1; |
| 298 | qp->s_hdr.lrh[1] = cpu_to_be16(qp->remote_ah_attr.dlid); | ||
| 299 | qp->s_hdr.lrh[2] = cpu_to_be16(hwords + nwords + SIZE_OF_CRC); | ||
| 300 | qp->s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev->dd)); | ||
| 301 | bth0 |= extra_bytes << 20; | ||
| 302 | ohdr->bth[0] = cpu_to_be32(bth0); | ||
| 303 | ohdr->bth[1] = cpu_to_be32(qp->remote_qpn); | ||
| 304 | ohdr->bth[2] = cpu_to_be32(bth2); | ||
| 305 | |||
| 306 | /* Check for more work to do. */ | ||
| 307 | goto again; | ||
| 308 | 218 | ||
| 309 | done: | 219 | done: |
| 310 | spin_unlock_irqrestore(&qp->s_lock, flags); | 220 | return 0; |
| 311 | clear_bit(IPATH_S_BUSY, &qp->s_flags); | ||
| 312 | |||
| 313 | bail: | ||
| 314 | return; | ||
| 315 | } | 221 | } |
| 316 | 222 | ||
| 317 | /** | 223 | /** |
| @@ -335,7 +241,6 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 335 | u32 hdrsize; | 241 | u32 hdrsize; |
| 336 | u32 psn; | 242 | u32 psn; |
| 337 | u32 pad; | 243 | u32 pad; |
| 338 | unsigned long flags; | ||
| 339 | struct ib_wc wc; | 244 | struct ib_wc wc; |
| 340 | u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu); | 245 | u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu); |
| 341 | struct ib_reth *reth; | 246 | struct ib_reth *reth; |
| @@ -373,8 +278,6 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 373 | wc.imm_data = 0; | 278 | wc.imm_data = 0; |
| 374 | wc.wc_flags = 0; | 279 | wc.wc_flags = 0; |
| 375 | 280 | ||
| 376 | spin_lock_irqsave(&qp->r_rq.lock, flags); | ||
| 377 | |||
| 378 | /* Compare the PSN verses the expected PSN. */ | 281 | /* Compare the PSN verses the expected PSN. */ |
| 379 | if (unlikely(ipath_cmp24(psn, qp->r_psn) != 0)) { | 282 | if (unlikely(ipath_cmp24(psn, qp->r_psn) != 0)) { |
| 380 | /* | 283 | /* |
| @@ -535,12 +438,13 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 535 | if (qp->r_len != 0) { | 438 | if (qp->r_len != 0) { |
| 536 | u32 rkey = be32_to_cpu(reth->rkey); | 439 | u32 rkey = be32_to_cpu(reth->rkey); |
| 537 | u64 vaddr = be64_to_cpu(reth->vaddr); | 440 | u64 vaddr = be64_to_cpu(reth->vaddr); |
| 441 | int ok; | ||
| 538 | 442 | ||
| 539 | /* Check rkey */ | 443 | /* Check rkey */ |
| 540 | if (unlikely(!ipath_rkey_ok( | 444 | ok = ipath_rkey_ok(dev, &qp->r_sge, qp->r_len, |
| 541 | dev, &qp->r_sge, qp->r_len, | 445 | vaddr, rkey, |
| 542 | vaddr, rkey, | 446 | IB_ACCESS_REMOTE_WRITE); |
| 543 | IB_ACCESS_REMOTE_WRITE))) { | 447 | if (unlikely(!ok)) { |
| 544 | dev->n_pkt_drops++; | 448 | dev->n_pkt_drops++; |
| 545 | goto done; | 449 | goto done; |
| 546 | } | 450 | } |
| @@ -558,8 +462,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 558 | } | 462 | } |
| 559 | if (opcode == OP(RDMA_WRITE_ONLY)) | 463 | if (opcode == OP(RDMA_WRITE_ONLY)) |
| 560 | goto rdma_last; | 464 | goto rdma_last; |
| 561 | else if (opcode == | 465 | else if (opcode == OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE)) |
| 562 | OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE)) | ||
| 563 | goto rdma_last_imm; | 466 | goto rdma_last_imm; |
| 564 | /* FALLTHROUGH */ | 467 | /* FALLTHROUGH */ |
| 565 | case OP(RDMA_WRITE_MIDDLE): | 468 | case OP(RDMA_WRITE_MIDDLE): |
| @@ -592,9 +495,9 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 592 | dev->n_pkt_drops++; | 495 | dev->n_pkt_drops++; |
| 593 | goto done; | 496 | goto done; |
| 594 | } | 497 | } |
| 595 | if (qp->r_reuse_sge) { | 498 | if (qp->r_reuse_sge) |
| 596 | qp->r_reuse_sge = 0; | 499 | qp->r_reuse_sge = 0; |
| 597 | } else if (!ipath_get_rwqe(qp, 1)) { | 500 | else if (!ipath_get_rwqe(qp, 1)) { |
| 598 | dev->n_pkt_drops++; | 501 | dev->n_pkt_drops++; |
| 599 | goto done; | 502 | goto done; |
| 600 | } | 503 | } |
| @@ -631,15 +534,11 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 631 | 534 | ||
| 632 | default: | 535 | default: |
| 633 | /* Drop packet for unknown opcodes. */ | 536 | /* Drop packet for unknown opcodes. */ |
| 634 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 635 | dev->n_pkt_drops++; | 537 | dev->n_pkt_drops++; |
| 636 | goto bail; | 538 | goto done; |
| 637 | } | 539 | } |
| 638 | qp->r_psn++; | 540 | qp->r_psn++; |
| 639 | qp->r_state = opcode; | 541 | qp->r_state = opcode; |
| 640 | done: | 542 | done: |
| 641 | spin_unlock_irqrestore(&qp->r_rq.lock, flags); | ||
| 642 | |||
| 643 | bail: | ||
| 644 | return; | 543 | return; |
| 645 | } | 544 | } |
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c index e606daf83210..3466129af804 100644 --- a/drivers/infiniband/hw/ipath/ipath_ud.c +++ b/drivers/infiniband/hw/ipath/ipath_ud.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -33,7 +34,7 @@ | |||
| 33 | #include <rdma/ib_smi.h> | 34 | #include <rdma/ib_smi.h> |
| 34 | 35 | ||
| 35 | #include "ipath_verbs.h" | 36 | #include "ipath_verbs.h" |
| 36 | #include "ips_common.h" | 37 | #include "ipath_common.h" |
| 37 | 38 | ||
| 38 | /** | 39 | /** |
| 39 | * ipath_ud_loopback - handle send on loopback QPs | 40 | * ipath_ud_loopback - handle send on loopback QPs |
| @@ -274,6 +275,11 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr) | |||
| 274 | len += wr->sg_list[i].length; | 275 | len += wr->sg_list[i].length; |
| 275 | ss.num_sge++; | 276 | ss.num_sge++; |
| 276 | } | 277 | } |
| 278 | /* Check for invalid packet size. */ | ||
| 279 | if (len > ipath_layer_get_ibmtu(dev->dd)) { | ||
| 280 | ret = -EINVAL; | ||
| 281 | goto bail; | ||
| 282 | } | ||
| 277 | extra_bytes = (4 - len) & 3; | 283 | extra_bytes = (4 - len) & 3; |
| 278 | nwords = (len + extra_bytes) >> 2; | 284 | nwords = (len + extra_bytes) >> 2; |
| 279 | 285 | ||
| @@ -283,8 +289,8 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr) | |||
| 283 | ret = -EINVAL; | 289 | ret = -EINVAL; |
| 284 | goto bail; | 290 | goto bail; |
| 285 | } | 291 | } |
| 286 | if (ah_attr->dlid >= IPS_MULTICAST_LID_BASE) { | 292 | if (ah_attr->dlid >= IPATH_MULTICAST_LID_BASE) { |
| 287 | if (ah_attr->dlid != IPS_PERMISSIVE_LID) | 293 | if (ah_attr->dlid != IPATH_PERMISSIVE_LID) |
| 288 | dev->n_multicast_xmit++; | 294 | dev->n_multicast_xmit++; |
| 289 | else | 295 | else |
| 290 | dev->n_unicast_xmit++; | 296 | dev->n_unicast_xmit++; |
| @@ -304,7 +310,7 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr) | |||
| 304 | if (ah_attr->ah_flags & IB_AH_GRH) { | 310 | if (ah_attr->ah_flags & IB_AH_GRH) { |
| 305 | /* Header size in 32-bit words. */ | 311 | /* Header size in 32-bit words. */ |
| 306 | hwords = 17; | 312 | hwords = 17; |
| 307 | lrh0 = IPS_LRH_GRH; | 313 | lrh0 = IPATH_LRH_GRH; |
| 308 | ohdr = &qp->s_hdr.u.l.oth; | 314 | ohdr = &qp->s_hdr.u.l.oth; |
| 309 | qp->s_hdr.u.l.grh.version_tclass_flow = | 315 | qp->s_hdr.u.l.grh.version_tclass_flow = |
| 310 | cpu_to_be32((6 << 28) | | 316 | cpu_to_be32((6 << 28) | |
| @@ -330,7 +336,7 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr) | |||
| 330 | } else { | 336 | } else { |
| 331 | /* Header size in 32-bit words. */ | 337 | /* Header size in 32-bit words. */ |
| 332 | hwords = 7; | 338 | hwords = 7; |
| 333 | lrh0 = IPS_LRH_BTH; | 339 | lrh0 = IPATH_LRH_BTH; |
| 334 | ohdr = &qp->s_hdr.u.oth; | 340 | ohdr = &qp->s_hdr.u.oth; |
| 335 | } | 341 | } |
| 336 | if (wr->opcode == IB_WR_SEND_WITH_IMM) { | 342 | if (wr->opcode == IB_WR_SEND_WITH_IMM) { |
| @@ -361,18 +367,18 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr) | |||
| 361 | if (wr->send_flags & IB_SEND_SOLICITED) | 367 | if (wr->send_flags & IB_SEND_SOLICITED) |
| 362 | bth0 |= 1 << 23; | 368 | bth0 |= 1 << 23; |
| 363 | bth0 |= extra_bytes << 20; | 369 | bth0 |= extra_bytes << 20; |
| 364 | bth0 |= qp->ibqp.qp_type == IB_QPT_SMI ? IPS_DEFAULT_P_KEY : | 370 | bth0 |= qp->ibqp.qp_type == IB_QPT_SMI ? IPATH_DEFAULT_P_KEY : |
| 365 | ipath_layer_get_pkey(dev->dd, qp->s_pkey_index); | 371 | ipath_layer_get_pkey(dev->dd, qp->s_pkey_index); |
| 366 | ohdr->bth[0] = cpu_to_be32(bth0); | 372 | ohdr->bth[0] = cpu_to_be32(bth0); |
| 367 | /* | 373 | /* |
| 368 | * Use the multicast QP if the destination LID is a multicast LID. | 374 | * Use the multicast QP if the destination LID is a multicast LID. |
| 369 | */ | 375 | */ |
| 370 | ohdr->bth[1] = ah_attr->dlid >= IPS_MULTICAST_LID_BASE && | 376 | ohdr->bth[1] = ah_attr->dlid >= IPATH_MULTICAST_LID_BASE && |
| 371 | ah_attr->dlid != IPS_PERMISSIVE_LID ? | 377 | ah_attr->dlid != IPATH_PERMISSIVE_LID ? |
| 372 | __constant_cpu_to_be32(IPS_MULTICAST_QPN) : | 378 | __constant_cpu_to_be32(IPATH_MULTICAST_QPN) : |
| 373 | cpu_to_be32(wr->wr.ud.remote_qpn); | 379 | cpu_to_be32(wr->wr.ud.remote_qpn); |
| 374 | /* XXX Could lose a PSN count but not worth locking */ | 380 | /* XXX Could lose a PSN count but not worth locking */ |
| 375 | ohdr->bth[2] = cpu_to_be32(qp->s_next_psn++ & IPS_PSN_MASK); | 381 | ohdr->bth[2] = cpu_to_be32(qp->s_next_psn++ & IPATH_PSN_MASK); |
| 376 | /* | 382 | /* |
| 377 | * Qkeys with the high order bit set mean use the | 383 | * Qkeys with the high order bit set mean use the |
| 378 | * qkey from the QP context instead of the WR (see 10.2.5). | 384 | * qkey from the QP context instead of the WR (see 10.2.5). |
| @@ -463,7 +469,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 463 | src_qp = be32_to_cpu(ohdr->u.ud.deth[1]); | 469 | src_qp = be32_to_cpu(ohdr->u.ud.deth[1]); |
| 464 | } | 470 | } |
| 465 | } | 471 | } |
| 466 | src_qp &= IPS_QPN_MASK; | 472 | src_qp &= IPATH_QPN_MASK; |
| 467 | 473 | ||
| 468 | /* | 474 | /* |
| 469 | * Check that the permissive LID is only used on QP0 | 475 | * Check that the permissive LID is only used on QP0 |
| @@ -554,7 +560,16 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 554 | spin_lock_irqsave(&rq->lock, flags); | 560 | spin_lock_irqsave(&rq->lock, flags); |
| 555 | if (rq->tail == rq->head) { | 561 | if (rq->tail == rq->head) { |
| 556 | spin_unlock_irqrestore(&rq->lock, flags); | 562 | spin_unlock_irqrestore(&rq->lock, flags); |
| 557 | dev->n_pkt_drops++; | 563 | /* |
| 564 | * Count VL15 packets dropped due to no receive buffer. | ||
| 565 | * Otherwise, count them as buffer overruns since usually, | ||
| 566 | * the HW will be able to receive packets even if there are | ||
| 567 | * no QPs with posted receive buffers. | ||
| 568 | */ | ||
| 569 | if (qp->ibqp.qp_num == 0) | ||
| 570 | dev->n_vl15_dropped++; | ||
| 571 | else | ||
| 572 | dev->rcv_errors++; | ||
| 558 | goto bail; | 573 | goto bail; |
| 559 | } | 574 | } |
| 560 | /* Silently drop packets which are too big. */ | 575 | /* Silently drop packets which are too big. */ |
| @@ -612,7 +627,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 612 | /* | 627 | /* |
| 613 | * Save the LMC lower bits if the destination LID is a unicast LID. | 628 | * Save the LMC lower bits if the destination LID is a unicast LID. |
| 614 | */ | 629 | */ |
| 615 | wc.dlid_path_bits = dlid >= IPS_MULTICAST_LID_BASE ? 0 : | 630 | wc.dlid_path_bits = dlid >= IPATH_MULTICAST_LID_BASE ? 0 : |
| 616 | dlid & ((1 << (dev->mkeyprot_resv_lmc & 7)) - 1); | 631 | dlid & ((1 << (dev->mkeyprot_resv_lmc & 7)) - 1); |
| 617 | /* Signal completion event if the solicited bit is set. */ | 632 | /* Signal completion event if the solicited bit is set. */ |
| 618 | ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, | 633 | ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, |
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c index 2bb08afc86d0..e32fca9faf80 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_pages.c +++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -57,17 +58,6 @@ static int __get_user_pages(unsigned long start_page, size_t num_pages, | |||
| 57 | size_t got; | 58 | size_t got; |
| 58 | int ret; | 59 | int ret; |
| 59 | 60 | ||
| 60 | #if 0 | ||
| 61 | /* | ||
| 62 | * XXX - causes MPI programs to fail, haven't had time to check | ||
| 63 | * yet | ||
| 64 | */ | ||
| 65 | if (!capable(CAP_IPC_LOCK)) { | ||
| 66 | ret = -EPERM; | ||
| 67 | goto bail; | ||
| 68 | } | ||
| 69 | #endif | ||
| 70 | |||
| 71 | lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> | 61 | lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> |
| 72 | PAGE_SHIFT; | 62 | PAGE_SHIFT; |
| 73 | 63 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c index 28fdbdaa789d..56ac336dd1ec 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -36,7 +37,7 @@ | |||
| 36 | 37 | ||
| 37 | #include "ipath_kernel.h" | 38 | #include "ipath_kernel.h" |
| 38 | #include "ipath_verbs.h" | 39 | #include "ipath_verbs.h" |
| 39 | #include "ips_common.h" | 40 | #include "ipath_common.h" |
| 40 | 41 | ||
| 41 | /* Not static, because we don't want the compiler removing it */ | 42 | /* Not static, because we don't want the compiler removing it */ |
| 42 | const char ipath_verbs_version[] = "ipath_verbs " IPATH_IDSTR; | 43 | const char ipath_verbs_version[] = "ipath_verbs " IPATH_IDSTR; |
| @@ -55,9 +56,62 @@ unsigned int ib_ipath_debug; /* debug mask */ | |||
| 55 | module_param_named(debug, ib_ipath_debug, uint, S_IWUSR | S_IRUGO); | 56 | module_param_named(debug, ib_ipath_debug, uint, S_IWUSR | S_IRUGO); |
| 56 | MODULE_PARM_DESC(debug, "Verbs debug mask"); | 57 | MODULE_PARM_DESC(debug, "Verbs debug mask"); |
| 57 | 58 | ||
| 59 | static unsigned int ib_ipath_max_pds = 0xFFFF; | ||
| 60 | module_param_named(max_pds, ib_ipath_max_pds, uint, S_IWUSR | S_IRUGO); | ||
| 61 | MODULE_PARM_DESC(max_pds, | ||
| 62 | "Maximum number of protection domains to support"); | ||
| 63 | |||
| 64 | static unsigned int ib_ipath_max_ahs = 0xFFFF; | ||
| 65 | module_param_named(max_ahs, ib_ipath_max_ahs, uint, S_IWUSR | S_IRUGO); | ||
| 66 | MODULE_PARM_DESC(max_ahs, "Maximum number of address handles to support"); | ||
| 67 | |||
| 68 | unsigned int ib_ipath_max_cqes = 0x2FFFF; | ||
| 69 | module_param_named(max_cqes, ib_ipath_max_cqes, uint, S_IWUSR | S_IRUGO); | ||
| 70 | MODULE_PARM_DESC(max_cqes, | ||
| 71 | "Maximum number of completion queue entries to support"); | ||
| 72 | |||
| 73 | unsigned int ib_ipath_max_cqs = 0x1FFFF; | ||
| 74 | module_param_named(max_cqs, ib_ipath_max_cqs, uint, S_IWUSR | S_IRUGO); | ||
| 75 | MODULE_PARM_DESC(max_cqs, "Maximum number of completion queues to support"); | ||
| 76 | |||
| 77 | unsigned int ib_ipath_max_qp_wrs = 0x3FFF; | ||
| 78 | module_param_named(max_qp_wrs, ib_ipath_max_qp_wrs, uint, | ||
| 79 | S_IWUSR | S_IRUGO); | ||
| 80 | MODULE_PARM_DESC(max_qp_wrs, "Maximum number of QP WRs to support"); | ||
| 81 | |||
| 82 | unsigned int ib_ipath_max_sges = 0x60; | ||
| 83 | module_param_named(max_sges, ib_ipath_max_sges, uint, S_IWUSR | S_IRUGO); | ||
| 84 | MODULE_PARM_DESC(max_sges, "Maximum number of SGEs to support"); | ||
| 85 | |||
| 86 | unsigned int ib_ipath_max_mcast_grps = 16384; | ||
| 87 | module_param_named(max_mcast_grps, ib_ipath_max_mcast_grps, uint, | ||
| 88 | S_IWUSR | S_IRUGO); | ||
| 89 | MODULE_PARM_DESC(max_mcast_grps, | ||
| 90 | "Maximum number of multicast groups to support"); | ||
| 91 | |||
| 92 | unsigned int ib_ipath_max_mcast_qp_attached = 16; | ||
| 93 | module_param_named(max_mcast_qp_attached, ib_ipath_max_mcast_qp_attached, | ||
| 94 | uint, S_IWUSR | S_IRUGO); | ||
| 95 | MODULE_PARM_DESC(max_mcast_qp_attached, | ||
| 96 | "Maximum number of attached QPs to support"); | ||
| 97 | |||
| 98 | unsigned int ib_ipath_max_srqs = 1024; | ||
| 99 | module_param_named(max_srqs, ib_ipath_max_srqs, uint, S_IWUSR | S_IRUGO); | ||
| 100 | MODULE_PARM_DESC(max_srqs, "Maximum number of SRQs to support"); | ||
| 101 | |||
| 102 | unsigned int ib_ipath_max_srq_sges = 128; | ||
| 103 | module_param_named(max_srq_sges, ib_ipath_max_srq_sges, | ||
| 104 | uint, S_IWUSR | S_IRUGO); | ||
| 105 | MODULE_PARM_DESC(max_srq_sges, "Maximum number of SRQ SGEs to support"); | ||
| 106 | |||
| 107 | unsigned int ib_ipath_max_srq_wrs = 0x1FFFF; | ||
| 108 | module_param_named(max_srq_wrs, ib_ipath_max_srq_wrs, | ||
| 109 | uint, S_IWUSR | S_IRUGO); | ||
| 110 | MODULE_PARM_DESC(max_srq_wrs, "Maximum number of SRQ WRs support"); | ||
| 111 | |||
| 58 | MODULE_LICENSE("GPL"); | 112 | MODULE_LICENSE("GPL"); |
| 59 | MODULE_AUTHOR("PathScale <support@pathscale.com>"); | 113 | MODULE_AUTHOR("QLogic <support@pathscale.com>"); |
| 60 | MODULE_DESCRIPTION("Pathscale InfiniPath driver"); | 114 | MODULE_DESCRIPTION("QLogic InfiniPath driver"); |
| 61 | 115 | ||
| 62 | const int ib_ipath_state_ops[IB_QPS_ERR + 1] = { | 116 | const int ib_ipath_state_ops[IB_QPS_ERR + 1] = { |
| 63 | [IB_QPS_RESET] = 0, | 117 | [IB_QPS_RESET] = 0, |
| @@ -193,7 +247,7 @@ static int ipath_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
| 193 | switch (qp->ibqp.qp_type) { | 247 | switch (qp->ibqp.qp_type) { |
| 194 | case IB_QPT_UC: | 248 | case IB_QPT_UC: |
| 195 | case IB_QPT_RC: | 249 | case IB_QPT_RC: |
| 196 | err = ipath_post_rc_send(qp, wr); | 250 | err = ipath_post_ruc_send(qp, wr); |
| 197 | break; | 251 | break; |
| 198 | 252 | ||
| 199 | case IB_QPT_SMI: | 253 | case IB_QPT_SMI: |
| @@ -375,7 +429,7 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen) | |||
| 375 | 429 | ||
| 376 | /* Check for a valid destination LID (see ch. 7.11.1). */ | 430 | /* Check for a valid destination LID (see ch. 7.11.1). */ |
| 377 | lid = be16_to_cpu(hdr->lrh[1]); | 431 | lid = be16_to_cpu(hdr->lrh[1]); |
| 378 | if (lid < IPS_MULTICAST_LID_BASE) { | 432 | if (lid < IPATH_MULTICAST_LID_BASE) { |
| 379 | lid &= ~((1 << (dev->mkeyprot_resv_lmc & 7)) - 1); | 433 | lid &= ~((1 << (dev->mkeyprot_resv_lmc & 7)) - 1); |
| 380 | if (unlikely(lid != ipath_layer_get_lid(dev->dd))) { | 434 | if (unlikely(lid != ipath_layer_get_lid(dev->dd))) { |
| 381 | dev->rcv_errors++; | 435 | dev->rcv_errors++; |
| @@ -385,9 +439,9 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen) | |||
| 385 | 439 | ||
| 386 | /* Check for GRH */ | 440 | /* Check for GRH */ |
| 387 | lnh = be16_to_cpu(hdr->lrh[0]) & 3; | 441 | lnh = be16_to_cpu(hdr->lrh[0]) & 3; |
| 388 | if (lnh == IPS_LRH_BTH) | 442 | if (lnh == IPATH_LRH_BTH) |
| 389 | ohdr = &hdr->u.oth; | 443 | ohdr = &hdr->u.oth; |
| 390 | else if (lnh == IPS_LRH_GRH) | 444 | else if (lnh == IPATH_LRH_GRH) |
| 391 | ohdr = &hdr->u.l.oth; | 445 | ohdr = &hdr->u.l.oth; |
| 392 | else { | 446 | else { |
| 393 | dev->rcv_errors++; | 447 | dev->rcv_errors++; |
| @@ -399,8 +453,8 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen) | |||
| 399 | dev->opstats[opcode].n_packets++; | 453 | dev->opstats[opcode].n_packets++; |
| 400 | 454 | ||
| 401 | /* Get the destination QP number. */ | 455 | /* Get the destination QP number. */ |
| 402 | qp_num = be32_to_cpu(ohdr->bth[1]) & IPS_QPN_MASK; | 456 | qp_num = be32_to_cpu(ohdr->bth[1]) & IPATH_QPN_MASK; |
| 403 | if (qp_num == IPS_MULTICAST_QPN) { | 457 | if (qp_num == IPATH_MULTICAST_QPN) { |
| 404 | struct ipath_mcast *mcast; | 458 | struct ipath_mcast *mcast; |
| 405 | struct ipath_mcast_qp *p; | 459 | struct ipath_mcast_qp *p; |
| 406 | 460 | ||
| @@ -411,7 +465,7 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen) | |||
| 411 | } | 465 | } |
| 412 | dev->n_multicast_rcv++; | 466 | dev->n_multicast_rcv++; |
| 413 | list_for_each_entry_rcu(p, &mcast->qp_list, list) | 467 | list_for_each_entry_rcu(p, &mcast->qp_list, list) |
| 414 | ipath_qp_rcv(dev, hdr, lnh == IPS_LRH_GRH, data, | 468 | ipath_qp_rcv(dev, hdr, lnh == IPATH_LRH_GRH, data, |
| 415 | tlen, p->qp); | 469 | tlen, p->qp); |
| 416 | /* | 470 | /* |
| 417 | * Notify ipath_multicast_detach() if it is waiting for us | 471 | * Notify ipath_multicast_detach() if it is waiting for us |
| @@ -423,7 +477,7 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen) | |||
| 423 | qp = ipath_lookup_qpn(&dev->qp_table, qp_num); | 477 | qp = ipath_lookup_qpn(&dev->qp_table, qp_num); |
| 424 | if (qp) { | 478 | if (qp) { |
| 425 | dev->n_unicast_rcv++; | 479 | dev->n_unicast_rcv++; |
| 426 | ipath_qp_rcv(dev, hdr, lnh == IPS_LRH_GRH, data, | 480 | ipath_qp_rcv(dev, hdr, lnh == IPATH_LRH_GRH, data, |
| 427 | tlen, qp); | 481 | tlen, qp); |
| 428 | /* | 482 | /* |
| 429 | * Notify ipath_destroy_qp() if it is waiting | 483 | * Notify ipath_destroy_qp() if it is waiting |
| @@ -567,40 +621,38 @@ static int ipath_query_device(struct ib_device *ibdev, | |||
| 567 | struct ib_device_attr *props) | 621 | struct ib_device_attr *props) |
| 568 | { | 622 | { |
| 569 | struct ipath_ibdev *dev = to_idev(ibdev); | 623 | struct ipath_ibdev *dev = to_idev(ibdev); |
| 570 | u32 vendor, boardrev, majrev, minrev; | ||
| 571 | 624 | ||
| 572 | memset(props, 0, sizeof(*props)); | 625 | memset(props, 0, sizeof(*props)); |
| 573 | 626 | ||
| 574 | props->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR | | 627 | props->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR | |
| 575 | IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT | | 628 | IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT | |
| 576 | IB_DEVICE_SYS_IMAGE_GUID; | 629 | IB_DEVICE_SYS_IMAGE_GUID; |
| 577 | ipath_layer_query_device(dev->dd, &vendor, &boardrev, | 630 | props->vendor_id = ipath_layer_get_vendorid(dev->dd); |
| 578 | &majrev, &minrev); | 631 | props->vendor_part_id = ipath_layer_get_deviceid(dev->dd); |
| 579 | props->vendor_id = vendor; | 632 | props->hw_ver = ipath_layer_get_pcirev(dev->dd); |
| 580 | props->vendor_part_id = boardrev; | ||
| 581 | props->hw_ver = boardrev << 16 | majrev << 8 | minrev; | ||
| 582 | 633 | ||
| 583 | props->sys_image_guid = dev->sys_image_guid; | 634 | props->sys_image_guid = dev->sys_image_guid; |
| 584 | 635 | ||
| 585 | props->max_mr_size = ~0ull; | 636 | props->max_mr_size = ~0ull; |
| 586 | props->max_qp = 0xffff; | 637 | props->max_qp = dev->qp_table.max; |
| 587 | props->max_qp_wr = 0xffff; | 638 | props->max_qp_wr = ib_ipath_max_qp_wrs; |
| 588 | props->max_sge = 255; | 639 | props->max_sge = ib_ipath_max_sges; |
| 589 | props->max_cq = 0xffff; | 640 | props->max_cq = ib_ipath_max_cqs; |
| 590 | props->max_cqe = 0xffff; | 641 | props->max_ah = ib_ipath_max_ahs; |
| 591 | props->max_mr = 0xffff; | 642 | props->max_cqe = ib_ipath_max_cqes; |
| 592 | props->max_pd = 0xffff; | 643 | props->max_mr = dev->lk_table.max; |
| 644 | props->max_pd = ib_ipath_max_pds; | ||
| 593 | props->max_qp_rd_atom = 1; | 645 | props->max_qp_rd_atom = 1; |
| 594 | props->max_qp_init_rd_atom = 1; | 646 | props->max_qp_init_rd_atom = 1; |
| 595 | /* props->max_res_rd_atom */ | 647 | /* props->max_res_rd_atom */ |
| 596 | props->max_srq = 0xffff; | 648 | props->max_srq = ib_ipath_max_srqs; |
| 597 | props->max_srq_wr = 0xffff; | 649 | props->max_srq_wr = ib_ipath_max_srq_wrs; |
| 598 | props->max_srq_sge = 255; | 650 | props->max_srq_sge = ib_ipath_max_srq_sges; |
| 599 | /* props->local_ca_ack_delay */ | 651 | /* props->local_ca_ack_delay */ |
| 600 | props->atomic_cap = IB_ATOMIC_HCA; | 652 | props->atomic_cap = IB_ATOMIC_HCA; |
| 601 | props->max_pkeys = ipath_layer_get_npkeys(dev->dd); | 653 | props->max_pkeys = ipath_layer_get_npkeys(dev->dd); |
| 602 | props->max_mcast_grp = 0xffff; | 654 | props->max_mcast_grp = ib_ipath_max_mcast_grps; |
| 603 | props->max_mcast_qp_attach = 0xffff; | 655 | props->max_mcast_qp_attach = ib_ipath_max_mcast_qp_attached; |
| 604 | props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * | 656 | props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * |
| 605 | props->max_mcast_grp; | 657 | props->max_mcast_grp; |
| 606 | 658 | ||
| @@ -643,10 +695,10 @@ static int ipath_query_port(struct ib_device *ibdev, | |||
| 643 | ipath_layer_get_lastibcstat(dev->dd) & 0xf]; | 695 | ipath_layer_get_lastibcstat(dev->dd) & 0xf]; |
| 644 | props->port_cap_flags = dev->port_cap_flags; | 696 | props->port_cap_flags = dev->port_cap_flags; |
| 645 | props->gid_tbl_len = 1; | 697 | props->gid_tbl_len = 1; |
| 646 | props->max_msg_sz = 4096; | 698 | props->max_msg_sz = 0x80000000; |
| 647 | props->pkey_tbl_len = ipath_layer_get_npkeys(dev->dd); | 699 | props->pkey_tbl_len = ipath_layer_get_npkeys(dev->dd); |
| 648 | props->bad_pkey_cntr = ipath_layer_get_cr_errpkey(dev->dd) - | 700 | props->bad_pkey_cntr = ipath_layer_get_cr_errpkey(dev->dd) - |
| 649 | dev->n_pkey_violations; | 701 | dev->z_pkey_violations; |
| 650 | props->qkey_viol_cntr = dev->qkey_violations; | 702 | props->qkey_viol_cntr = dev->qkey_violations; |
| 651 | props->active_width = IB_WIDTH_4X; | 703 | props->active_width = IB_WIDTH_4X; |
| 652 | /* See rate_show() */ | 704 | /* See rate_show() */ |
| @@ -743,15 +795,30 @@ static struct ib_pd *ipath_alloc_pd(struct ib_device *ibdev, | |||
| 743 | struct ib_ucontext *context, | 795 | struct ib_ucontext *context, |
| 744 | struct ib_udata *udata) | 796 | struct ib_udata *udata) |
| 745 | { | 797 | { |
| 798 | struct ipath_ibdev *dev = to_idev(ibdev); | ||
| 746 | struct ipath_pd *pd; | 799 | struct ipath_pd *pd; |
| 747 | struct ib_pd *ret; | 800 | struct ib_pd *ret; |
| 748 | 801 | ||
| 802 | /* | ||
| 803 | * This is actually totally arbitrary. Some correctness tests | ||
| 804 | * assume there's a maximum number of PDs that can be allocated. | ||
| 805 | * We don't actually have this limit, but we fail the test if | ||
| 806 | * we allow allocations of more than we report for this value. | ||
| 807 | */ | ||
| 808 | |||
| 809 | if (dev->n_pds_allocated == ib_ipath_max_pds) { | ||
| 810 | ret = ERR_PTR(-ENOMEM); | ||
| 811 | goto bail; | ||
| 812 | } | ||
| 813 | |||
| 749 | pd = kmalloc(sizeof *pd, GFP_KERNEL); | 814 | pd = kmalloc(sizeof *pd, GFP_KERNEL); |
| 750 | if (!pd) { | 815 | if (!pd) { |
| 751 | ret = ERR_PTR(-ENOMEM); | 816 | ret = ERR_PTR(-ENOMEM); |
| 752 | goto bail; | 817 | goto bail; |
| 753 | } | 818 | } |
| 754 | 819 | ||
| 820 | dev->n_pds_allocated++; | ||
| 821 | |||
| 755 | /* ib_alloc_pd() will initialize pd->ibpd. */ | 822 | /* ib_alloc_pd() will initialize pd->ibpd. */ |
| 756 | pd->user = udata != NULL; | 823 | pd->user = udata != NULL; |
| 757 | 824 | ||
| @@ -764,6 +831,9 @@ bail: | |||
| 764 | static int ipath_dealloc_pd(struct ib_pd *ibpd) | 831 | static int ipath_dealloc_pd(struct ib_pd *ibpd) |
| 765 | { | 832 | { |
| 766 | struct ipath_pd *pd = to_ipd(ibpd); | 833 | struct ipath_pd *pd = to_ipd(ibpd); |
| 834 | struct ipath_ibdev *dev = to_idev(ibpd->device); | ||
| 835 | |||
| 836 | dev->n_pds_allocated--; | ||
| 767 | 837 | ||
| 768 | kfree(pd); | 838 | kfree(pd); |
| 769 | 839 | ||
| @@ -782,21 +852,40 @@ static struct ib_ah *ipath_create_ah(struct ib_pd *pd, | |||
| 782 | { | 852 | { |
| 783 | struct ipath_ah *ah; | 853 | struct ipath_ah *ah; |
| 784 | struct ib_ah *ret; | 854 | struct ib_ah *ret; |
| 855 | struct ipath_ibdev *dev = to_idev(pd->device); | ||
| 856 | |||
| 857 | if (dev->n_ahs_allocated == ib_ipath_max_ahs) { | ||
| 858 | ret = ERR_PTR(-ENOMEM); | ||
| 859 | goto bail; | ||
| 860 | } | ||
| 785 | 861 | ||
| 786 | /* A multicast address requires a GRH (see ch. 8.4.1). */ | 862 | /* A multicast address requires a GRH (see ch. 8.4.1). */ |
| 787 | if (ah_attr->dlid >= IPS_MULTICAST_LID_BASE && | 863 | if (ah_attr->dlid >= IPATH_MULTICAST_LID_BASE && |
| 788 | ah_attr->dlid != IPS_PERMISSIVE_LID && | 864 | ah_attr->dlid != IPATH_PERMISSIVE_LID && |
| 789 | !(ah_attr->ah_flags & IB_AH_GRH)) { | 865 | !(ah_attr->ah_flags & IB_AH_GRH)) { |
| 790 | ret = ERR_PTR(-EINVAL); | 866 | ret = ERR_PTR(-EINVAL); |
| 791 | goto bail; | 867 | goto bail; |
| 792 | } | 868 | } |
| 793 | 869 | ||
| 870 | if (ah_attr->dlid == 0) { | ||
| 871 | ret = ERR_PTR(-EINVAL); | ||
| 872 | goto bail; | ||
| 873 | } | ||
| 874 | |||
| 875 | if (ah_attr->port_num < 1 || | ||
| 876 | ah_attr->port_num > pd->device->phys_port_cnt) { | ||
| 877 | ret = ERR_PTR(-EINVAL); | ||
| 878 | goto bail; | ||
| 879 | } | ||
| 880 | |||
| 794 | ah = kmalloc(sizeof *ah, GFP_ATOMIC); | 881 | ah = kmalloc(sizeof *ah, GFP_ATOMIC); |
| 795 | if (!ah) { | 882 | if (!ah) { |
| 796 | ret = ERR_PTR(-ENOMEM); | 883 | ret = ERR_PTR(-ENOMEM); |
| 797 | goto bail; | 884 | goto bail; |
| 798 | } | 885 | } |
| 799 | 886 | ||
| 887 | dev->n_ahs_allocated++; | ||
| 888 | |||
| 800 | /* ib_create_ah() will initialize ah->ibah. */ | 889 | /* ib_create_ah() will initialize ah->ibah. */ |
| 801 | ah->attr = *ah_attr; | 890 | ah->attr = *ah_attr; |
| 802 | 891 | ||
| @@ -814,8 +903,11 @@ bail: | |||
| 814 | */ | 903 | */ |
| 815 | static int ipath_destroy_ah(struct ib_ah *ibah) | 904 | static int ipath_destroy_ah(struct ib_ah *ibah) |
| 816 | { | 905 | { |
| 906 | struct ipath_ibdev *dev = to_idev(ibah->device); | ||
| 817 | struct ipath_ah *ah = to_iah(ibah); | 907 | struct ipath_ah *ah = to_iah(ibah); |
| 818 | 908 | ||
| 909 | dev->n_ahs_allocated--; | ||
| 910 | |||
| 819 | kfree(ah); | 911 | kfree(ah); |
| 820 | 912 | ||
| 821 | return 0; | 913 | return 0; |
| @@ -889,6 +981,7 @@ static int ipath_verbs_register_sysfs(struct ib_device *dev); | |||
| 889 | */ | 981 | */ |
| 890 | static void *ipath_register_ib_device(int unit, struct ipath_devdata *dd) | 982 | static void *ipath_register_ib_device(int unit, struct ipath_devdata *dd) |
| 891 | { | 983 | { |
| 984 | struct ipath_layer_counters cntrs; | ||
| 892 | struct ipath_ibdev *idev; | 985 | struct ipath_ibdev *idev; |
| 893 | struct ib_device *dev; | 986 | struct ib_device *dev; |
| 894 | int ret; | 987 | int ret; |
| @@ -939,6 +1032,25 @@ static void *ipath_register_ib_device(int unit, struct ipath_devdata *dd) | |||
| 939 | idev->pma_counter_select[5] = IB_PMA_PORT_XMIT_WAIT; | 1032 | idev->pma_counter_select[5] = IB_PMA_PORT_XMIT_WAIT; |
| 940 | idev->link_width_enabled = 3; /* 1x or 4x */ | 1033 | idev->link_width_enabled = 3; /* 1x or 4x */ |
| 941 | 1034 | ||
| 1035 | /* Snapshot current HW counters to "clear" them. */ | ||
| 1036 | ipath_layer_get_counters(dd, &cntrs); | ||
| 1037 | idev->z_symbol_error_counter = cntrs.symbol_error_counter; | ||
| 1038 | idev->z_link_error_recovery_counter = | ||
| 1039 | cntrs.link_error_recovery_counter; | ||
| 1040 | idev->z_link_downed_counter = cntrs.link_downed_counter; | ||
| 1041 | idev->z_port_rcv_errors = cntrs.port_rcv_errors; | ||
| 1042 | idev->z_port_rcv_remphys_errors = | ||
| 1043 | cntrs.port_rcv_remphys_errors; | ||
| 1044 | idev->z_port_xmit_discards = cntrs.port_xmit_discards; | ||
| 1045 | idev->z_port_xmit_data = cntrs.port_xmit_data; | ||
| 1046 | idev->z_port_rcv_data = cntrs.port_rcv_data; | ||
| 1047 | idev->z_port_xmit_packets = cntrs.port_xmit_packets; | ||
| 1048 | idev->z_port_rcv_packets = cntrs.port_rcv_packets; | ||
| 1049 | idev->z_local_link_integrity_errors = | ||
| 1050 | cntrs.local_link_integrity_errors; | ||
| 1051 | idev->z_excessive_buffer_overrun_errors = | ||
| 1052 | cntrs.excessive_buffer_overrun_errors; | ||
| 1053 | |||
| 942 | /* | 1054 | /* |
| 943 | * The system image GUID is supposed to be the same for all | 1055 | * The system image GUID is supposed to be the same for all |
| 944 | * IB HCAs in a single system but since there can be other | 1056 | * IB HCAs in a single system but since there can be other |
| @@ -1109,11 +1221,8 @@ static ssize_t show_rev(struct class_device *cdev, char *buf) | |||
| 1109 | { | 1221 | { |
| 1110 | struct ipath_ibdev *dev = | 1222 | struct ipath_ibdev *dev = |
| 1111 | container_of(cdev, struct ipath_ibdev, ibdev.class_dev); | 1223 | container_of(cdev, struct ipath_ibdev, ibdev.class_dev); |
| 1112 | int vendor, boardrev, majrev, minrev; | ||
| 1113 | 1224 | ||
| 1114 | ipath_layer_query_device(dev->dd, &vendor, &boardrev, | 1225 | return sprintf(buf, "%x\n", ipath_layer_get_pcirev(dev->dd)); |
| 1115 | &majrev, &minrev); | ||
| 1116 | return sprintf(buf, "%d.%d\n", majrev, minrev); | ||
| 1117 | } | 1226 | } |
| 1118 | 1227 | ||
| 1119 | static ssize_t show_hca(struct class_device *cdev, char *buf) | 1228 | static ssize_t show_hca(struct class_device *cdev, char *buf) |
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h index 4f8d59300e9b..2df684727dc1 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.h +++ b/drivers/infiniband/hw/ipath/ipath_verbs.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -148,6 +149,7 @@ struct ipath_mcast { | |||
| 148 | struct list_head qp_list; | 149 | struct list_head qp_list; |
| 149 | wait_queue_head_t wait; | 150 | wait_queue_head_t wait; |
| 150 | atomic_t refcount; | 151 | atomic_t refcount; |
| 152 | int n_attached; | ||
| 151 | }; | 153 | }; |
| 152 | 154 | ||
| 153 | /* Memory region */ | 155 | /* Memory region */ |
| @@ -305,32 +307,34 @@ struct ipath_qp { | |||
| 305 | u32 s_next_psn; /* PSN for next request */ | 307 | u32 s_next_psn; /* PSN for next request */ |
| 306 | u32 s_last_psn; /* last response PSN processed */ | 308 | u32 s_last_psn; /* last response PSN processed */ |
| 307 | u32 s_psn; /* current packet sequence number */ | 309 | u32 s_psn; /* current packet sequence number */ |
| 310 | u32 s_ack_psn; /* PSN for RDMA_READ */ | ||
| 308 | u32 s_rnr_timeout; /* number of milliseconds for RNR timeout */ | 311 | u32 s_rnr_timeout; /* number of milliseconds for RNR timeout */ |
| 309 | u32 s_ack_psn; /* PSN for next ACK or RDMA_READ */ | 312 | u32 r_ack_psn; /* PSN for next ACK or atomic ACK */ |
| 310 | u64 s_ack_atomic; /* data for atomic ACK */ | ||
| 311 | u64 r_wr_id; /* ID for current receive WQE */ | 313 | u64 r_wr_id; /* ID for current receive WQE */ |
| 312 | u64 r_atomic_data; /* data for last atomic op */ | 314 | u64 r_atomic_data; /* data for last atomic op */ |
| 313 | u32 r_atomic_psn; /* PSN of last atomic op */ | 315 | u32 r_atomic_psn; /* PSN of last atomic op */ |
| 314 | u32 r_len; /* total length of r_sge */ | 316 | u32 r_len; /* total length of r_sge */ |
| 315 | u32 r_rcv_len; /* receive data len processed */ | 317 | u32 r_rcv_len; /* receive data len processed */ |
| 316 | u32 r_psn; /* expected rcv packet sequence number */ | 318 | u32 r_psn; /* expected rcv packet sequence number */ |
| 319 | u32 r_msn; /* message sequence number */ | ||
| 317 | u8 state; /* QP state */ | 320 | u8 state; /* QP state */ |
| 318 | u8 s_state; /* opcode of last packet sent */ | 321 | u8 s_state; /* opcode of last packet sent */ |
| 319 | u8 s_ack_state; /* opcode of packet to ACK */ | 322 | u8 s_ack_state; /* opcode of packet to ACK */ |
| 320 | u8 s_nak_state; /* non-zero if NAK is pending */ | 323 | u8 s_nak_state; /* non-zero if NAK is pending */ |
| 321 | u8 r_state; /* opcode of last packet received */ | 324 | u8 r_state; /* opcode of last packet received */ |
| 325 | u8 r_ack_state; /* opcode of packet to ACK */ | ||
| 326 | u8 r_nak_state; /* non-zero if NAK is pending */ | ||
| 327 | u8 r_min_rnr_timer; /* retry timeout value for RNR NAKs */ | ||
| 322 | u8 r_reuse_sge; /* for UC receive errors */ | 328 | u8 r_reuse_sge; /* for UC receive errors */ |
| 323 | u8 r_sge_inx; /* current index into sg_list */ | 329 | u8 r_sge_inx; /* current index into sg_list */ |
| 324 | u8 s_max_sge; /* size of s_wq->sg_list */ | ||
| 325 | u8 qp_access_flags; | 330 | u8 qp_access_flags; |
| 331 | u8 s_max_sge; /* size of s_wq->sg_list */ | ||
| 326 | u8 s_retry_cnt; /* number of times to retry */ | 332 | u8 s_retry_cnt; /* number of times to retry */ |
| 327 | u8 s_rnr_retry_cnt; | 333 | u8 s_rnr_retry_cnt; |
| 328 | u8 s_min_rnr_timer; | ||
| 329 | u8 s_retry; /* requester retry counter */ | 334 | u8 s_retry; /* requester retry counter */ |
| 330 | u8 s_rnr_retry; /* requester RNR retry counter */ | 335 | u8 s_rnr_retry; /* requester RNR retry counter */ |
| 331 | u8 s_pkey_index; /* PKEY index to use */ | 336 | u8 s_pkey_index; /* PKEY index to use */ |
| 332 | enum ib_mtu path_mtu; | 337 | enum ib_mtu path_mtu; |
| 333 | atomic_t msn; /* message sequence number */ | ||
| 334 | u32 remote_qpn; | 338 | u32 remote_qpn; |
| 335 | u32 qkey; /* QKEY for this QP (for UD or RD) */ | 339 | u32 qkey; /* QKEY for this QP (for UD or RD) */ |
| 336 | u32 s_size; /* send work queue size */ | 340 | u32 s_size; /* send work queue size */ |
| @@ -431,6 +435,11 @@ struct ipath_ibdev { | |||
| 431 | __be64 sys_image_guid; /* in network order */ | 435 | __be64 sys_image_guid; /* in network order */ |
| 432 | __be64 gid_prefix; /* in network order */ | 436 | __be64 gid_prefix; /* in network order */ |
| 433 | __be64 mkey; | 437 | __be64 mkey; |
| 438 | u32 n_pds_allocated; /* number of PDs allocated for device */ | ||
| 439 | u32 n_ahs_allocated; /* number of AHs allocated for device */ | ||
| 440 | u32 n_cqs_allocated; /* number of CQs allocated for device */ | ||
| 441 | u32 n_srqs_allocated; /* number of SRQs allocated for device */ | ||
| 442 | u32 n_mcast_grps_allocated; /* number of mcast groups allocated */ | ||
| 434 | u64 ipath_sword; /* total dwords sent (sample result) */ | 443 | u64 ipath_sword; /* total dwords sent (sample result) */ |
| 435 | u64 ipath_rword; /* total dwords received (sample result) */ | 444 | u64 ipath_rword; /* total dwords received (sample result) */ |
| 436 | u64 ipath_spkts; /* total packets sent (sample result) */ | 445 | u64 ipath_spkts; /* total packets sent (sample result) */ |
| @@ -442,17 +451,19 @@ struct ipath_ibdev { | |||
| 442 | u64 n_unicast_rcv; /* total unicast packets received */ | 451 | u64 n_unicast_rcv; /* total unicast packets received */ |
| 443 | u64 n_multicast_xmit; /* total multicast packets sent */ | 452 | u64 n_multicast_xmit; /* total multicast packets sent */ |
| 444 | u64 n_multicast_rcv; /* total multicast packets received */ | 453 | u64 n_multicast_rcv; /* total multicast packets received */ |
| 445 | u64 n_symbol_error_counter; /* starting count for PMA */ | 454 | u64 z_symbol_error_counter; /* starting count for PMA */ |
| 446 | u64 n_link_error_recovery_counter; /* starting count for PMA */ | 455 | u64 z_link_error_recovery_counter; /* starting count for PMA */ |
| 447 | u64 n_link_downed_counter; /* starting count for PMA */ | 456 | u64 z_link_downed_counter; /* starting count for PMA */ |
| 448 | u64 n_port_rcv_errors; /* starting count for PMA */ | 457 | u64 z_port_rcv_errors; /* starting count for PMA */ |
| 449 | u64 n_port_rcv_remphys_errors; /* starting count for PMA */ | 458 | u64 z_port_rcv_remphys_errors; /* starting count for PMA */ |
| 450 | u64 n_port_xmit_discards; /* starting count for PMA */ | 459 | u64 z_port_xmit_discards; /* starting count for PMA */ |
| 451 | u64 n_port_xmit_data; /* starting count for PMA */ | 460 | u64 z_port_xmit_data; /* starting count for PMA */ |
| 452 | u64 n_port_rcv_data; /* starting count for PMA */ | 461 | u64 z_port_rcv_data; /* starting count for PMA */ |
| 453 | u64 n_port_xmit_packets; /* starting count for PMA */ | 462 | u64 z_port_xmit_packets; /* starting count for PMA */ |
| 454 | u64 n_port_rcv_packets; /* starting count for PMA */ | 463 | u64 z_port_rcv_packets; /* starting count for PMA */ |
| 455 | u32 n_pkey_violations; /* starting count for PMA */ | 464 | u32 z_pkey_violations; /* starting count for PMA */ |
| 465 | u32 z_local_link_integrity_errors; /* starting count for PMA */ | ||
| 466 | u32 z_excessive_buffer_overrun_errors; /* starting count for PMA */ | ||
| 456 | u32 n_rc_resends; | 467 | u32 n_rc_resends; |
| 457 | u32 n_rc_acks; | 468 | u32 n_rc_acks; |
| 458 | u32 n_rc_qacks; | 469 | u32 n_rc_qacks; |
| @@ -462,6 +473,7 @@ struct ipath_ibdev { | |||
| 462 | u32 n_other_naks; | 473 | u32 n_other_naks; |
| 463 | u32 n_timeouts; | 474 | u32 n_timeouts; |
| 464 | u32 n_pkt_drops; | 475 | u32 n_pkt_drops; |
| 476 | u32 n_vl15_dropped; | ||
| 465 | u32 n_wqe_errs; | 477 | u32 n_wqe_errs; |
| 466 | u32 n_rdma_dup_busy; | 478 | u32 n_rdma_dup_busy; |
| 467 | u32 n_piowait; | 479 | u32 n_piowait; |
| @@ -580,10 +592,6 @@ void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc); | |||
| 580 | 592 | ||
| 581 | void ipath_get_credit(struct ipath_qp *qp, u32 aeth); | 593 | void ipath_get_credit(struct ipath_qp *qp, u32 aeth); |
| 582 | 594 | ||
| 583 | void ipath_do_rc_send(unsigned long data); | ||
| 584 | |||
| 585 | void ipath_do_uc_send(unsigned long data); | ||
| 586 | |||
| 587 | void ipath_cq_enter(struct ipath_cq *cq, struct ib_wc *entry, int sig); | 595 | void ipath_cq_enter(struct ipath_cq *cq, struct ib_wc *entry, int sig); |
| 588 | 596 | ||
| 589 | int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss, | 597 | int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss, |
| @@ -596,7 +604,7 @@ void ipath_copy_sge(struct ipath_sge_state *ss, void *data, u32 length); | |||
| 596 | 604 | ||
| 597 | void ipath_skip_sge(struct ipath_sge_state *ss, u32 length); | 605 | void ipath_skip_sge(struct ipath_sge_state *ss, u32 length); |
| 598 | 606 | ||
| 599 | int ipath_post_rc_send(struct ipath_qp *qp, struct ib_send_wr *wr); | 607 | int ipath_post_ruc_send(struct ipath_qp *qp, struct ib_send_wr *wr); |
| 600 | 608 | ||
| 601 | void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | 609 | void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, |
| 602 | int has_grh, void *data, u32 tlen, struct ipath_qp *qp); | 610 | int has_grh, void *data, u32 tlen, struct ipath_qp *qp); |
| @@ -678,7 +686,19 @@ void ipath_insert_rnr_queue(struct ipath_qp *qp); | |||
| 678 | 686 | ||
| 679 | int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only); | 687 | int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only); |
| 680 | 688 | ||
| 681 | void ipath_ruc_loopback(struct ipath_qp *sqp, struct ib_wc *wc); | 689 | u32 ipath_make_grh(struct ipath_ibdev *dev, struct ib_grh *hdr, |
| 690 | struct ib_global_route *grh, u32 hwords, u32 nwords); | ||
| 691 | |||
| 692 | void ipath_do_ruc_send(unsigned long data); | ||
| 693 | |||
| 694 | u32 ipath_make_rc_ack(struct ipath_qp *qp, struct ipath_other_headers *ohdr, | ||
| 695 | u32 pmtu); | ||
| 696 | |||
| 697 | int ipath_make_rc_req(struct ipath_qp *qp, struct ipath_other_headers *ohdr, | ||
| 698 | u32 pmtu, u32 *bth0p, u32 *bth2p); | ||
| 699 | |||
| 700 | int ipath_make_uc_req(struct ipath_qp *qp, struct ipath_other_headers *ohdr, | ||
| 701 | u32 pmtu, u32 *bth0p, u32 *bth2p); | ||
| 682 | 702 | ||
| 683 | extern const enum ib_wc_opcode ib_ipath_wc_opcode[]; | 703 | extern const enum ib_wc_opcode ib_ipath_wc_opcode[]; |
| 684 | 704 | ||
| @@ -688,6 +708,24 @@ extern const int ib_ipath_state_ops[]; | |||
| 688 | 708 | ||
| 689 | extern unsigned int ib_ipath_lkey_table_size; | 709 | extern unsigned int ib_ipath_lkey_table_size; |
| 690 | 710 | ||
| 711 | extern unsigned int ib_ipath_max_cqes; | ||
| 712 | |||
| 713 | extern unsigned int ib_ipath_max_cqs; | ||
| 714 | |||
| 715 | extern unsigned int ib_ipath_max_qp_wrs; | ||
| 716 | |||
| 717 | extern unsigned int ib_ipath_max_sges; | ||
| 718 | |||
| 719 | extern unsigned int ib_ipath_max_mcast_grps; | ||
| 720 | |||
| 721 | extern unsigned int ib_ipath_max_mcast_qp_attached; | ||
| 722 | |||
| 723 | extern unsigned int ib_ipath_max_srqs; | ||
| 724 | |||
| 725 | extern unsigned int ib_ipath_max_srq_sges; | ||
| 726 | |||
| 727 | extern unsigned int ib_ipath_max_srq_wrs; | ||
| 728 | |||
| 691 | extern const u32 ib_ipath_rnr_table[]; | 729 | extern const u32 ib_ipath_rnr_table[]; |
| 692 | 730 | ||
| 693 | #endif /* IPATH_VERBS_H */ | 731 | #endif /* IPATH_VERBS_H */ |
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c index 10b31d2c4f20..ee0e1d96d723 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
| @@ -92,6 +93,7 @@ static struct ipath_mcast *ipath_mcast_alloc(union ib_gid *mgid) | |||
| 92 | INIT_LIST_HEAD(&mcast->qp_list); | 93 | INIT_LIST_HEAD(&mcast->qp_list); |
| 93 | init_waitqueue_head(&mcast->wait); | 94 | init_waitqueue_head(&mcast->wait); |
| 94 | atomic_set(&mcast->refcount, 0); | 95 | atomic_set(&mcast->refcount, 0); |
| 96 | mcast->n_attached = 0; | ||
| 95 | 97 | ||
| 96 | bail: | 98 | bail: |
| 97 | return mcast; | 99 | return mcast; |
| @@ -157,7 +159,8 @@ bail: | |||
| 157 | * the table but the QP was added. Return ESRCH if the QP was already | 159 | * the table but the QP was added. Return ESRCH if the QP was already |
| 158 | * attached and neither structure was added. | 160 | * attached and neither structure was added. |
| 159 | */ | 161 | */ |
| 160 | static int ipath_mcast_add(struct ipath_mcast *mcast, | 162 | static int ipath_mcast_add(struct ipath_ibdev *dev, |
| 163 | struct ipath_mcast *mcast, | ||
| 161 | struct ipath_mcast_qp *mqp) | 164 | struct ipath_mcast_qp *mqp) |
| 162 | { | 165 | { |
| 163 | struct rb_node **n = &mcast_tree.rb_node; | 166 | struct rb_node **n = &mcast_tree.rb_node; |
| @@ -188,34 +191,47 @@ static int ipath_mcast_add(struct ipath_mcast *mcast, | |||
| 188 | /* Search the QP list to see if this is already there. */ | 191 | /* Search the QP list to see if this is already there. */ |
| 189 | list_for_each_entry_rcu(p, &tmcast->qp_list, list) { | 192 | list_for_each_entry_rcu(p, &tmcast->qp_list, list) { |
| 190 | if (p->qp == mqp->qp) { | 193 | if (p->qp == mqp->qp) { |
| 191 | spin_unlock_irqrestore(&mcast_lock, flags); | ||
| 192 | ret = ESRCH; | 194 | ret = ESRCH; |
| 193 | goto bail; | 195 | goto bail; |
| 194 | } | 196 | } |
| 195 | } | 197 | } |
| 198 | if (tmcast->n_attached == ib_ipath_max_mcast_qp_attached) { | ||
| 199 | ret = ENOMEM; | ||
| 200 | goto bail; | ||
| 201 | } | ||
| 202 | |||
| 203 | tmcast->n_attached++; | ||
| 204 | |||
| 196 | list_add_tail_rcu(&mqp->list, &tmcast->qp_list); | 205 | list_add_tail_rcu(&mqp->list, &tmcast->qp_list); |
| 197 | spin_unlock_irqrestore(&mcast_lock, flags); | ||
| 198 | ret = EEXIST; | 206 | ret = EEXIST; |
| 199 | goto bail; | 207 | goto bail; |
| 200 | } | 208 | } |
| 201 | 209 | ||
| 210 | if (dev->n_mcast_grps_allocated == ib_ipath_max_mcast_grps) { | ||
| 211 | ret = ENOMEM; | ||
| 212 | goto bail; | ||
| 213 | } | ||
| 214 | |||
| 215 | dev->n_mcast_grps_allocated++; | ||
| 216 | |||
| 202 | list_add_tail_rcu(&mqp->list, &mcast->qp_list); | 217 | list_add_tail_rcu(&mqp->list, &mcast->qp_list); |
| 203 | 218 | ||
| 204 | atomic_inc(&mcast->refcount); | 219 | atomic_inc(&mcast->refcount); |
| 205 | rb_link_node(&mcast->rb_node, pn, n); | 220 | rb_link_node(&mcast->rb_node, pn, n); |
| 206 | rb_insert_color(&mcast->rb_node, &mcast_tree); | 221 | rb_insert_color(&mcast->rb_node, &mcast_tree); |
| 207 | 222 | ||
| 208 | spin_unlock_irqrestore(&mcast_lock, flags); | ||
| 209 | |||
| 210 | ret = 0; | 223 | ret = 0; |
| 211 | 224 | ||
| 212 | bail: | 225 | bail: |
| 226 | spin_unlock_irqrestore(&mcast_lock, flags); | ||
| 227 | |||
| 213 | return ret; | 228 | return ret; |
| 214 | } | 229 | } |
| 215 | 230 | ||
| 216 | int ipath_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | 231 | int ipath_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) |
| 217 | { | 232 | { |
| 218 | struct ipath_qp *qp = to_iqp(ibqp); | 233 | struct ipath_qp *qp = to_iqp(ibqp); |
| 234 | struct ipath_ibdev *dev = to_idev(ibqp->device); | ||
| 219 | struct ipath_mcast *mcast; | 235 | struct ipath_mcast *mcast; |
| 220 | struct ipath_mcast_qp *mqp; | 236 | struct ipath_mcast_qp *mqp; |
| 221 | int ret; | 237 | int ret; |
| @@ -235,7 +251,7 @@ int ipath_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | |||
| 235 | ret = -ENOMEM; | 251 | ret = -ENOMEM; |
| 236 | goto bail; | 252 | goto bail; |
| 237 | } | 253 | } |
| 238 | switch (ipath_mcast_add(mcast, mqp)) { | 254 | switch (ipath_mcast_add(dev, mcast, mqp)) { |
| 239 | case ESRCH: | 255 | case ESRCH: |
| 240 | /* Neither was used: can't attach the same QP twice. */ | 256 | /* Neither was used: can't attach the same QP twice. */ |
| 241 | ipath_mcast_qp_free(mqp); | 257 | ipath_mcast_qp_free(mqp); |
| @@ -245,6 +261,12 @@ int ipath_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | |||
| 245 | case EEXIST: /* The mcast wasn't used */ | 261 | case EEXIST: /* The mcast wasn't used */ |
| 246 | ipath_mcast_free(mcast); | 262 | ipath_mcast_free(mcast); |
| 247 | break; | 263 | break; |
| 264 | case ENOMEM: | ||
| 265 | /* Exceeded the maximum number of mcast groups. */ | ||
| 266 | ipath_mcast_qp_free(mqp); | ||
| 267 | ipath_mcast_free(mcast); | ||
| 268 | ret = -ENOMEM; | ||
| 269 | goto bail; | ||
| 248 | default: | 270 | default: |
| 249 | break; | 271 | break; |
| 250 | } | 272 | } |
| @@ -258,6 +280,7 @@ bail: | |||
| 258 | int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | 280 | int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) |
| 259 | { | 281 | { |
| 260 | struct ipath_qp *qp = to_iqp(ibqp); | 282 | struct ipath_qp *qp = to_iqp(ibqp); |
| 283 | struct ipath_ibdev *dev = to_idev(ibqp->device); | ||
| 261 | struct ipath_mcast *mcast = NULL; | 284 | struct ipath_mcast *mcast = NULL; |
| 262 | struct ipath_mcast_qp *p, *tmp; | 285 | struct ipath_mcast_qp *p, *tmp; |
| 263 | struct rb_node *n; | 286 | struct rb_node *n; |
| @@ -272,7 +295,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | |||
| 272 | while (1) { | 295 | while (1) { |
| 273 | if (n == NULL) { | 296 | if (n == NULL) { |
| 274 | spin_unlock_irqrestore(&mcast_lock, flags); | 297 | spin_unlock_irqrestore(&mcast_lock, flags); |
| 275 | ret = 0; | 298 | ret = -EINVAL; |
| 276 | goto bail; | 299 | goto bail; |
| 277 | } | 300 | } |
| 278 | 301 | ||
| @@ -296,6 +319,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | |||
| 296 | * link until we are sure there are no list walkers. | 319 | * link until we are sure there are no list walkers. |
| 297 | */ | 320 | */ |
| 298 | list_del_rcu(&p->list); | 321 | list_del_rcu(&p->list); |
| 322 | mcast->n_attached--; | ||
| 299 | 323 | ||
| 300 | /* If this was the last attached QP, remove the GID too. */ | 324 | /* If this was the last attached QP, remove the GID too. */ |
| 301 | if (list_empty(&mcast->qp_list)) { | 325 | if (list_empty(&mcast->qp_list)) { |
| @@ -319,6 +343,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | |||
| 319 | atomic_dec(&mcast->refcount); | 343 | atomic_dec(&mcast->refcount); |
| 320 | wait_event(mcast->wait, !atomic_read(&mcast->refcount)); | 344 | wait_event(mcast->wait, !atomic_read(&mcast->refcount)); |
| 321 | ipath_mcast_free(mcast); | 345 | ipath_mcast_free(mcast); |
| 346 | dev->n_mcast_grps_allocated--; | ||
| 322 | } | 347 | } |
| 323 | 348 | ||
| 324 | ret = 0; | 349 | ret = 0; |
diff --git a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c b/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c index adc5322f15c1..f8f9e2e8cbdd 100644 --- a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c +++ b/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
diff --git a/drivers/infiniband/hw/ipath/ips_common.h b/drivers/infiniband/hw/ipath/ips_common.h deleted file mode 100644 index ab7cbbbfd03a..000000000000 --- a/drivers/infiniband/hw/ipath/ips_common.h +++ /dev/null | |||
| @@ -1,263 +0,0 @@ | |||
| 1 | #ifndef IPS_COMMON_H | ||
| 2 | #define IPS_COMMON_H | ||
| 3 | /* | ||
| 4 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | ||
| 5 | * | ||
| 6 | * This software is available to you under a choice of one of two | ||
| 7 | * licenses. You may choose to be licensed under the terms of the GNU | ||
| 8 | * General Public License (GPL) Version 2, available from the file | ||
| 9 | * COPYING in the main directory of this source tree, or the | ||
| 10 | * OpenIB.org BSD license below: | ||
| 11 | * | ||
| 12 | * Redistribution and use in source and binary forms, with or | ||
| 13 | * without modification, are permitted provided that the following | ||
| 14 | * conditions are met: | ||
| 15 | * | ||
| 16 | * - Redistributions of source code must retain the above | ||
| 17 | * copyright notice, this list of conditions and the following | ||
| 18 | * disclaimer. | ||
| 19 | * | ||
| 20 | * - Redistributions in binary form must reproduce the above | ||
| 21 | * copyright notice, this list of conditions and the following | ||
| 22 | * disclaimer in the documentation and/or other materials | ||
| 23 | * provided with the distribution. | ||
| 24 | * | ||
| 25 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 26 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| 27 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 28 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
| 29 | * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
| 30 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 31 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| 32 | * SOFTWARE. | ||
| 33 | */ | ||
| 34 | |||
| 35 | #include "ipath_common.h" | ||
| 36 | |||
| 37 | struct ipath_header { | ||
| 38 | /* | ||
| 39 | * Version - 4 bits, Port - 4 bits, TID - 10 bits and Offset - | ||
| 40 | * 14 bits before ECO change ~28 Dec 03. After that, Vers 4, | ||
| 41 | * Port 3, TID 11, offset 14. | ||
| 42 | */ | ||
| 43 | __le32 ver_port_tid_offset; | ||
| 44 | __le16 chksum; | ||
| 45 | __le16 pkt_flags; | ||
| 46 | }; | ||
| 47 | |||
| 48 | struct ips_message_header { | ||
| 49 | __be16 lrh[4]; | ||
| 50 | __be32 bth[3]; | ||
| 51 | /* fields below this point are in host byte order */ | ||
| 52 | struct ipath_header iph; | ||
| 53 | __u8 sub_opcode; | ||
| 54 | __u8 flags; | ||
| 55 | __u16 src_rank; | ||
| 56 | /* 24 bits. The upper 8 bit is available for other use */ | ||
| 57 | union { | ||
| 58 | struct { | ||
| 59 | unsigned ack_seq_num:24; | ||
| 60 | unsigned port:4; | ||
| 61 | unsigned unused:4; | ||
| 62 | }; | ||
| 63 | __u32 ack_seq_num_org; | ||
| 64 | }; | ||
| 65 | __u8 expected_tid_session_id; | ||
| 66 | __u8 tinylen; /* to aid MPI */ | ||
| 67 | union { | ||
| 68 | __u16 tag; /* to aid MPI */ | ||
| 69 | __u16 mqhdr; /* for PSM MQ */ | ||
| 70 | }; | ||
| 71 | union { | ||
| 72 | __u32 mpi[4]; /* to aid MPI */ | ||
| 73 | __u32 data[4]; | ||
| 74 | __u64 mq[2]; /* for PSM MQ */ | ||
| 75 | struct { | ||
| 76 | __u16 mtu; | ||
| 77 | __u8 major_ver; | ||
| 78 | __u8 minor_ver; | ||
| 79 | __u32 not_used; //free | ||
| 80 | __u32 run_id; | ||
| 81 | __u32 client_ver; | ||
| 82 | }; | ||
| 83 | }; | ||
| 84 | }; | ||
| 85 | |||
| 86 | struct ether_header { | ||
| 87 | __be16 lrh[4]; | ||
| 88 | __be32 bth[3]; | ||
| 89 | struct ipath_header iph; | ||
| 90 | __u8 sub_opcode; | ||
| 91 | __u8 cmd; | ||
| 92 | __be16 lid; | ||
| 93 | __u16 mac[3]; | ||
| 94 | __u8 frag_num; | ||
| 95 | __u8 seq_num; | ||
| 96 | __le32 len; | ||
| 97 | /* MUST be of word size due to PIO write requirements */ | ||
| 98 | __le32 csum; | ||
| 99 | __le16 csum_offset; | ||
| 100 | __le16 flags; | ||
| 101 | __u16 first_2_bytes; | ||
| 102 | __u8 unused[2]; /* currently unused */ | ||
| 103 | }; | ||
| 104 | |||
| 105 | /* | ||
| 106 | * The PIO buffer used for sending infinipath messages must only be written | ||
| 107 | * in 32-bit words, all the data must be written, and no writes can occur | ||
| 108 | * after the last word is written (which transfers "ownership" of the buffer | ||
| 109 | * to the chip and triggers the message to be sent). | ||
| 110 | * Since the Linux sk_buff structure can be recursive, non-aligned, and | ||
| 111 | * any number of bytes in each segment, we use the following structure | ||
| 112 | * to keep information about the overall state of the copy operation. | ||
| 113 | * This is used to save the information needed to store the checksum | ||
| 114 | * in the right place before sending the last word to the hardware and | ||
| 115 | * to buffer the last 0-3 bytes of non-word sized segments. | ||
| 116 | */ | ||
| 117 | struct copy_data_s { | ||
| 118 | struct ether_header *hdr; | ||
| 119 | /* addr of PIO buf to write csum to */ | ||
| 120 | __u32 __iomem *csum_pio; | ||
| 121 | __u32 __iomem *to; /* addr of PIO buf to write data to */ | ||
| 122 | __u32 device; /* which device to allocate PIO bufs from */ | ||
| 123 | __s32 error; /* set if there is an error. */ | ||
| 124 | __s32 extra; /* amount of data saved in u.buf below */ | ||
| 125 | __u32 len; /* total length to send in bytes */ | ||
| 126 | __u32 flen; /* frament length in words */ | ||
| 127 | __u32 csum; /* partial IP checksum */ | ||
| 128 | __u32 pos; /* position for partial checksum */ | ||
| 129 | __u32 offset; /* offset to where data currently starts */ | ||
| 130 | __s32 checksum_calc; /* set to 1 when csum has been calculated */ | ||
| 131 | struct sk_buff *skb; | ||
| 132 | union { | ||
| 133 | __u32 w; | ||
| 134 | __u8 buf[4]; | ||
| 135 | } u; | ||
| 136 | }; | ||
| 137 | |||
| 138 | /* IB - LRH header consts */ | ||
| 139 | #define IPS_LRH_GRH 0x0003 /* 1. word of IB LRH - next header: GRH */ | ||
| 140 | #define IPS_LRH_BTH 0x0002 /* 1. word of IB LRH - next header: BTH */ | ||
| 141 | |||
| 142 | #define IPS_OFFSET 0 | ||
| 143 | |||
| 144 | /* | ||
| 145 | * defines the cut-off point between the header queue and eager/expected | ||
| 146 | * TID queue | ||
| 147 | */ | ||
| 148 | #define NUM_OF_EXTRA_WORDS_IN_HEADER_QUEUE \ | ||
| 149 | ((sizeof(struct ips_message_header) - \ | ||
| 150 | offsetof(struct ips_message_header, iph)) >> 2) | ||
| 151 | |||
| 152 | /* OpCodes */ | ||
| 153 | #define OPCODE_IPS 0xC0 | ||
| 154 | #define OPCODE_ITH4X 0xC1 | ||
| 155 | |||
| 156 | /* OpCode 30 is use by stand-alone test programs */ | ||
| 157 | #define OPCODE_RAW_DATA 0xDE | ||
| 158 | /* last OpCode (31) is reserved for test */ | ||
| 159 | #define OPCODE_TEST 0xDF | ||
| 160 | |||
| 161 | /* sub OpCodes - ips */ | ||
| 162 | #define OPCODE_SEQ_DATA 0x01 | ||
| 163 | #define OPCODE_SEQ_CTRL 0x02 | ||
| 164 | |||
| 165 | #define OPCODE_SEQ_MQ_DATA 0x03 | ||
| 166 | #define OPCODE_SEQ_MQ_CTRL 0x04 | ||
| 167 | |||
| 168 | #define OPCODE_ACK 0x10 | ||
| 169 | #define OPCODE_NAK 0x11 | ||
| 170 | |||
| 171 | #define OPCODE_ERR_CHK 0x20 | ||
| 172 | #define OPCODE_ERR_CHK_PLS 0x21 | ||
| 173 | |||
| 174 | #define OPCODE_STARTUP 0x30 | ||
| 175 | #define OPCODE_STARTUP_ACK 0x31 | ||
| 176 | #define OPCODE_STARTUP_NAK 0x32 | ||
| 177 | |||
| 178 | #define OPCODE_STARTUP_EXT 0x34 | ||
| 179 | #define OPCODE_STARTUP_ACK_EXT 0x35 | ||
| 180 | #define OPCODE_STARTUP_NAK_EXT 0x36 | ||
| 181 | |||
| 182 | #define OPCODE_TIDS_RELEASE 0x40 | ||
| 183 | #define OPCODE_TIDS_RELEASE_CONFIRM 0x41 | ||
| 184 | |||
| 185 | #define OPCODE_CLOSE 0x50 | ||
| 186 | #define OPCODE_CLOSE_ACK 0x51 | ||
| 187 | /* | ||
| 188 | * like OPCODE_CLOSE, but no complaint if other side has already closed. | ||
| 189 | * Used when doing abort(), MPI_Abort(), etc. | ||
| 190 | */ | ||
| 191 | #define OPCODE_ABORT 0x52 | ||
| 192 | |||
| 193 | /* sub OpCodes - ith4x */ | ||
| 194 | #define OPCODE_ENCAP 0x81 | ||
| 195 | #define OPCODE_LID_ARP 0x82 | ||
| 196 | |||
| 197 | /* Receive Header Queue: receive type (from infinipath) */ | ||
| 198 | #define RCVHQ_RCV_TYPE_EXPECTED 0 | ||
| 199 | #define RCVHQ_RCV_TYPE_EAGER 1 | ||
| 200 | #define RCVHQ_RCV_TYPE_NON_KD 2 | ||
| 201 | #define RCVHQ_RCV_TYPE_ERROR 3 | ||
| 202 | |||
| 203 | /* misc. */ | ||
| 204 | #define SIZE_OF_CRC 1 | ||
| 205 | |||
| 206 | #define EAGER_TID_ID INFINIPATH_I_TID_MASK | ||
| 207 | |||
| 208 | #define IPS_DEFAULT_P_KEY 0xFFFF | ||
| 209 | |||
| 210 | #define IPS_PERMISSIVE_LID 0xFFFF | ||
| 211 | #define IPS_MULTICAST_LID_BASE 0xC000 | ||
| 212 | |||
| 213 | #define IPS_AETH_CREDIT_SHIFT 24 | ||
| 214 | #define IPS_AETH_CREDIT_MASK 0x1F | ||
| 215 | #define IPS_AETH_CREDIT_INVAL 0x1F | ||
| 216 | |||
| 217 | #define IPS_PSN_MASK 0xFFFFFF | ||
| 218 | #define IPS_MSN_MASK 0xFFFFFF | ||
| 219 | #define IPS_QPN_MASK 0xFFFFFF | ||
| 220 | #define IPS_MULTICAST_QPN 0xFFFFFF | ||
| 221 | |||
| 222 | /* functions for extracting fields from rcvhdrq entries */ | ||
| 223 | static inline __u32 ips_get_hdr_err_flags(const __le32 * rbuf) | ||
| 224 | { | ||
| 225 | return __le32_to_cpu(rbuf[1]); | ||
| 226 | } | ||
| 227 | |||
| 228 | static inline __u32 ips_get_index(const __le32 * rbuf) | ||
| 229 | { | ||
| 230 | return (__le32_to_cpu(rbuf[0]) >> INFINIPATH_RHF_EGRINDEX_SHIFT) | ||
| 231 | & INFINIPATH_RHF_EGRINDEX_MASK; | ||
| 232 | } | ||
| 233 | |||
| 234 | static inline __u32 ips_get_rcv_type(const __le32 * rbuf) | ||
| 235 | { | ||
| 236 | return (__le32_to_cpu(rbuf[0]) >> INFINIPATH_RHF_RCVTYPE_SHIFT) | ||
| 237 | & INFINIPATH_RHF_RCVTYPE_MASK; | ||
| 238 | } | ||
| 239 | |||
| 240 | static inline __u32 ips_get_length_in_bytes(const __le32 * rbuf) | ||
| 241 | { | ||
| 242 | return ((__le32_to_cpu(rbuf[0]) >> INFINIPATH_RHF_LENGTH_SHIFT) | ||
| 243 | & INFINIPATH_RHF_LENGTH_MASK) << 2; | ||
| 244 | } | ||
| 245 | |||
| 246 | static inline void *ips_get_first_protocol_header(const __u32 * rbuf) | ||
| 247 | { | ||
| 248 | return (void *)&rbuf[2]; | ||
| 249 | } | ||
| 250 | |||
| 251 | static inline struct ips_message_header *ips_get_ips_header(const __u32 * | ||
| 252 | rbuf) | ||
| 253 | { | ||
| 254 | return (struct ips_message_header *)&rbuf[2]; | ||
| 255 | } | ||
| 256 | |||
| 257 | static inline __u32 ips_get_ipath_ver(__le32 hdrword) | ||
| 258 | { | ||
| 259 | return (__le32_to_cpu(hdrword) >> INFINIPATH_I_VERS_SHIFT) | ||
| 260 | & INFINIPATH_I_VERS_MASK; | ||
| 261 | } | ||
| 262 | |||
| 263 | #endif /* IPS_COMMON_H */ | ||
diff --git a/drivers/infiniband/hw/ipath/verbs_debug.h b/drivers/infiniband/hw/ipath/verbs_debug.h index 40d693cf3f94..6186676f2a16 100644 --- a/drivers/infiniband/hw/ipath/verbs_debug.h +++ b/drivers/infiniband/hw/ipath/verbs_debug.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 QLogic, Inc. All rights reserved. | ||
| 2 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. | 3 | * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. |
| 3 | * | 4 | * |
| 4 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c index 465fd220569c..557cde3a4563 100644 --- a/drivers/infiniband/hw/mthca/mthca_main.c +++ b/drivers/infiniband/hw/mthca/mthca_main.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * $Id: mthca_main.c 1396 2004-12-28 04:10:27Z roland $ | 34 | * $Id: mthca_main.c 1396 2004-12-28 04:10:27Z roland $ |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
diff --git a/drivers/infiniband/hw/mthca/mthca_reset.c b/drivers/infiniband/hw/mthca/mthca_reset.c index f4fddd5327f5..91934f2d9dba 100644 --- a/drivers/infiniband/hw/mthca/mthca_reset.c +++ b/drivers/infiniband/hw/mthca/mthca_reset.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * $Id: mthca_reset.c 1349 2004-12-16 21:09:43Z roland $ | 32 | * $Id: mthca_reset.c 1349 2004-12-16 21:09:43Z roland $ |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 37 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 38 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 491d2afaf5b4..3f89f5e19036 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include <linux/netdevice.h> | 42 | #include <linux/netdevice.h> |
| 43 | #include <linux/workqueue.h> | 43 | #include <linux/workqueue.h> |
| 44 | #include <linux/pci.h> | 44 | #include <linux/pci.h> |
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/kref.h> | 45 | #include <linux/kref.h> |
| 47 | #include <linux/if_infiniband.h> | 46 | #include <linux/if_infiniband.h> |
| 48 | #include <linux/mutex.h> | 47 | #include <linux/mutex.h> |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 4c3f2de2a06e..b2c033edb03c 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | #include <linux/blkdev.h> | 54 | #include <linux/blkdev.h> |
| 55 | #include <linux/init.h> | 55 | #include <linux/init.h> |
| 56 | #include <linux/ioctl.h> | 56 | #include <linux/ioctl.h> |
| 57 | #include <linux/devfs_fs_kernel.h> | ||
| 58 | #include <linux/cdev.h> | 57 | #include <linux/cdev.h> |
| 59 | #include <linux/in.h> | 58 | #include <linux/in.h> |
| 60 | #include <linux/net.h> | 59 | #include <linux/net.h> |
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c index 462f8d300aae..9793ac36d17f 100644 --- a/drivers/input/gameport/emu10k1-gp.c +++ b/drivers/input/gameport/emu10k1-gp.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/ioport.h> | 34 | #include <linux/ioport.h> |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 37 | #include <linux/gameport.h> | 36 | #include <linux/gameport.h> |
| 38 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c index 3e2d28f263e9..f68dbe6f7f04 100644 --- a/drivers/input/gameport/ns558.c +++ b/drivers/input/gameport/ns558.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/ioport.h> | 35 | #include <linux/ioport.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 39 | #include <linux/gameport.h> | 38 | #include <linux/gameport.h> |
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 01dc0b195d59..e9a02db36ecc 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic | 28 | * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h index 668f24535ba0..e9924d6f01b3 100644 --- a/drivers/input/joystick/iforce/iforce.h +++ b/drivers/input/joystick/iforce/iforce.h | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/usb.h> | 36 | #include <linux/usb.h> |
| 37 | #include <linux/serio.h> | 37 | #include <linux/serio.h> |
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/circ_buf.h> | 38 | #include <linux/circ_buf.h> |
| 40 | #include <linux/mutex.h> | 39 | #include <linux/mutex.h> |
| 41 | 40 | ||
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c index 33edd030aa75..d22c7c624296 100644 --- a/drivers/input/keyboard/hilkbd.c +++ b/drivers/input/keyboard/hilkbd.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/pci_ids.h> | 18 | #include <linux/pci_ids.h> |
| 19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 23 | #include <linux/input.h> | 22 | #include <linux/input.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c index 2c510881874a..83906f80ba21 100644 --- a/drivers/input/keyboard/locomokbd.c +++ b/drivers/input/keyboard/locomokbd.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c index 42c11fbf3c79..106c94f33b93 100644 --- a/drivers/input/misc/sparcspkr.c +++ b/drivers/input/misc/sparcspkr.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (c) 2002 Vojtech Pavlik | 4 | * Copyright (c) 2002 Vojtech Pavlik |
| 5 | * Copyright (c) 2002, 2006 David S. Miller (davem@davemloft.net) | 5 | * Copyright (c) 2002, 2006 David S. Miller (davem@davemloft.net) |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c index afc66f56df43..50f1fed10be4 100644 --- a/drivers/input/mouse/inport.c +++ b/drivers/input/mouse/inport.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/moduleparam.h> | 38 | #include <linux/moduleparam.h> |
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> |
| 41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 42 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c index a89742431717..0023501a5b63 100644 --- a/drivers/input/mouse/sermouse.c +++ b/drivers/input/mouse/sermouse.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 35 | #include <linux/input.h> | 35 | #include <linux/input.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/serio.h> | 36 | #include <linux/serio.h> |
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | 38 | ||
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c index 7b85bc21ae4a..47edcfd022ba 100644 --- a/drivers/input/mouse/vsxxxaa.c +++ b/drivers/input/mouse/vsxxxaa.c | |||
| @@ -81,7 +81,6 @@ | |||
| 81 | #include <linux/slab.h> | 81 | #include <linux/slab.h> |
| 82 | #include <linux/interrupt.h> | 82 | #include <linux/interrupt.h> |
| 83 | #include <linux/input.h> | 83 | #include <linux/input.h> |
| 84 | #include <linux/config.h> | ||
| 85 | #include <linux/serio.h> | 84 | #include <linux/serio.h> |
| 86 | #include <linux/init.h> | 85 | #include <linux/init.h> |
| 87 | 86 | ||
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index eb721b11ff37..1f851acab30d 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/input.h> | 21 | #include <linux/input.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/smp_lock.h> | 22 | #include <linux/smp_lock.h> |
| 24 | #include <linux/random.h> | 23 | #include <linux/random.h> |
| 25 | #include <linux/major.h> | 24 | #include <linux/major.h> |
diff --git a/drivers/input/power.c b/drivers/input/power.c index 526e6070600c..51a519e24b6d 100644 --- a/drivers/input/power.c +++ b/drivers/input/power.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| 33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c index 1ac739ef2ffa..bc6e87add093 100644 --- a/drivers/input/serio/ct82c710.c +++ b/drivers/input/serio/ct82c710.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 36 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 37 | #include <linux/serio.h> | 36 | #include <linux/serio.h> |
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index c0b1e4becad3..22d02d53eb16 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * was usable/enabled ?) | 22 | * was usable/enabled ?) |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/serio.h> | 27 | #include <linux/serio.h> |
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index 6d66351805a2..7d9fafea9615 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
| @@ -1,13 +1,10 @@ | |||
| 1 | #ifndef _I8042_SPARCIO_H | 1 | #ifndef _I8042_SPARCIO_H |
| 2 | #define _I8042_SPARCIO_H | 2 | #define _I8042_SPARCIO_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/io.h> | 4 | #include <asm/io.h> |
| 6 | |||
| 7 | #ifdef CONFIG_PCI | ||
| 8 | #include <asm/oplib.h> | 5 | #include <asm/oplib.h> |
| 9 | #include <asm/ebus.h> | 6 | #include <asm/prom.h> |
| 10 | #endif | 7 | #include <asm/of_device.h> |
| 11 | 8 | ||
| 12 | static int i8042_kbd_irq = -1; | 9 | static int i8042_kbd_irq = -1; |
| 13 | static int i8042_aux_irq = -1; | 10 | static int i8042_aux_irq = -1; |
| @@ -48,54 +45,83 @@ static inline void i8042_write_command(int val) | |||
| 48 | #define OBP_PS2MS_NAME1 "kdmouse" | 45 | #define OBP_PS2MS_NAME1 "kdmouse" |
| 49 | #define OBP_PS2MS_NAME2 "mouse" | 46 | #define OBP_PS2MS_NAME2 "mouse" |
| 50 | 47 | ||
| 48 | static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_device_id *match) | ||
| 49 | { | ||
| 50 | struct device_node *dp = op->node; | ||
| 51 | |||
| 52 | dp = dp->child; | ||
| 53 | while (dp) { | ||
| 54 | if (!strcmp(dp->name, OBP_PS2KBD_NAME1) || | ||
| 55 | !strcmp(dp->name, OBP_PS2KBD_NAME2)) { | ||
| 56 | struct of_device *kbd = of_find_device_by_node(dp); | ||
| 57 | unsigned int irq = kbd->irqs[0]; | ||
| 58 | if (irq == 0xffffffff) | ||
| 59 | irq = op->irqs[0]; | ||
| 60 | i8042_kbd_irq = irq; | ||
| 61 | kbd_iobase = of_ioremap(&kbd->resource[0], | ||
| 62 | 0, 8, "kbd"); | ||
| 63 | } else if (!strcmp(dp->name, OBP_PS2MS_NAME1) || | ||
| 64 | !strcmp(dp->name, OBP_PS2MS_NAME2)) { | ||
| 65 | struct of_device *ms = of_find_device_by_node(dp); | ||
| 66 | unsigned int irq = ms->irqs[0]; | ||
| 67 | if (irq == 0xffffffff) | ||
| 68 | irq = op->irqs[0]; | ||
| 69 | i8042_aux_irq = irq; | ||
| 70 | } | ||
| 71 | |||
| 72 | dp = dp->sibling; | ||
| 73 | } | ||
| 74 | |||
| 75 | return 0; | ||
| 76 | } | ||
| 77 | |||
| 78 | static int __devexit sparc_i8042_remove(struct of_device *op) | ||
| 79 | { | ||
| 80 | of_iounmap(kbd_iobase, 8); | ||
| 81 | |||
| 82 | return 0; | ||
| 83 | } | ||
| 84 | |||
| 85 | static struct of_device_id sparc_i8042_match[] = { | ||
| 86 | { | ||
| 87 | .name = "8042", | ||
| 88 | }, | ||
| 89 | {}, | ||
| 90 | }; | ||
| 91 | MODULE_DEVICE_TABLE(of, i8042_match); | ||
| 92 | |||
| 93 | static struct of_platform_driver sparc_i8042_driver = { | ||
| 94 | .name = "i8042", | ||
| 95 | .match_table = sparc_i8042_match, | ||
| 96 | .probe = sparc_i8042_probe, | ||
| 97 | .remove = __devexit_p(sparc_i8042_remove), | ||
| 98 | }; | ||
| 99 | |||
| 51 | static int __init i8042_platform_init(void) | 100 | static int __init i8042_platform_init(void) |
| 52 | { | 101 | { |
| 53 | #ifndef CONFIG_PCI | 102 | #ifndef CONFIG_PCI |
| 54 | return -ENODEV; | 103 | return -ENODEV; |
| 55 | #else | 104 | #else |
| 56 | char prop[128]; | 105 | struct device_node *root = of_find_node_by_path("/"); |
| 57 | int len; | ||
| 58 | 106 | ||
| 59 | len = prom_getproperty(prom_root_node, "name", prop, sizeof(prop)); | 107 | if (!strcmp(root->name, "SUNW,JavaStation-1")) { |
| 60 | if (len < 0) { | ||
| 61 | printk("i8042: Cannot get name property of root OBP node.\n"); | ||
| 62 | return -ENODEV; | ||
| 63 | } | ||
| 64 | if (strncmp(prop, "SUNW,JavaStation-1", len) == 0) { | ||
| 65 | /* Hardcoded values for MrCoffee. */ | 108 | /* Hardcoded values for MrCoffee. */ |
| 66 | i8042_kbd_irq = i8042_aux_irq = 13 | 0x20; | 109 | i8042_kbd_irq = i8042_aux_irq = 13 | 0x20; |
| 67 | kbd_iobase = ioremap(0x71300060, 8); | 110 | kbd_iobase = ioremap(0x71300060, 8); |
| 68 | if (!kbd_iobase) | 111 | if (!kbd_iobase) |
| 69 | return -ENODEV; | 112 | return -ENODEV; |
| 70 | } else { | 113 | } else { |
| 71 | struct linux_ebus *ebus; | 114 | int err = of_register_driver(&sparc_i8042_driver, |
| 72 | struct linux_ebus_device *edev; | 115 | &of_bus_type); |
| 73 | struct linux_ebus_child *child; | 116 | if (err) |
| 74 | 117 | return err; | |
| 75 | for_each_ebus(ebus) { | 118 | |
| 76 | for_each_ebusdev(edev, ebus) { | ||
| 77 | if (!strcmp(edev->prom_node->name, "8042")) | ||
| 78 | goto edev_found; | ||
| 79 | } | ||
| 80 | } | ||
| 81 | return -ENODEV; | ||
| 82 | |||
| 83 | edev_found: | ||
| 84 | for_each_edevchild(edev, child) { | ||
| 85 | if (!strcmp(child->prom_node->name, OBP_PS2KBD_NAME1) || | ||
| 86 | !strcmp(child->prom_node->name, OBP_PS2KBD_NAME2)) { | ||
| 87 | i8042_kbd_irq = child->irqs[0]; | ||
| 88 | kbd_iobase = | ||
| 89 | ioremap(child->resource[0].start, 8); | ||
| 90 | } | ||
| 91 | if (!strcmp(child->prom_node->name, OBP_PS2MS_NAME1) || | ||
| 92 | !strcmp(child->prom_node->name, OBP_PS2MS_NAME2)) | ||
| 93 | i8042_aux_irq = child->irqs[0]; | ||
| 94 | } | ||
| 95 | if (i8042_kbd_irq == -1 || | 119 | if (i8042_kbd_irq == -1 || |
| 96 | i8042_aux_irq == -1) { | 120 | i8042_aux_irq == -1) { |
| 97 | printk("i8042: Error, 8042 device lacks both kbd and " | 121 | if (kbd_iobase) { |
| 98 | "mouse nodes.\n"); | 122 | of_iounmap(kbd_iobase, 8); |
| 123 | kbd_iobase = (void __iomem *) NULL; | ||
| 124 | } | ||
| 99 | return -ENODEV; | 125 | return -ENODEV; |
| 100 | } | 126 | } |
| 101 | } | 127 | } |
| @@ -109,7 +135,10 @@ static int __init i8042_platform_init(void) | |||
| 109 | static inline void i8042_platform_exit(void) | 135 | static inline void i8042_platform_exit(void) |
| 110 | { | 136 | { |
| 111 | #ifdef CONFIG_PCI | 137 | #ifdef CONFIG_PCI |
| 112 | iounmap(kbd_iobase); | 138 | struct device_node *root = of_find_node_by_path("/"); |
| 139 | |||
| 140 | if (strcmp(root->name, "SUNW,JavaStation-1")) | ||
| 141 | of_unregister_driver(&sparc_i8042_driver); | ||
| 113 | #endif | 142 | #endif |
| 114 | } | 143 | } |
| 115 | 144 | ||
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index a7d91d5356a5..7fa4bc222583 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/moduleparam.h> | 15 | #include <linux/moduleparam.h> |
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/ioport.h> | 17 | #include <linux/ioport.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/serio.h> | 19 | #include <linux/serio.h> |
| 21 | #include <linux/err.h> | 20 | #include <linux/err.h> |
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h index cbbf3842da5b..af526ab9ec04 100644 --- a/drivers/input/serio/i8042.h +++ b/drivers/input/serio/i8042.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _I8042_H | 1 | #ifndef _I8042_H |
| 2 | #define _I8042_H | 2 | #define _I8042_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Copyright (c) 1999-2002 Vojtech Pavlik | 6 | * Copyright (c) 1999-2002 Vojtech Pavlik |
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c index 5f9ecad2ca75..00e3929c6288 100644 --- a/drivers/input/tsdev.c +++ b/drivers/input/tsdev.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <linux/init.h> | 48 | #include <linux/init.h> |
| 49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
| 50 | #include <linux/major.h> | 50 | #include <linux/major.h> |
| 51 | #include <linux/config.h> | ||
| 52 | #include <linux/smp_lock.h> | 51 | #include <linux/smp_lock.h> |
| 53 | #include <linux/random.h> | 52 | #include <linux/random.h> |
| 54 | #include <linux/time.h> | 53 | #include <linux/time.h> |
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index a518ec531021..669f76393b5a 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c index e7cf6bc286a6..c1b21552fc03 100644 --- a/drivers/isdn/capi/capiutil.c +++ b/drivers/isdn/capi/capiutil.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/isdn/capiutil.h> | 20 | #include <linux/isdn/capiutil.h> |
| 22 | 21 | ||
| 23 | /* from CAPI2.0 DDK AVM Berlin GmbH */ | 22 | /* from CAPI2.0 DDK AVM Berlin GmbH */ |
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c index 1b37d86d5ee1..399b316111f7 100644 --- a/drivers/isdn/divert/divert_procfs.c +++ b/drivers/isdn/divert/divert_procfs.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/poll.h> | 13 | #include <linux/poll.h> |
| 15 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index 1ca3bfdef51d..884bd72c1bf4 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef GIGASET_H | 16 | #ifndef GIGASET_H |
| 17 | #define GIGASET_H | 17 | #define GIGASET_H |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/compiler.h> | 20 | #include <linux/compiler.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c index 4d64e5cbcdbf..a4beeb46c859 100644 --- a/drivers/isdn/hardware/avm/b1dma.c +++ b/drivers/isdn/hardware/avm/b1dma.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c index 5435a6cfb5e7..7edf19b32299 100644 --- a/drivers/isdn/hardware/avm/b1pci.c +++ b/drivers/isdn/hardware/avm/b1pci.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c index f7253b2136ea..e7924a545d49 100644 --- a/drivers/isdn/hardware/avm/c4.c +++ b/drivers/isdn/hardware/avm/c4.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c index 2ceec8e8419f..af85511600d0 100644 --- a/drivers/isdn/hardware/avm/t1pci.c +++ b/drivers/isdn/hardware/avm/t1pci.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c index 8fe4f3f09353..7a74ed35b1bf 100644 --- a/drivers/isdn/hardware/eicon/capimain.c +++ b/drivers/isdn/hardware/eicon/capimain.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * of the GNU General Public License, incorporated herein by reference. | 10 | * of the GNU General Public License, incorporated herein by reference. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
diff --git a/drivers/isdn/hardware/eicon/diva_didd.c b/drivers/isdn/hardware/eicon/diva_didd.c index 27204f4b111a..14298b8c835f 100644 --- a/drivers/isdn/hardware/eicon/diva_didd.c +++ b/drivers/isdn/hardware/eicon/diva_didd.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * of the GNU General Public License, incorporated herein by reference. | 11 | * of the GNU General Public License, incorporated herein by reference. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c index b163c5909182..77155d9f399b 100644 --- a/drivers/isdn/hardware/eicon/divamnt.c +++ b/drivers/isdn/hardware/eicon/divamnt.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * of the GNU General Public License, incorporated herein by reference. | 10 | * of the GNU General Public License, incorporated herein by reference. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c index 6e7d89a31c1d..fff0d89c806b 100644 --- a/drivers/isdn/hardware/eicon/divasi.c +++ b/drivers/isdn/hardware/eicon/divasi.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * of the GNU General Public License, incorporated herein by reference. | 10 | * of the GNU General Public License, incorporated herein by reference. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index 9dee6a39104c..b05e35f7ccb1 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * of the GNU General Public License, incorporated herein by reference. | 9 | * of the GNU General Public License, incorporated herein by reference. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c index c12efa6f8429..6a4373a4f1e8 100644 --- a/drivers/isdn/hardware/eicon/divasproc.c +++ b/drivers/isdn/hardware/eicon/divasproc.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * of the GNU General Public License, incorporated herein by reference. | 10 | * of the GNU General Public License, incorporated herein by reference. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/poll.h> | 15 | #include <linux/poll.h> |
diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h index 12b8ff29e976..a66836cf756c 100644 --- a/drivers/isdn/hardware/eicon/platform.h +++ b/drivers/isdn/hardware/eicon/platform.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #define DIVA_BUILD "local" | 18 | #define DIVA_BUILD "local" |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 4abe5ff10e72..93f3a5343a74 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include "hisax.h" | 16 | #include "hisax.h" |
| 18 | #include "isac.h" | 17 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index dcb308aeb50c..de28cb54817d 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include "hisax.h" | 15 | #include "hisax.h" |
| 17 | #include "isac.h" | 16 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c index 5f21b82c8c8d..9d1abfb93dde 100644 --- a/drivers/isdn/hisax/bkm_a8.c +++ b/drivers/isdn/hisax/bkm_a8.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include "hisax.h" | 15 | #include "hisax.h" |
| 17 | #include "isac.h" | 16 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 27332506f9f7..5333be5d2c47 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/stddef.h> | 18 | #include <linux/stddef.h> |
| 19 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include "hisax.h" | 21 | #include "hisax.h" |
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index b0ff1cc97d7c..fbb9d02e3e29 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include "hisax.h" | 19 | #include "hisax.h" |
| 21 | #include "isac.h" | 20 | #include "isac.h" |
| 22 | #include "hscx.h" | 21 | #include "hscx.h" |
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index f8ca4b323331..7a5cdb1dee1e 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include "hisax.h" | 22 | #include "hisax.h" |
| 24 | #include "arcofi.h" | 23 | #include "arcofi.h" |
| 25 | #include "isac.h" | 24 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c index 898ec0916195..0279fb323cb1 100644 --- a/drivers/isdn/hisax/elsa_ser.c +++ b/drivers/isdn/hisax/elsa_ser.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/serial.h> | 10 | #include <linux/serial.h> |
| 12 | #include <linux/serial_reg.h> | 11 | #include <linux/serial_reg.h> |
| 13 | 12 | ||
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 3341cf155531..5f4876184691 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | */ | 60 | */ |
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | #include <linux/config.h> | ||
| 64 | #include "hisax.h" | 63 | #include "hisax.h" |
| 65 | #include "isac.h" | 64 | #include "isac.h" |
| 66 | #include "isdnl1.h" | 65 | #include "isdnl1.h" |
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 60b04c6d9e7d..82a1d2e86cee 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include "hisax.h" | 15 | #include "hisax.h" |
| 17 | #include "isac.h" | 16 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index e3866b0a97fd..913fd27a1f55 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 3622720f0505..fa9615747e26 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include "hisax.h" | 19 | #include "hisax.h" |
| 21 | #include "hfc_pci.h" | 20 | #include "hfc_pci.h" |
| 22 | #include "isdnl1.h" | 21 | #include "isdnl1.h" |
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index 262c44127419..b5e571a52694 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/stddef.h> | 33 | #include <linux/stddef.h> |
| 34 | #include <linux/timer.h> | 34 | #include <linux/timer.h> |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/kernel_stat.h> | 37 | #include <linux/kernel_stat.h> |
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 11fe537e2f6f..75920aa0a3c5 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * of the GNU General Public License, incorporated herein by reference. | 6 | * of the GNU General Public License, incorporated herein by reference. |
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
| 12 | #include <linux/major.h> | 11 | #include <linux/major.h> |
diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h index ba518a7a7fb7..ceafecdb1037 100644 --- a/drivers/isdn/hisax/hisax_debug.h +++ b/drivers/isdn/hisax/hisax_debug.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef __HISAX_DEBUG_H__ | 22 | #ifndef __HISAX_DEBUG_H__ |
| 23 | #define __HISAX_DEBUG_H__ | 23 | #define __HISAX_DEBUG_H__ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | #ifdef CONFIG_HISAX_DEBUG | 26 | #ifdef CONFIG_HISAX_DEBUG |
| 28 | 27 | ||
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c index 2e9afae1254a..df5fc92a89b2 100644 --- a/drivers/isdn/hisax/ipacx.c +++ b/drivers/isdn/hisax/ipacx.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include "hisax_if.h" | 14 | #include "hisax_if.h" |
| 16 | #include "hisax.h" | 15 | #include "hisax.h" |
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c index c9917cd2132b..281fa27d9f00 100644 --- a/drivers/isdn/hisax/isdnl3.c +++ b/drivers/isdn/hisax/isdnl3.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include "hisax.h" | 19 | #include "hisax.h" |
| 20 | #include "isdnl3.h" | 20 | #include "isdnl3.h" |
| 21 | #include <linux/config.h> | ||
| 22 | 21 | ||
| 23 | const char *l3_revision = "$Revision: 2.22.2.3 $"; | 22 | const char *l3_revision = "$Revision: 2.22.2.3 $"; |
| 24 | 23 | ||
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c index e96845cdd4f6..99feae8b9210 100644 --- a/drivers/isdn/hisax/l3dss1.c +++ b/drivers/isdn/hisax/l3dss1.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include "isdnl3.h" | 23 | #include "isdnl3.h" |
| 24 | #include "l3dss1.h" | 24 | #include "l3dss1.h" |
| 25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | extern char *HiSax_getrev(const char *revision); | 27 | extern char *HiSax_getrev(const char *revision); |
| 29 | static const char *dss1_revision = "$Revision: 2.32.2.3 $"; | 28 | static const char *dss1_revision = "$Revision: 2.32.2.3 $"; |
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c index 68a2159cbd11..868762cf76c6 100644 --- a/drivers/isdn/hisax/niccy.c +++ b/drivers/isdn/hisax/niccy.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include "hisax.h" | 18 | #include "hisax.h" |
| 20 | #include "isac.h" | 19 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index a7d3cd3f36fd..1b3ac46df52c 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include "hisax.h" | 9 | #include "hisax.h" |
| 11 | #include "isac.h" | 10 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index 1ae7cac98a87..7a6010eac60d 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include "hisax.h" | 9 | #include "hisax.h" |
| 11 | #include "icc.h" | 10 | #include "icc.h" |
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c index 8c044a6a7fe3..11ea456626b6 100644 --- a/drivers/isdn/hisax/sedlbauer.c +++ b/drivers/isdn/hisax/sedlbauer.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/init.h> | 41 | #include <linux/init.h> |
| 42 | #include <linux/config.h> | ||
| 43 | #include "hisax.h" | 42 | #include "hisax.h" |
| 44 | #include "isac.h" | 43 | #include "isac.h" |
| 45 | #include "ipac.h" | 44 | #include "ipac.h" |
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h index 9ffaae7c657a..04416bad611d 100644 --- a/drivers/isdn/hisax/st5481.h +++ b/drivers/isdn/hisax/st5481.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _ST5481_H_ | 13 | #ifndef _ST5481_H_ |
| 14 | #define _ST5481_H_ | 14 | #define _ST5481_H_ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | // USB IDs, the Product Id is in the range 0x4810-0x481F | 17 | // USB IDs, the Product Id is in the range 0x4810-0x481F |
| 19 | 18 | ||
diff --git a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c index 99cb0f3d59a1..2716aa5c60f7 100644 --- a/drivers/isdn/hisax/st5481_init.c +++ b/drivers/isdn/hisax/st5481_init.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * clean up debug | 24 | * clean up debug |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index e82ab2251b82..a1bb73e28841 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #include "hisax.h" | 16 | #include "hisax.h" |
| 18 | #include "isac.h" | 17 | #include "isac.h" |
| 19 | #include "hscx.h" | 18 | #include "hscx.h" |
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index 0352ee5f706c..00e4fa2aef51 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include "hisax.h" | 14 | #include "hisax.h" |
| 16 | #include "w6692.h" | 15 | #include "w6692.h" |
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c index 48d134be9908..89fd531fbce6 100644 --- a/drivers/isdn/hysdn/boardergo.c +++ b/drivers/isdn/hysdn/boardergo.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/signal.h> | 18 | #include <linux/signal.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h index 3a9b29b38bc4..461e831592dd 100644 --- a/drivers/isdn/hysdn/hysdn_defs.h +++ b/drivers/isdn/hysdn/hysdn_defs.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef HYSDN_DEFS_H | 14 | #ifndef HYSDN_DEFS_H |
| 15 | #define HYSDN_DEFS_H | 15 | #define HYSDN_DEFS_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/hysdn_if.h> | 17 | #include <linux/hysdn_if.h> |
| 19 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 20 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c index b75ac5af236a..b702ed27252b 100644 --- a/drivers/isdn/hysdn/hysdn_init.c +++ b/drivers/isdn/hysdn/hysdn_init.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/poll.h> | 15 | #include <linux/poll.h> |
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c index 133032920ff8..1c0d54ac12ab 100644 --- a/drivers/isdn/hysdn/hysdn_sched.c +++ b/drivers/isdn/hysdn/hysdn_sched.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 16 | #include <linux/signal.h> | 15 | #include <linux/signal.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index eb21063e6f63..9f6c6375ff75 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/poll.h> | 16 | #include <linux/poll.h> |
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 96c115e13389..43da8ae1b2ad 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * http://i4l.zabbadoz.net/i4l/cisco-hdlc.txt | 22 | * http://i4l.zabbadoz.net/i4l/cisco-hdlc.txt |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/isdn.h> | 25 | #include <linux/isdn.h> |
| 27 | #include <net/arp.h> | 26 | #include <net/arp.h> |
| 28 | #include <net/dst.h> | 27 | #include <net/dst.h> |
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 918742271c79..29e7667ec962 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/isdn.h> | 12 | #include <linux/isdn.h> |
| 14 | #include <linux/poll.h> | 13 | #include <linux/poll.h> |
| 15 | #include <linux/ppp-comp.h> | 14 | #include <linux/ppp-comp.h> |
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index 0a53a990c100..9ab66e8960d5 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #undef ISDN_TTY_STAT_DEBUG | 12 | #undef ISDN_TTY_STAT_DEBUG |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/isdn.h> | 14 | #include <linux/isdn.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include "isdn_common.h" | 16 | #include "isdn_common.h" |
diff --git a/drivers/isdn/i4l/isdn_tty.h b/drivers/isdn/i4l/isdn_tty.h index 9f0fa9501f4d..692c74d6b749 100644 --- a/drivers/isdn/i4l/isdn_tty.h +++ b/drivers/isdn/i4l/isdn_tty.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #define DLE 0x10 | 14 | #define DLE 0x10 |
| 16 | #define ETX 0x03 | 15 | #define ETX 0x03 |
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c index a67d31af797a..fabbd461603e 100644 --- a/drivers/isdn/isdnloop/isdnloop.c +++ b/drivers/isdn/isdnloop/isdnloop.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index c75d0ef1609c..d424b4452028 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 1b1ce6523960..47f0ff196328 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/drivers/leds/leds-corgi.c b/drivers/leds/leds-corgi.c index bb7d84df0121..cf1dcd719a28 100644 --- a/drivers/leds/leds-corgi.c +++ b/drivers/leds/leds-corgi.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
diff --git a/drivers/leds/leds-ixp4xx-gpio.c b/drivers/leds/leds-ixp4xx-gpio.c index 30ced150e4cf..7dcf0b92c460 100644 --- a/drivers/leds/leds-ixp4xx-gpio.c +++ b/drivers/leds/leds-ixp4xx-gpio.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 37 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c index 8419e29b71f4..3b87951aa555 100644 --- a/drivers/leds/leds-locomo.c +++ b/drivers/leds/leds-locomo.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/device.h> | 13 | #include <linux/device.h> |
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c index 650cf72dc675..fb1edc1c9edb 100644 --- a/drivers/leds/leds-s3c24xx.c +++ b/drivers/leds/leds-s3c24xx.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
diff --git a/drivers/leds/leds-spitz.c b/drivers/leds/leds-spitz.c index 65bbef4a5e09..126d09cc96ec 100644 --- a/drivers/leds/leds-spitz.c +++ b/drivers/leds/leds-spitz.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
diff --git a/drivers/leds/leds-tosa.c b/drivers/leds/leds-tosa.c index c9e8cc1ec481..fb2416a38303 100644 --- a/drivers/leds/leds-tosa.c +++ b/drivers/leds/leds-tosa.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c index fbf141ef46ec..179c2876b541 100644 --- a/drivers/leds/ledtrig-timer.c +++ b/drivers/leds/ledtrig-timer.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 9f1a049dc226..360f93f6fcdb 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * - move bus probe to a kernel thread | 16 | * - move bus probe to a kernel thread |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index cbfbbe2b150a..545be1ed6927 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * Move to syfs | 34 | * Move to syfs |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
diff --git a/drivers/macintosh/apm_emu.c b/drivers/macintosh/apm_emu.c index e5a2bbf99399..1293876a2ebd 100644 --- a/drivers/macintosh/apm_emu.c +++ b/drivers/macintosh/apm_emu.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | 22 | ||
| 24 | #include <linux/poll.h> | 23 | #include <linux/poll.h> |
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c index a66636116f0b..6b129eef7987 100644 --- a/drivers/macintosh/mac_hid.c +++ b/drivers/macintosh/mac_hid.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * This file will soon be removed in favor of an uinput userspace tool. | 8 | * This file will soon be removed in favor of an uinput userspace tool. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
| 14 | #include <linux/sysctl.h> | 13 | #include <linux/sysctl.h> |
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index c687ac703941..d832e109b1b1 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * sub-devices. | 17 | * sub-devices. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c index 7f7d4eaca870..cae24a13526a 100644 --- a/drivers/macintosh/macio_sysfs.c +++ b/drivers/macintosh/macio_sysfs.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/stat.h> | 2 | #include <linux/stat.h> |
| 4 | #include <asm/macio.h> | 3 | #include <asm/macio.h> |
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 53c1c7909413..0acf2f7fd9d7 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * as published by the Free Software Foundation; either version | 10 | * as published by the Free Software Foundation; either version |
| 11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index f4516ca7aa3a..030130570e0a 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * the userland interface | 19 | * the userland interface |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/device.h> | 24 | #include <linux/device.h> |
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index 5282fec17075..7f86478bdd36 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 231146f439dd..c1fe0b368f76 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
| @@ -97,7 +97,6 @@ | |||
| 97 | * | 97 | * |
| 98 | */ | 98 | */ |
| 99 | 99 | ||
| 100 | #include <linux/config.h> | ||
| 101 | #include <linux/types.h> | 100 | #include <linux/types.h> |
| 102 | #include <linux/module.h> | 101 | #include <linux/module.h> |
| 103 | #include <linux/errno.h> | 102 | #include <linux/errno.h> |
diff --git a/drivers/macintosh/therm_pm72.h b/drivers/macintosh/therm_pm72.h index c17e61f9c418..fc7e9b7ecaf2 100644 --- a/drivers/macintosh/therm_pm72.h +++ b/drivers/macintosh/therm_pm72.h | |||
| @@ -93,7 +93,7 @@ static char * critical_overtemp_path = "/sbin/critical_overtemp"; | |||
| 93 | * 0. This appear to be safe enough for this first version | 93 | * 0. This appear to be safe enough for this first version |
| 94 | * of the driver, though I would accept any clean patch | 94 | * of the driver, though I would accept any clean patch |
| 95 | * doing a better use of the device-tree without turning the | 95 | * doing a better use of the device-tree without turning the |
| 96 | * while i2c registration mecanism into a racy mess | 96 | * while i2c registration mechanism into a racy mess |
| 97 | * | 97 | * |
| 98 | * Note: Xserve changed this. We have some bits on the K2 bus, | 98 | * Note: Xserve changed this. We have some bits on the K2 bus, |
| 99 | * which I arbitrarily set to 0x200. Ultimately, we really want | 99 | * which I arbitrarily set to 0x200. Ultimately, we really want |
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 3d9dd2e166aa..c7d1c290cb0c 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c index 2d9d79150403..6501db50fb83 100644 --- a/drivers/macintosh/via-cuda.c +++ b/drivers/macintosh/via-cuda.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 1996 Paul Mackerras. | 9 | * Copyright (C) 1996 Paul Mackerras. |
| 10 | */ | 10 | */ |
| 11 | #include <stdarg.h> | 11 | #include <stdarg.h> |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 1ab4f16c08b9..c1193d34ec9e 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #include <stdarg.h> | 23 | #include <stdarg.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/macintosh/windfarm_cpufreq_clamp.c b/drivers/macintosh/windfarm_cpufreq_clamp.c index 81337cd16e80..900aade06198 100644 --- a/drivers/macintosh/windfarm_cpufreq_clamp.c +++ b/drivers/macintosh/windfarm_cpufreq_clamp.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 3 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 4 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index ebbd2d856256..ecc56765d949 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/timer.h> | 23 | #include <linux/timer.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/list.h> | 25 | #include <linux/list.h> |
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 8eea0ddbf5ec..1d0fafda0f76 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/blkdev.h> | 9 | #include <linux/blkdev.h> |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/ctype.h> | 10 | #include <linux/ctype.h> |
| 12 | #include <linux/device-mapper.h> | 11 | #include <linux/device-mapper.h> |
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c index 73ab875fb158..f1db6eff4857 100644 --- a/drivers/md/kcopyd.c +++ b/drivers/md/kcopyd.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/atomic.h> | 12 | #include <asm/atomic.h> |
| 13 | 13 | ||
| 14 | #include <linux/blkdev.h> | 14 | #include <linux/blkdev.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/list.h> | 17 | #include <linux/list.h> |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 2ec1b3520a0b..2fe32c261922 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/kthread.h> | 36 | #include <linux/kthread.h> |
| 38 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
| 39 | #include <linux/raid/md.h> | 38 | #include <linux/raid/md.h> |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 837ec4eb3d60..7433871f4b3a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 25 | #include <linux/highmem.h> | 24 | #include <linux/highmem.h> |
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c index 2092e6c33dd2..d2905720eb74 100644 --- a/drivers/media/common/saa7146_hlp.c +++ b/drivers/media/common/saa7146_hlp.c | |||
| @@ -158,7 +158,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev, | |||
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | /* the horizontal scaling increment controls the UV filter | 160 | /* the horizontal scaling increment controls the UV filter |
| 161 | to reduce the bandwith to improve the display quality, | 161 | to reduce the bandwidth to improve the display quality, |
| 162 | so set it ... */ | 162 | so set it ... */ |
| 163 | if ( xsci == 0x400) | 163 | if ( xsci == 0x400) |
| 164 | pfuv = 0x00; | 164 | pfuv = 0x00; |
diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h index b3dd0603cd92..5a6c4fe249e7 100644 --- a/drivers/media/dvb/b2c2/flexcop-common.h +++ b/drivers/media/dvb/b2c2/flexcop-common.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __FLEXCOP_COMMON_H__ | 8 | #ifndef __FLEXCOP_COMMON_H__ |
| 9 | #define __FLEXCOP_COMMON_H__ | 9 | #define __FLEXCOP_COMMON_H__ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
| 13 | #include <linux/mutex.h> | 12 | #include <linux/mutex.h> |
| 14 | 13 | ||
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index 1b8953600425..001c71b6be61 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 5e8bb41a088b..59ac35ddd51e 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
| @@ -570,7 +570,8 @@ static int dvb_frontend_thread(void *data) | |||
| 570 | dvb_frontend_add_event(fe, s); | 570 | dvb_frontend_add_event(fe, s); |
| 571 | fepriv->status = s; | 571 | fepriv->status = s; |
| 572 | } | 572 | } |
| 573 | } | 573 | } else |
| 574 | dvb_frontend_swzigzag(fe); | ||
| 574 | } else | 575 | } else |
| 575 | dvb_frontend_swzigzag(fe); | 576 | dvb_frontend_swzigzag(fe); |
| 576 | } | 577 | } |
| @@ -975,6 +976,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, | |||
| 975 | 976 | ||
| 976 | case FE_SET_FRONTEND_TUNE_MODE: | 977 | case FE_SET_FRONTEND_TUNE_MODE: |
| 977 | fepriv->tune_mode_flags = (unsigned long) parg; | 978 | fepriv->tune_mode_flags = (unsigned long) parg; |
| 979 | err = 0; | ||
| 978 | break; | 980 | break; |
| 979 | }; | 981 | }; |
| 980 | 982 | ||
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 4cf9f89c51bf..97f8ea962438 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __DVB_USB_H__ | 8 | #ifndef __DVB_USB_H__ |
| 9 | #define __DVB_USB_H__ | 9 | #define __DVB_USB_H__ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/input.h> | 11 | #include <linux/input.h> |
| 13 | #include <linux/usb.h> | 12 | #include <linux/usb.h> |
| 14 | #include <linux/firmware.h> | 13 | #include <linux/firmware.h> |
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c index 3c7c09a362b2..13ad1bfae663 100644 --- a/drivers/media/dvb/frontends/cx22700.c +++ b/drivers/media/dvb/frontends/cx22700.c | |||
| @@ -134,6 +134,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet | |||
| 134 | return -EINVAL; | 134 | return -EINVAL; |
| 135 | 135 | ||
| 136 | if (p->code_rate_LP < FEC_1_2 || p->code_rate_LP > FEC_7_8) | 136 | if (p->code_rate_LP < FEC_1_2 || p->code_rate_LP > FEC_7_8) |
| 137 | return -EINVAL; | ||
| 137 | 138 | ||
| 138 | if (p->code_rate_HP == FEC_4_5 || p->code_rate_LP == FEC_4_5) | 139 | if (p->code_rate_HP == FEC_4_5 || p->code_rate_LP == FEC_4_5) |
| 139 | return -EINVAL; | 140 | return -EINVAL; |
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c index f2f795cba56a..274a87b7a5d5 100644 --- a/drivers/media/dvb/frontends/cx24123.c +++ b/drivers/media/dvb/frontends/cx24123.c | |||
| @@ -670,10 +670,10 @@ static int cx24123_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage | |||
| 670 | switch (voltage) { | 670 | switch (voltage) { |
| 671 | case SEC_VOLTAGE_13: | 671 | case SEC_VOLTAGE_13: |
| 672 | dprintk("%s: setting voltage 13V\n", __FUNCTION__); | 672 | dprintk("%s: setting voltage 13V\n", __FUNCTION__); |
| 673 | return cx24123_writereg(state, 0x29, val | 0x80); | 673 | return cx24123_writereg(state, 0x29, val & 0x7f); |
| 674 | case SEC_VOLTAGE_18: | 674 | case SEC_VOLTAGE_18: |
| 675 | dprintk("%s: setting voltage 18V\n", __FUNCTION__); | 675 | dprintk("%s: setting voltage 18V\n", __FUNCTION__); |
| 676 | return cx24123_writereg(state, 0x29, val & 0x7f); | 676 | return cx24123_writereg(state, 0x29, val | 0x80); |
| 677 | default: | 677 | default: |
| 678 | return -EINVAL; | 678 | return -EINVAL; |
| 679 | }; | 679 | }; |
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c index 7c6dc7e30900..5302e11883a2 100644 --- a/drivers/media/dvb/frontends/dib3000mb.c +++ b/drivers/media/dvb/frontends/dib3000mb.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/moduleparam.h> | 26 | #include <linux/moduleparam.h> |
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c index 6c3be2529980..98673474a140 100644 --- a/drivers/media/dvb/frontends/dib3000mc.c +++ b/drivers/media/dvb/frontends/dib3000mc.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * see Documentation/dvb/README.dibusb for more information | 20 | * see Documentation/dvb/README.dibusb for more information |
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c index 6e8ad176e1a1..9a354708bd20 100644 --- a/drivers/media/dvb/frontends/lgdt330x.c +++ b/drivers/media/dvb/frontends/lgdt330x.c | |||
| @@ -216,7 +216,7 @@ static int lgdt330x_init(struct dvb_frontend* fe) | |||
| 216 | AGC_DELAY0, 0x07, | 216 | AGC_DELAY0, 0x07, |
| 217 | AGC_DELAY2, 0xfe, | 217 | AGC_DELAY2, 0xfe, |
| 218 | /* Change the value of IAGCBW[15:8] | 218 | /* Change the value of IAGCBW[15:8] |
| 219 | of inner AGC loop filter bandwith */ | 219 | of inner AGC loop filter bandwidth */ |
| 220 | AGC_LOOP_BANDWIDTH0, 0x08, | 220 | AGC_LOOP_BANDWIDTH0, 0x08, |
| 221 | AGC_LOOP_BANDWIDTH1, 0x9a | 221 | AGC_LOOP_BANDWIDTH1, 0x9a |
| 222 | }; | 222 | }; |
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index e83ff2104c9b..9cbd164aa281 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c index 6bffe85c161c..9b57576bfeb4 100644 --- a/drivers/media/dvb/frontends/ves1820.c +++ b/drivers/media/dvb/frontends/ves1820.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index 7a5c99c200e8..500f15c10aaf 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/kmod.h> | 34 | #include <linux/kmod.h> |
| 36 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index 6163cb03b8f4..5f111d407730 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
| @@ -1141,6 +1141,15 @@ static void frontend_init(struct budget_av *budget_av) | |||
| 1141 | break; | 1141 | break; |
| 1142 | 1142 | ||
| 1143 | case SUBID_DVBC_KNC1: | 1143 | case SUBID_DVBC_KNC1: |
| 1144 | budget_av->reinitialise_demod = 1; | ||
| 1145 | fe = tda10021_attach(&philips_cu1216_config, | ||
| 1146 | &budget_av->budget.i2c_adap, | ||
| 1147 | read_pwm(budget_av)); | ||
| 1148 | if (fe) { | ||
| 1149 | fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params; | ||
| 1150 | } | ||
| 1151 | break; | ||
| 1152 | |||
| 1144 | case SUBID_DVBC_KNC1_PLUS: | 1153 | case SUBID_DVBC_KNC1_PLUS: |
| 1145 | case SUBID_DVBC_CINERGY1200: | 1154 | case SUBID_DVBC_CINERGY1200: |
| 1146 | budget_av->reinitialise_demod = 1; | 1155 | budget_av->reinitialise_demod = 1; |
| @@ -1293,11 +1302,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio | |||
| 1293 | 1302 | ||
| 1294 | budget_av->budget.dvb_adapter.priv = budget_av; | 1303 | budget_av->budget.dvb_adapter.priv = budget_av; |
| 1295 | frontend_init(budget_av); | 1304 | frontend_init(budget_av); |
| 1296 | 1305 | ciintf_init(budget_av); | |
| 1297 | if (!budget_av->has_saa7113) { | ||
| 1298 | ciintf_init(budget_av); | ||
| 1299 | } | ||
| 1300 | |||
| 1301 | return 0; | 1306 | return 0; |
| 1302 | } | 1307 | } |
| 1303 | 1308 | ||
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 336b2fe1a5f2..04cef3023457 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | is a bit braindead (no matching channel masks or no matching filter mask), | 43 | is a bit braindead (no matching channel masks or no matching filter mask), |
| 44 | we won't support this - yet. it doesn't event support negative filters, | 44 | we won't support this - yet. it doesn't event support negative filters, |
| 45 | so the best way is maybe to keep TTUSB_HWSECTIONS undef'd and just | 45 | so the best way is maybe to keep TTUSB_HWSECTIONS undef'd and just |
| 46 | parse TS data. USB bandwith will be a problem when having large | 46 | parse TS data. USB bandwidth will be a problem when having large |
| 47 | datastreams, especially for dvb-net, but hey, that's not my problem. | 47 | datastreams, especially for dvb-net, but hey, that's not my problem. |
| 48 | 48 | ||
| 49 | TTUSB_DISEQC, TTUSB_TONE: | 49 | TTUSB_DISEQC, TTUSB_TONE: |
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c index 9f249e7e60c9..4c82956390c1 100644 --- a/drivers/media/radio/radio-gemtek-pci.c +++ b/drivers/media/radio/radio-gemtek-pci.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | *************************************************************************** | 37 | *************************************************************************** |
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/types.h> | 40 | #include <linux/types.h> |
| 42 | #include <linux/list.h> | 41 | #include <linux/list.h> |
| 43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index ae14f5f32039..5c5e682a3004 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * 2003-09-01: Support w3cam by Takeo Takahashi | 18 | * 2003-09-01: Support w3cam by Takeo Takahashi |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index e68a6d2fff24..de14818d5cc4 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
| @@ -3548,11 +3547,6 @@ void __devinit bttv_init_card2(struct bttv *btv) | |||
| 3548 | /* Hybrid DVB card, DOES have a tda9887 */ | 3547 | /* Hybrid DVB card, DOES have a tda9887 */ |
| 3549 | if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE) | 3548 | if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE) |
| 3550 | tda9887 = 1; | 3549 | tda9887 = 1; |
| 3551 | if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) || | ||
| 3552 | (btv->tuner_type == TUNER_PHILIPS_FM1236_MK3) || | ||
| 3553 | (btv->tuner_type == TUNER_PHILIPS_FM1256_IH3) || | ||
| 3554 | tda9887) | ||
| 3555 | request_module("tda9887"); | ||
| 3556 | if (btv->tuner_type != UNSET) | 3550 | if (btv->tuner_type != UNSET) |
| 3557 | request_module("tuner"); | 3551 | request_module("tuner"); |
| 3558 | } | 3552 | } |
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index d2956010f763..311c4c541e01 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
| @@ -360,7 +360,7 @@ struct bttv { | |||
| 360 | int mbox_csel; | 360 | int mbox_csel; |
| 361 | 361 | ||
| 362 | /* risc memory management data | 362 | /* risc memory management data |
| 363 | - must aquire s_lock before changing these | 363 | - must acquire s_lock before changing these |
| 364 | - only the irq handler is supported to touch top + bottom + vcurr */ | 364 | - only the irq handler is supported to touch top + bottom + vcurr */ |
| 365 | struct btcx_riscmem main; | 365 | struct btcx_riscmem main; |
| 366 | struct bttv_buffer *screen; /* overlay */ | 366 | struct bttv_buffer *screen; /* overlay */ |
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c index 840fe0177121..353d02b67c33 100644 --- a/drivers/media/video/compat_ioctl32.c +++ b/drivers/media/video/compat_ioctl32.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * ioctls. | 12 | * ioctls. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/compat.h> | 15 | #include <linux/compat.h> |
| 17 | #include <linux/videodev.h> | 16 | #include <linux/videodev.h> |
| 18 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index 95c5aceecc5b..3b31a0dd2f0c 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */ | 26 | /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */ |
| 27 | /* #define _CPIA_DEBUG_ 1 */ | 27 | /* #define _CPIA_DEBUG_ 1 */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | 29 | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/moduleparam.h> | 31 | #include <linux/moduleparam.h> |
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index d129db57fcd4..d09f49950f2a 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | 31 | ||
| 32 | #include <linux/version.h> | 32 | #include <linux/version.h> |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | 34 | ||
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/time.h> | 36 | #include <linux/time.h> |
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c index 4c89bd395d3e..41f4b8d17559 100644 --- a/drivers/media/video/cpia_pp.c +++ b/drivers/media/video/cpia_pp.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */ | 25 | /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */ |
| 26 | /* #define _CPIA_DEBUG_ 1 */ | 26 | /* #define _CPIA_DEBUG_ 1 */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 4ff81582ec56..349632b48e93 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
| @@ -686,6 +686,39 @@ static struct videobuf_queue_ops blackbird_qops = { | |||
| 686 | 686 | ||
| 687 | /* ------------------------------------------------------------------ */ | 687 | /* ------------------------------------------------------------------ */ |
| 688 | 688 | ||
| 689 | static const u32 *ctrl_classes[] = { | ||
| 690 | cx88_user_ctrls, | ||
| 691 | cx2341x_mpeg_ctrls, | ||
| 692 | NULL | ||
| 693 | }; | ||
| 694 | |||
| 695 | static int blackbird_queryctrl(struct cx8802_dev *dev, struct v4l2_queryctrl *qctrl) | ||
| 696 | { | ||
| 697 | qctrl->id = v4l2_ctrl_next(ctrl_classes, qctrl->id); | ||
| 698 | if (qctrl->id == 0) | ||
| 699 | return -EINVAL; | ||
| 700 | |||
| 701 | /* Standard V4L2 controls */ | ||
| 702 | if (cx8800_ctrl_query(qctrl) == 0) | ||
| 703 | return 0; | ||
| 704 | |||
| 705 | /* MPEG V4L2 controls */ | ||
| 706 | if (cx2341x_ctrl_query(&dev->params, qctrl)) | ||
| 707 | qctrl->flags |= V4L2_CTRL_FLAG_DISABLED; | ||
| 708 | return 0; | ||
| 709 | } | ||
| 710 | |||
| 711 | static int blackbird_querymenu(struct cx8802_dev *dev, struct v4l2_querymenu *qmenu) | ||
| 712 | { | ||
| 713 | struct v4l2_queryctrl qctrl; | ||
| 714 | |||
| 715 | qctrl.id = qmenu->id; | ||
| 716 | blackbird_queryctrl(dev, &qctrl); | ||
| 717 | return v4l2_ctrl_query_menu(qmenu, &qctrl, cx2341x_ctrl_get_menu(qmenu->id)); | ||
| 718 | } | ||
| 719 | |||
| 720 | /* ------------------------------------------------------------------ */ | ||
| 721 | |||
| 689 | static int mpeg_do_ioctl(struct inode *inode, struct file *file, | 722 | static int mpeg_do_ioctl(struct inode *inode, struct file *file, |
| 690 | unsigned int cmd, void *arg) | 723 | unsigned int cmd, void *arg) |
| 691 | { | 724 | { |
| @@ -866,6 +899,16 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file, | |||
| 866 | core->name); | 899 | core->name); |
| 867 | return 0; | 900 | return 0; |
| 868 | } | 901 | } |
| 902 | case VIDIOC_QUERYMENU: | ||
| 903 | return blackbird_querymenu(dev, arg); | ||
| 904 | case VIDIOC_QUERYCTRL: | ||
| 905 | { | ||
| 906 | struct v4l2_queryctrl *c = arg; | ||
| 907 | |||
| 908 | if (blackbird_queryctrl(dev, c) == 0) | ||
| 909 | return 0; | ||
| 910 | return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl); | ||
| 911 | } | ||
| 869 | 912 | ||
| 870 | default: | 913 | default: |
| 871 | return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl); | 914 | return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl); |
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index f9d68f20dc88..14bd4863d157 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
| @@ -1194,6 +1194,21 @@ struct cx88_board cx88_boards[] = { | |||
| 1194 | }}, | 1194 | }}, |
| 1195 | .dvb = 1, | 1195 | .dvb = 1, |
| 1196 | }, | 1196 | }, |
| 1197 | [CX88_BOARD_GENIATECH_DVBS] = { | ||
| 1198 | .name = "Geniatech DVB-S", | ||
| 1199 | .tuner_type = TUNER_ABSENT, | ||
| 1200 | .radio_type = UNSET, | ||
| 1201 | .tuner_addr = ADDR_UNSET, | ||
| 1202 | .radio_addr = ADDR_UNSET, | ||
| 1203 | .input = {{ | ||
| 1204 | .type = CX88_VMUX_DVB, | ||
| 1205 | .vmux = 0, | ||
| 1206 | },{ | ||
| 1207 | .type = CX88_VMUX_COMPOSITE1, | ||
| 1208 | .vmux = 1, | ||
| 1209 | }}, | ||
| 1210 | .dvb = 1, | ||
| 1211 | }, | ||
| 1197 | }; | 1212 | }; |
| 1198 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); | 1213 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); |
| 1199 | 1214 | ||
| @@ -1439,6 +1454,10 @@ struct cx88_subid cx88_subids[] = { | |||
| 1439 | .subvendor = 0x18ac, | 1454 | .subvendor = 0x18ac, |
| 1440 | .subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */ | 1455 | .subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */ |
| 1441 | .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, | 1456 | .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, |
| 1457 | },{ | ||
| 1458 | .subvendor = 0x14f1, | ||
| 1459 | .subdevice = 0x0084, | ||
| 1460 | .card = CX88_BOARD_GENIATECH_DVBS, | ||
| 1442 | }, | 1461 | }, |
| 1443 | }; | 1462 | }; |
| 1444 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); | 1463 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); |
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index dce1feddd55d..afde3789d702 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
| @@ -496,6 +496,26 @@ static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t | |||
| 496 | return 0; | 496 | return 0; |
| 497 | } | 497 | } |
| 498 | 498 | ||
| 499 | static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) | ||
| 500 | { | ||
| 501 | struct cx8802_dev *dev= fe->dvb->priv; | ||
| 502 | struct cx88_core *core = dev->core; | ||
| 503 | |||
| 504 | if (voltage == SEC_VOLTAGE_OFF) { | ||
| 505 | dprintk(1,"LNB Voltage OFF\n"); | ||
| 506 | cx_write(MO_GP0_IO, 0x0000efff); | ||
| 507 | } | ||
| 508 | |||
| 509 | if (core->prev_set_voltage) | ||
| 510 | return core->prev_set_voltage(fe, voltage); | ||
| 511 | return 0; | ||
| 512 | } | ||
| 513 | |||
| 514 | static struct cx24123_config geniatech_dvbs_config = { | ||
| 515 | .demod_address = 0x55, | ||
| 516 | .set_ts_params = cx24123_set_ts_param, | ||
| 517 | }; | ||
| 518 | |||
| 499 | static struct cx24123_config hauppauge_novas_config = { | 519 | static struct cx24123_config hauppauge_novas_config = { |
| 500 | .demod_address = 0x55, | 520 | .demod_address = 0x55, |
| 501 | .set_ts_params = cx24123_set_ts_param, | 521 | .set_ts_params = cx24123_set_ts_param, |
| @@ -760,6 +780,14 @@ static int dvb_register(struct cx8802_dev *dev) | |||
| 760 | dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage; | 780 | dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage; |
| 761 | } | 781 | } |
| 762 | break; | 782 | break; |
| 783 | case CX88_BOARD_GENIATECH_DVBS: | ||
| 784 | dev->dvb.frontend = cx24123_attach(&geniatech_dvbs_config, | ||
| 785 | &dev->core->i2c_adap); | ||
| 786 | if (dev->dvb.frontend) { | ||
| 787 | dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage; | ||
| 788 | dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage; | ||
| 789 | } | ||
| 790 | break; | ||
| 763 | #endif | 791 | #endif |
| 764 | default: | 792 | default: |
| 765 | printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", | 793 | printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 8d5cf474b68e..c538d99ec9f6 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
| @@ -327,6 +327,51 @@ static struct cx88_ctrl cx8800_ctls[] = { | |||
| 327 | }; | 327 | }; |
| 328 | static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls); | 328 | static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls); |
| 329 | 329 | ||
| 330 | const u32 cx88_user_ctrls[] = { | ||
| 331 | V4L2_CID_USER_CLASS, | ||
| 332 | V4L2_CID_BRIGHTNESS, | ||
| 333 | V4L2_CID_CONTRAST, | ||
| 334 | V4L2_CID_SATURATION, | ||
| 335 | V4L2_CID_HUE, | ||
| 336 | V4L2_CID_AUDIO_VOLUME, | ||
| 337 | V4L2_CID_AUDIO_BALANCE, | ||
| 338 | V4L2_CID_AUDIO_MUTE, | ||
| 339 | 0 | ||
| 340 | }; | ||
| 341 | EXPORT_SYMBOL(cx88_user_ctrls); | ||
| 342 | |||
| 343 | static const u32 *ctrl_classes[] = { | ||
| 344 | cx88_user_ctrls, | ||
| 345 | NULL | ||
| 346 | }; | ||
| 347 | |||
| 348 | int cx8800_ctrl_query(struct v4l2_queryctrl *qctrl) | ||
| 349 | { | ||
| 350 | int i; | ||
| 351 | |||
| 352 | if (qctrl->id < V4L2_CID_BASE || | ||
| 353 | qctrl->id >= V4L2_CID_LASTP1) | ||
| 354 | return -EINVAL; | ||
| 355 | for (i = 0; i < CX8800_CTLS; i++) | ||
| 356 | if (cx8800_ctls[i].v.id == qctrl->id) | ||
| 357 | break; | ||
| 358 | if (i == CX8800_CTLS) { | ||
| 359 | *qctrl = no_ctl; | ||
| 360 | return 0; | ||
| 361 | } | ||
| 362 | *qctrl = cx8800_ctls[i].v; | ||
| 363 | return 0; | ||
| 364 | } | ||
| 365 | EXPORT_SYMBOL(cx8800_ctrl_query); | ||
| 366 | |||
| 367 | static int cx88_queryctrl(struct v4l2_queryctrl *qctrl) | ||
| 368 | { | ||
| 369 | qctrl->id = v4l2_ctrl_next(ctrl_classes, qctrl->id); | ||
| 370 | if (qctrl->id == 0) | ||
| 371 | return -EINVAL; | ||
| 372 | return cx8800_ctrl_query(qctrl); | ||
| 373 | } | ||
| 374 | |||
| 330 | /* ------------------------------------------------------------------- */ | 375 | /* ------------------------------------------------------------------- */ |
| 331 | /* resource management */ | 376 | /* resource management */ |
| 332 | 377 | ||
| @@ -1362,20 +1407,8 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, | |||
| 1362 | case VIDIOC_QUERYCTRL: | 1407 | case VIDIOC_QUERYCTRL: |
| 1363 | { | 1408 | { |
| 1364 | struct v4l2_queryctrl *c = arg; | 1409 | struct v4l2_queryctrl *c = arg; |
| 1365 | int i; | ||
| 1366 | 1410 | ||
| 1367 | if (c->id < V4L2_CID_BASE || | 1411 | return cx88_queryctrl(c); |
| 1368 | c->id >= V4L2_CID_LASTP1) | ||
| 1369 | return -EINVAL; | ||
| 1370 | for (i = 0; i < CX8800_CTLS; i++) | ||
| 1371 | if (cx8800_ctls[i].v.id == c->id) | ||
| 1372 | break; | ||
| 1373 | if (i == CX8800_CTLS) { | ||
| 1374 | *c = no_ctl; | ||
| 1375 | return 0; | ||
| 1376 | } | ||
| 1377 | *c = cx8800_ctls[i].v; | ||
| 1378 | return 0; | ||
| 1379 | } | 1412 | } |
| 1380 | case VIDIOC_G_CTRL: | 1413 | case VIDIOC_G_CTRL: |
| 1381 | return get_control(core,arg); | 1414 | return get_control(core,arg); |
| @@ -1893,8 +1926,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, | |||
| 1893 | /* load and configure helper modules */ | 1926 | /* load and configure helper modules */ |
| 1894 | if (TUNER_ABSENT != core->tuner_type) | 1927 | if (TUNER_ABSENT != core->tuner_type) |
| 1895 | request_module("tuner"); | 1928 | request_module("tuner"); |
| 1896 | if (core->tda9887_conf) | ||
| 1897 | request_module("tda9887"); | ||
| 1898 | 1929 | ||
| 1899 | /* register v4l devices */ | 1930 | /* register v4l devices */ |
| 1900 | dev->video_dev = cx88_vdev_init(core,dev->pci, | 1931 | dev->video_dev = cx88_vdev_init(core,dev->pci, |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 9a9a0fc7a41a..e7810955dd4f 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
| @@ -196,6 +196,7 @@ extern struct sram_channel cx88_sram_channels[]; | |||
| 196 | #define CX88_BOARD_PIXELVIEW_PLAYTV_P7000 49 | 196 | #define CX88_BOARD_PIXELVIEW_PLAYTV_P7000 49 |
| 197 | #define CX88_BOARD_NPGTECH_REALTV_TOP10FM 50 | 197 | #define CX88_BOARD_NPGTECH_REALTV_TOP10FM 50 |
| 198 | #define CX88_BOARD_WINFAST_DTV2000H 51 | 198 | #define CX88_BOARD_WINFAST_DTV2000H 51 |
| 199 | #define CX88_BOARD_GENIATECH_DVBS 52 | ||
| 199 | 200 | ||
| 200 | enum cx88_itype { | 201 | enum cx88_itype { |
| 201 | CX88_VMUX_COMPOSITE1 = 1, | 202 | CX88_VMUX_COMPOSITE1 = 1, |
| @@ -590,6 +591,8 @@ int cx8802_resume_common(struct pci_dev *pci_dev); | |||
| 590 | extern int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, | 591 | extern int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, |
| 591 | struct cx88_core *core, unsigned int cmd, | 592 | struct cx88_core *core, unsigned int cmd, |
| 592 | void *arg, v4l2_kioctl driver_ioctl); | 593 | void *arg, v4l2_kioctl driver_ioctl); |
| 594 | extern const u32 cx88_user_ctrls[]; | ||
| 595 | extern int cx8800_ctrl_query(struct v4l2_queryctrl *qctrl); | ||
| 593 | 596 | ||
| 594 | /* | 597 | /* |
| 595 | * Local variables: | 598 | * Local variables: |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 9286090817cd..2a461dde480c 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
| @@ -1574,8 +1574,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
| 1574 | request_module("tvp5150"); | 1574 | request_module("tvp5150"); |
| 1575 | if (dev->has_tuner) | 1575 | if (dev->has_tuner) |
| 1576 | request_module("tuner"); | 1576 | request_module("tuner"); |
| 1577 | if (dev->tda9887_conf) | ||
| 1578 | request_module("tda9887"); | ||
| 1579 | #endif | 1577 | #endif |
| 1580 | errCode = em28xx_config(dev); | 1578 | errCode = em28xx_config(dev); |
| 1581 | if (errCode) { | 1579 | if (errCode) { |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index f68ca7d9f531..ddd62214bee5 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * along with this program; if not, write to the Free Software | 26 | * along with this program; if not, write to the Free Software |
| 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 32 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h index 0d09a0e3803c..ea107cb5c845 100644 --- a/drivers/media/video/meye.h +++ b/drivers/media/video/meye.h | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #define MEYE_DRIVER_VERSION __stringify(MEYE_DRIVER_MAJORVERSION) "." \ | 36 | #define MEYE_DRIVER_VERSION __stringify(MEYE_DRIVER_MAJORVERSION) "." \ |
| 37 | __stringify(MEYE_DRIVER_MINORVERSION) | 37 | __stringify(MEYE_DRIVER_MINORVERSION) |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 41 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
| 42 | #include <linux/kfifo.h> | 41 | #include <linux/kfifo.h> |
diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h index 4e451049013d..545e4ac094f2 100644 --- a/drivers/media/video/msp3400-driver.h +++ b/drivers/media/video/msp3400-driver.h | |||
| @@ -90,8 +90,8 @@ struct msp_state { | |||
| 90 | /* thread */ | 90 | /* thread */ |
| 91 | struct task_struct *kthread; | 91 | struct task_struct *kthread; |
| 92 | wait_queue_head_t wq; | 92 | wait_queue_head_t wq; |
| 93 | int restart:1; | 93 | unsigned int restart:1; |
| 94 | int watch_stereo:1; | 94 | unsigned int watch_stereo:1; |
| 95 | }; | 95 | }; |
| 96 | 96 | ||
| 97 | /* msp3400-driver.c */ | 97 | /* msp3400-driver.c */ |
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c index a988df226aab..1b07a61c2ebb 100644 --- a/drivers/media/video/ov511.c +++ b/drivers/media/video/ov511.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 35 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/vmalloc.h> | 40 | #include <linux/vmalloc.h> |
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile index fed603ad0a67..02e414210dac 100644 --- a/drivers/media/video/pvrusb2/Makefile +++ b/drivers/media/video/pvrusb2/Makefile | |||
| @@ -8,7 +8,7 @@ obj-pvrusb2-24xxx-$(CONFIG_VIDEO_PVRUSB2_24XXX) := \ | |||
| 8 | pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ | 8 | pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ |
| 9 | pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \ | 9 | pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \ |
| 10 | pvrusb2-encoder.o pvrusb2-video-v4l.o \ | 10 | pvrusb2-encoder.o pvrusb2-video-v4l.o \ |
| 11 | pvrusb2-eeprom.o pvrusb2-tuner.o pvrusb2-demod.o \ | 11 | pvrusb2-eeprom.o pvrusb2-tuner.o \ |
| 12 | pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ | 12 | pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ |
| 13 | pvrusb2-ctrl.o pvrusb2-std.o \ | 13 | pvrusb2-ctrl.o pvrusb2-std.o \ |
| 14 | pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \ | 14 | pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \ |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c index 313d2dcf9e4b..9846c464ec80 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c | |||
| @@ -145,8 +145,8 @@ static int get_audio_status(struct pvr2_msp3400_handler *ctxt) | |||
| 145 | 145 | ||
| 146 | static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt) | 146 | static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt) |
| 147 | { | 147 | { |
| 148 | ctxt->client->handler = 0; | 148 | ctxt->client->handler = NULL; |
| 149 | ctxt->hdw->audio_stat = 0; | 149 | ctxt->hdw->audio_stat = NULL; |
| 150 | kfree(ctxt); | 150 | kfree(ctxt); |
| 151 | } | 151 | } |
| 152 | 152 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c index 40dc59871a45..f129f316d20e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-context.c +++ b/drivers/media/video/pvrusb2/pvrusb2-context.c | |||
| @@ -77,7 +77,7 @@ struct pvr2_context *pvr2_context_create( | |||
| 77 | const struct usb_device_id *devid, | 77 | const struct usb_device_id *devid, |
| 78 | void (*setup_func)(struct pvr2_context *)) | 78 | void (*setup_func)(struct pvr2_context *)) |
| 79 | { | 79 | { |
| 80 | struct pvr2_context *mp = 0; | 80 | struct pvr2_context *mp = NULL; |
| 81 | mp = kmalloc(sizeof(*mp),GFP_KERNEL); | 81 | mp = kmalloc(sizeof(*mp),GFP_KERNEL); |
| 82 | if (!mp) goto done; | 82 | if (!mp) goto done; |
| 83 | memset(mp,0,sizeof(*mp)); | 83 | memset(mp,0,sizeof(*mp)); |
| @@ -87,7 +87,7 @@ struct pvr2_context *pvr2_context_create( | |||
| 87 | mp->hdw = pvr2_hdw_create(intf,devid); | 87 | mp->hdw = pvr2_hdw_create(intf,devid); |
| 88 | if (!mp->hdw) { | 88 | if (!mp->hdw) { |
| 89 | pvr2_context_destroy(mp); | 89 | pvr2_context_destroy(mp); |
| 90 | mp = 0; | 90 | mp = NULL; |
| 91 | goto done; | 91 | goto done; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| @@ -145,7 +145,7 @@ void pvr2_channel_init(struct pvr2_channel *cp,struct pvr2_context *mp) | |||
| 145 | { | 145 | { |
| 146 | cp->hdw = mp->hdw; | 146 | cp->hdw = mp->hdw; |
| 147 | cp->mc_head = mp; | 147 | cp->mc_head = mp; |
| 148 | cp->mc_next = 0; | 148 | cp->mc_next = NULL; |
| 149 | cp->mc_prev = mp->mc_last; | 149 | cp->mc_prev = mp->mc_last; |
| 150 | if (mp->mc_last) { | 150 | if (mp->mc_last) { |
| 151 | mp->mc_last->mc_next = cp; | 151 | mp->mc_last->mc_next = cp; |
| @@ -160,8 +160,8 @@ static void pvr2_channel_disclaim_stream(struct pvr2_channel *cp) | |||
| 160 | { | 160 | { |
| 161 | if (!cp->stream) return; | 161 | if (!cp->stream) return; |
| 162 | pvr2_stream_kill(cp->stream->stream); | 162 | pvr2_stream_kill(cp->stream->stream); |
| 163 | cp->stream->user = 0; | 163 | cp->stream->user = NULL; |
| 164 | cp->stream = 0; | 164 | cp->stream = NULL; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | 167 | ||
| @@ -179,7 +179,7 @@ void pvr2_channel_done(struct pvr2_channel *cp) | |||
| 179 | } else { | 179 | } else { |
| 180 | mp->mc_first = cp->mc_next; | 180 | mp->mc_first = cp->mc_next; |
| 181 | } | 181 | } |
| 182 | cp->hdw = 0; | 182 | cp->hdw = NULL; |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | 185 | ||
| @@ -212,7 +212,7 @@ struct pvr2_ioread *pvr2_channel_create_mpeg_stream( | |||
| 212 | { | 212 | { |
| 213 | struct pvr2_ioread *cp; | 213 | struct pvr2_ioread *cp; |
| 214 | cp = pvr2_ioread_create(); | 214 | cp = pvr2_ioread_create(); |
| 215 | if (!cp) return 0; | 215 | if (!cp) return NULL; |
| 216 | pvr2_ioread_setup(cp,sp->stream); | 216 | pvr2_ioread_setup(cp,sp->stream); |
| 217 | pvr2_ioread_set_sync_key(cp,stream_sync_key,sizeof(stream_sync_key)); | 217 | pvr2_ioread_set_sync_key(cp,stream_sync_key,sizeof(stream_sync_key)); |
| 218 | return cp; | 218 | return cp; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c index d5df9fbeba2f..fb6198f1df98 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c +++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c | |||
| @@ -158,7 +158,7 @@ int pvr2_ctrl_get_mask(struct pvr2_ctrl *cptr) | |||
| 158 | /* Retrieve the control's name */ | 158 | /* Retrieve the control's name */ |
| 159 | const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr) | 159 | const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr) |
| 160 | { | 160 | { |
| 161 | if (!cptr) return 0; | 161 | if (!cptr) return NULL; |
| 162 | return cptr->info->name; | 162 | return cptr->info->name; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| @@ -166,7 +166,7 @@ const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr) | |||
| 166 | /* Retrieve the control's desc */ | 166 | /* Retrieve the control's desc */ |
| 167 | const char *pvr2_ctrl_get_desc(struct pvr2_ctrl *cptr) | 167 | const char *pvr2_ctrl_get_desc(struct pvr2_ctrl *cptr) |
| 168 | { | 168 | { |
| 169 | if (!cptr) return 0; | 169 | if (!cptr) return NULL; |
| 170 | return cptr->info->desc; | 170 | return cptr->info->desc; |
| 171 | } | 171 | } |
| 172 | 172 | ||
| @@ -488,7 +488,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr, | |||
| 488 | 488 | ||
| 489 | LOCK_TAKE(cptr->hdw->big_lock); do { | 489 | LOCK_TAKE(cptr->hdw->big_lock); do { |
| 490 | if (cptr->info->type == pvr2_ctl_int) { | 490 | if (cptr->info->type == pvr2_ctl_int) { |
| 491 | ret = parse_token(ptr,len,valptr,0,0); | 491 | ret = parse_token(ptr,len,valptr,NULL,0); |
| 492 | if ((ret >= 0) && | 492 | if ((ret >= 0) && |
| 493 | ((*valptr < cptr->info->def.type_int.min_value) || | 493 | ((*valptr < cptr->info->def.type_int.min_value) || |
| 494 | (*valptr > cptr->info->def.type_int.max_value))) { | 494 | (*valptr > cptr->info->def.type_int.max_value))) { |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c index 27eadaff75a0..c80c26be6e4d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | |||
| @@ -139,8 +139,8 @@ static const struct pvr2_v4l_cx2584x_ops decoder_ops[] = { | |||
| 139 | 139 | ||
| 140 | static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt) | 140 | static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt) |
| 141 | { | 141 | { |
| 142 | ctxt->client->handler = 0; | 142 | ctxt->client->handler = NULL; |
| 143 | ctxt->hdw->decoder_ctrl = 0; | 143 | ctxt->hdw->decoder_ctrl = NULL; |
| 144 | kfree(ctxt); | 144 | kfree(ctxt); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| @@ -221,7 +221,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt, | |||
| 221 | static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt) | 221 | static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt) |
| 222 | { | 222 | { |
| 223 | int ret; | 223 | int ret; |
| 224 | ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0); | 224 | ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL); |
| 225 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret); | 225 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret); |
| 226 | } | 226 | } |
| 227 | 227 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c index 586900e365ff..f985f00d885a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c +++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c | |||
| @@ -82,7 +82,7 @@ static unsigned int debugifc_isolate_word(const char *buf,unsigned int count, | |||
| 82 | unsigned int wlen; | 82 | unsigned int wlen; |
| 83 | unsigned int scnt; | 83 | unsigned int scnt; |
| 84 | 84 | ||
| 85 | wptr = 0; | 85 | wptr = NULL; |
| 86 | wlen = 0; | 86 | wlen = 0; |
| 87 | scnt = debugifc_count_whitespace(buf,count); | 87 | scnt = debugifc_count_whitespace(buf,count); |
| 88 | consume_cnt += scnt; count -= scnt; buf += scnt; | 88 | consume_cnt += scnt; count -= scnt; buf += scnt; |
| @@ -337,8 +337,8 @@ int pvr2_debugifc_print_status(struct pvr2_hdw *hdw, | |||
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | 339 | ||
| 340 | int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf, | 340 | static int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf, |
| 341 | unsigned int count) | 341 | unsigned int count) |
| 342 | { | 342 | { |
| 343 | const char *wptr; | 343 | const char *wptr; |
| 344 | unsigned int wlen; | 344 | unsigned int wlen; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-demod.c b/drivers/media/video/pvrusb2/pvrusb2-demod.c deleted file mode 100644 index 9686569a11f6..000000000000 --- a/drivers/media/video/pvrusb2/pvrusb2-demod.c +++ /dev/null | |||
| @@ -1,126 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * | ||
| 3 | * $Id$ | ||
| 4 | * | ||
| 5 | * Copyright (C) 2005 Mike Isely <isely@pobox.com> | ||
| 6 | * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation; either version 2 of the License | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | * GNU General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | |||
| 23 | #include "pvrusb2.h" | ||
| 24 | #include "pvrusb2-util.h" | ||
| 25 | #include "pvrusb2-demod.h" | ||
| 26 | #include "pvrusb2-hdw-internal.h" | ||
| 27 | #include "pvrusb2-debug.h" | ||
| 28 | #include <linux/videodev2.h> | ||
| 29 | #include <media/tuner.h> | ||
| 30 | #include <media/v4l2-common.h> | ||
| 31 | |||
| 32 | |||
| 33 | struct pvr2_demod_handler { | ||
| 34 | struct pvr2_hdw *hdw; | ||
| 35 | struct pvr2_i2c_client *client; | ||
| 36 | struct pvr2_i2c_handler i2c_handler; | ||
| 37 | int type_update_fl; | ||
| 38 | }; | ||
| 39 | |||
| 40 | |||
| 41 | static void set_config(struct pvr2_demod_handler *ctxt) | ||
| 42 | { | ||
| 43 | struct pvr2_hdw *hdw = ctxt->hdw; | ||
| 44 | int cfg = 0; | ||
| 45 | |||
| 46 | switch (hdw->tuner_type) { | ||
| 47 | case TUNER_PHILIPS_FM1216ME_MK3: | ||
| 48 | case TUNER_PHILIPS_FM1236_MK3: | ||
| 49 | cfg = TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE; | ||
| 50 | break; | ||
| 51 | default: | ||
| 52 | break; | ||
| 53 | } | ||
| 54 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c demod set_config(0x%x)",cfg); | ||
| 55 | pvr2_i2c_client_cmd(ctxt->client,TDA9887_SET_CONFIG,&cfg); | ||
| 56 | ctxt->type_update_fl = 0; | ||
| 57 | } | ||
| 58 | |||
| 59 | |||
| 60 | static int demod_check(struct pvr2_demod_handler *ctxt) | ||
| 61 | { | ||
| 62 | struct pvr2_hdw *hdw = ctxt->hdw; | ||
| 63 | if (hdw->tuner_updated) ctxt->type_update_fl = !0; | ||
| 64 | return ctxt->type_update_fl != 0; | ||
| 65 | } | ||
| 66 | |||
| 67 | |||
| 68 | static void demod_update(struct pvr2_demod_handler *ctxt) | ||
| 69 | { | ||
| 70 | if (ctxt->type_update_fl) set_config(ctxt); | ||
| 71 | } | ||
| 72 | |||
| 73 | |||
| 74 | static void demod_detach(struct pvr2_demod_handler *ctxt) | ||
| 75 | { | ||
| 76 | ctxt->client->handler = 0; | ||
| 77 | kfree(ctxt); | ||
| 78 | } | ||
| 79 | |||
| 80 | |||
| 81 | static unsigned int demod_describe(struct pvr2_demod_handler *ctxt,char *buf,unsigned int cnt) | ||
| 82 | { | ||
| 83 | return scnprintf(buf,cnt,"handler: pvrusb2-demod"); | ||
| 84 | } | ||
| 85 | |||
| 86 | |||
| 87 | const static struct pvr2_i2c_handler_functions tuner_funcs = { | ||
| 88 | .detach = (void (*)(void *))demod_detach, | ||
| 89 | .check = (int (*)(void *))demod_check, | ||
| 90 | .update = (void (*)(void *))demod_update, | ||
| 91 | .describe = (unsigned int (*)(void *,char *,unsigned int))demod_describe, | ||
| 92 | }; | ||
| 93 | |||
| 94 | |||
| 95 | int pvr2_i2c_demod_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) | ||
| 96 | { | ||
| 97 | struct pvr2_demod_handler *ctxt; | ||
| 98 | if (cp->handler) return 0; | ||
| 99 | |||
| 100 | ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL); | ||
| 101 | if (!ctxt) return 0; | ||
| 102 | memset(ctxt,0,sizeof(*ctxt)); | ||
| 103 | |||
| 104 | ctxt->i2c_handler.func_data = ctxt; | ||
| 105 | ctxt->i2c_handler.func_table = &tuner_funcs; | ||
| 106 | ctxt->type_update_fl = !0; | ||
| 107 | ctxt->client = cp; | ||
| 108 | ctxt->hdw = hdw; | ||
| 109 | cp->handler = &ctxt->i2c_handler; | ||
| 110 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x tda9887 V4L2 handler set up", | ||
| 111 | cp->client->addr); | ||
| 112 | return !0; | ||
| 113 | } | ||
| 114 | |||
| 115 | |||
| 116 | |||
| 117 | |||
| 118 | /* | ||
| 119 | Stuff for Emacs to see, in order to encourage consistent editing style: | ||
| 120 | *** Local Variables: *** | ||
| 121 | *** mode: c *** | ||
| 122 | *** fill-column: 70 *** | ||
| 123 | *** tab-width: 8 *** | ||
| 124 | *** c-basic-offset: 8 *** | ||
| 125 | *** End: *** | ||
| 126 | */ | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-demod.h b/drivers/media/video/pvrusb2/pvrusb2-demod.h deleted file mode 100644 index 4c4e40ffbf03..000000000000 --- a/drivers/media/video/pvrusb2/pvrusb2-demod.h +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * | ||
| 3 | * $Id$ | ||
| 4 | * | ||
| 5 | * Copyright (C) 2005 Mike Isely <isely@pobox.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 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 | ||
| 19 | * | ||
| 20 | */ | ||
| 21 | #ifndef __PVRUSB2_DEMOD_H | ||
| 22 | #define __PVRUSB2_DEMOD_H | ||
| 23 | |||
| 24 | #include "pvrusb2-i2c-core.h" | ||
| 25 | |||
| 26 | int pvr2_i2c_demod_setup(struct pvr2_hdw *,struct pvr2_i2c_client *); | ||
| 27 | |||
| 28 | #endif /* __PVRUSB2_DEMOD_H */ | ||
| 29 | |||
| 30 | /* | ||
| 31 | Stuff for Emacs to see, in order to encourage consistent editing style: | ||
| 32 | *** Local Variables: *** | ||
| 33 | *** mode: c *** | ||
| 34 | *** fill-column: 70 *** | ||
| 35 | *** tab-width: 8 *** | ||
| 36 | *** c-basic-offset: 8 *** | ||
| 37 | *** End: *** | ||
| 38 | */ | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c index 94d383ff9889..6cff8e75f426 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c | |||
| @@ -58,7 +58,7 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw) | |||
| 58 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, | 58 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, |
| 59 | "Failed to allocate memory" | 59 | "Failed to allocate memory" |
| 60 | " required to read eeprom"); | 60 | " required to read eeprom"); |
| 61 | return 0; | 61 | return NULL; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | trace_eeprom("Value for eeprom addr from controller was 0x%x", | 64 | trace_eeprom("Value for eeprom addr from controller was 0x%x", |
| @@ -108,7 +108,7 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw) | |||
| 108 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, | 108 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, |
| 109 | "eeprom fetch set offs err=%d",ret); | 109 | "eeprom fetch set offs err=%d",ret); |
| 110 | kfree(eeprom); | 110 | kfree(eeprom); |
| 111 | return 0; | 111 | return NULL; |
| 112 | } | 112 | } |
| 113 | } | 113 | } |
| 114 | return eeprom; | 114 | return eeprom; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c index 2cc31695b435..18a7073501c6 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c | |||
| @@ -65,7 +65,7 @@ static int pvr2_encoder_write_words(struct pvr2_hdw *hdw, | |||
| 65 | } | 65 | } |
| 66 | ret = pvr2_send_request(hdw, | 66 | ret = pvr2_send_request(hdw, |
| 67 | hdw->cmd_buffer,1+(chunkCnt*7), | 67 | hdw->cmd_buffer,1+(chunkCnt*7), |
| 68 | 0,0); | 68 | NULL,0); |
| 69 | if (ret) return ret; | 69 | if (ret) return ret; |
| 70 | data += chunkCnt; | 70 | data += chunkCnt; |
| 71 | dlen -= chunkCnt; | 71 | dlen -= chunkCnt; |
| @@ -322,7 +322,7 @@ int pvr2_encoder_configure(struct pvr2_hdw *hdw) | |||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | ret = cx2341x_update(hdw,pvr2_encoder_cmd, | 324 | ret = cx2341x_update(hdw,pvr2_encoder_cmd, |
| 325 | (hdw->enc_cur_valid ? &hdw->enc_cur_state : 0), | 325 | (hdw->enc_cur_valid ? &hdw->enc_cur_state : NULL), |
| 326 | &hdw->enc_ctl_state); | 326 | &hdw->enc_ctl_state); |
| 327 | if (ret) { | 327 | if (ret) { |
| 328 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, | 328 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index ba2afbfe32c5..0d6dc33ca320 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | |||
| @@ -354,23 +354,6 @@ struct pvr2_hdw { | |||
| 354 | unsigned int control_cnt; | 354 | unsigned int control_cnt; |
| 355 | }; | 355 | }; |
| 356 | 356 | ||
| 357 | int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw); | ||
| 358 | |||
| 359 | unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *); | ||
| 360 | |||
| 361 | void pvr2_hdw_subsys_bit_chg_no_lock(struct pvr2_hdw *hdw, | ||
| 362 | unsigned long msk,unsigned long val); | ||
| 363 | void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw, | ||
| 364 | unsigned long msk, | ||
| 365 | unsigned long val); | ||
| 366 | |||
| 367 | void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw); | ||
| 368 | void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw); | ||
| 369 | |||
| 370 | int pvr2_i2c_basic_op(struct pvr2_hdw *,u8 i2c_addr, | ||
| 371 | u8 *wdata,u16 wlen, | ||
| 372 | u8 *rdata,u16 rlen); | ||
| 373 | |||
| 374 | #endif /* __PVRUSB2_HDW_INTERNAL_H */ | 357 | #endif /* __PVRUSB2_HDW_INTERNAL_H */ |
| 375 | 358 | ||
| 376 | /* | 359 | /* |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 643c471375da..9b48abcf6089 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
| @@ -63,7 +63,6 @@ struct pvr2_string_table { | |||
| 63 | static const char *pvr2_client_24xxx[] = { | 63 | static const char *pvr2_client_24xxx[] = { |
| 64 | "cx25840", | 64 | "cx25840", |
| 65 | "tuner", | 65 | "tuner", |
| 66 | "tda9887", | ||
| 67 | "wm8775", | 66 | "wm8775", |
| 68 | }; | 67 | }; |
| 69 | #endif | 68 | #endif |
| @@ -73,7 +72,6 @@ static const char *pvr2_client_29xxx[] = { | |||
| 73 | "msp3400", | 72 | "msp3400", |
| 74 | "saa7115", | 73 | "saa7115", |
| 75 | "tuner", | 74 | "tuner", |
| 76 | "tda9887", | ||
| 77 | }; | 75 | }; |
| 78 | 76 | ||
| 79 | static struct pvr2_string_table pvr2_client_lists[] = { | 77 | static struct pvr2_string_table pvr2_client_lists[] = { |
| @@ -89,8 +87,8 @@ static struct pvr2_string_table pvr2_client_lists[] = { | |||
| 89 | #endif | 87 | #endif |
| 90 | }; | 88 | }; |
| 91 | 89 | ||
| 92 | static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = 0}; | 90 | static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL}; |
| 93 | DECLARE_MUTEX(pvr2_unit_sem); | 91 | static DECLARE_MUTEX(pvr2_unit_sem); |
| 94 | 92 | ||
| 95 | static int ctlchg = 0; | 93 | static int ctlchg = 0; |
| 96 | static int initusbreset = 1; | 94 | static int initusbreset = 1; |
| @@ -263,6 +261,25 @@ static const char *control_values_subsystem[] = { | |||
| 263 | [PVR2_SUBSYS_B_ENC_RUN] = "enc_run", | 261 | [PVR2_SUBSYS_B_ENC_RUN] = "enc_run", |
| 264 | }; | 262 | }; |
| 265 | 263 | ||
| 264 | static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl); | ||
| 265 | static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw); | ||
| 266 | static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw); | ||
| 267 | static unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *hdw); | ||
| 268 | static void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw); | ||
| 269 | static void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw); | ||
| 270 | static void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *hdw); | ||
| 271 | static void pvr2_hdw_subsys_bit_chg_no_lock(struct pvr2_hdw *hdw, | ||
| 272 | unsigned long msk, | ||
| 273 | unsigned long val); | ||
| 274 | static void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw, | ||
| 275 | unsigned long msk, | ||
| 276 | unsigned long val); | ||
| 277 | static int pvr2_send_request_ex(struct pvr2_hdw *hdw, | ||
| 278 | unsigned int timeout,int probe_fl, | ||
| 279 | void *write_data,unsigned int write_len, | ||
| 280 | void *read_data,unsigned int read_len); | ||
| 281 | static int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res); | ||
| 282 | static int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res); | ||
| 266 | 283 | ||
| 267 | static int ctrl_channelfreq_get(struct pvr2_ctrl *cptr,int *vp) | 284 | static int ctrl_channelfreq_get(struct pvr2_ctrl *cptr,int *vp) |
| 268 | { | 285 | { |
| @@ -405,7 +422,7 @@ static unsigned int ctrl_cx2341x_getv4lflags(struct pvr2_ctrl *cptr) | |||
| 405 | info = (struct pvr2_ctl_info *)(cptr->info); | 422 | info = (struct pvr2_ctl_info *)(cptr->info); |
| 406 | if (qctrl.flags & V4L2_CTRL_FLAG_READ_ONLY) { | 423 | if (qctrl.flags & V4L2_CTRL_FLAG_READ_ONLY) { |
| 407 | if (info->set_value) { | 424 | if (info->set_value) { |
| 408 | info->set_value = 0; | 425 | info->set_value = NULL; |
| 409 | } | 426 | } |
| 410 | } else { | 427 | } else { |
| 411 | if (!(info->set_value)) { | 428 | if (!(info->set_value)) { |
| @@ -836,14 +853,6 @@ unsigned long pvr2_hdw_get_sn(struct pvr2_hdw *hdw) | |||
| 836 | } | 853 | } |
| 837 | 854 | ||
| 838 | 855 | ||
| 839 | struct pvr2_hdw *pvr2_hdw_find(int unit_number) | ||
| 840 | { | ||
| 841 | if (unit_number < 0) return 0; | ||
| 842 | if (unit_number >= PVR_NUM) return 0; | ||
| 843 | return unit_pointers[unit_number]; | ||
| 844 | } | ||
| 845 | |||
| 846 | |||
| 847 | int pvr2_hdw_get_unit_number(struct pvr2_hdw *hdw) | 856 | int pvr2_hdw_get_unit_number(struct pvr2_hdw *hdw) |
| 848 | { | 857 | { |
| 849 | return hdw->unit_number; | 858 | return hdw->unit_number; |
| @@ -917,9 +926,9 @@ static int pvr2_locate_firmware(struct pvr2_hdw *hdw, | |||
| 917 | * is not suitable for an usb transaction. | 926 | * is not suitable for an usb transaction. |
| 918 | * | 927 | * |
| 919 | */ | 928 | */ |
| 920 | int pvr2_upload_firmware1(struct pvr2_hdw *hdw) | 929 | static int pvr2_upload_firmware1(struct pvr2_hdw *hdw) |
| 921 | { | 930 | { |
| 922 | const struct firmware *fw_entry = 0; | 931 | const struct firmware *fw_entry = NULL; |
| 923 | void *fw_ptr; | 932 | void *fw_ptr; |
| 924 | unsigned int pipe; | 933 | unsigned int pipe; |
| 925 | int ret; | 934 | int ret; |
| @@ -1015,7 +1024,7 @@ int pvr2_upload_firmware1(struct pvr2_hdw *hdw) | |||
| 1015 | 1024 | ||
| 1016 | int pvr2_upload_firmware2(struct pvr2_hdw *hdw) | 1025 | int pvr2_upload_firmware2(struct pvr2_hdw *hdw) |
| 1017 | { | 1026 | { |
| 1018 | const struct firmware *fw_entry = 0; | 1027 | const struct firmware *fw_entry = NULL; |
| 1019 | void *fw_ptr; | 1028 | void *fw_ptr; |
| 1020 | unsigned int pipe, fw_len, fw_done; | 1029 | unsigned int pipe, fw_len, fw_done; |
| 1021 | int actual_length; | 1030 | int actual_length; |
| @@ -1166,8 +1175,9 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) | |||
| 1166 | reconfigure and start over. | 1175 | reconfigure and start over. |
| 1167 | 1176 | ||
| 1168 | */ | 1177 | */ |
| 1169 | void pvr2_hdw_subsys_bit_chg_no_lock(struct pvr2_hdw *hdw, | 1178 | static void pvr2_hdw_subsys_bit_chg_no_lock(struct pvr2_hdw *hdw, |
| 1170 | unsigned long msk,unsigned long val) | 1179 | unsigned long msk, |
| 1180 | unsigned long val) | ||
| 1171 | { | 1181 | { |
| 1172 | unsigned long nmsk; | 1182 | unsigned long nmsk; |
| 1173 | unsigned long vmsk; | 1183 | unsigned long vmsk; |
| @@ -1318,18 +1328,6 @@ void pvr2_hdw_subsys_bit_chg(struct pvr2_hdw *hdw, | |||
| 1318 | } | 1328 | } |
| 1319 | 1329 | ||
| 1320 | 1330 | ||
| 1321 | void pvr2_hdw_subsys_bit_set(struct pvr2_hdw *hdw,unsigned long msk) | ||
| 1322 | { | ||
| 1323 | pvr2_hdw_subsys_bit_chg(hdw,msk,msk); | ||
| 1324 | } | ||
| 1325 | |||
| 1326 | |||
| 1327 | void pvr2_hdw_subsys_bit_clr(struct pvr2_hdw *hdw,unsigned long msk) | ||
| 1328 | { | ||
| 1329 | pvr2_hdw_subsys_bit_chg(hdw,msk,0); | ||
| 1330 | } | ||
| 1331 | |||
| 1332 | |||
| 1333 | unsigned long pvr2_hdw_subsys_get(struct pvr2_hdw *hdw) | 1331 | unsigned long pvr2_hdw_subsys_get(struct pvr2_hdw *hdw) |
| 1334 | { | 1332 | { |
| 1335 | return hdw->subsys_enabled_mask; | 1333 | return hdw->subsys_enabled_mask; |
| @@ -1342,9 +1340,9 @@ unsigned long pvr2_hdw_subsys_stream_get(struct pvr2_hdw *hdw) | |||
| 1342 | } | 1340 | } |
| 1343 | 1341 | ||
| 1344 | 1342 | ||
| 1345 | void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw, | 1343 | static void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw, |
| 1346 | unsigned long msk, | 1344 | unsigned long msk, |
| 1347 | unsigned long val) | 1345 | unsigned long val) |
| 1348 | { | 1346 | { |
| 1349 | unsigned long val2; | 1347 | unsigned long val2; |
| 1350 | msk &= PVR2_SUBSYS_ALL; | 1348 | msk &= PVR2_SUBSYS_ALL; |
| @@ -1366,7 +1364,7 @@ void pvr2_hdw_subsys_stream_bit_chg(struct pvr2_hdw *hdw, | |||
| 1366 | } | 1364 | } |
| 1367 | 1365 | ||
| 1368 | 1366 | ||
| 1369 | int pvr2_hdw_set_streaming_no_lock(struct pvr2_hdw *hdw,int enableFl) | 1367 | static int pvr2_hdw_set_streaming_no_lock(struct pvr2_hdw *hdw,int enableFl) |
| 1370 | { | 1368 | { |
| 1371 | if ((!enableFl) == !(hdw->flag_streaming_enabled)) return 0; | 1369 | if ((!enableFl) == !(hdw->flag_streaming_enabled)) return 0; |
| 1372 | if (enableFl) { | 1370 | if (enableFl) { |
| @@ -1400,8 +1398,8 @@ int pvr2_hdw_set_streaming(struct pvr2_hdw *hdw,int enable_flag) | |||
| 1400 | } | 1398 | } |
| 1401 | 1399 | ||
| 1402 | 1400 | ||
| 1403 | int pvr2_hdw_set_stream_type_no_lock(struct pvr2_hdw *hdw, | 1401 | static int pvr2_hdw_set_stream_type_no_lock(struct pvr2_hdw *hdw, |
| 1404 | enum pvr2_config config) | 1402 | enum pvr2_config config) |
| 1405 | { | 1403 | { |
| 1406 | unsigned long sm = hdw->subsys_enabled_mask; | 1404 | unsigned long sm = hdw->subsys_enabled_mask; |
| 1407 | if (!hdw->flag_ok) return -EIO; | 1405 | if (!hdw->flag_ok) return -EIO; |
| @@ -1741,7 +1739,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, | |||
| 1741 | sizeof(pvr2_device_names)/sizeof(pvr2_device_names[0])) { | 1739 | sizeof(pvr2_device_names)/sizeof(pvr2_device_names[0])) { |
| 1742 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, | 1740 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, |
| 1743 | "Bogus device type of %u reported",hdw_type); | 1741 | "Bogus device type of %u reported",hdw_type); |
| 1744 | return 0; | 1742 | return NULL; |
| 1745 | } | 1743 | } |
| 1746 | 1744 | ||
| 1747 | hdw = kmalloc(sizeof(*hdw),GFP_KERNEL); | 1745 | hdw = kmalloc(sizeof(*hdw),GFP_KERNEL); |
| @@ -1922,38 +1920,38 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, | |||
| 1922 | if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info); | 1920 | if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info); |
| 1923 | kfree(hdw); | 1921 | kfree(hdw); |
| 1924 | } | 1922 | } |
| 1925 | return 0; | 1923 | return NULL; |
| 1926 | } | 1924 | } |
| 1927 | 1925 | ||
| 1928 | 1926 | ||
| 1929 | /* Remove _all_ associations between this driver and the underlying USB | 1927 | /* Remove _all_ associations between this driver and the underlying USB |
| 1930 | layer. */ | 1928 | layer. */ |
| 1931 | void pvr2_hdw_remove_usb_stuff(struct pvr2_hdw *hdw) | 1929 | static void pvr2_hdw_remove_usb_stuff(struct pvr2_hdw *hdw) |
| 1932 | { | 1930 | { |
| 1933 | if (hdw->flag_disconnected) return; | 1931 | if (hdw->flag_disconnected) return; |
| 1934 | pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_remove_usb_stuff: hdw=%p",hdw); | 1932 | pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_remove_usb_stuff: hdw=%p",hdw); |
| 1935 | if (hdw->ctl_read_urb) { | 1933 | if (hdw->ctl_read_urb) { |
| 1936 | usb_kill_urb(hdw->ctl_read_urb); | 1934 | usb_kill_urb(hdw->ctl_read_urb); |
| 1937 | usb_free_urb(hdw->ctl_read_urb); | 1935 | usb_free_urb(hdw->ctl_read_urb); |
| 1938 | hdw->ctl_read_urb = 0; | 1936 | hdw->ctl_read_urb = NULL; |
| 1939 | } | 1937 | } |
| 1940 | if (hdw->ctl_write_urb) { | 1938 | if (hdw->ctl_write_urb) { |
| 1941 | usb_kill_urb(hdw->ctl_write_urb); | 1939 | usb_kill_urb(hdw->ctl_write_urb); |
| 1942 | usb_free_urb(hdw->ctl_write_urb); | 1940 | usb_free_urb(hdw->ctl_write_urb); |
| 1943 | hdw->ctl_write_urb = 0; | 1941 | hdw->ctl_write_urb = NULL; |
| 1944 | } | 1942 | } |
| 1945 | if (hdw->ctl_read_buffer) { | 1943 | if (hdw->ctl_read_buffer) { |
| 1946 | kfree(hdw->ctl_read_buffer); | 1944 | kfree(hdw->ctl_read_buffer); |
| 1947 | hdw->ctl_read_buffer = 0; | 1945 | hdw->ctl_read_buffer = NULL; |
| 1948 | } | 1946 | } |
| 1949 | if (hdw->ctl_write_buffer) { | 1947 | if (hdw->ctl_write_buffer) { |
| 1950 | kfree(hdw->ctl_write_buffer); | 1948 | kfree(hdw->ctl_write_buffer); |
| 1951 | hdw->ctl_write_buffer = 0; | 1949 | hdw->ctl_write_buffer = NULL; |
| 1952 | } | 1950 | } |
| 1953 | pvr2_hdw_render_useless_unlocked(hdw); | 1951 | pvr2_hdw_render_useless_unlocked(hdw); |
| 1954 | hdw->flag_disconnected = !0; | 1952 | hdw->flag_disconnected = !0; |
| 1955 | hdw->usb_dev = 0; | 1953 | hdw->usb_dev = NULL; |
| 1956 | hdw->usb_intf = 0; | 1954 | hdw->usb_intf = NULL; |
| 1957 | } | 1955 | } |
| 1958 | 1956 | ||
| 1959 | 1957 | ||
| @@ -1963,11 +1961,11 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw) | |||
| 1963 | pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_destroy: hdw=%p",hdw); | 1961 | pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_destroy: hdw=%p",hdw); |
| 1964 | if (hdw->fw_buffer) { | 1962 | if (hdw->fw_buffer) { |
| 1965 | kfree(hdw->fw_buffer); | 1963 | kfree(hdw->fw_buffer); |
| 1966 | hdw->fw_buffer = 0; | 1964 | hdw->fw_buffer = NULL; |
| 1967 | } | 1965 | } |
| 1968 | if (hdw->vid_stream) { | 1966 | if (hdw->vid_stream) { |
| 1969 | pvr2_stream_destroy(hdw->vid_stream); | 1967 | pvr2_stream_destroy(hdw->vid_stream); |
| 1970 | hdw->vid_stream = 0; | 1968 | hdw->vid_stream = NULL; |
| 1971 | } | 1969 | } |
| 1972 | if (hdw->audio_stat) { | 1970 | if (hdw->audio_stat) { |
| 1973 | hdw->audio_stat->detach(hdw->audio_stat->ctxt); | 1971 | hdw->audio_stat->detach(hdw->audio_stat->ctxt); |
| @@ -1981,7 +1979,7 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw) | |||
| 1981 | if ((hdw->unit_number >= 0) && | 1979 | if ((hdw->unit_number >= 0) && |
| 1982 | (hdw->unit_number < PVR_NUM) && | 1980 | (hdw->unit_number < PVR_NUM) && |
| 1983 | (unit_pointers[hdw->unit_number] == hdw)) { | 1981 | (unit_pointers[hdw->unit_number] == hdw)) { |
| 1984 | unit_pointers[hdw->unit_number] = 0; | 1982 | unit_pointers[hdw->unit_number] = NULL; |
| 1985 | } | 1983 | } |
| 1986 | } while (0); up(&pvr2_unit_sem); | 1984 | } while (0); up(&pvr2_unit_sem); |
| 1987 | if (hdw->controls) kfree(hdw->controls); | 1985 | if (hdw->controls) kfree(hdw->controls); |
| @@ -2018,7 +2016,7 @@ void pvr2_hdw_disconnect(struct pvr2_hdw *hdw) | |||
| 2018 | 2016 | ||
| 2019 | // Attempt to autoselect an appropriate value for std_enum_cur given | 2017 | // Attempt to autoselect an appropriate value for std_enum_cur given |
| 2020 | // whatever is currently in std_mask_cur | 2018 | // whatever is currently in std_mask_cur |
| 2021 | void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw) | 2019 | static void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw) |
| 2022 | { | 2020 | { |
| 2023 | unsigned int idx; | 2021 | unsigned int idx; |
| 2024 | for (idx = 1; idx < hdw->std_enum_cnt; idx++) { | 2022 | for (idx = 1; idx < hdw->std_enum_cnt; idx++) { |
| @@ -2033,7 +2031,7 @@ void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw) | |||
| 2033 | 2031 | ||
| 2034 | // Calculate correct set of enumerated standards based on currently known | 2032 | // Calculate correct set of enumerated standards based on currently known |
| 2035 | // set of available standards bits. | 2033 | // set of available standards bits. |
| 2036 | void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw) | 2034 | static void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw) |
| 2037 | { | 2035 | { |
| 2038 | struct v4l2_standard *newstd; | 2036 | struct v4l2_standard *newstd; |
| 2039 | unsigned int std_cnt; | 2037 | unsigned int std_cnt; |
| @@ -2043,12 +2041,12 @@ void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw) | |||
| 2043 | 2041 | ||
| 2044 | if (hdw->std_defs) { | 2042 | if (hdw->std_defs) { |
| 2045 | kfree(hdw->std_defs); | 2043 | kfree(hdw->std_defs); |
| 2046 | hdw->std_defs = 0; | 2044 | hdw->std_defs = NULL; |
| 2047 | } | 2045 | } |
| 2048 | hdw->std_enum_cnt = 0; | 2046 | hdw->std_enum_cnt = 0; |
| 2049 | if (hdw->std_enum_names) { | 2047 | if (hdw->std_enum_names) { |
| 2050 | kfree(hdw->std_enum_names); | 2048 | kfree(hdw->std_enum_names); |
| 2051 | hdw->std_enum_names = 0; | 2049 | hdw->std_enum_names = NULL; |
| 2052 | } | 2050 | } |
| 2053 | 2051 | ||
| 2054 | if (!std_cnt) { | 2052 | if (!std_cnt) { |
| @@ -2099,7 +2097,7 @@ unsigned int pvr2_hdw_get_ctrl_count(struct pvr2_hdw *hdw) | |||
| 2099 | struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_index(struct pvr2_hdw *hdw, | 2097 | struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_index(struct pvr2_hdw *hdw, |
| 2100 | unsigned int idx) | 2098 | unsigned int idx) |
| 2101 | { | 2099 | { |
| 2102 | if (idx >= hdw->control_cnt) return 0; | 2100 | if (idx >= hdw->control_cnt) return NULL; |
| 2103 | return hdw->controls + idx; | 2101 | return hdw->controls + idx; |
| 2104 | } | 2102 | } |
| 2105 | 2103 | ||
| @@ -2118,7 +2116,7 @@ struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_id(struct pvr2_hdw *hdw, | |||
| 2118 | i = cptr->info->internal_id; | 2116 | i = cptr->info->internal_id; |
| 2119 | if (i && (i == ctl_id)) return cptr; | 2117 | if (i && (i == ctl_id)) return cptr; |
| 2120 | } | 2118 | } |
| 2121 | return 0; | 2119 | return NULL; |
| 2122 | } | 2120 | } |
| 2123 | 2121 | ||
| 2124 | 2122 | ||
| @@ -2135,7 +2133,7 @@ struct pvr2_ctrl *pvr2_hdw_get_ctrl_v4l(struct pvr2_hdw *hdw,unsigned int ctl_id | |||
| 2135 | i = cptr->info->v4l_id; | 2133 | i = cptr->info->v4l_id; |
| 2136 | if (i && (i == ctl_id)) return cptr; | 2134 | if (i && (i == ctl_id)) return cptr; |
| 2137 | } | 2135 | } |
| 2138 | return 0; | 2136 | return NULL; |
| 2139 | } | 2137 | } |
| 2140 | 2138 | ||
| 2141 | 2139 | ||
| @@ -2149,7 +2147,7 @@ struct pvr2_ctrl *pvr2_hdw_get_ctrl_nextv4l(struct pvr2_hdw *hdw, | |||
| 2149 | int i; | 2147 | int i; |
| 2150 | 2148 | ||
| 2151 | /* This could be made a lot more efficient, but for now... */ | 2149 | /* This could be made a lot more efficient, but for now... */ |
| 2152 | cp2 = 0; | 2150 | cp2 = NULL; |
| 2153 | for (idx = 0; idx < hdw->control_cnt; idx++) { | 2151 | for (idx = 0; idx < hdw->control_cnt; idx++) { |
| 2154 | cptr = hdw->controls + idx; | 2152 | cptr = hdw->controls + idx; |
| 2155 | i = cptr->info->v4l_id; | 2153 | i = cptr->info->v4l_id; |
| @@ -2159,7 +2157,7 @@ struct pvr2_ctrl *pvr2_hdw_get_ctrl_nextv4l(struct pvr2_hdw *hdw, | |||
| 2159 | cp2 = cptr; | 2157 | cp2 = cptr; |
| 2160 | } | 2158 | } |
| 2161 | return cp2; | 2159 | return cp2; |
| 2162 | return 0; | 2160 | return NULL; |
| 2163 | } | 2161 | } |
| 2164 | 2162 | ||
| 2165 | 2163 | ||
| @@ -2182,7 +2180,7 @@ static const char *get_ctrl_typename(enum pvr2_ctl_type tp) | |||
| 2182 | state(s) back to their previous value before this function was called. | 2180 | state(s) back to their previous value before this function was called. |
| 2183 | Thus we can automatically reconfigure affected pieces of the driver as | 2181 | Thus we can automatically reconfigure affected pieces of the driver as |
| 2184 | controls are changed. */ | 2182 | controls are changed. */ |
| 2185 | int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw) | 2183 | static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw) |
| 2186 | { | 2184 | { |
| 2187 | unsigned long saved_subsys_mask = hdw->subsys_enabled_mask; | 2185 | unsigned long saved_subsys_mask = hdw->subsys_enabled_mask; |
| 2188 | unsigned long stale_subsys_mask = 0; | 2186 | unsigned long stale_subsys_mask = 0; |
| @@ -2321,14 +2319,6 @@ void pvr2_hdw_poll_trigger_unlocked(struct pvr2_hdw *hdw) | |||
| 2321 | } | 2319 | } |
| 2322 | 2320 | ||
| 2323 | 2321 | ||
| 2324 | void pvr2_hdw_poll_trigger(struct pvr2_hdw *hdw) | ||
| 2325 | { | ||
| 2326 | LOCK_TAKE(hdw->big_lock); do { | ||
| 2327 | pvr2_hdw_poll_trigger_unlocked(hdw); | ||
| 2328 | } while (0); LOCK_GIVE(hdw->big_lock); | ||
| 2329 | } | ||
| 2330 | |||
| 2331 | |||
| 2332 | /* Return name for this driver instance */ | 2322 | /* Return name for this driver instance */ |
| 2333 | const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *hdw) | 2323 | const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *hdw) |
| 2334 | { | 2324 | { |
| @@ -2337,7 +2327,7 @@ const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *hdw) | |||
| 2337 | 2327 | ||
| 2338 | 2328 | ||
| 2339 | /* Return bit mask indicating signal status */ | 2329 | /* Return bit mask indicating signal status */ |
| 2340 | unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *hdw) | 2330 | static unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *hdw) |
| 2341 | { | 2331 | { |
| 2342 | unsigned int msk = 0; | 2332 | unsigned int msk = 0; |
| 2343 | switch (hdw->input_val) { | 2333 | switch (hdw->input_val) { |
| @@ -2424,7 +2414,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw, int enable_flag) | |||
| 2424 | pvr2_trace(PVR2_TRACE_FIRMWARE, | 2414 | pvr2_trace(PVR2_TRACE_FIRMWARE, |
| 2425 | "Cleaning up after CPU firmware fetch"); | 2415 | "Cleaning up after CPU firmware fetch"); |
| 2426 | kfree(hdw->fw_buffer); | 2416 | kfree(hdw->fw_buffer); |
| 2427 | hdw->fw_buffer = 0; | 2417 | hdw->fw_buffer = NULL; |
| 2428 | hdw->fw_size = 0; | 2418 | hdw->fw_size = 0; |
| 2429 | /* Now release the CPU. It will disconnect and | 2419 | /* Now release the CPU. It will disconnect and |
| 2430 | reconnect later. */ | 2420 | reconnect later. */ |
| @@ -2519,22 +2509,6 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *hdw,int v) | |||
| 2519 | } | 2509 | } |
| 2520 | 2510 | ||
| 2521 | 2511 | ||
| 2522 | void pvr2_reset_ctl_endpoints(struct pvr2_hdw *hdw) | ||
| 2523 | { | ||
| 2524 | if (!hdw->usb_dev) return; | ||
| 2525 | usb_settoggle(hdw->usb_dev, PVR2_CTL_WRITE_ENDPOINT & 0xf, | ||
| 2526 | !(PVR2_CTL_WRITE_ENDPOINT & USB_DIR_IN), 0); | ||
| 2527 | usb_settoggle(hdw->usb_dev, PVR2_CTL_READ_ENDPOINT & 0xf, | ||
| 2528 | !(PVR2_CTL_READ_ENDPOINT & USB_DIR_IN), 0); | ||
| 2529 | usb_clear_halt(hdw->usb_dev, | ||
| 2530 | usb_rcvbulkpipe(hdw->usb_dev, | ||
| 2531 | PVR2_CTL_READ_ENDPOINT & 0x7f)); | ||
| 2532 | usb_clear_halt(hdw->usb_dev, | ||
| 2533 | usb_sndbulkpipe(hdw->usb_dev, | ||
| 2534 | PVR2_CTL_WRITE_ENDPOINT & 0x7f)); | ||
| 2535 | } | ||
| 2536 | |||
| 2537 | |||
| 2538 | static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs) | 2512 | static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs) |
| 2539 | { | 2513 | { |
| 2540 | struct pvr2_hdw *hdw = urb->context; | 2514 | struct pvr2_hdw *hdw = urb->context; |
| @@ -2568,10 +2542,10 @@ static void pvr2_ctl_timeout(unsigned long data) | |||
| 2568 | } | 2542 | } |
| 2569 | 2543 | ||
| 2570 | 2544 | ||
| 2571 | int pvr2_send_request_ex(struct pvr2_hdw *hdw, | 2545 | static int pvr2_send_request_ex(struct pvr2_hdw *hdw, |
| 2572 | unsigned int timeout,int probe_fl, | 2546 | unsigned int timeout,int probe_fl, |
| 2573 | void *write_data,unsigned int write_len, | 2547 | void *write_data,unsigned int write_len, |
| 2574 | void *read_data,unsigned int read_len) | 2548 | void *read_data,unsigned int read_len) |
| 2575 | { | 2549 | { |
| 2576 | unsigned int idx; | 2550 | unsigned int idx; |
| 2577 | int status = 0; | 2551 | int status = 0; |
| @@ -2826,7 +2800,7 @@ int pvr2_write_register(struct pvr2_hdw *hdw, u16 reg, u32 data) | |||
| 2826 | } | 2800 | } |
| 2827 | 2801 | ||
| 2828 | 2802 | ||
| 2829 | int pvr2_read_register(struct pvr2_hdw *hdw, u16 reg, u32 *data) | 2803 | static int pvr2_read_register(struct pvr2_hdw *hdw, u16 reg, u32 *data) |
| 2830 | { | 2804 | { |
| 2831 | int ret = 0; | 2805 | int ret = 0; |
| 2832 | 2806 | ||
| @@ -2850,7 +2824,7 @@ int pvr2_read_register(struct pvr2_hdw *hdw, u16 reg, u32 *data) | |||
| 2850 | } | 2824 | } |
| 2851 | 2825 | ||
| 2852 | 2826 | ||
| 2853 | int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res) | 2827 | static int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res) |
| 2854 | { | 2828 | { |
| 2855 | int ret; | 2829 | int ret; |
| 2856 | 2830 | ||
| @@ -2867,7 +2841,7 @@ int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res) | |||
| 2867 | } | 2841 | } |
| 2868 | 2842 | ||
| 2869 | 2843 | ||
| 2870 | int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res) | 2844 | static int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res) |
| 2871 | { | 2845 | { |
| 2872 | int ret; | 2846 | int ret; |
| 2873 | 2847 | ||
| @@ -2883,13 +2857,13 @@ int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res) | |||
| 2883 | } | 2857 | } |
| 2884 | 2858 | ||
| 2885 | 2859 | ||
| 2886 | void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *hdw) | 2860 | static void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *hdw) |
| 2887 | { | 2861 | { |
| 2888 | if (!hdw->flag_ok) return; | 2862 | if (!hdw->flag_ok) return; |
| 2889 | pvr2_trace(PVR2_TRACE_INIT,"render_useless"); | 2863 | pvr2_trace(PVR2_TRACE_INIT,"render_useless"); |
| 2890 | hdw->flag_ok = 0; | 2864 | hdw->flag_ok = 0; |
| 2891 | if (hdw->vid_stream) { | 2865 | if (hdw->vid_stream) { |
| 2892 | pvr2_stream_setup(hdw->vid_stream,0,0,0); | 2866 | pvr2_stream_setup(hdw->vid_stream,NULL,0,0); |
| 2893 | } | 2867 | } |
| 2894 | hdw->flag_streaming_enabled = 0; | 2868 | hdw->flag_streaming_enabled = 0; |
| 2895 | hdw->subsys_enabled_mask = 0; | 2869 | hdw->subsys_enabled_mask = 0; |
| @@ -2908,7 +2882,7 @@ void pvr2_hdw_device_reset(struct pvr2_hdw *hdw) | |||
| 2908 | { | 2882 | { |
| 2909 | int ret; | 2883 | int ret; |
| 2910 | pvr2_trace(PVR2_TRACE_INIT,"Performing a device reset..."); | 2884 | pvr2_trace(PVR2_TRACE_INIT,"Performing a device reset..."); |
| 2911 | ret = usb_lock_device_for_reset(hdw->usb_dev,0); | 2885 | ret = usb_lock_device_for_reset(hdw->usb_dev,NULL); |
| 2912 | if (ret == 1) { | 2886 | if (ret == 1) { |
| 2913 | ret = usb_reset_device(hdw->usb_dev); | 2887 | ret = usb_reset_device(hdw->usb_dev); |
| 2914 | usb_unlock_device(hdw->usb_dev); | 2888 | usb_unlock_device(hdw->usb_dev); |
| @@ -2957,7 +2931,7 @@ int pvr2_hdw_cmd_deep_reset(struct pvr2_hdw *hdw) | |||
| 2957 | pvr2_trace(PVR2_TRACE_INIT,"Requesting uproc hard reset"); | 2931 | pvr2_trace(PVR2_TRACE_INIT,"Requesting uproc hard reset"); |
| 2958 | hdw->flag_ok = !0; | 2932 | hdw->flag_ok = !0; |
| 2959 | hdw->cmd_buffer[0] = 0xdd; | 2933 | hdw->cmd_buffer[0] = 0xdd; |
| 2960 | status = pvr2_send_request(hdw,hdw->cmd_buffer,1,0,0); | 2934 | status = pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0); |
| 2961 | } while (0); LOCK_GIVE(hdw->ctl_lock); | 2935 | } while (0); LOCK_GIVE(hdw->ctl_lock); |
| 2962 | return status; | 2936 | return status; |
| 2963 | } | 2937 | } |
| @@ -2969,7 +2943,7 @@ int pvr2_hdw_cmd_powerup(struct pvr2_hdw *hdw) | |||
| 2969 | LOCK_TAKE(hdw->ctl_lock); do { | 2943 | LOCK_TAKE(hdw->ctl_lock); do { |
| 2970 | pvr2_trace(PVR2_TRACE_INIT,"Requesting powerup"); | 2944 | pvr2_trace(PVR2_TRACE_INIT,"Requesting powerup"); |
| 2971 | hdw->cmd_buffer[0] = 0xde; | 2945 | hdw->cmd_buffer[0] = 0xde; |
| 2972 | status = pvr2_send_request(hdw,hdw->cmd_buffer,1,0,0); | 2946 | status = pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0); |
| 2973 | } while (0); LOCK_GIVE(hdw->ctl_lock); | 2947 | } while (0); LOCK_GIVE(hdw->ctl_lock); |
| 2974 | return status; | 2948 | return status; |
| 2975 | } | 2949 | } |
| @@ -2996,12 +2970,12 @@ int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *hdw) | |||
| 2996 | } | 2970 | } |
| 2997 | 2971 | ||
| 2998 | 2972 | ||
| 2999 | int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl) | 2973 | static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl) |
| 3000 | { | 2974 | { |
| 3001 | int status; | 2975 | int status; |
| 3002 | LOCK_TAKE(hdw->ctl_lock); do { | 2976 | LOCK_TAKE(hdw->ctl_lock); do { |
| 3003 | hdw->cmd_buffer[0] = (runFl ? 0x36 : 0x37); | 2977 | hdw->cmd_buffer[0] = (runFl ? 0x36 : 0x37); |
| 3004 | status = pvr2_send_request(hdw,hdw->cmd_buffer,1,0,0); | 2978 | status = pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0); |
| 3005 | } while (0); LOCK_GIVE(hdw->ctl_lock); | 2979 | } while (0); LOCK_GIVE(hdw->ctl_lock); |
| 3006 | if (!status) { | 2980 | if (!status) { |
| 3007 | hdw->subsys_enabled_mask = | 2981 | hdw->subsys_enabled_mask = |
| @@ -3094,7 +3068,7 @@ int pvr2_hdw_gpio_chg_out(struct pvr2_hdw *hdw,u32 msk,u32 val) | |||
| 3094 | } | 3068 | } |
| 3095 | 3069 | ||
| 3096 | 3070 | ||
| 3097 | int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw) | 3071 | static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw) |
| 3098 | { | 3072 | { |
| 3099 | int result; | 3073 | int result; |
| 3100 | LOCK_TAKE(hdw->ctl_lock); do { | 3074 | LOCK_TAKE(hdw->ctl_lock); do { |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h index 63f529154431..fd931b5da490 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h | |||
| @@ -91,7 +91,6 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, | |||
| 91 | void pvr2_hdw_poll(struct pvr2_hdw *); | 91 | void pvr2_hdw_poll(struct pvr2_hdw *); |
| 92 | 92 | ||
| 93 | /* Trigger a poll to take place later at a convenient time */ | 93 | /* Trigger a poll to take place later at a convenient time */ |
| 94 | void pvr2_hdw_poll_trigger(struct pvr2_hdw *); | ||
| 95 | void pvr2_hdw_poll_trigger_unlocked(struct pvr2_hdw *); | 94 | void pvr2_hdw_poll_trigger_unlocked(struct pvr2_hdw *); |
| 96 | 95 | ||
| 97 | /* Register a callback used to trigger a future poll */ | 96 | /* Register a callback used to trigger a future poll */ |
| @@ -99,9 +98,6 @@ void pvr2_hdw_setup_poll_trigger(struct pvr2_hdw *, | |||
| 99 | void (*func)(void *), | 98 | void (*func)(void *), |
| 100 | void *data); | 99 | void *data); |
| 101 | 100 | ||
| 102 | /* Get pointer to structure given unit number */ | ||
| 103 | struct pvr2_hdw *pvr2_hdw_find(int unit_number); | ||
| 104 | |||
| 105 | /* Destroy hardware interaction structure */ | 101 | /* Destroy hardware interaction structure */ |
| 106 | void pvr2_hdw_destroy(struct pvr2_hdw *); | 102 | void pvr2_hdw_destroy(struct pvr2_hdw *); |
| 107 | 103 | ||
| @@ -180,12 +176,6 @@ int pvr2_hdw_get_stdenum_value(struct pvr2_hdw *hdw,struct v4l2_standard *std, | |||
| 180 | void pvr2_hdw_subsys_bit_chg(struct pvr2_hdw *hdw, | 176 | void pvr2_hdw_subsys_bit_chg(struct pvr2_hdw *hdw, |
| 181 | unsigned long msk,unsigned long val); | 177 | unsigned long msk,unsigned long val); |
| 182 | 178 | ||
| 183 | /* Shortcut for pvr2_hdw_subsys_bit_chg(hdw,msk,msk) */ | ||
| 184 | void pvr2_hdw_subsys_bit_set(struct pvr2_hdw *hdw,unsigned long msk); | ||
| 185 | |||
| 186 | /* Shortcut for pvr2_hdw_subsys_bit_chg(hdw,msk,0) */ | ||
| 187 | void pvr2_hdw_subsys_bit_clr(struct pvr2_hdw *hdw,unsigned long msk); | ||
| 188 | |||
| 189 | /* Retrieve mask indicating which pieces of hardware are currently enabled | 179 | /* Retrieve mask indicating which pieces of hardware are currently enabled |
| 190 | / configured. */ | 180 | / configured. */ |
| 191 | unsigned long pvr2_hdw_subsys_get(struct pvr2_hdw *); | 181 | unsigned long pvr2_hdw_subsys_get(struct pvr2_hdw *); |
| @@ -225,34 +215,18 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *,int); | |||
| 225 | /* The following entry points are all lower level things you normally don't | 215 | /* The following entry points are all lower level things you normally don't |
| 226 | want to worry about. */ | 216 | want to worry about. */ |
| 227 | 217 | ||
| 228 | /* Attempt to recover from a USB foul-up (in practice I find that if you | ||
| 229 | have to do this, then it's already too late). */ | ||
| 230 | void pvr2_reset_ctl_endpoints(struct pvr2_hdw *hdw); | ||
| 231 | |||
| 232 | /* Issue a command and get a response from the device. LOTS of higher | 218 | /* Issue a command and get a response from the device. LOTS of higher |
| 233 | level stuff is built on this. */ | 219 | level stuff is built on this. */ |
| 234 | int pvr2_send_request(struct pvr2_hdw *, | 220 | int pvr2_send_request(struct pvr2_hdw *, |
| 235 | void *write_ptr,unsigned int write_len, | 221 | void *write_ptr,unsigned int write_len, |
| 236 | void *read_ptr,unsigned int read_len); | 222 | void *read_ptr,unsigned int read_len); |
| 237 | 223 | ||
| 238 | /* Issue a command and get a response from the device. This extended | ||
| 239 | version includes a probe flag (which if set means that device errors | ||
| 240 | should not be logged or treated as fatal) and a timeout in jiffies. | ||
| 241 | This can be used to non-lethally probe the health of endpoint 1. */ | ||
| 242 | int pvr2_send_request_ex(struct pvr2_hdw *,unsigned int timeout,int probe_fl, | ||
| 243 | void *write_ptr,unsigned int write_len, | ||
| 244 | void *read_ptr,unsigned int read_len); | ||
| 245 | |||
| 246 | /* Slightly higher level device communication functions. */ | 224 | /* Slightly higher level device communication functions. */ |
| 247 | int pvr2_write_register(struct pvr2_hdw *, u16, u32); | 225 | int pvr2_write_register(struct pvr2_hdw *, u16, u32); |
| 248 | int pvr2_read_register(struct pvr2_hdw *, u16, u32 *); | ||
| 249 | int pvr2_write_u16(struct pvr2_hdw *, u16, int); | ||
| 250 | int pvr2_write_u8(struct pvr2_hdw *, u8, int); | ||
| 251 | 226 | ||
| 252 | /* Call if for any reason we can't talk to the hardware anymore - this will | 227 | /* Call if for any reason we can't talk to the hardware anymore - this will |
| 253 | cause the driver to stop flailing on the device. */ | 228 | cause the driver to stop flailing on the device. */ |
| 254 | void pvr2_hdw_render_useless(struct pvr2_hdw *); | 229 | void pvr2_hdw_render_useless(struct pvr2_hdw *); |
| 255 | void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *); | ||
| 256 | 230 | ||
| 257 | /* Set / clear 8051's reset bit */ | 231 | /* Set / clear 8051's reset bit */ |
| 258 | void pvr2_hdw_cpureset_assert(struct pvr2_hdw *,int); | 232 | void pvr2_hdw_cpureset_assert(struct pvr2_hdw *,int); |
| @@ -271,12 +245,6 @@ int pvr2_hdw_cmd_powerup(struct pvr2_hdw *); | |||
| 271 | /* Order decoder to reset */ | 245 | /* Order decoder to reset */ |
| 272 | int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *); | 246 | int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *); |
| 273 | 247 | ||
| 274 | /* Stop / start video stream transport */ | ||
| 275 | int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl); | ||
| 276 | |||
| 277 | /* Find I2C address of eeprom */ | ||
| 278 | int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *); | ||
| 279 | |||
| 280 | /* Direct manipulation of GPIO bits */ | 248 | /* Direct manipulation of GPIO bits */ |
| 281 | int pvr2_hdw_gpio_get_dir(struct pvr2_hdw *hdw,u32 *); | 249 | int pvr2_hdw_gpio_get_dir(struct pvr2_hdw *hdw,u32 *); |
| 282 | int pvr2_hdw_gpio_get_out(struct pvr2_hdw *hdw,u32 *); | 250 | int pvr2_hdw_gpio_get_out(struct pvr2_hdw *hdw,u32 *); |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c index 1dd4f6249b99..fbe6039aeb6a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include "pvrusb2-i2c-cmd-v4l2.h" | 25 | #include "pvrusb2-i2c-cmd-v4l2.h" |
| 26 | #include "pvrusb2-audio.h" | 26 | #include "pvrusb2-audio.h" |
| 27 | #include "pvrusb2-tuner.h" | 27 | #include "pvrusb2-tuner.h" |
| 28 | #include "pvrusb2-demod.h" | ||
| 29 | #include "pvrusb2-video-v4l.h" | 28 | #include "pvrusb2-video-v4l.h" |
| 30 | #ifdef CONFIG_VIDEO_PVRUSB2_24XXX | 29 | #ifdef CONFIG_VIDEO_PVRUSB2_24XXX |
| 31 | #include "pvrusb2-cx2584x-v4l.h" | 30 | #include "pvrusb2-cx2584x-v4l.h" |
| @@ -89,11 +88,6 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) | |||
| 89 | return; | 88 | return; |
| 90 | } | 89 | } |
| 91 | } | 90 | } |
| 92 | if (id == I2C_DRIVERID_TDA9887) { | ||
| 93 | if (pvr2_i2c_demod_setup(hdw,cp)) { | ||
| 94 | return; | ||
| 95 | } | ||
| 96 | } | ||
| 97 | } | 91 | } |
| 98 | 92 | ||
| 99 | 93 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c index 9f81aff2b38a..8a9933dec912 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | |||
| @@ -196,7 +196,7 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size = { | |||
| 196 | static void do_log(struct pvr2_hdw *hdw) | 196 | static void do_log(struct pvr2_hdw *hdw) |
| 197 | { | 197 | { |
| 198 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 do_log()"); | 198 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 do_log()"); |
| 199 | pvr2_i2c_core_cmd(hdw,VIDIOC_LOG_STATUS,0); | 199 | pvr2_i2c_core_cmd(hdw,VIDIOC_LOG_STATUS,NULL); |
| 200 | 200 | ||
| 201 | } | 201 | } |
| 202 | 202 | ||
| @@ -217,7 +217,7 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log = { | |||
| 217 | void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl) | 217 | void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl) |
| 218 | { | 218 | { |
| 219 | pvr2_i2c_client_cmd(cp, | 219 | pvr2_i2c_client_cmd(cp, |
| 220 | (fl ? VIDIOC_STREAMON : VIDIOC_STREAMOFF),0); | 220 | (fl ? VIDIOC_STREAMON : VIDIOC_STREAMOFF),NULL); |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | 223 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index c8d0bdee3ff1..7fca47982277 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | |||
| @@ -37,6 +37,10 @@ static unsigned int i2c_scan = 0; | |||
| 37 | module_param(i2c_scan, int, S_IRUGO|S_IWUSR); | 37 | module_param(i2c_scan, int, S_IRUGO|S_IWUSR); |
| 38 | MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); | 38 | MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); |
| 39 | 39 | ||
| 40 | static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp, | ||
| 41 | unsigned int detail, | ||
| 42 | char *buf,unsigned int maxlen); | ||
| 43 | |||
| 40 | static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */ | 44 | static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */ |
| 41 | u8 i2c_addr, /* I2C address we're talking to */ | 45 | u8 i2c_addr, /* I2C address we're talking to */ |
| 42 | u8 *data, /* Data to write */ | 46 | u8 *data, /* Data to write */ |
| @@ -165,12 +169,12 @@ static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */ | |||
| 165 | 169 | ||
| 166 | /* This is the common low level entry point for doing I2C operations to the | 170 | /* This is the common low level entry point for doing I2C operations to the |
| 167 | hardware. */ | 171 | hardware. */ |
| 168 | int pvr2_i2c_basic_op(struct pvr2_hdw *hdw, | 172 | static int pvr2_i2c_basic_op(struct pvr2_hdw *hdw, |
| 169 | u8 i2c_addr, | 173 | u8 i2c_addr, |
| 170 | u8 *wdata, | 174 | u8 *wdata, |
| 171 | u16 wlen, | 175 | u16 wlen, |
| 172 | u8 *rdata, | 176 | u8 *rdata, |
| 173 | u16 rlen) | 177 | u16 rlen) |
| 174 | { | 178 | { |
| 175 | if (!rdata) rlen = 0; | 179 | if (!rdata) rlen = 0; |
| 176 | if (!wdata) wlen = 0; | 180 | if (!wdata) wlen = 0; |
| @@ -267,7 +271,7 @@ static int i2c_hack_cx25840(struct pvr2_hdw *hdw, | |||
| 267 | "WARNING: Disabling further access to the device" | 271 | "WARNING: Disabling further access to the device" |
| 268 | " to prevent other foul-ups."); | 272 | " to prevent other foul-ups."); |
| 269 | // This blocks all further communication with the part. | 273 | // This blocks all further communication with the part. |
| 270 | hdw->i2c_func[0x44] = 0; | 274 | hdw->i2c_func[0x44] = NULL; |
| 271 | pvr2_hdw_render_useless(hdw); | 275 | pvr2_hdw_render_useless(hdw); |
| 272 | goto fail; | 276 | goto fail; |
| 273 | } | 277 | } |
| @@ -294,7 +298,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 294 | int num) | 298 | int num) |
| 295 | { | 299 | { |
| 296 | int ret = -ENOTSUPP; | 300 | int ret = -ENOTSUPP; |
| 297 | pvr2_i2c_func funcp = 0; | 301 | pvr2_i2c_func funcp = NULL; |
| 298 | struct pvr2_hdw *hdw = (struct pvr2_hdw *)(i2c_adap->algo_data); | 302 | struct pvr2_hdw *hdw = (struct pvr2_hdw *)(i2c_adap->algo_data); |
| 299 | 303 | ||
| 300 | if (!num) { | 304 | if (!num) { |
| @@ -319,7 +323,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 319 | u16 tcnt,bcnt,offs; | 323 | u16 tcnt,bcnt,offs; |
| 320 | if (!msgs[0].len) { | 324 | if (!msgs[0].len) { |
| 321 | /* Length == 0 read. This is a probe. */ | 325 | /* Length == 0 read. This is a probe. */ |
| 322 | if (funcp(hdw,msgs[0].addr,0,0,0,0)) { | 326 | if (funcp(hdw,msgs[0].addr,NULL,0,NULL,0)) { |
| 323 | ret = -EIO; | 327 | ret = -EIO; |
| 324 | goto done; | 328 | goto done; |
| 325 | } | 329 | } |
| @@ -336,7 +340,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 336 | if (bcnt > sizeof(hdw->cmd_buffer)-1) { | 340 | if (bcnt > sizeof(hdw->cmd_buffer)-1) { |
| 337 | bcnt = sizeof(hdw->cmd_buffer)-1; | 341 | bcnt = sizeof(hdw->cmd_buffer)-1; |
| 338 | } | 342 | } |
| 339 | if (funcp(hdw,msgs[0].addr,0,0, | 343 | if (funcp(hdw,msgs[0].addr,NULL,0, |
| 340 | msgs[0].buf+offs,bcnt)) { | 344 | msgs[0].buf+offs,bcnt)) { |
| 341 | ret = -EIO; | 345 | ret = -EIO; |
| 342 | goto done; | 346 | goto done; |
| @@ -350,7 +354,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 350 | /* Simple write */ | 354 | /* Simple write */ |
| 351 | ret = 1; | 355 | ret = 1; |
| 352 | if (funcp(hdw,msgs[0].addr, | 356 | if (funcp(hdw,msgs[0].addr, |
| 353 | msgs[0].buf,msgs[0].len,0,0)) { | 357 | msgs[0].buf,msgs[0].len,NULL,0)) { |
| 354 | ret = -EIO; | 358 | ret = -EIO; |
| 355 | } | 359 | } |
| 356 | goto done; | 360 | goto done; |
| @@ -705,9 +709,9 @@ int pvr2_i2c_core_check_stale(struct pvr2_hdw *hdw) | |||
| 705 | return (hdw->i2c_pend_types & PVR2_I2C_PEND_ALL) != 0; | 709 | return (hdw->i2c_pend_types & PVR2_I2C_PEND_ALL) != 0; |
| 706 | } | 710 | } |
| 707 | 711 | ||
| 708 | unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp, | 712 | static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp, |
| 709 | unsigned int detail, | 713 | unsigned int detail, |
| 710 | char *buf,unsigned int maxlen) | 714 | char *buf,unsigned int maxlen) |
| 711 | { | 715 | { |
| 712 | unsigned int ccnt,bcnt; | 716 | unsigned int ccnt,bcnt; |
| 713 | int spcfl = 0; | 717 | int spcfl = 0; |
| @@ -871,7 +875,7 @@ static void do_i2c_scan(struct pvr2_hdw *hdw) | |||
| 871 | msg[0].addr = 0; | 875 | msg[0].addr = 0; |
| 872 | msg[0].flags = I2C_M_RD; | 876 | msg[0].flags = I2C_M_RD; |
| 873 | msg[0].len = 0; | 877 | msg[0].len = 0; |
| 874 | msg[0].buf = 0; | 878 | msg[0].buf = NULL; |
| 875 | printk("%s: i2c scan beginning\n",hdw->name); | 879 | printk("%s: i2c scan beginning\n",hdw->name); |
| 876 | for (i = 0; i < 128; i++) { | 880 | for (i = 0; i < 128; i++) { |
| 877 | msg[0].addr = i; | 881 | msg[0].addr = i; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h index e8af5b0ed3ce..6d7e25247576 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h | |||
| @@ -75,9 +75,6 @@ unsigned int pvr2_i2c_report(struct pvr2_hdw *,char *buf,unsigned int maxlen); | |||
| 75 | PVR2_I2C_DETAIL_DEBUG |\ | 75 | PVR2_I2C_DETAIL_DEBUG |\ |
| 76 | PVR2_I2C_DETAIL_HANDLER |\ | 76 | PVR2_I2C_DETAIL_HANDLER |\ |
| 77 | PVR2_I2C_DETAIL_CTLMASK) | 77 | PVR2_I2C_DETAIL_CTLMASK) |
| 78 | unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *, | ||
| 79 | unsigned int detail_mask, | ||
| 80 | char *buf,unsigned int maxlen); | ||
| 81 | 78 | ||
| 82 | void pvr2_i2c_probe(struct pvr2_hdw *,struct pvr2_i2c_client *); | 79 | void pvr2_i2c_probe(struct pvr2_hdw *,struct pvr2_i2c_client *); |
| 83 | const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx); | 80 | const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx); |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c index a984c91f571c..681f79c8064e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-io.c +++ b/drivers/media/video/pvrusb2/pvrusb2-io.c | |||
| @@ -93,7 +93,7 @@ struct pvr2_buffer { | |||
| 93 | struct urb *purb; | 93 | struct urb *purb; |
| 94 | }; | 94 | }; |
| 95 | 95 | ||
| 96 | const char *pvr2_buffer_state_decode(enum pvr2_buffer_state st) | 96 | static const char *pvr2_buffer_state_decode(enum pvr2_buffer_state st) |
| 97 | { | 97 | { |
| 98 | switch (st) { | 98 | switch (st) { |
| 99 | case pvr2_buffer_state_none: return "none"; | 99 | case pvr2_buffer_state_none: return "none"; |
| @@ -104,7 +104,8 @@ const char *pvr2_buffer_state_decode(enum pvr2_buffer_state st) | |||
| 104 | return "unknown"; | 104 | return "unknown"; |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | void pvr2_buffer_describe(struct pvr2_buffer *bp,const char *msg) | 107 | #ifdef SANITY_CHECK_BUFFERS |
| 108 | static void pvr2_buffer_describe(struct pvr2_buffer *bp,const char *msg) | ||
| 108 | { | 109 | { |
| 109 | pvr2_trace(PVR2_TRACE_INFO, | 110 | pvr2_trace(PVR2_TRACE_INFO, |
| 110 | "buffer%s%s %p state=%s id=%d status=%d" | 111 | "buffer%s%s %p state=%s id=%d status=%d" |
| @@ -115,10 +116,11 @@ void pvr2_buffer_describe(struct pvr2_buffer *bp,const char *msg) | |||
| 115 | (bp ? pvr2_buffer_state_decode(bp->state) : "(invalid)"), | 116 | (bp ? pvr2_buffer_state_decode(bp->state) : "(invalid)"), |
| 116 | (bp ? bp->id : 0), | 117 | (bp ? bp->id : 0), |
| 117 | (bp ? bp->status : 0), | 118 | (bp ? bp->status : 0), |
| 118 | (bp ? bp->stream : 0), | 119 | (bp ? bp->stream : NULL), |
| 119 | (bp ? bp->purb : 0), | 120 | (bp ? bp->purb : NULL), |
| 120 | (bp ? bp->signature : 0)); | 121 | (bp ? bp->signature : 0)); |
| 121 | } | 122 | } |
| 123 | #endif /* SANITY_CHECK_BUFFERS */ | ||
| 122 | 124 | ||
| 123 | static void pvr2_buffer_remove(struct pvr2_buffer *bp) | 125 | static void pvr2_buffer_remove(struct pvr2_buffer *bp) |
| 124 | { | 126 | { |
| @@ -284,7 +286,7 @@ static void pvr2_buffer_done(struct pvr2_buffer *bp) | |||
| 284 | pvr2_buffer_wipe(bp); | 286 | pvr2_buffer_wipe(bp); |
| 285 | pvr2_buffer_set_none(bp); | 287 | pvr2_buffer_set_none(bp); |
| 286 | bp->signature = 0; | 288 | bp->signature = 0; |
| 287 | bp->stream = 0; | 289 | bp->stream = NULL; |
| 288 | if (bp->purb) usb_free_urb(bp->purb); | 290 | if (bp->purb) usb_free_urb(bp->purb); |
| 289 | pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/" | 291 | pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/" |
| 290 | " bufferDone %p",bp); | 292 | " bufferDone %p",bp); |
| @@ -339,13 +341,13 @@ static int pvr2_stream_buffer_count(struct pvr2_stream *sp,unsigned int cnt) | |||
| 339 | struct pvr2_buffer *bp; | 341 | struct pvr2_buffer *bp; |
| 340 | bp = sp->buffers[sp->buffer_total_count - 1]; | 342 | bp = sp->buffers[sp->buffer_total_count - 1]; |
| 341 | /* Paranoia */ | 343 | /* Paranoia */ |
| 342 | sp->buffers[sp->buffer_total_count - 1] = 0; | 344 | sp->buffers[sp->buffer_total_count - 1] = NULL; |
| 343 | (sp->buffer_total_count)--; | 345 | (sp->buffer_total_count)--; |
| 344 | pvr2_buffer_done(bp); | 346 | pvr2_buffer_done(bp); |
| 345 | kfree(bp); | 347 | kfree(bp); |
| 346 | } | 348 | } |
| 347 | if (scnt < sp->buffer_slot_count) { | 349 | if (scnt < sp->buffer_slot_count) { |
| 348 | struct pvr2_buffer **nb = 0; | 350 | struct pvr2_buffer **nb = NULL; |
| 349 | if (scnt) { | 351 | if (scnt) { |
| 350 | nb = kmalloc(scnt * sizeof(*nb),GFP_KERNEL); | 352 | nb = kmalloc(scnt * sizeof(*nb),GFP_KERNEL); |
| 351 | if (!nb) return -ENOMEM; | 353 | if (!nb) return -ENOMEM; |
| @@ -513,10 +515,6 @@ void pvr2_stream_set_callback(struct pvr2_stream *sp, | |||
| 513 | } | 515 | } |
| 514 | 516 | ||
| 515 | /* Query / set the nominal buffer count */ | 517 | /* Query / set the nominal buffer count */ |
| 516 | int pvr2_stream_get_buffer_count(struct pvr2_stream *sp) | ||
| 517 | { | ||
| 518 | return sp->buffer_target_count; | ||
| 519 | } | ||
| 520 | 518 | ||
| 521 | int pvr2_stream_set_buffer_count(struct pvr2_stream *sp,unsigned int cnt) | 519 | int pvr2_stream_set_buffer_count(struct pvr2_stream *sp,unsigned int cnt) |
| 522 | { | 520 | { |
| @@ -532,21 +530,21 @@ int pvr2_stream_set_buffer_count(struct pvr2_stream *sp,unsigned int cnt) | |||
| 532 | struct pvr2_buffer *pvr2_stream_get_idle_buffer(struct pvr2_stream *sp) | 530 | struct pvr2_buffer *pvr2_stream_get_idle_buffer(struct pvr2_stream *sp) |
| 533 | { | 531 | { |
| 534 | struct list_head *lp = sp->idle_list.next; | 532 | struct list_head *lp = sp->idle_list.next; |
| 535 | if (lp == &sp->idle_list) return 0; | 533 | if (lp == &sp->idle_list) return NULL; |
| 536 | return list_entry(lp,struct pvr2_buffer,list_overhead); | 534 | return list_entry(lp,struct pvr2_buffer,list_overhead); |
| 537 | } | 535 | } |
| 538 | 536 | ||
| 539 | struct pvr2_buffer *pvr2_stream_get_ready_buffer(struct pvr2_stream *sp) | 537 | struct pvr2_buffer *pvr2_stream_get_ready_buffer(struct pvr2_stream *sp) |
| 540 | { | 538 | { |
| 541 | struct list_head *lp = sp->ready_list.next; | 539 | struct list_head *lp = sp->ready_list.next; |
| 542 | if (lp == &sp->ready_list) return 0; | 540 | if (lp == &sp->ready_list) return NULL; |
| 543 | return list_entry(lp,struct pvr2_buffer,list_overhead); | 541 | return list_entry(lp,struct pvr2_buffer,list_overhead); |
| 544 | } | 542 | } |
| 545 | 543 | ||
| 546 | struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id) | 544 | struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id) |
| 547 | { | 545 | { |
| 548 | if (id < 0) return 0; | 546 | if (id < 0) return NULL; |
| 549 | if (id >= sp->buffer_total_count) return 0; | 547 | if (id >= sp->buffer_total_count) return NULL; |
| 550 | return sp->buffers[id]; | 548 | return sp->buffers[id]; |
| 551 | } | 549 | } |
| 552 | 550 | ||
| @@ -555,17 +553,6 @@ int pvr2_stream_get_ready_count(struct pvr2_stream *sp) | |||
| 555 | return sp->r_count; | 553 | return sp->r_count; |
| 556 | } | 554 | } |
| 557 | 555 | ||
| 558 | int pvr2_stream_get_idle_count(struct pvr2_stream *sp) | ||
| 559 | { | ||
| 560 | return sp->i_count; | ||
| 561 | } | ||
| 562 | |||
| 563 | void pvr2_stream_flush(struct pvr2_stream *sp) | ||
| 564 | { | ||
| 565 | mutex_lock(&sp->mutex); do { | ||
| 566 | pvr2_stream_internal_flush(sp); | ||
| 567 | } while(0); mutex_unlock(&sp->mutex); | ||
| 568 | } | ||
| 569 | 556 | ||
| 570 | void pvr2_stream_kill(struct pvr2_stream *sp) | 557 | void pvr2_stream_kill(struct pvr2_stream *sp) |
| 571 | { | 558 | { |
| @@ -620,20 +607,6 @@ int pvr2_buffer_queue(struct pvr2_buffer *bp) | |||
| 620 | return ret; | 607 | return ret; |
| 621 | } | 608 | } |
| 622 | 609 | ||
| 623 | int pvr2_buffer_idle(struct pvr2_buffer *bp) | ||
| 624 | { | ||
| 625 | struct pvr2_stream *sp; | ||
| 626 | if (!bp) return -EINVAL; | ||
| 627 | sp = bp->stream; | ||
| 628 | mutex_lock(&sp->mutex); do { | ||
| 629 | pvr2_buffer_wipe(bp); | ||
| 630 | pvr2_buffer_set_idle(bp); | ||
| 631 | if (sp->buffer_total_count != sp->buffer_target_count) { | ||
| 632 | pvr2_stream_achieve_buffer_count(sp); | ||
| 633 | } | ||
| 634 | } while(0); mutex_unlock(&sp->mutex); | ||
| 635 | return 0; | ||
| 636 | } | ||
| 637 | 610 | ||
| 638 | int pvr2_buffer_set_buffer(struct pvr2_buffer *bp,void *ptr,unsigned int cnt) | 611 | int pvr2_buffer_set_buffer(struct pvr2_buffer *bp,void *ptr,unsigned int cnt) |
| 639 | { | 612 | { |
| @@ -673,10 +646,6 @@ int pvr2_buffer_get_status(struct pvr2_buffer *bp) | |||
| 673 | return bp->status; | 646 | return bp->status; |
| 674 | } | 647 | } |
| 675 | 648 | ||
| 676 | enum pvr2_buffer_state pvr2_buffer_get_state(struct pvr2_buffer *bp) | ||
| 677 | { | ||
| 678 | return bp->state; | ||
| 679 | } | ||
| 680 | 649 | ||
| 681 | int pvr2_buffer_get_id(struct pvr2_buffer *bp) | 650 | int pvr2_buffer_get_id(struct pvr2_buffer *bp) |
| 682 | { | 651 | { |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.h b/drivers/media/video/pvrusb2/pvrusb2-io.h index 65e11385b2b3..96285ad234a6 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-io.h +++ b/drivers/media/video/pvrusb2/pvrusb2-io.h | |||
| @@ -36,8 +36,6 @@ enum pvr2_buffer_state { | |||
| 36 | struct pvr2_stream; | 36 | struct pvr2_stream; |
| 37 | struct pvr2_buffer; | 37 | struct pvr2_buffer; |
| 38 | 38 | ||
| 39 | const char *pvr2_buffer_state_decode(enum pvr2_buffer_state); | ||
| 40 | |||
| 41 | /* Initialize / tear down stream structure */ | 39 | /* Initialize / tear down stream structure */ |
| 42 | struct pvr2_stream *pvr2_stream_create(void); | 40 | struct pvr2_stream *pvr2_stream_create(void); |
| 43 | void pvr2_stream_destroy(struct pvr2_stream *); | 41 | void pvr2_stream_destroy(struct pvr2_stream *); |
| @@ -49,7 +47,6 @@ void pvr2_stream_set_callback(struct pvr2_stream *, | |||
| 49 | void *data); | 47 | void *data); |
| 50 | 48 | ||
| 51 | /* Query / set the nominal buffer count */ | 49 | /* Query / set the nominal buffer count */ |
| 52 | int pvr2_stream_get_buffer_count(struct pvr2_stream *); | ||
| 53 | int pvr2_stream_set_buffer_count(struct pvr2_stream *,unsigned int); | 50 | int pvr2_stream_set_buffer_count(struct pvr2_stream *,unsigned int); |
| 54 | 51 | ||
| 55 | /* Get a pointer to a buffer that is either idle, ready, or is specified | 52 | /* Get a pointer to a buffer that is either idle, ready, or is specified |
| @@ -59,12 +56,8 @@ struct pvr2_buffer *pvr2_stream_get_ready_buffer(struct pvr2_stream *); | |||
| 59 | struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id); | 56 | struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id); |
| 60 | 57 | ||
| 61 | /* Find out how many buffers are idle or ready */ | 58 | /* Find out how many buffers are idle or ready */ |
| 62 | int pvr2_stream_get_idle_count(struct pvr2_stream *); | ||
| 63 | int pvr2_stream_get_ready_count(struct pvr2_stream *); | 59 | int pvr2_stream_get_ready_count(struct pvr2_stream *); |
| 64 | 60 | ||
| 65 | /* Kill all pending operations */ | ||
| 66 | void pvr2_stream_flush(struct pvr2_stream *); | ||
| 67 | |||
| 68 | /* Kill all pending buffers and throw away any ready buffers as well */ | 61 | /* Kill all pending buffers and throw away any ready buffers as well */ |
| 69 | void pvr2_stream_kill(struct pvr2_stream *); | 62 | void pvr2_stream_kill(struct pvr2_stream *); |
| 70 | 63 | ||
| @@ -77,18 +70,12 @@ unsigned int pvr2_buffer_get_count(struct pvr2_buffer *); | |||
| 77 | /* Retrieve completion code for given ready buffer */ | 70 | /* Retrieve completion code for given ready buffer */ |
| 78 | int pvr2_buffer_get_status(struct pvr2_buffer *); | 71 | int pvr2_buffer_get_status(struct pvr2_buffer *); |
| 79 | 72 | ||
| 80 | /* Retrieve state of given buffer */ | ||
| 81 | enum pvr2_buffer_state pvr2_buffer_get_state(struct pvr2_buffer *); | ||
| 82 | |||
| 83 | /* Retrieve ID of given buffer */ | 73 | /* Retrieve ID of given buffer */ |
| 84 | int pvr2_buffer_get_id(struct pvr2_buffer *); | 74 | int pvr2_buffer_get_id(struct pvr2_buffer *); |
| 85 | 75 | ||
| 86 | /* Start reading into given buffer (kill it if needed) */ | 76 | /* Start reading into given buffer (kill it if needed) */ |
| 87 | int pvr2_buffer_queue(struct pvr2_buffer *); | 77 | int pvr2_buffer_queue(struct pvr2_buffer *); |
| 88 | 78 | ||
| 89 | /* Move buffer back to idle pool (kill it if needed) */ | ||
| 90 | int pvr2_buffer_idle(struct pvr2_buffer *); | ||
| 91 | |||
| 92 | #endif /* __PVRUSB2_IO_H */ | 79 | #endif /* __PVRUSB2_IO_H */ |
| 93 | 80 | ||
| 94 | /* | 81 | /* |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c index 49da062e3271..f7a2e225a002 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c +++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.c | |||
| @@ -54,7 +54,7 @@ static int pvr2_ioread_init(struct pvr2_ioread *cp) | |||
| 54 | { | 54 | { |
| 55 | unsigned int idx; | 55 | unsigned int idx; |
| 56 | 56 | ||
| 57 | cp->stream = 0; | 57 | cp->stream = NULL; |
| 58 | mutex_init(&cp->mutex); | 58 | mutex_init(&cp->mutex); |
| 59 | 59 | ||
| 60 | for (idx = 0; idx < BUFFER_COUNT; idx++) { | 60 | for (idx = 0; idx < BUFFER_COUNT; idx++) { |
| @@ -77,7 +77,7 @@ static void pvr2_ioread_done(struct pvr2_ioread *cp) | |||
| 77 | { | 77 | { |
| 78 | unsigned int idx; | 78 | unsigned int idx; |
| 79 | 79 | ||
| 80 | pvr2_ioread_setup(cp,0); | 80 | pvr2_ioread_setup(cp,NULL); |
| 81 | for (idx = 0; idx < BUFFER_COUNT; idx++) { | 81 | for (idx = 0; idx < BUFFER_COUNT; idx++) { |
| 82 | if (!(cp->buffer_storage[idx])) continue; | 82 | if (!(cp->buffer_storage[idx])) continue; |
| 83 | kfree(cp->buffer_storage[idx]); | 83 | kfree(cp->buffer_storage[idx]); |
| @@ -88,12 +88,12 @@ struct pvr2_ioread *pvr2_ioread_create(void) | |||
| 88 | { | 88 | { |
| 89 | struct pvr2_ioread *cp; | 89 | struct pvr2_ioread *cp; |
| 90 | cp = kmalloc(sizeof(*cp),GFP_KERNEL); | 90 | cp = kmalloc(sizeof(*cp),GFP_KERNEL); |
| 91 | if (!cp) return 0; | 91 | if (!cp) return NULL; |
| 92 | pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_create id=%p",cp); | 92 | pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_create id=%p",cp); |
| 93 | memset(cp,0,sizeof(*cp)); | 93 | memset(cp,0,sizeof(*cp)); |
| 94 | if (pvr2_ioread_init(cp) < 0) { | 94 | if (pvr2_ioread_init(cp) < 0) { |
| 95 | kfree(cp); | 95 | kfree(cp); |
| 96 | return 0; | 96 | return NULL; |
| 97 | } | 97 | } |
| 98 | return cp; | 98 | return cp; |
| 99 | } | 99 | } |
| @@ -105,7 +105,7 @@ void pvr2_ioread_destroy(struct pvr2_ioread *cp) | |||
| 105 | pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_destroy id=%p",cp); | 105 | pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_destroy id=%p",cp); |
| 106 | if (cp->sync_key_ptr) { | 106 | if (cp->sync_key_ptr) { |
| 107 | kfree(cp->sync_key_ptr); | 107 | kfree(cp->sync_key_ptr); |
| 108 | cp->sync_key_ptr = 0; | 108 | cp->sync_key_ptr = NULL; |
| 109 | } | 109 | } |
| 110 | kfree(cp); | 110 | kfree(cp); |
| 111 | } | 111 | } |
| @@ -124,7 +124,7 @@ void pvr2_ioread_set_sync_key(struct pvr2_ioread *cp, | |||
| 124 | if (sync_key_len != cp->sync_key_len) { | 124 | if (sync_key_len != cp->sync_key_len) { |
| 125 | if (cp->sync_key_ptr) { | 125 | if (cp->sync_key_ptr) { |
| 126 | kfree(cp->sync_key_ptr); | 126 | kfree(cp->sync_key_ptr); |
| 127 | cp->sync_key_ptr = 0; | 127 | cp->sync_key_ptr = NULL; |
| 128 | } | 128 | } |
| 129 | cp->sync_key_len = 0; | 129 | cp->sync_key_len = 0; |
| 130 | if (sync_key_len) { | 130 | if (sync_key_len) { |
| @@ -144,8 +144,8 @@ static void pvr2_ioread_stop(struct pvr2_ioread *cp) | |||
| 144 | pvr2_trace(PVR2_TRACE_START_STOP, | 144 | pvr2_trace(PVR2_TRACE_START_STOP, |
| 145 | "/*---TRACE_READ---*/ pvr2_ioread_stop id=%p",cp); | 145 | "/*---TRACE_READ---*/ pvr2_ioread_stop id=%p",cp); |
| 146 | pvr2_stream_kill(cp->stream); | 146 | pvr2_stream_kill(cp->stream); |
| 147 | cp->c_buf = 0; | 147 | cp->c_buf = NULL; |
| 148 | cp->c_data_ptr = 0; | 148 | cp->c_data_ptr = NULL; |
| 149 | cp->c_data_len = 0; | 149 | cp->c_data_len = 0; |
| 150 | cp->c_data_offs = 0; | 150 | cp->c_data_offs = 0; |
| 151 | cp->enabled = 0; | 151 | cp->enabled = 0; |
| @@ -179,8 +179,8 @@ static int pvr2_ioread_start(struct pvr2_ioread *cp) | |||
| 179 | } | 179 | } |
| 180 | } | 180 | } |
| 181 | cp->enabled = !0; | 181 | cp->enabled = !0; |
| 182 | cp->c_buf = 0; | 182 | cp->c_buf = NULL; |
| 183 | cp->c_data_ptr = 0; | 183 | cp->c_data_ptr = NULL; |
| 184 | cp->c_data_len = 0; | 184 | cp->c_data_len = 0; |
| 185 | cp->c_data_offs = 0; | 185 | cp->c_data_offs = 0; |
| 186 | cp->stream_running = 0; | 186 | cp->stream_running = 0; |
| @@ -214,7 +214,7 @@ int pvr2_ioread_setup(struct pvr2_ioread *cp,struct pvr2_stream *sp) | |||
| 214 | pvr2_ioread_stop(cp); | 214 | pvr2_ioread_stop(cp); |
| 215 | pvr2_stream_kill(cp->stream); | 215 | pvr2_stream_kill(cp->stream); |
| 216 | pvr2_stream_set_buffer_count(cp->stream,0); | 216 | pvr2_stream_set_buffer_count(cp->stream,0); |
| 217 | cp->stream = 0; | 217 | cp->stream = NULL; |
| 218 | } | 218 | } |
| 219 | if (sp) { | 219 | if (sp) { |
| 220 | pvr2_trace(PVR2_TRACE_START_STOP, | 220 | pvr2_trace(PVR2_TRACE_START_STOP, |
| @@ -251,12 +251,8 @@ int pvr2_ioread_set_enabled(struct pvr2_ioread *cp,int fl) | |||
| 251 | return ret; | 251 | return ret; |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | int pvr2_ioread_get_enabled(struct pvr2_ioread *cp) | ||
| 255 | { | ||
| 256 | return cp->enabled != 0; | ||
| 257 | } | ||
| 258 | 254 | ||
| 259 | int pvr2_ioread_get_buffer(struct pvr2_ioread *cp) | 255 | static int pvr2_ioread_get_buffer(struct pvr2_ioread *cp) |
| 260 | { | 256 | { |
| 261 | int stat; | 257 | int stat; |
| 262 | 258 | ||
| @@ -274,8 +270,8 @@ int pvr2_ioread_get_buffer(struct pvr2_ioread *cp) | |||
| 274 | pvr2_ioread_stop(cp); | 270 | pvr2_ioread_stop(cp); |
| 275 | return 0; | 271 | return 0; |
| 276 | } | 272 | } |
| 277 | cp->c_buf = 0; | 273 | cp->c_buf = NULL; |
| 278 | cp->c_data_ptr = 0; | 274 | cp->c_data_ptr = NULL; |
| 279 | cp->c_data_len = 0; | 275 | cp->c_data_len = 0; |
| 280 | cp->c_data_offs = 0; | 276 | cp->c_data_offs = 0; |
| 281 | } | 277 | } |
| @@ -307,7 +303,7 @@ int pvr2_ioread_get_buffer(struct pvr2_ioread *cp) | |||
| 307 | return !0; | 303 | return !0; |
| 308 | } | 304 | } |
| 309 | 305 | ||
| 310 | void pvr2_ioread_filter(struct pvr2_ioread *cp) | 306 | static void pvr2_ioread_filter(struct pvr2_ioread *cp) |
| 311 | { | 307 | { |
| 312 | unsigned int idx; | 308 | unsigned int idx; |
| 313 | if (!cp->enabled) return; | 309 | if (!cp->enabled) return; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.h b/drivers/media/video/pvrusb2/pvrusb2-ioread.h index 6b002597f5de..1d362f833588 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ioread.h +++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.h | |||
| @@ -33,7 +33,6 @@ void pvr2_ioread_set_sync_key(struct pvr2_ioread *, | |||
| 33 | const char *sync_key_ptr, | 33 | const char *sync_key_ptr, |
| 34 | unsigned int sync_key_len); | 34 | unsigned int sync_key_len); |
| 35 | int pvr2_ioread_set_enabled(struct pvr2_ioread *,int fl); | 35 | int pvr2_ioread_set_enabled(struct pvr2_ioread *,int fl); |
| 36 | int pvr2_ioread_get_enabled(struct pvr2_ioread *); | ||
| 37 | int pvr2_ioread_read(struct pvr2_ioread *,void __user *buf,unsigned int cnt); | 36 | int pvr2_ioread_read(struct pvr2_ioread *,void __user *buf,unsigned int cnt); |
| 38 | int pvr2_ioread_avail(struct pvr2_ioread *); | 37 | int pvr2_ioread_avail(struct pvr2_ioread *); |
| 39 | 38 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c index b95248274ed0..8f1a5afdd34e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/drivers/media/video/pvrusb2/pvrusb2-main.c | |||
| @@ -54,7 +54,7 @@ module_param_named(debug,pvrusb2_debug,int,S_IRUGO|S_IWUSR); | |||
| 54 | MODULE_PARM_DESC(debug, "Debug trace mask"); | 54 | MODULE_PARM_DESC(debug, "Debug trace mask"); |
| 55 | 55 | ||
| 56 | #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS | 56 | #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS |
| 57 | static struct pvr2_sysfs_class *class_ptr = 0; | 57 | static struct pvr2_sysfs_class *class_ptr = NULL; |
| 58 | #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */ | 58 | #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */ |
| 59 | 59 | ||
| 60 | static void pvr_setup_attach(struct pvr2_context *pvr) | 60 | static void pvr_setup_attach(struct pvr2_context *pvr) |
| @@ -104,10 +104,10 @@ static void pvr_disconnect(struct usb_interface *intf) | |||
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | static struct usb_driver pvr_driver = { | 106 | static struct usb_driver pvr_driver = { |
| 107 | name: "pvrusb2", | 107 | .name = "pvrusb2", |
| 108 | id_table: pvr2_device_table, | 108 | .id_table = pvr2_device_table, |
| 109 | probe: pvr_probe, | 109 | .probe = pvr_probe, |
| 110 | disconnect: pvr_disconnect | 110 | .disconnect = pvr_disconnect |
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | /* | 113 | /* |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c index 134063693643..f95c598ff627 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-std.c +++ b/drivers/media/video/pvrusb2/pvrusb2-std.c | |||
| @@ -121,7 +121,7 @@ static const struct std_name *find_std_name(const struct std_name *arrPtr, | |||
| 121 | if (strlen(p->name) != bufSize) continue; | 121 | if (strlen(p->name) != bufSize) continue; |
| 122 | if (!memcmp(bufPtr,p->name,bufSize)) return p; | 122 | if (!memcmp(bufPtr,p->name,bufSize)) return p; |
| 123 | } | 123 | } |
| 124 | return 0; | 124 | return NULL; |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | 127 | ||
| @@ -289,7 +289,7 @@ static struct v4l2_standard *match_std(v4l2_std_id id) | |||
| 289 | return generic_standards + idx; | 289 | return generic_standards + idx; |
| 290 | } | 290 | } |
| 291 | } | 291 | } |
| 292 | return 0; | 292 | return NULL; |
| 293 | } | 293 | } |
| 294 | 294 | ||
| 295 | static int pvr2_std_fill(struct v4l2_standard *std,v4l2_std_id id) | 295 | static int pvr2_std_fill(struct v4l2_standard *std,v4l2_std_id id) |
| @@ -364,7 +364,7 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr, | |||
| 364 | 364 | ||
| 365 | pvr2_trace(PVR2_TRACE_INIT,"Setting up %u unique standard(s)", | 365 | pvr2_trace(PVR2_TRACE_INIT,"Setting up %u unique standard(s)", |
| 366 | std_cnt); | 366 | std_cnt); |
| 367 | if (!std_cnt) return 0; // paranoia | 367 | if (!std_cnt) return NULL; // paranoia |
| 368 | 368 | ||
| 369 | stddefs = kmalloc(sizeof(struct v4l2_standard) * std_cnt, | 369 | stddefs = kmalloc(sizeof(struct v4l2_standard) * std_cnt, |
| 370 | GFP_KERNEL); | 370 | GFP_KERNEL); |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c index c6e6523d74b4..6af55a8b6f05 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | |||
| @@ -504,7 +504,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id) | |||
| 504 | cip->cptr = cptr; | 504 | cip->cptr = cptr; |
| 505 | 505 | ||
| 506 | cip->chptr = sfp; | 506 | cip->chptr = sfp; |
| 507 | cip->item_next = 0; | 507 | cip->item_next = NULL; |
| 508 | if (sfp->item_last) { | 508 | if (sfp->item_last) { |
| 509 | sfp->item_last->item_next = cip; | 509 | sfp->item_last->item_next = cip; |
| 510 | } else { | 510 | } else { |
| @@ -625,7 +625,7 @@ static void pvr2_sysfs_tear_down_debugifc(struct pvr2_sysfs *sfp) | |||
| 625 | &sfp->debugifc->attr_debuginfo); | 625 | &sfp->debugifc->attr_debuginfo); |
| 626 | class_device_remove_file(sfp->class_dev,&sfp->debugifc->attr_debugcmd); | 626 | class_device_remove_file(sfp->class_dev,&sfp->debugifc->attr_debugcmd); |
| 627 | kfree(sfp->debugifc); | 627 | kfree(sfp->debugifc); |
| 628 | sfp->debugifc = 0; | 628 | sfp->debugifc = NULL; |
| 629 | } | 629 | } |
| 630 | #endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */ | 630 | #endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */ |
| 631 | 631 | ||
| @@ -678,9 +678,9 @@ static void class_dev_destroy(struct pvr2_sysfs *sfp) | |||
| 678 | class_device_remove_file(sfp->class_dev,&sfp->attr_v4l_minor_number); | 678 | class_device_remove_file(sfp->class_dev,&sfp->attr_v4l_minor_number); |
| 679 | class_device_remove_file(sfp->class_dev,&sfp->attr_unit_number); | 679 | class_device_remove_file(sfp->class_dev,&sfp->attr_unit_number); |
| 680 | pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev); | 680 | pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev); |
| 681 | sfp->class_dev->class_data = 0; | 681 | sfp->class_dev->class_data = NULL; |
| 682 | class_device_unregister(sfp->class_dev); | 682 | class_device_unregister(sfp->class_dev); |
| 683 | sfp->class_dev = 0; | 683 | sfp->class_dev = NULL; |
| 684 | } | 684 | } |
| 685 | 685 | ||
| 686 | 686 | ||
| @@ -739,13 +739,13 @@ static void class_dev_create(struct pvr2_sysfs *sfp, | |||
| 739 | sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number"; | 739 | sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number"; |
| 740 | sfp->attr_v4l_minor_number.attr.mode = S_IRUGO; | 740 | sfp->attr_v4l_minor_number.attr.mode = S_IRUGO; |
| 741 | sfp->attr_v4l_minor_number.show = v4l_minor_number_show; | 741 | sfp->attr_v4l_minor_number.show = v4l_minor_number_show; |
| 742 | sfp->attr_v4l_minor_number.store = 0; | 742 | sfp->attr_v4l_minor_number.store = NULL; |
| 743 | class_device_create_file(sfp->class_dev,&sfp->attr_v4l_minor_number); | 743 | class_device_create_file(sfp->class_dev,&sfp->attr_v4l_minor_number); |
| 744 | sfp->attr_unit_number.attr.owner = THIS_MODULE; | 744 | sfp->attr_unit_number.attr.owner = THIS_MODULE; |
| 745 | sfp->attr_unit_number.attr.name = "unit_number"; | 745 | sfp->attr_unit_number.attr.name = "unit_number"; |
| 746 | sfp->attr_unit_number.attr.mode = S_IRUGO; | 746 | sfp->attr_unit_number.attr.mode = S_IRUGO; |
| 747 | sfp->attr_unit_number.show = unit_number_show; | 747 | sfp->attr_unit_number.show = unit_number_show; |
| 748 | sfp->attr_unit_number.store = 0; | 748 | sfp->attr_unit_number.store = NULL; |
| 749 | class_device_create_file(sfp->class_dev,&sfp->attr_unit_number); | 749 | class_device_create_file(sfp->class_dev,&sfp->attr_unit_number); |
| 750 | 750 | ||
| 751 | pvr2_sysfs_add_controls(sfp); | 751 | pvr2_sysfs_add_controls(sfp); |
| @@ -806,7 +806,7 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void) | |||
| 806 | pvr2_sysfs_trace( | 806 | pvr2_sysfs_trace( |
| 807 | "Registration failed for pvr2_sysfs_class id=%p",clp); | 807 | "Registration failed for pvr2_sysfs_class id=%p",clp); |
| 808 | kfree(clp); | 808 | kfree(clp); |
| 809 | clp = 0; | 809 | clp = NULL; |
| 810 | } | 810 | } |
| 811 | return clp; | 811 | return clp; |
| 812 | } | 812 | } |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c index f4aba8144ce0..af9f246f8d3f 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-tuner.c +++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.c | |||
| @@ -69,7 +69,7 @@ static void tuner_update(struct pvr2_tuner_handler *ctxt) | |||
| 69 | 69 | ||
| 70 | static void pvr2_tuner_detach(struct pvr2_tuner_handler *ctxt) | 70 | static void pvr2_tuner_detach(struct pvr2_tuner_handler *ctxt) |
| 71 | { | 71 | { |
| 72 | ctxt->client->handler = 0; | 72 | ctxt->client->handler = NULL; |
| 73 | kfree(ctxt); | 73 | kfree(ctxt); |
| 74 | } | 74 | } |
| 75 | 75 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 961951010c27..0caf70b8c0de 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
| @@ -81,7 +81,7 @@ static int video_nr[PVR_NUM] = {[0 ... PVR_NUM-1] = -1}; | |||
| 81 | module_param_array(video_nr, int, NULL, 0444); | 81 | module_param_array(video_nr, int, NULL, 0444); |
| 82 | MODULE_PARM_DESC(video_nr, "Offset for device's minor"); | 82 | MODULE_PARM_DESC(video_nr, "Offset for device's minor"); |
| 83 | 83 | ||
| 84 | struct v4l2_capability pvr_capability ={ | 84 | static struct v4l2_capability pvr_capability ={ |
| 85 | .driver = "pvrusb2", | 85 | .driver = "pvrusb2", |
| 86 | .card = "Hauppauge WinTV pvr-usb2", | 86 | .card = "Hauppauge WinTV pvr-usb2", |
| 87 | .bus_info = "usb", | 87 | .bus_info = "usb", |
| @@ -111,7 +111,7 @@ static struct v4l2_tuner pvr_v4l2_tuners[]= { | |||
| 111 | } | 111 | } |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | struct v4l2_fmtdesc pvr_fmtdesc [] = { | 114 | static struct v4l2_fmtdesc pvr_fmtdesc [] = { |
| 115 | { | 115 | { |
| 116 | .index = 0, | 116 | .index = 0, |
| 117 | .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, | 117 | .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, |
| @@ -127,7 +127,7 @@ struct v4l2_fmtdesc pvr_fmtdesc [] = { | |||
| 127 | #define PVR_FORMAT_PIX 0 | 127 | #define PVR_FORMAT_PIX 0 |
| 128 | #define PVR_FORMAT_VBI 1 | 128 | #define PVR_FORMAT_VBI 1 |
| 129 | 129 | ||
| 130 | struct v4l2_format pvr_format [] = { | 130 | static struct v4l2_format pvr_format [] = { |
| 131 | [PVR_FORMAT_PIX] = { | 131 | [PVR_FORMAT_PIX] = { |
| 132 | .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, | 132 | .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, |
| 133 | .fmt = { | 133 | .fmt = { |
| @@ -701,9 +701,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, | |||
| 701 | 701 | ||
| 702 | static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) | 702 | static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) |
| 703 | { | 703 | { |
| 704 | pvr2_trace(PVR2_TRACE_INIT, | 704 | printk(KERN_INFO "pvrusb2: unregistering device video%d [%s]\n", |
| 705 | "unregistering device video%d [%s]", | 705 | dip->vdev->minor,pvr2_config_get_name(dip->config)); |
| 706 | dip->vdev->minor,pvr2_config_get_name(dip->config)); | ||
| 707 | if (dip->ctxt_idx >= 0) { | 706 | if (dip->ctxt_idx >= 0) { |
| 708 | mutex_lock(&device_lock); | 707 | mutex_lock(&device_lock); |
| 709 | devices[dip->ctxt_idx] = NULL; | 708 | devices[dip->ctxt_idx] = NULL; |
| @@ -725,7 +724,7 @@ static void pvr2_v4l2_destroy_no_lock(struct pvr2_v4l2 *vp) | |||
| 725 | } | 724 | } |
| 726 | 725 | ||
| 727 | 726 | ||
| 728 | void pvr2_v4l2_internal_check(struct pvr2_channel *chp) | 727 | static void pvr2_v4l2_internal_check(struct pvr2_channel *chp) |
| 729 | { | 728 | { |
| 730 | struct pvr2_v4l2 *vp; | 729 | struct pvr2_v4l2 *vp; |
| 731 | vp = container_of(chp,struct pvr2_v4l2,channel); | 730 | vp = container_of(chp,struct pvr2_v4l2,channel); |
| @@ -735,8 +734,8 @@ void pvr2_v4l2_internal_check(struct pvr2_channel *chp) | |||
| 735 | } | 734 | } |
| 736 | 735 | ||
| 737 | 736 | ||
| 738 | int pvr2_v4l2_ioctl(struct inode *inode, struct file *file, | 737 | static int pvr2_v4l2_ioctl(struct inode *inode, struct file *file, |
| 739 | unsigned int cmd, unsigned long arg) | 738 | unsigned int cmd, unsigned long arg) |
| 740 | { | 739 | { |
| 741 | 740 | ||
| 742 | /* Temporary hack : use ivtv api until a v4l2 one is available. */ | 741 | /* Temporary hack : use ivtv api until a v4l2 one is available. */ |
| @@ -747,7 +746,7 @@ int pvr2_v4l2_ioctl(struct inode *inode, struct file *file, | |||
| 747 | } | 746 | } |
| 748 | 747 | ||
| 749 | 748 | ||
| 750 | int pvr2_v4l2_release(struct inode *inode, struct file *file) | 749 | static int pvr2_v4l2_release(struct inode *inode, struct file *file) |
| 751 | { | 750 | { |
| 752 | struct pvr2_v4l2_fh *fhp = file->private_data; | 751 | struct pvr2_v4l2_fh *fhp = file->private_data; |
| 753 | struct pvr2_v4l2 *vp = fhp->vhead; | 752 | struct pvr2_v4l2 *vp = fhp->vhead; |
| @@ -761,9 +760,9 @@ int pvr2_v4l2_release(struct inode *inode, struct file *file) | |||
| 761 | hdw = fhp->channel.mc_head->hdw; | 760 | hdw = fhp->channel.mc_head->hdw; |
| 762 | pvr2_hdw_set_streaming(hdw,0); | 761 | pvr2_hdw_set_streaming(hdw,0); |
| 763 | sp = pvr2_ioread_get_stream(fhp->rhp); | 762 | sp = pvr2_ioread_get_stream(fhp->rhp); |
| 764 | if (sp) pvr2_stream_set_callback(sp,0,0); | 763 | if (sp) pvr2_stream_set_callback(sp,NULL,NULL); |
| 765 | pvr2_ioread_destroy(fhp->rhp); | 764 | pvr2_ioread_destroy(fhp->rhp); |
| 766 | fhp->rhp = 0; | 765 | fhp->rhp = NULL; |
| 767 | } | 766 | } |
| 768 | v4l2_prio_close(&vp->prio, &fhp->prio); | 767 | v4l2_prio_close(&vp->prio, &fhp->prio); |
| 769 | file->private_data = NULL; | 768 | file->private_data = NULL; |
| @@ -779,9 +778,9 @@ int pvr2_v4l2_release(struct inode *inode, struct file *file) | |||
| 779 | } else { | 778 | } else { |
| 780 | vp->vfirst = fhp->vnext; | 779 | vp->vfirst = fhp->vnext; |
| 781 | } | 780 | } |
| 782 | fhp->vnext = 0; | 781 | fhp->vnext = NULL; |
| 783 | fhp->vprev = 0; | 782 | fhp->vprev = NULL; |
| 784 | fhp->vhead = 0; | 783 | fhp->vhead = NULL; |
| 785 | pvr2_channel_done(&fhp->channel); | 784 | pvr2_channel_done(&fhp->channel); |
| 786 | pvr2_trace(PVR2_TRACE_STRUCT, | 785 | pvr2_trace(PVR2_TRACE_STRUCT, |
| 787 | "Destroying pvr_v4l2_fh id=%p",fhp); | 786 | "Destroying pvr_v4l2_fh id=%p",fhp); |
| @@ -794,9 +793,9 @@ int pvr2_v4l2_release(struct inode *inode, struct file *file) | |||
| 794 | } | 793 | } |
| 795 | 794 | ||
| 796 | 795 | ||
| 797 | int pvr2_v4l2_open(struct inode *inode, struct file *file) | 796 | static int pvr2_v4l2_open(struct inode *inode, struct file *file) |
| 798 | { | 797 | { |
| 799 | struct pvr2_v4l2_dev *dip = 0; /* Our own context pointer */ | 798 | struct pvr2_v4l2_dev *dip = NULL; /* Our own context pointer */ |
| 800 | struct pvr2_v4l2_fh *fhp; | 799 | struct pvr2_v4l2_fh *fhp; |
| 801 | struct pvr2_v4l2 *vp; | 800 | struct pvr2_v4l2 *vp; |
| 802 | struct pvr2_hdw *hdw; | 801 | struct pvr2_hdw *hdw; |
| @@ -854,7 +853,7 @@ int pvr2_v4l2_open(struct inode *inode, struct file *file) | |||
| 854 | pvr2_context_enter(vp->channel.mc_head); do { | 853 | pvr2_context_enter(vp->channel.mc_head); do { |
| 855 | pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_v4l2_fh id=%p",fhp); | 854 | pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_v4l2_fh id=%p",fhp); |
| 856 | pvr2_channel_init(&fhp->channel,vp->channel.mc_head); | 855 | pvr2_channel_init(&fhp->channel,vp->channel.mc_head); |
| 857 | fhp->vnext = 0; | 856 | fhp->vnext = NULL; |
| 858 | fhp->vprev = vp->vlast; | 857 | fhp->vprev = vp->vlast; |
| 859 | if (vp->vlast) { | 858 | if (vp->vlast) { |
| 860 | vp->vlast->vnext = fhp; | 859 | vp->vlast->vnext = fhp; |
| @@ -897,7 +896,7 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh) | |||
| 897 | 896 | ||
| 898 | fh->rhp = pvr2_channel_create_mpeg_stream(fh->dev_info->stream); | 897 | fh->rhp = pvr2_channel_create_mpeg_stream(fh->dev_info->stream); |
| 899 | if (!fh->rhp) { | 898 | if (!fh->rhp) { |
| 900 | pvr2_channel_claim_stream(&fh->channel,0); | 899 | pvr2_channel_claim_stream(&fh->channel,NULL); |
| 901 | return -ENOMEM; | 900 | return -ENOMEM; |
| 902 | } | 901 | } |
| 903 | 902 | ||
| @@ -1078,9 +1077,8 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, | |||
| 1078 | (video_register_device(dip->vdev, v4l_type, -1) < 0)) { | 1077 | (video_register_device(dip->vdev, v4l_type, -1) < 0)) { |
| 1079 | err("Failed to register pvrusb2 v4l video device"); | 1078 | err("Failed to register pvrusb2 v4l video device"); |
| 1080 | } else { | 1079 | } else { |
| 1081 | pvr2_trace(PVR2_TRACE_INIT, | 1080 | printk(KERN_INFO "pvrusb2: registered device video%d [%s]\n", |
| 1082 | "registered device video%d [%s]", | 1081 | dip->vdev->minor,pvr2_config_get_name(dip->config)); |
| 1083 | dip->vdev->minor,pvr2_config_get_name(dip->config)); | ||
| 1084 | } | 1082 | } |
| 1085 | 1083 | ||
| 1086 | if ((dip->vdev->minor < sizeof(devices)/sizeof(devices[0])) && | 1084 | if ((dip->vdev->minor < sizeof(devices)/sizeof(devices[0])) && |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index e4ec7f25194c..05f2cddeb47b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | |||
| @@ -126,8 +126,8 @@ static const struct pvr2_v4l_decoder_ops decoder_ops[] = { | |||
| 126 | 126 | ||
| 127 | static void decoder_detach(struct pvr2_v4l_decoder *ctxt) | 127 | static void decoder_detach(struct pvr2_v4l_decoder *ctxt) |
| 128 | { | 128 | { |
| 129 | ctxt->client->handler = 0; | 129 | ctxt->client->handler = NULL; |
| 130 | ctxt->hdw->decoder_ctrl = 0; | 130 | ctxt->hdw->decoder_ctrl = NULL; |
| 131 | kfree(ctxt); | 131 | kfree(ctxt); |
| 132 | } | 132 | } |
| 133 | 133 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c index fcad346e3955..2413e5198e16 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c | |||
| @@ -89,7 +89,7 @@ static unsigned int wm8775_describe(struct pvr2_v4l_wm8775 *ctxt, | |||
| 89 | 89 | ||
| 90 | static void wm8775_detach(struct pvr2_v4l_wm8775 *ctxt) | 90 | static void wm8775_detach(struct pvr2_v4l_wm8775 *ctxt) |
| 91 | { | 91 | { |
| 92 | ctxt->client->handler = 0; | 92 | ctxt->client->handler = NULL; |
| 93 | kfree(ctxt); | 93 | kfree(ctxt); |
| 94 | } | 94 | } |
| 95 | 95 | ||
diff --git a/drivers/media/video/pwc/pwc-uncompress.h b/drivers/media/video/pwc/pwc-uncompress.h index 041227f65246..43028e74e9e0 100644 --- a/drivers/media/video/pwc/pwc-uncompress.h +++ b/drivers/media/video/pwc/pwc-uncompress.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #ifndef PWC_UNCOMPRESS_H | 30 | #ifndef PWC_UNCOMPRESS_H |
| 31 | #define PWC_UNCOMPRESS_H | 31 | #define PWC_UNCOMPRESS_H |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | 33 | ||
| 35 | #include <media/pwc-ioctl.h> | 34 | #include <media/pwc-ioctl.h> |
| 36 | 35 | ||
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index 629f79e44fb6..7e9c4237d1e8 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #ifndef PWC_H | 25 | #ifndef PWC_H |
| 26 | #define PWC_H | 26 | #define PWC_H |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 31 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index da3007d2f411..535172f643b9 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 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 | #include <linux/config.h> | ||
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| @@ -942,8 +941,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
| 942 | /* load i2c helpers */ | 941 | /* load i2c helpers */ |
| 943 | if (TUNER_ABSENT != dev->tuner_type) | 942 | if (TUNER_ABSENT != dev->tuner_type) |
| 944 | request_module("tuner"); | 943 | request_module("tuner"); |
| 945 | if (dev->tda9887_conf) | ||
| 946 | request_module("tda9887"); | ||
| 947 | if (card_is_empress(dev)) { | 944 | if (card_is_empress(dev)) { |
| 948 | request_module("saa6752hs"); | 945 | request_module("saa6752hs"); |
| 949 | request_module_depend("saa7134-empress",&need_empress); | 946 | request_module_depend("saa7134-empress",&need_empress); |
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index a846ebc78cd7..67987baee77a 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | static const char version[] = "0.24"; | 28 | static const char version[] = "0.24"; |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 33 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index 351b182d921f..2ba2991a214f 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | * Fixed proc entry removal bug. | 58 | * Fixed proc entry removal bug. |
| 59 | */ | 59 | */ |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 63 | #include <linux/init.h> | 62 | #include <linux/init.h> |
| 64 | #include <linux/vmalloc.h> | 63 | #include <linux/vmalloc.h> |
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 2fadabf99688..8dab481d384a 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
| @@ -590,8 +590,8 @@ int tda9887_tuner_init(struct i2c_client *c) | |||
| 590 | t->set_tv_freq = tda9887_set_freq; | 590 | t->set_tv_freq = tda9887_set_freq; |
| 591 | t->set_radio_freq = tda9887_set_freq; | 591 | t->set_radio_freq = tda9887_set_freq; |
| 592 | t->standby = tda9887_standby; | 592 | t->standby = tda9887_standby; |
| 593 | t->tuner_status=tda9887_tuner_status; | 593 | t->tuner_status = tda9887_tuner_status; |
| 594 | t->get_afc=tda9887_get_afc; | 594 | t->get_afc = tda9887_get_afc; |
| 595 | 595 | ||
| 596 | return 0; | 596 | return 0; |
| 597 | } | 597 | } |
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 011413cf34a8..f7eb402d5f2b 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
| @@ -416,7 +416,7 @@ static void tuner_status(struct i2c_client *client) | |||
| 416 | 416 | ||
| 417 | /* ---------------------------------------------------------------------- */ | 417 | /* ---------------------------------------------------------------------- */ |
| 418 | 418 | ||
| 419 | /* static var Used only in tuner_attach and tuner_probe */ | 419 | /* static vars: used only in tuner_attach and tuner_probe */ |
| 420 | static unsigned default_mode_mask; | 420 | static unsigned default_mode_mask; |
| 421 | 421 | ||
| 422 | /* During client attach, set_type is called by adapter's attach_inform callback. | 422 | /* During client attach, set_type is called by adapter's attach_inform callback. |
| @@ -608,13 +608,13 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
| 608 | tuner_dbg("VIDIOCSAUDIO not implemented.\n"); | 608 | tuner_dbg("VIDIOCSAUDIO not implemented.\n"); |
| 609 | break; | 609 | break; |
| 610 | case TDA9887_SET_CONFIG: | 610 | case TDA9887_SET_CONFIG: |
| 611 | { | 611 | if (t->type == TUNER_TDA9887) { |
| 612 | int *i = arg; | 612 | int *i = arg; |
| 613 | 613 | ||
| 614 | t->tda9887_config = *i; | 614 | t->tda9887_config = *i; |
| 615 | set_freq(client, t->tv_freq); | 615 | set_freq(client, t->tv_freq); |
| 616 | } | ||
| 616 | break; | 617 | break; |
| 617 | } | ||
| 618 | /* --- v4l ioctls --- */ | 618 | /* --- v4l ioctls --- */ |
| 619 | /* take care: bttv does userspace copying, we'll get a | 619 | /* take care: bttv does userspace copying, we'll get a |
| 620 | kernel pointer here... */ | 620 | kernel pointer here... */ |
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c index 6da6f82b8c88..d071c5cbf013 100644 --- a/drivers/media/video/tuner-simple.c +++ b/drivers/media/video/tuner-simple.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/i2c.h> | 7 | #include <linux/i2c.h> |
| 8 | #include <linux/videodev.h> | 8 | #include <linux/videodev.h> |
| 9 | #include <media/tuner.h> | 9 | #include <media/tuner.h> |
| 10 | #include <media/v4l2-common.h> | ||
| 10 | 11 | ||
| 11 | static int offset = 0; | 12 | static int offset = 0; |
| 12 | module_param(offset, int, 0666); | 13 | module_param(offset, int, 0666); |
| @@ -128,6 +129,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) | |||
| 128 | u8 buffer[4]; | 129 | u8 buffer[4]; |
| 129 | int rc, IFPCoff, i, j; | 130 | int rc, IFPCoff, i, j; |
| 130 | enum param_type desired_type; | 131 | enum param_type desired_type; |
| 132 | struct tuner_params *params; | ||
| 131 | 133 | ||
| 132 | tun = &tuners[t->type]; | 134 | tun = &tuners[t->type]; |
| 133 | 135 | ||
| @@ -169,19 +171,20 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) | |||
| 169 | IFPCoff,t->type); | 171 | IFPCoff,t->type); |
| 170 | j = 0; | 172 | j = 0; |
| 171 | } | 173 | } |
| 174 | params = &tun->params[j]; | ||
| 172 | 175 | ||
| 173 | for (i = 0; i < tun->params[j].count; i++) { | 176 | for (i = 0; i < params->count; i++) { |
| 174 | if (freq > tun->params[j].ranges[i].limit) | 177 | if (freq > params->ranges[i].limit) |
| 175 | continue; | 178 | continue; |
| 176 | break; | 179 | break; |
| 177 | } | 180 | } |
| 178 | if (i == tun->params[j].count) { | 181 | if (i == params->count) { |
| 179 | tuner_dbg("TV frequency out of range (%d > %d)", | 182 | tuner_dbg("TV frequency out of range (%d > %d)", |
| 180 | freq, tun->params[j].ranges[i - 1].limit); | 183 | freq, params->ranges[i - 1].limit); |
| 181 | freq = tun->params[j].ranges[--i].limit; | 184 | freq = params->ranges[--i].limit; |
| 182 | } | 185 | } |
| 183 | config = tun->params[j].ranges[i].config; | 186 | config = params->ranges[i].config; |
| 184 | cb = tun->params[j].ranges[i].cb; | 187 | cb = params->ranges[i].cb; |
| 185 | /* i == 0 -> VHF_LO | 188 | /* i == 0 -> VHF_LO |
| 186 | * i == 1 -> VHF_HI | 189 | * i == 1 -> VHF_HI |
| 187 | * i == 2 -> UHF */ | 190 | * i == 2 -> UHF */ |
| @@ -281,7 +284,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) | |||
| 281 | break; | 284 | break; |
| 282 | } | 285 | } |
| 283 | 286 | ||
| 284 | if (tuners[t->type].params->cb_first_if_lower_freq && div < t->last_div) { | 287 | if (params->cb_first_if_lower_freq && div < t->last_div) { |
| 285 | buffer[0] = config; | 288 | buffer[0] = config; |
| 286 | buffer[1] = cb; | 289 | buffer[1] = cb; |
| 287 | buffer[2] = (div>>8) & 0x7f; | 290 | buffer[2] = (div>>8) & 0x7f; |
| @@ -293,6 +296,43 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) | |||
| 293 | buffer[3] = cb; | 296 | buffer[3] = cb; |
| 294 | } | 297 | } |
| 295 | t->last_div = div; | 298 | t->last_div = div; |
| 299 | if (params->has_tda9887) { | ||
| 300 | int config = 0; | ||
| 301 | int is_secam_l = (t->std & (V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC)) && | ||
| 302 | !(t->std & ~(V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC)); | ||
| 303 | |||
| 304 | if (t->std == V4L2_STD_SECAM_LC) { | ||
| 305 | if (params->port1_active ^ params->port1_invert_for_secam_lc) | ||
| 306 | config |= TDA9887_PORT1_ACTIVE; | ||
| 307 | if (params->port2_active ^ params->port2_invert_for_secam_lc) | ||
| 308 | config |= TDA9887_PORT2_ACTIVE; | ||
| 309 | } | ||
| 310 | else { | ||
| 311 | if (params->port1_active) | ||
| 312 | config |= TDA9887_PORT1_ACTIVE; | ||
| 313 | if (params->port2_active) | ||
| 314 | config |= TDA9887_PORT2_ACTIVE; | ||
| 315 | } | ||
| 316 | if (params->intercarrier_mode) | ||
| 317 | config |= TDA9887_INTERCARRIER; | ||
| 318 | if (is_secam_l) { | ||
| 319 | if (i == 0 && params->default_top_secam_low) | ||
| 320 | config |= TDA9887_TOP(params->default_top_secam_low); | ||
| 321 | else if (i == 1 && params->default_top_secam_mid) | ||
| 322 | config |= TDA9887_TOP(params->default_top_secam_mid); | ||
| 323 | else if (params->default_top_secam_high) | ||
| 324 | config |= TDA9887_TOP(params->default_top_secam_high); | ||
| 325 | } | ||
| 326 | else { | ||
| 327 | if (i == 0 && params->default_top_low) | ||
| 328 | config |= TDA9887_TOP(params->default_top_low); | ||
| 329 | else if (i == 1 && params->default_top_mid) | ||
| 330 | config |= TDA9887_TOP(params->default_top_mid); | ||
| 331 | else if (params->default_top_high) | ||
| 332 | config |= TDA9887_TOP(params->default_top_high); | ||
| 333 | } | ||
| 334 | i2c_clients_command(c->adapter, TDA9887_SET_CONFIG, &config); | ||
| 335 | } | ||
| 296 | tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n", | 336 | tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n", |
| 297 | buffer[0],buffer[1],buffer[2],buffer[3]); | 337 | buffer[0],buffer[1],buffer[2],buffer[3]); |
| 298 | 338 | ||
| @@ -339,6 +379,7 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq) | |||
| 339 | u16 div; | 379 | u16 div; |
| 340 | int rc, j; | 380 | int rc, j; |
| 341 | enum param_type desired_type = TUNER_PARAM_TYPE_RADIO; | 381 | enum param_type desired_type = TUNER_PARAM_TYPE_RADIO; |
| 382 | struct tuner_params *params; | ||
| 342 | 383 | ||
| 343 | tun = &tuners[t->type]; | 384 | tun = &tuners[t->type]; |
| 344 | 385 | ||
| @@ -352,7 +393,8 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq) | |||
| 352 | j = 0; | 393 | j = 0; |
| 353 | 394 | ||
| 354 | div = (20 * freq / 16000) + (int)(20*10.7); /* IF 10.7 MHz */ | 395 | div = (20 * freq / 16000) + (int)(20*10.7); /* IF 10.7 MHz */ |
| 355 | buffer[2] = (tun->params[j].ranges[0].config & ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */ | 396 | params = &tun->params[j]; |
| 397 | buffer[2] = (params->ranges[0].config & ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */ | ||
| 356 | 398 | ||
| 357 | switch (t->type) { | 399 | switch (t->type) { |
| 358 | case TUNER_TENA_9533_DI: | 400 | case TUNER_TENA_9533_DI: |
| @@ -384,7 +426,7 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq) | |||
| 384 | } | 426 | } |
| 385 | buffer[0] = (div>>8) & 0x7f; | 427 | buffer[0] = (div>>8) & 0x7f; |
| 386 | buffer[1] = div & 0xff; | 428 | buffer[1] = div & 0xff; |
| 387 | if (tuners[t->type].params->cb_first_if_lower_freq && div < t->last_div) { | 429 | if (params->cb_first_if_lower_freq && div < t->last_div) { |
| 388 | buffer[0] = buffer[2]; | 430 | buffer[0] = buffer[2]; |
| 389 | buffer[1] = buffer[3]; | 431 | buffer[1] = buffer[3]; |
| 390 | buffer[2] = (div>>8) & 0x7f; | 432 | buffer[2] = (div>>8) & 0x7f; |
| @@ -398,6 +440,18 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq) | |||
| 398 | buffer[0],buffer[1],buffer[2],buffer[3]); | 440 | buffer[0],buffer[1],buffer[2],buffer[3]); |
| 399 | t->last_div = div; | 441 | t->last_div = div; |
| 400 | 442 | ||
| 443 | if (params->has_tda9887) { | ||
| 444 | int config = 0; | ||
| 445 | if (params->port1_active && !params->port1_fm_high_sensitivity) | ||
| 446 | config |= TDA9887_PORT1_ACTIVE; | ||
| 447 | if (params->port2_active && !params->port2_fm_high_sensitivity) | ||
| 448 | config |= TDA9887_PORT2_ACTIVE; | ||
| 449 | if (params->intercarrier_mode) | ||
| 450 | config |= TDA9887_INTERCARRIER; | ||
| 451 | /* if (params->port1_set_for_fm_mono) | ||
| 452 | config &= ~TDA9887_PORT1_ACTIVE;*/ | ||
| 453 | i2c_clients_command(c->adapter, TDA9887_SET_CONFIG, &config); | ||
| 454 | } | ||
| 401 | if (4 != (rc = i2c_master_send(c,buffer,4))) | 455 | if (4 != (rc = i2c_master_send(c,buffer,4))) |
| 402 | tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc); | 456 | tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc); |
| 403 | } | 457 | } |
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c index 9d9226cb6393..a167e17c6dcd 100644 --- a/drivers/media/video/tuner-types.c +++ b/drivers/media/video/tuner-types.c | |||
| @@ -380,6 +380,10 @@ static struct tuner_params tuner_philips_fq1216me_params[] = { | |||
| 380 | .type = TUNER_PARAM_TYPE_PAL, | 380 | .type = TUNER_PARAM_TYPE_PAL, |
| 381 | .ranges = tuner_lg_pal_ranges, | 381 | .ranges = tuner_lg_pal_ranges, |
| 382 | .count = ARRAY_SIZE(tuner_lg_pal_ranges), | 382 | .count = ARRAY_SIZE(tuner_lg_pal_ranges), |
| 383 | .has_tda9887 = 1, | ||
| 384 | .port1_active = 1, | ||
| 385 | .port2_active = 1, | ||
| 386 | .port2_invert_for_secam_lc = 1, | ||
| 383 | }, | 387 | }, |
| 384 | }; | 388 | }; |
| 385 | 389 | ||
| @@ -542,6 +546,14 @@ static struct tuner_params tuner_fm1216me_mk3_params[] = { | |||
| 542 | .ranges = tuner_fm1216me_mk3_pal_ranges, | 546 | .ranges = tuner_fm1216me_mk3_pal_ranges, |
| 543 | .count = ARRAY_SIZE(tuner_fm1216me_mk3_pal_ranges), | 547 | .count = ARRAY_SIZE(tuner_fm1216me_mk3_pal_ranges), |
| 544 | .cb_first_if_lower_freq = 1, | 548 | .cb_first_if_lower_freq = 1, |
| 549 | .has_tda9887 = 1, | ||
| 550 | .port1_active = 1, | ||
| 551 | .port2_active = 1, | ||
| 552 | .port2_invert_for_secam_lc = 1, | ||
| 553 | .port1_fm_high_sensitivity = 1, | ||
| 554 | .default_top_mid = -2, | ||
| 555 | .default_top_secam_mid = -2, | ||
| 556 | .default_top_secam_high = -2, | ||
| 545 | }, | 557 | }, |
| 546 | }; | 558 | }; |
| 547 | 559 | ||
| @@ -612,6 +624,10 @@ static struct tuner_params tuner_fm1236_mk3_params[] = { | |||
| 612 | .ranges = tuner_fm1236_mk3_ntsc_ranges, | 624 | .ranges = tuner_fm1236_mk3_ntsc_ranges, |
| 613 | .count = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges), | 625 | .count = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges), |
| 614 | .cb_first_if_lower_freq = 1, | 626 | .cb_first_if_lower_freq = 1, |
| 627 | .has_tda9887 = 1, | ||
| 628 | .port1_active = 1, | ||
| 629 | .port2_active = 1, | ||
| 630 | .port1_fm_high_sensitivity = 1, | ||
| 615 | }, | 631 | }, |
| 616 | }; | 632 | }; |
| 617 | 633 | ||
| @@ -632,6 +648,8 @@ static struct tuner_params tuner_microtune_4049_fm5_params[] = { | |||
| 632 | .type = TUNER_PARAM_TYPE_PAL, | 648 | .type = TUNER_PARAM_TYPE_PAL, |
| 633 | .ranges = tuner_temic_4009f_5_pal_ranges, | 649 | .ranges = tuner_temic_4009f_5_pal_ranges, |
| 634 | .count = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges), | 650 | .count = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges), |
| 651 | .has_tda9887 = 1, | ||
| 652 | .port1_invert_for_secam_lc = 1, | ||
| 635 | }, | 653 | }, |
| 636 | }; | 654 | }; |
| 637 | 655 | ||
| @@ -648,6 +666,8 @@ static struct tuner_params tuner_panasonic_vp27_params[] = { | |||
| 648 | .type = TUNER_PARAM_TYPE_NTSC, | 666 | .type = TUNER_PARAM_TYPE_NTSC, |
| 649 | .ranges = tuner_panasonic_vp27_ntsc_ranges, | 667 | .ranges = tuner_panasonic_vp27_ntsc_ranges, |
| 650 | .count = ARRAY_SIZE(tuner_panasonic_vp27_ntsc_ranges), | 668 | .count = ARRAY_SIZE(tuner_panasonic_vp27_ntsc_ranges), |
| 669 | .has_tda9887 = 1, | ||
| 670 | .intercarrier_mode = 1, | ||
| 651 | }, | 671 | }, |
| 652 | }; | 672 | }; |
| 653 | 673 | ||
| @@ -782,6 +802,13 @@ static struct tuner_params tuner_philips_fq1216ame_mk4_params[] = { | |||
| 782 | .type = TUNER_PARAM_TYPE_PAL, | 802 | .type = TUNER_PARAM_TYPE_PAL, |
| 783 | .ranges = tuner_philips_fq12_6a___mk4_pal_ranges, | 803 | .ranges = tuner_philips_fq12_6a___mk4_pal_ranges, |
| 784 | .count = ARRAY_SIZE(tuner_philips_fq12_6a___mk4_pal_ranges), | 804 | .count = ARRAY_SIZE(tuner_philips_fq12_6a___mk4_pal_ranges), |
| 805 | .has_tda9887 = 1, | ||
| 806 | .port1_active = 1, | ||
| 807 | .port2_invert_for_secam_lc = 1, | ||
| 808 | .default_top_mid = -2, | ||
| 809 | .default_top_secam_low = -2, | ||
| 810 | .default_top_secam_mid = -2, | ||
| 811 | .default_top_secam_high = -2, | ||
| 785 | }, | 812 | }, |
| 786 | }; | 813 | }; |
| 787 | 814 | ||
| @@ -870,6 +897,12 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = { | |||
| 870 | .type = TUNER_PARAM_TYPE_PAL, | 897 | .type = TUNER_PARAM_TYPE_PAL, |
| 871 | .ranges = tuner_philips_fmd1216me_mk3_pal_ranges, | 898 | .ranges = tuner_philips_fmd1216me_mk3_pal_ranges, |
| 872 | .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_pal_ranges), | 899 | .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_pal_ranges), |
| 900 | .has_tda9887 = 1, | ||
| 901 | .port1_active = 1, | ||
| 902 | .port2_active = 1, | ||
| 903 | .port2_fm_high_sensitivity = 1, | ||
| 904 | .port2_invert_for_secam_lc = 1, | ||
| 905 | .port1_set_for_fm_mono = 1, | ||
| 873 | }, | 906 | }, |
| 874 | }; | 907 | }; |
| 875 | 908 | ||
| @@ -1005,6 +1038,7 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = { | |||
| 1005 | .type = TUNER_PARAM_TYPE_NTSC, | 1038 | .type = TUNER_PARAM_TYPE_NTSC, |
| 1006 | .ranges = tuner_samsung_tcpn_2121p30a_ntsc_ranges, | 1039 | .ranges = tuner_samsung_tcpn_2121p30a_ntsc_ranges, |
| 1007 | .count = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_ntsc_ranges), | 1040 | .count = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_ntsc_ranges), |
| 1041 | .has_tda9887 = 1, | ||
| 1008 | }, | 1042 | }, |
| 1009 | }; | 1043 | }; |
| 1010 | 1044 | ||
| @@ -1037,6 +1071,10 @@ static struct tuner_params tuner_samsung_tcpg_6121p30a_params[] = { | |||
| 1037 | .type = TUNER_PARAM_TYPE_PAL, | 1071 | .type = TUNER_PARAM_TYPE_PAL, |
| 1038 | .ranges = tuner_samsung_tcpg_6121p30a_pal_ranges, | 1072 | .ranges = tuner_samsung_tcpg_6121p30a_pal_ranges, |
| 1039 | .count = ARRAY_SIZE(tuner_samsung_tcpg_6121p30a_pal_ranges), | 1073 | .count = ARRAY_SIZE(tuner_samsung_tcpg_6121p30a_pal_ranges), |
| 1074 | .has_tda9887 = 1, | ||
| 1075 | .port1_active = 1, | ||
| 1076 | .port2_active = 1, | ||
| 1077 | .port2_invert_for_secam_lc = 1, | ||
| 1040 | }, | 1078 | }, |
| 1041 | }; | 1079 | }; |
| 1042 | 1080 | ||
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index c2b756107548..936e3f746fba 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 30f8d80ddcaa..d95529e8e513 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
| @@ -73,14 +73,14 @@ static struct HAUPPAUGE_TUNER_FMT | |||
| 73 | } | 73 | } |
| 74 | hauppauge_tuner_fmt[] = | 74 | hauppauge_tuner_fmt[] = |
| 75 | { | 75 | { |
| 76 | { V4L2_STD_UNKNOWN," UNKNOWN" }, | 76 | { V4L2_STD_UNKNOWN, " UNKNOWN" }, |
| 77 | { V4L2_STD_UNKNOWN," FM" }, | 77 | { V4L2_STD_UNKNOWN, " FM" }, |
| 78 | { V4L2_STD_PAL_BG, " PAL(B/G)" }, | 78 | { V4L2_STD_B|V4L2_STD_GH, " PAL(B/G)" }, |
| 79 | { V4L2_STD_NTSC_M, " NTSC(M)" }, | 79 | { V4L2_STD_MN, " NTSC(M)" }, |
| 80 | { V4L2_STD_PAL_I, " PAL(I)" }, | 80 | { V4L2_STD_PAL_I, " PAL(I)" }, |
| 81 | { V4L2_STD_SECAM_L," SECAM(L/L')" }, | 81 | { V4L2_STD_SECAM_L|V4L2_STD_SECAM_LC, " SECAM(L/L')" }, |
| 82 | { V4L2_STD_PAL_DK, " PAL(D/D1/K)" }, | 82 | { V4L2_STD_DK, " PAL(D/D1/K)" }, |
| 83 | { V4L2_STD_ATSC, " ATSC/DVB Digital" }, | 83 | { V4L2_STD_ATSC, " ATSC/DVB Digital" }, |
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | /* This is the full list of possible tuners. Many thanks to Hauppauge for | 86 | /* This is the full list of possible tuners. Many thanks to Hauppauge for |
| @@ -219,7 +219,7 @@ hauppauge_tuner[] = | |||
| 219 | { TUNER_ABSENT, "Thompson DTT75105"}, | 219 | { TUNER_ABSENT, "Thompson DTT75105"}, |
| 220 | { TUNER_ABSENT, "Conexant_CX24109"}, | 220 | { TUNER_ABSENT, "Conexant_CX24109"}, |
| 221 | { TUNER_TCL_2002N, "TCL M2523_5N_E"}, | 221 | { TUNER_TCL_2002N, "TCL M2523_5N_E"}, |
| 222 | { TUNER_ABSENT, "TCL M2523_3DB_E"}, | 222 | { TUNER_TCL_2002MB, "TCL M2523_3DB_E"}, |
| 223 | { TUNER_ABSENT, "Philips 8275A"}, | 223 | { TUNER_ABSENT, "Philips 8275A"}, |
| 224 | { TUNER_ABSENT, "Microtune MT2060"}, | 224 | { TUNER_ABSENT, "Microtune MT2060"}, |
| 225 | { TUNER_ABSENT, "Philips FM1236 MK5"}, | 225 | { TUNER_ABSENT, "Philips FM1236 MK5"}, |
diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h index 49dbee5f5628..051775d4c726 100644 --- a/drivers/media/video/usbvideo/usbvideo.h +++ b/drivers/media/video/usbvideo/usbvideo.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef usbvideo_h | 16 | #ifndef usbvideo_h |
| 17 | #define usbvideo_h | 17 | #define usbvideo_h |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/videodev.h> | 19 | #include <linux/videodev.h> |
| 21 | #include <media/v4l2-common.h> | 20 | #include <media/v4l2-common.h> |
| 22 | #include <linux/usb.h> | 21 | #include <linux/usb.h> |
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c index 19d3c20dc7ef..d83a2c84d233 100644 --- a/drivers/media/video/v4l1-compat.c +++ b/drivers/media/video/v4l1-compat.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | 19 | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 97f946db8597..f06dc19e504a 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * Added Gerd Knorrs v4l1 enhancements (Justin Schoeman) | 44 | * Added Gerd Knorrs v4l1 enhancements (Justin Schoeman) |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 49 | #include <linux/types.h> | 48 | #include <linux/types.h> |
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c index 8f271de57fd6..2ae3fb250630 100644 --- a/drivers/media/video/videocodec.c +++ b/drivers/media/video/videocodec.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 37 | 37 | ||
| 38 | // kernel config is here (procfs flag) | 38 | // kernel config is here (procfs flag) |
| 39 | #include <linux/config.h> | ||
| 40 | 39 | ||
| 41 | #ifdef CONFIG_PROC_FS | 40 | #ifdef CONFIG_PROC_FS |
| 42 | #include <linux/proc_fs.h> | 41 | #include <linux/proc_fs.h> |
diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/videocodec.h index 8c233720b6a5..97a3bbeda505 100644 --- a/drivers/media/video/videocodec.h +++ b/drivers/media/video/videocodec.h | |||
| @@ -222,14 +222,14 @@ M zr36055[1] 0001 0000c001 00000000 (zr36050[1]) | |||
| 222 | /* ========================= */ | 222 | /* ========================= */ |
| 223 | 223 | ||
| 224 | struct vfe_polarity { | 224 | struct vfe_polarity { |
| 225 | int vsync_pol:1; | 225 | unsigned int vsync_pol:1; |
| 226 | int hsync_pol:1; | 226 | unsigned int hsync_pol:1; |
| 227 | int field_pol:1; | 227 | unsigned int field_pol:1; |
| 228 | int blank_pol:1; | 228 | unsigned int blank_pol:1; |
| 229 | int subimg_pol:1; | 229 | unsigned int subimg_pol:1; |
| 230 | int poe_pol:1; | 230 | unsigned int poe_pol:1; |
| 231 | int pvalid_pol:1; | 231 | unsigned int pvalid_pol:1; |
| 232 | int vclk_pol:1; | 232 | unsigned int vclk_pol:1; |
| 233 | }; | 233 | }; |
| 234 | 234 | ||
| 235 | struct vfe_settings { | 235 | struct vfe_settings { |
diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h index 2836b45ec206..ec7696e8f1fa 100644 --- a/drivers/media/video/w9968cf.h +++ b/drivers/media/video/w9968cf.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
| 29 | #include <linux/list.h> | 29 | #include <linux/list.h> |
| 30 | #include <linux/wait.h> | 30 | #include <linux/wait.h> |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/param.h> | 31 | #include <linux/param.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/rwsem.h> | 33 | #include <linux/rwsem.h> |
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c index 958c1e6fc852..33b32f3cf84e 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c index 02168d9c2187..3cbac2e8aed3 100644 --- a/drivers/media/video/zoran_device.c +++ b/drivers/media/video/zoran_device.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index 9711f6248ef7..d9a5876eb386 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/version.h> | 47 | #include <linux/version.h> |
| 49 | #include <linux/init.h> | 48 | #include <linux/init.h> |
| 50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c index f4ffe79bdc5b..c7f6f6488360 100644 --- a/drivers/media/video/zoran_procfs.c +++ b/drivers/media/video/zoran_procfs.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
diff --git a/drivers/media/video/zr36120_mem.c b/drivers/media/video/zr36120_mem.c index c87113d6cc60..416eaa93b8a4 100644 --- a/drivers/media/video/zr36120_mem.c +++ b/drivers/media/video/zr36120_mem.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 23 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 12dd8d493ee2..2544fc7af0f6 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | */ | 46 | */ |
| 47 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 47 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
| 51 | #include <linux/module.h> | 50 | #include <linux/module.h> |
| 52 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| @@ -5592,7 +5591,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag) | |||
| 5592 | 5591 | ||
| 5593 | /* The SCSI driver needs to adjust timeouts on all current | 5592 | /* The SCSI driver needs to adjust timeouts on all current |
| 5594 | * commands prior to the diagnostic reset being issued. | 5593 | * commands prior to the diagnostic reset being issued. |
| 5595 | * Prevents timeouts occuring during a diagnostic reset...very bad. | 5594 | * Prevents timeouts occurring during a diagnostic reset...very bad. |
| 5596 | * For all other protocol drivers, this is a no-op. | 5595 | * For all other protocol drivers, this is a no-op. |
| 5597 | */ | 5596 | */ |
| 5598 | { | 5597 | { |
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index 4720f9ae86aa..32ae4d664545 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #define MPTBASE_H_INCLUDED | 49 | #define MPTBASE_H_INCLUDED |
| 50 | /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 50 | /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 51 | 51 | ||
| 52 | #include <linux/config.h> | ||
| 53 | #include <linux/kernel.h> | 52 | #include <linux/kernel.h> |
| 54 | #include <linux/pci.h> | 53 | #include <linux/pci.h> |
| 55 | 54 | ||
diff --git a/drivers/message/i2o/debug.c b/drivers/message/i2o/debug.c index 5a6cca8e8c45..8abe45e49ad7 100644 --- a/drivers/message/i2o/debug.c +++ b/drivers/message/i2o/debug.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 4 | #include <linux/pci.h> | 3 | #include <linux/pci.h> |
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index c8426a9bf273..6fe2ff5a63db 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Note that all locks are private to this file. Nothing else may | 16 | * Note that all locks are private to this file. Nothing else may |
| 17 | * touch them. | 17 | * touch them. |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 79fd062ccb34..02776814443e 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * pin should provide pulses even when the LCD is blanked, otherwise | 17 | * pin should provide pulses even when the LCD is blanked, otherwise |
| 18 | * a pen touch needed to unblank the LCD will never be read. | 18 | * a pen touch needed to unblank the LCD will never be read. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h index 6aba41954448..634d538ccd14 100644 --- a/drivers/misc/ibmasm/ibmasm.h +++ b/drivers/misc/ibmasm/ibmasm.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/wait.h> | 29 | #include <linux/wait.h> |
| 30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 35 | #include <linux/device.h> | 34 | #include <linux/device.h> |
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c index 3228516b7d19..075a2a07924e 100644 --- a/drivers/mmc/at91_mci.c +++ b/drivers/mmc/at91_mci.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | Gets the status of the write protect pin, if available. | 53 | Gets the status of the write protect pin, if available. |
| 54 | */ | 54 | */ |
| 55 | 55 | ||
| 56 | #include <linux/config.h> | ||
| 57 | #include <linux/module.h> | 56 | #include <linux/module.h> |
| 58 | #include <linux/moduleparam.h> | 57 | #include <linux/moduleparam.h> |
| 59 | #include <linux/init.h> | 58 | #include <linux/init.h> |
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c index 5dc4bee7abeb..41069908f4a7 100644 --- a/drivers/mmc/au1xmmc.c +++ b/drivers/mmc/au1xmmc.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * So we use the timer to check the status manually. | 34 | * So we use the timer to check the status manually. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | #include <linux/platform_device.h> | 39 | #include <linux/platform_device.h> |
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c index 5c62f4e6ad06..7ca9e95bdf89 100644 --- a/drivers/mmc/imxmmc.c +++ b/drivers/mmc/imxmmc.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * deficiencies | 25 | * deficiencies |
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #ifdef CONFIG_MMC_DEBUG | 29 | #ifdef CONFIG_MMC_DEBUG |
| 31 | #define DEBUG | 30 | #define DEBUG |
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 6201f3086a02..247ff2f23ac9 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 8576a65ca1c3..9dfb34a857e3 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/moduleparam.h> | 11 | #include <linux/moduleparam.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index c25244b3657b..7a4840ec53b7 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/moduleparam.h> | 15 | #include <linux/moduleparam.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index b49368fd96b8..ef350908478c 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * 1 and 3 byte data transfers not supported | 16 | * 1 and 3 byte data transfers not supported |
| 17 | * max block length up to 1023 | 17 | * max block length up to 1023 |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 8167332d4013..3fcd86c08ebd 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * - On APIC systems the FIFO empty interrupt is sometimes lost. | 21 | * - On APIC systems the FIFO empty interrupt is sometimes lost. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 1e01ad38b26e..9885726a16e4 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c index 4bf9f8cac0dd..60e11a0ada97 100644 --- a/drivers/mtd/chips/cfi_probe.c +++ b/drivers/mtd/chips/cfi_probe.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | $Id: cfi_probe.c,v 1.86 2005/11/29 14:48:31 gleixner Exp $ | 4 | $Id: cfi_probe.c,v 1.86 2005/11/29 14:48:31 gleixner Exp $ |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/chips/chipreg.c b/drivers/mtd/chips/chipreg.c index c2127840a183..2174c97549f0 100644 --- a/drivers/mtd/chips/chipreg.c +++ b/drivers/mtd/chips/chipreg.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/kmod.h> | 10 | #include <linux/kmod.h> |
| 12 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c index 517ea33e7260..8f39d0a31438 100644 --- a/drivers/mtd/chips/jedec_probe.c +++ b/drivers/mtd/chips/jedec_probe.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | Occasionally maintained by Thayne Harbaugh tharbaugh at lnxi dot com | 8 | Occasionally maintained by Thayne Harbaugh tharbaugh at lnxi dot com |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index be3f1c136d02..ede3561be870 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | * Licence: GPL | 9 | * Licence: GPL |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 14 | #include <linux/blkdev.h> | 13 | #include <linux/blkdev.h> |
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c index 593bb033a3fa..78872c3f3760 100644 --- a/drivers/mtd/devices/docprobe.c +++ b/drivers/mtd/devices/docprobe.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | */ | 40 | */ |
| 41 | #define DOC_SINGLE_DRIVER | 41 | #define DOC_SINGLE_DRIVER |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| 45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| 46 | #include <asm/errno.h> | 45 | #include <asm/errno.h> |
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 04271d02b6b6..5db716045927 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * as published by the Free Software Foundation; either version | 9 | * as published by the Free Software Foundation; either version |
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c index b4438eacfd80..e427c82d5f4c 100644 --- a/drivers/mtd/devices/mtdram.c +++ b/drivers/mtd/devices/mtdram.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
| 16 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c index 30f07b473ae2..6f9bbf6fee4d 100644 --- a/drivers/mtd/devices/pmc551.c +++ b/drivers/mtd/devices/pmc551.c | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | * * Comb the init routine. It's still a bit cludgy on a few things. | 82 | * * Comb the init routine. It's still a bit cludgy on a few things. |
| 83 | */ | 83 | */ |
| 84 | 84 | ||
| 85 | #include <linux/config.h> | ||
| 86 | #include <linux/kernel.h> | 85 | #include <linux/kernel.h> |
| 87 | #include <linux/module.h> | 86 | #include <linux/module.h> |
| 88 | #include <asm/uaccess.h> | 87 | #include <asm/uaccess.h> |
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c index 1e21a2c3dd29..4116535805f1 100644 --- a/drivers/mtd/inftlcore.c +++ b/drivers/mtd/inftlcore.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
diff --git a/drivers/mtd/maps/alchemy-flash.c b/drivers/mtd/maps/alchemy-flash.c index b933a2a27b18..7fc8097e41d2 100644 --- a/drivers/mtd/maps/alchemy-flash.c +++ b/drivers/mtd/maps/alchemy-flash.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c index a50587005263..447955be18af 100644 --- a/drivers/mtd/maps/amd76xrom.c +++ b/drivers/mtd/maps/amd76xrom.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/mtd/map.h> | 14 | #include <linux/mtd/map.h> |
| 15 | #include <linux/mtd/cfi.h> | 15 | #include <linux/mtd/cfi.h> |
| 16 | #include <linux/mtd/flashchip.h> | 16 | #include <linux/mtd/flashchip.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 19 | #include <linux/pci_ids.h> | 18 | #include <linux/pci_ids.h> |
| 20 | #include <linux/list.h> | 19 | #include <linux/list.h> |
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c index 5a95ab370a97..0402c21e291d 100644 --- a/drivers/mtd/maps/ceiva.c +++ b/drivers/mtd/maps/ceiva.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * $Id: ceiva.c,v 1.11 2004/09/16 23:27:12 gleixner Exp $ | 14 | * $Id: ceiva.c,v 1.11 2004/09/16 23:27:12 gleixner Exp $ |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
diff --git a/drivers/mtd/maps/cstm_mips_ixx.c b/drivers/mtd/maps/cstm_mips_ixx.c index a370953c1513..aa56defb94c8 100644 --- a/drivers/mtd/maps/cstm_mips_ixx.c +++ b/drivers/mtd/maps/cstm_mips_ixx.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/mtd/mtd.h> | 38 | #include <linux/mtd/mtd.h> |
| 39 | #include <linux/mtd/map.h> | 39 | #include <linux/mtd/map.h> |
| 40 | #include <linux/mtd/partitions.h> | 40 | #include <linux/mtd/partitions.h> |
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 43 | 42 | ||
| 44 | #if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) | 43 | #if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) |
diff --git a/drivers/mtd/maps/dbox2-flash.c b/drivers/mtd/maps/dbox2-flash.c index 85c2a9e22b1e..92a9c7fac993 100644 --- a/drivers/mtd/maps/dbox2-flash.c +++ b/drivers/mtd/maps/dbox2-flash.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/mtd/mtd.h> | 12 | #include <linux/mtd/mtd.h> |
| 13 | #include <linux/mtd/map.h> | 13 | #include <linux/mtd/map.h> |
| 14 | #include <linux/mtd/partitions.h> | 14 | #include <linux/mtd/partitions.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | 16 | ||
| 18 | /* partition_info gives details on the logical partitions that the split the | 17 | /* partition_info gives details on the logical partitions that the split the |
diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c index 8b3784e2de89..b32bb9347d71 100644 --- a/drivers/mtd/maps/dc21285.c +++ b/drivers/mtd/maps/dc21285.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | * $Id: dc21285.c,v 1.24 2005/11/07 11:14:26 gleixner Exp $ | 8 | * $Id: dc21285.c,v 1.24 2005/11/07 11:14:26 gleixner Exp $ |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c index c299d10b33e6..b1104fe1f207 100644 --- a/drivers/mtd/maps/dilnetpc.c +++ b/drivers/mtd/maps/dilnetpc.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * and http://www.ssv-embedded.de/ssv/pc104/p170.htm | 25 | * and http://www.ssv-embedded.de/ssv/pc104/p170.htm |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c index 2bb3c0f0f970..a43c49905cac 100644 --- a/drivers/mtd/maps/dmv182.c +++ b/drivers/mtd/maps/dmv182.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * option) any later version. | 16 | * option) any later version. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
diff --git a/drivers/mtd/maps/ebony.c b/drivers/mtd/maps/ebony.c index 60a6e51d662f..641e1dd8479e 100644 --- a/drivers/mtd/maps/ebony.c +++ b/drivers/mtd/maps/ebony.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/mtd/mtd.h> | 20 | #include <linux/mtd/mtd.h> |
| 21 | #include <linux/mtd/map.h> | 21 | #include <linux/mtd/map.h> |
| 22 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
| 23 | #include <linux/config.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <asm/ibm44x.h> | 24 | #include <asm/ibm44x.h> |
| 26 | #include <platforms/4xx/ebony.h> | 25 | #include <platforms/4xx/ebony.h> |
diff --git a/drivers/mtd/maps/edb7312.c b/drivers/mtd/maps/edb7312.c index b48a3473ffc1..1c5b97c89685 100644 --- a/drivers/mtd/maps/edb7312.c +++ b/drivers/mtd/maps/edb7312.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
| 19 | #include <linux/mtd/map.h> | 19 | #include <linux/mtd/map.h> |
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #ifdef CONFIG_MTD_PARTITIONS | 21 | #ifdef CONFIG_MTD_PARTITIONS |
| 23 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c index 0667101ccbe1..6dde3182d64a 100644 --- a/drivers/mtd/maps/h720x-flash.c +++ b/drivers/mtd/maps/h720x-flash.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * 2003 Thomas Gleixner <tglx@linutronix.de> | 8 | * 2003 Thomas Gleixner <tglx@linutronix.de> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c index 16732794edf3..db4b570d874a 100644 --- a/drivers/mtd/maps/ichxrom.c +++ b/drivers/mtd/maps/ichxrom.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/mtd/map.h> | 14 | #include <linux/mtd/map.h> |
| 15 | #include <linux/mtd/cfi.h> | 15 | #include <linux/mtd/cfi.h> |
| 16 | #include <linux/mtd/flashchip.h> | 16 | #include <linux/mtd/flashchip.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 19 | #include <linux/pci_ids.h> | 18 | #include <linux/pci_ids.h> |
| 20 | #include <linux/list.h> | 19 | #include <linux/list.h> |
diff --git a/drivers/mtd/maps/impa7.c b/drivers/mtd/maps/impa7.c index ba7f40311a7e..a0b4dc7155dc 100644 --- a/drivers/mtd/maps/impa7.c +++ b/drivers/mtd/maps/impa7.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
| 19 | #include <linux/mtd/map.h> | 19 | #include <linux/mtd/map.h> |
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #ifdef CONFIG_MTD_PARTITIONS | 21 | #ifdef CONFIG_MTD_PARTITIONS |
| 23 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c index a3ba52fbd868..c8db01b3e45f 100644 --- a/drivers/mtd/maps/integrator-flash.c +++ b/drivers/mtd/maps/integrator-flash.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | ======================================================================*/ | 27 | ======================================================================*/ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c index b8ccb0a95789..f27c132794c3 100644 --- a/drivers/mtd/maps/ipaq-flash.c +++ b/drivers/mtd/maps/ipaq-flash.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * $Id: ipaq-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $ | 8 | * $Id: ipaq-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $ |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/l440gx.c b/drivers/mtd/maps/l440gx.c index 851bf9576052..6b784ef5ee70 100644 --- a/drivers/mtd/maps/l440gx.c +++ b/drivers/mtd/maps/l440gx.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 14 | #include <linux/mtd/mtd.h> | 14 | #include <linux/mtd/mtd.h> |
| 15 | #include <linux/mtd/map.h> | 15 | #include <linux/mtd/map.h> |
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #define PIIXE_IOBASE_RESOURCE 11 | 17 | #define PIIXE_IOBASE_RESOURCE 11 |
| 19 | 18 | ||
diff --git a/drivers/mtd/maps/lasat.c b/drivers/mtd/maps/lasat.c index c658d4045ef2..1c13d2dc0cdf 100644 --- a/drivers/mtd/maps/lasat.c +++ b/drivers/mtd/maps/lasat.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
| 20 | #include <linux/mtd/map.h> | 20 | #include <linux/mtd/map.h> |
| 21 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <asm/lasat/lasat.h> | 22 | #include <asm/lasat/lasat.h> |
| 24 | 23 | ||
| 25 | static struct mtd_info *lasat_mtd; | 24 | static struct mtd_info *lasat_mtd; |
diff --git a/drivers/mtd/maps/mpc1211.c b/drivers/mtd/maps/mpc1211.c index 4685e8e13460..45a00fac88ac 100644 --- a/drivers/mtd/maps/mpc1211.c +++ b/drivers/mtd/maps/mpc1211.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/mtd/mtd.h> | 15 | #include <linux/mtd/mtd.h> |
| 16 | #include <linux/mtd/map.h> | 16 | #include <linux/mtd/map.h> |
| 17 | #include <linux/mtd/partitions.h> | 17 | #include <linux/mtd/partitions.h> |
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | static struct mtd_info *flash_mtd; | 19 | static struct mtd_info *flash_mtd; |
| 21 | static struct mtd_partition *parsed_parts; | 20 | static struct mtd_partition *parsed_parts; |
diff --git a/drivers/mtd/maps/mtx-1_flash.c b/drivers/mtd/maps/mtx-1_flash.c index 5c25d4e552c6..d884f2be28f6 100644 --- a/drivers/mtd/maps/mtx-1_flash.c +++ b/drivers/mtd/maps/mtx-1_flash.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/mtd/maps/ocotea.c b/drivers/mtd/maps/ocotea.c index a21fcd195ab4..2f07602ba940 100644 --- a/drivers/mtd/maps/ocotea.c +++ b/drivers/mtd/maps/ocotea.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
| 19 | #include <linux/mtd/map.h> | 19 | #include <linux/mtd/map.h> |
| 20 | #include <linux/mtd/partitions.h> | 20 | #include <linux/mtd/partitions.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 23 | #include <asm/ibm44x.h> | 22 | #include <asm/ibm44x.h> |
| 24 | #include <platforms/4xx/ocotea.h> | 23 | #include <platforms/4xx/ocotea.h> |
diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c index dc3765270057..e6e391efbeb6 100644 --- a/drivers/mtd/maps/omap-toto-flash.c +++ b/drivers/mtd/maps/omap-toto-flash.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * $Id: omap-toto-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $ | 8 | * $Id: omap-toto-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $ |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index d6301f08906d..7799a25a7f2a 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 19 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
| 20 | #include <linux/mtd/map.h> | 20 | #include <linux/mtd/map.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
| 23 | #include <linux/mtd/physmap.h> | 22 | #include <linux/mtd/physmap.h> |
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c index 50b14033613f..ec8fdae1dd99 100644 --- a/drivers/mtd/maps/redwood.c +++ b/drivers/mtd/maps/redwood.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * or implied. | 13 | * or implied. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 5cefb015633c..950bf1c57841 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * $Id: sa1100-flash.c,v 1.51 2005/11/07 11:14:28 gleixner Exp $ | 6 | * $Id: sa1100-flash.c,v 1.51 2005/11/07 11:14:28 gleixner Exp $ |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/ioport.h> | 10 | #include <linux/ioport.h> |
diff --git a/drivers/mtd/maps/sbc8240.c b/drivers/mtd/maps/sbc8240.c index 350286dc1d2e..7d0fcf8f4f33 100644 --- a/drivers/mtd/maps/sbc8240.c +++ b/drivers/mtd/maps/sbc8240.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Both parts are JEDEC compatible. | 18 | * Both parts are JEDEC compatible. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c index e8c130e1efd3..9b50cfc355b1 100644 --- a/drivers/mtd/maps/sc520cdp.c +++ b/drivers/mtd/maps/sc520cdp.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * For details see http://www.amd.com/products/epd/desiging/evalboards/18.elansc520/520_cdp_brief/index.html | 25 | * For details see http://www.amd.com/products/epd/desiging/evalboards/18.elansc520/520_cdp_brief/index.html |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c index 97a8dfd69258..dcfb85840d1e 100644 --- a/drivers/mtd/maps/scb2_flash.c +++ b/drivers/mtd/maps/scb2_flash.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | #include <linux/mtd/mtd.h> | 53 | #include <linux/mtd/mtd.h> |
| 54 | #include <linux/mtd/map.h> | 54 | #include <linux/mtd/map.h> |
| 55 | #include <linux/mtd/cfi.h> | 55 | #include <linux/mtd/cfi.h> |
| 56 | #include <linux/config.h> | ||
| 57 | #include <linux/pci.h> | 56 | #include <linux/pci.h> |
| 58 | #include <linux/pci_ids.h> | 57 | #include <linux/pci_ids.h> |
| 59 | 58 | ||
diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c index 331a15859d71..7391fd544e86 100644 --- a/drivers/mtd/maps/scx200_docflash.c +++ b/drivers/mtd/maps/scx200_docflash.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c index c53c2c369c9d..d76ceef453ce 100644 --- a/drivers/mtd/maps/solutionengine.c +++ b/drivers/mtd/maps/solutionengine.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/mtd/mtd.h> | 16 | #include <linux/mtd/mtd.h> |
| 17 | #include <linux/mtd/map.h> | 17 | #include <linux/mtd/map.h> |
| 18 | #include <linux/mtd/partitions.h> | 18 | #include <linux/mtd/partitions.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 21 | 20 | ||
| 22 | static struct mtd_info *flash_mtd; | 21 | static struct mtd_info *flash_mtd; |
diff --git a/drivers/mtd/maps/tqm834x.c b/drivers/mtd/maps/tqm834x.c index c7ae9a515c1a..58e5912bd381 100644 --- a/drivers/mtd/maps/tqm834x.c +++ b/drivers/mtd/maps/tqm834x.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c index a43517053e7c..19578ba84ee8 100644 --- a/drivers/mtd/maps/tqm8xxl.c +++ b/drivers/mtd/maps/tqm8xxl.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Thus, we choose CONFIG_MTD_CFI_I2 & CONFIG_MTD_CFI_B4 at | 22 | * Thus, we choose CONFIG_MTD_CFI_I2 & CONFIG_MTD_CFI_B4 at |
| 23 | * kernel configuration. | 23 | * kernel configuration. |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/ts5500_flash.c b/drivers/mtd/maps/ts5500_flash.c index a7422c200567..b47270e850bc 100644 --- a/drivers/mtd/maps/ts5500_flash.c +++ b/drivers/mtd/maps/ts5500_flash.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * $Id: ts5500_flash.c,v 1.5 2005/11/07 11:14:28 gleixner Exp $ | 26 | * $Id: ts5500_flash.c,v 1.5 2005/11/07 11:14:28 gleixner Exp $ |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c index f7264dc2ac9b..389fea28b9a6 100644 --- a/drivers/mtd/maps/uclinux.c +++ b/drivers/mtd/maps/uclinux.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | /****************************************************************************/ | 11 | /****************************************************************************/ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/drivers/mtd/maps/walnut.c b/drivers/mtd/maps/walnut.c index f46bec66150f..ec80eec376bf 100644 --- a/drivers/mtd/maps/walnut.c +++ b/drivers/mtd/maps/walnut.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/mtd/mtd.h> | 20 | #include <linux/mtd/mtd.h> |
| 21 | #include <linux/mtd/map.h> | 21 | #include <linux/mtd/map.h> |
| 22 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
| 23 | #include <linux/config.h> | ||
| 24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 25 | #include <asm/ibm4xx.h> | 24 | #include <asm/ibm4xx.h> |
| 26 | #include <platforms/4xx/walnut.h> | 25 | #include <platforms/4xx/walnut.h> |
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c index 60c197ec455b..ac5b8105b6ef 100644 --- a/drivers/mtd/maps/wr_sbc82xx_flash.c +++ b/drivers/mtd/maps/wr_sbc82xx_flash.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
| 19 | #include <linux/mtd/map.h> | 19 | #include <linux/mtd/map.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/mtd/partitions.h> | 20 | #include <linux/mtd/partitions.h> |
| 22 | 21 | ||
| 23 | #include <asm/immap_cpm2.h> | 22 | #include <asm/immap_cpm2.h> |
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c index e5c78463ebfd..04ed34694b14 100644 --- a/drivers/mtd/mtdblock.c +++ b/drivers/mtd/mtdblock.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> | 7 | * (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 9a4b59d92525..fb8b4f7e48d3 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/device.h> | 8 | #include <linux/device.h> |
| 10 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 16a952dd486a..168d3ba063c3 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 77a7123a5c56..06a930372b7a 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 18 | #include <linux/list.h> | 18 | #include <linux/list.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kmod.h> | 19 | #include <linux/kmod.h> |
| 21 | #include <linux/mtd/mtd.h> | 20 | #include <linux/mtd/mtd.h> |
| 22 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index ebd64abc8be8..545ff252d81e 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * $Id: nandsim.c,v 1.8 2005/03/19 15:33:56 dedekind Exp $ | 25 | * $Id: nandsim.c,v 1.8 2005/03/19 15:33:56 dedekind Exp $ |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c index dc7573501d8c..dd5cea8b4a7a 100644 --- a/drivers/mtd/nftlcore.c +++ b/drivers/mtd/nftlcore.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #define PRERELEASE | 12 | #define PRERELEASE |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index dc845f36fe49..cbdae54f715f 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | /* Maximum events (Rx packets, etc.) to handle at each interrupt. */ | 68 | /* Maximum events (Rx packets, etc.) to handle at each interrupt. */ |
| 69 | static int max_interrupt_work = 10; | 69 | static int max_interrupt_work = 10; |
| 70 | 70 | ||
| 71 | #include <linux/config.h> | ||
| 72 | #include <linux/module.h> | 71 | #include <linux/module.h> |
| 73 | #ifdef CONFIG_MCA | 72 | #ifdef CONFIG_MCA |
| 74 | #include <linux/mca.h> | 73 | #include <linux/mca.h> |
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 91d1c4c24d9b..ac60f3f62db8 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
| @@ -57,7 +57,6 @@ static int max_interrupt_work = 20; | |||
| 57 | #define RX_RING_SIZE 16 | 57 | #define RX_RING_SIZE 16 |
| 58 | #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer. */ | 58 | #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer. */ |
| 59 | 59 | ||
| 60 | #include <linux/config.h> | ||
| 61 | #include <linux/module.h> | 60 | #include <linux/module.h> |
| 62 | #include <linux/isapnp.h> | 61 | #include <linux/isapnp.h> |
| 63 | #include <linux/kernel.h> | 62 | #include <linux/kernel.h> |
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index d2f808979a2b..45125db44177 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -236,7 +236,6 @@ static int vortex_debug = VORTEX_DEBUG; | |||
| 236 | static int vortex_debug = 1; | 236 | static int vortex_debug = 1; |
| 237 | #endif | 237 | #endif |
| 238 | 238 | ||
| 239 | #include <linux/config.h> | ||
| 240 | #include <linux/module.h> | 239 | #include <linux/module.h> |
| 241 | #include <linux/kernel.h> | 240 | #include <linux/kernel.h> |
| 242 | #include <linux/string.h> | 241 | #include <linux/string.h> |
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index d26dd6a7062d..1d7af760c2b1 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #define DRV_RELDATE "Mar 22, 2004" | 52 | #define DRV_RELDATE "Mar 22, 2004" |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | #include <linux/config.h> | ||
| 56 | #include <linux/module.h> | 55 | #include <linux/module.h> |
| 57 | #include <linux/moduleparam.h> | 56 | #include <linux/moduleparam.h> |
| 58 | #include <linux/kernel.h> | 57 | #include <linux/kernel.h> |
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index ed2e3c03bc88..d21e98f5adbc 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
| @@ -93,7 +93,6 @@ | |||
| 93 | #define DRV_VERSION "0.9.27" | 93 | #define DRV_VERSION "0.9.27" |
| 94 | 94 | ||
| 95 | 95 | ||
| 96 | #include <linux/config.h> | ||
| 97 | #include <linux/module.h> | 96 | #include <linux/module.h> |
| 98 | #include <linux/kernel.h> | 97 | #include <linux/kernel.h> |
| 99 | #include <linux/compiler.h> | 98 | #include <linux/compiler.h> |
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 8a9f7d61b9b1..7e2ca9571467 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | 40 | ||
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 46 | #include <linux/string.h> | 45 | #include <linux/string.h> |
diff --git a/drivers/net/8390.h b/drivers/net/8390.h index 51e39dcd0603..a9a58f518f45 100644 --- a/drivers/net/8390.h +++ b/drivers/net/8390.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _8390_h | 7 | #ifndef _8390_h |
| 8 | #define _8390_h | 8 | #define _8390_h |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/if_ether.h> | 10 | #include <linux/if_ether.h> |
| 12 | #include <linux/ioport.h> | 11 | #include <linux/ioport.h> |
| 13 | #include <linux/skbuff.h> | 12 | #include <linux/skbuff.h> |
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 60304f7e7e5b..a8c245a82261 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * as published by the Free Software Foundation; either version | 27 | * as published by the Free Software Foundation; either version |
| 28 | * 2 of the License, or (at your option) any later version. | 28 | * 2 of the License, or (at your option) any later version. |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
| 32 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
| 33 | #include <linux/trdevice.h> | 32 | #include <linux/trdevice.h> |
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c index 71165ac0257a..519390c033c3 100644 --- a/drivers/net/a2065.c +++ b/drivers/net/a2065.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <linux/skbuff.h> | 48 | #include <linux/skbuff.h> |
| 49 | #include <linux/slab.h> | 49 | #include <linux/slab.h> |
| 50 | #include <linux/string.h> | 50 | #include <linux/string.h> |
| 51 | #include <linux/config.h> | ||
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 53 | #include <linux/crc32.h> | 52 | #include <linux/crc32.h> |
| 54 | #include <linux/zorro.h> | 53 | #include <linux/zorro.h> |
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 23ff22ba5d31..c290b5ae63b2 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | * Grant Grundler <grundler@cup.hp.com>: PCI write posting fixes. | 50 | * Grant Grundler <grundler@cup.hp.com>: PCI write posting fixes. |
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #include <linux/config.h> | ||
| 54 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 55 | #include <linux/moduleparam.h> | 54 | #include <linux/moduleparam.h> |
| 56 | #include <linux/version.h> | 55 | #include <linux/version.h> |
diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h index a97107023495..62ec8ceee698 100644 --- a/drivers/net/acenic.h +++ b/drivers/net/acenic.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _ACENIC_H_ | 1 | #ifndef _ACENIC_H_ |
| 2 | #define _ACENIC_H_ | 2 | #define _ACENIC_H_ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * Generate TX index update each time, when TX ring is closed. | 6 | * Generate TX index update each time, when TX ring is closed. |
diff --git a/drivers/net/acenic_firmware.h b/drivers/net/acenic_firmware.h index d7882dd783c8..ec146f60d77b 100644 --- a/drivers/net/acenic_firmware.h +++ b/drivers/net/acenic_firmware.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | /* | 1 | /* |
| 3 | * Declare these here even if Tigon I support is disabled to avoid | 2 | * Declare these here even if Tigon I support is disabled to avoid |
| 4 | * the compiler complaining about undefined symbols. | 3 | * the compiler complaining about undefined symbols. |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index d9ba8be72af8..c017c4f6b3b5 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
| @@ -69,7 +69,6 @@ Revision History: | |||
| 69 | */ | 69 | */ |
| 70 | 70 | ||
| 71 | 71 | ||
| 72 | #include <linux/config.h> | ||
| 73 | #include <linux/module.h> | 72 | #include <linux/module.h> |
| 74 | #include <linux/kernel.h> | 73 | #include <linux/kernel.h> |
| 75 | #include <linux/types.h> | 74 | #include <linux/types.h> |
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 9edaa183227a..1d01ac0000e4 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
| @@ -48,7 +48,6 @@ static const char *version = | |||
| 48 | * the driver figure it out. | 48 | * the driver figure it out. |
| 49 | */ | 49 | */ |
| 50 | 50 | ||
| 51 | #include <linux/config.h> | ||
| 52 | #include <linux/module.h> | 51 | #include <linux/module.h> |
| 53 | #include <linux/kernel.h> | 52 | #include <linux/kernel.h> |
| 54 | #include <linux/types.h> | 53 | #include <linux/types.h> |
diff --git a/drivers/net/appletalk/cops_ffdrv.h b/drivers/net/appletalk/cops_ffdrv.h index 31cf8c9c947f..b02005087c1b 100644 --- a/drivers/net/appletalk/cops_ffdrv.h +++ b/drivers/net/appletalk/cops_ffdrv.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * - Jay Schulist <jschlst@samba.org> | 24 | * - Jay Schulist <jschlst@samba.org> |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | #ifdef CONFIG_COPS_DAYNA | 28 | #ifdef CONFIG_COPS_DAYNA |
| 30 | 29 | ||
diff --git a/drivers/net/appletalk/cops_ltdrv.h b/drivers/net/appletalk/cops_ltdrv.h index 4afb8e18ba65..c699b1ad31da 100644 --- a/drivers/net/appletalk/cops_ltdrv.h +++ b/drivers/net/appletalk/cops_ltdrv.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * - Jay Schulist <jschlst@samba.org> | 23 | * - Jay Schulist <jschlst@samba.org> |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | #ifdef CONFIG_COPS_TANGENT | 27 | #ifdef CONFIG_COPS_TANGENT |
| 29 | 28 | ||
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 1a44a79ed064..7f7dd450226a 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * of the GNU General Public License, incorporated herein by reference. | 23 | * of the GNU General Public License, incorporated herein by reference. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index fabc0607b0f1..5a95005253fa 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #define VERSION "arcnet: v3.93 BETA 2000/04/29 - by Avery Pennarun et al.\n" | 44 | #define VERSION "arcnet: v3.93 BETA 2000/04/29 - by Avery Pennarun et al.\n" |
| 45 | 45 | ||
| 46 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/types.h> | 47 | #include <linux/types.h> |
| 49 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
| 50 | #include <linux/netdevice.h> | 49 | #include <linux/netdevice.h> |
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 613005a0285d..85493b7b924f 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/mii.h> | 22 | #include <linux/mii.h> |
| 24 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 25 | #include <linux/etherdevice.h> | 24 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index e613cc289749..5d7929c79bce 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | response to inb()s from other device probes! | 35 | response to inb()s from other device probes! |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 40 | #include <linux/netdevice.h> | 39 | #include <linux/netdevice.h> |
| 41 | #include <linux/etherdevice.h> | 40 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 038d5fcb15e6..55f6e3f65b53 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * | 35 | * |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 40 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 41 | #include <linux/sched.h> | 40 | #include <linux/sched.h> |
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index bbca8ae8018c..6fad83f24c4f 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * May 1999, Al Viro: proper release of /proc/net/bmac entry, switched to | 7 | * May 1999, Al Viro: proper release of /proc/net/bmac entry, switched to |
| 8 | * dynamic procfs inode. | 8 | * dynamic procfs inode. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/netdevice.h> | 12 | #include <linux/netdevice.h> |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 7635736cc791..7e32d4ea71e2 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Written by: Michael Chan (mchan@broadcom.com) | 9 | * Written by: Michael Chan (mchan@broadcom.com) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/moduleparam.h> | 14 | #include <linux/moduleparam.h> |
| @@ -57,8 +56,8 @@ | |||
| 57 | 56 | ||
| 58 | #define DRV_MODULE_NAME "bnx2" | 57 | #define DRV_MODULE_NAME "bnx2" |
| 59 | #define PFX DRV_MODULE_NAME ": " | 58 | #define PFX DRV_MODULE_NAME ": " |
| 60 | #define DRV_MODULE_VERSION "1.4.42" | 59 | #define DRV_MODULE_VERSION "1.4.43" |
| 61 | #define DRV_MODULE_RELDATE "June 12, 2006" | 60 | #define DRV_MODULE_RELDATE "June 28, 2006" |
| 62 | 61 | ||
| 63 | #define RUN_AT(x) (jiffies + (x)) | 62 | #define RUN_AT(x) (jiffies + (x)) |
| 64 | 63 | ||
| @@ -1676,7 +1675,7 @@ bnx2_tx_int(struct bnx2 *bp) | |||
| 1676 | 1675 | ||
| 1677 | tx_free_bd += last + 1; | 1676 | tx_free_bd += last + 1; |
| 1678 | 1677 | ||
| 1679 | dev_kfree_skb_irq(skb); | 1678 | dev_kfree_skb(skb); |
| 1680 | 1679 | ||
| 1681 | hw_cons = bp->hw_tx_cons = | 1680 | hw_cons = bp->hw_tx_cons = |
| 1682 | sblk->status_tx_quick_consumer_index0; | 1681 | sblk->status_tx_quick_consumer_index0; |
| @@ -1824,7 +1823,7 @@ reuse_rx: | |||
| 1824 | if ((len > (bp->dev->mtu + ETH_HLEN)) && | 1823 | if ((len > (bp->dev->mtu + ETH_HLEN)) && |
| 1825 | (ntohs(skb->protocol) != 0x8100)) { | 1824 | (ntohs(skb->protocol) != 0x8100)) { |
| 1826 | 1825 | ||
| 1827 | dev_kfree_skb_irq(skb); | 1826 | dev_kfree_skb(skb); |
| 1828 | goto next_rx; | 1827 | goto next_rx; |
| 1829 | 1828 | ||
| 1830 | } | 1829 | } |
| @@ -3643,7 +3642,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp) | |||
| 3643 | skb_shinfo(skb)->frags[j].size, | 3642 | skb_shinfo(skb)->frags[j].size, |
| 3644 | PCI_DMA_TODEVICE); | 3643 | PCI_DMA_TODEVICE); |
| 3645 | } | 3644 | } |
| 3646 | dev_kfree_skb_any(skb); | 3645 | dev_kfree_skb(skb); |
| 3647 | i += j + 1; | 3646 | i += j + 1; |
| 3648 | } | 3647 | } |
| 3649 | 3648 | ||
| @@ -3669,7 +3668,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp) | |||
| 3669 | 3668 | ||
| 3670 | rx_buf->skb = NULL; | 3669 | rx_buf->skb = NULL; |
| 3671 | 3670 | ||
| 3672 | dev_kfree_skb_any(skb); | 3671 | dev_kfree_skb(skb); |
| 3673 | } | 3672 | } |
| 3674 | } | 3673 | } |
| 3675 | 3674 | ||
| @@ -3999,7 +3998,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode) | |||
| 3999 | udelay(5); | 3998 | udelay(5); |
| 4000 | 3999 | ||
| 4001 | pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE); | 4000 | pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE); |
| 4002 | dev_kfree_skb_irq(skb); | 4001 | dev_kfree_skb(skb); |
| 4003 | 4002 | ||
| 4004 | if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) { | 4003 | if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) { |
| 4005 | goto loopback_test_done; | 4004 | goto loopback_test_done; |
| @@ -4541,7 +4540,7 @@ bnx2_close(struct net_device *dev) | |||
| 4541 | bnx2_netif_stop(bp); | 4540 | bnx2_netif_stop(bp); |
| 4542 | del_timer_sync(&bp->timer); | 4541 | del_timer_sync(&bp->timer); |
| 4543 | if (bp->flags & NO_WOL_FLAG) | 4542 | if (bp->flags & NO_WOL_FLAG) |
| 4544 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD; | 4543 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN; |
| 4545 | else if (bp->wol) | 4544 | else if (bp->wol) |
| 4546 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; | 4545 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; |
| 4547 | else | 4546 | else |
| @@ -5128,6 +5127,16 @@ bnx2_set_rx_csum(struct net_device *dev, u32 data) | |||
| 5128 | return 0; | 5127 | return 0; |
| 5129 | } | 5128 | } |
| 5130 | 5129 | ||
| 5130 | static int | ||
| 5131 | bnx2_set_tso(struct net_device *dev, u32 data) | ||
| 5132 | { | ||
| 5133 | if (data) | ||
| 5134 | dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN; | ||
| 5135 | else | ||
| 5136 | dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN); | ||
| 5137 | return 0; | ||
| 5138 | } | ||
| 5139 | |||
| 5131 | #define BNX2_NUM_STATS 46 | 5140 | #define BNX2_NUM_STATS 46 |
| 5132 | 5141 | ||
| 5133 | static struct { | 5142 | static struct { |
| @@ -5445,7 +5454,7 @@ static struct ethtool_ops bnx2_ethtool_ops = { | |||
| 5445 | .set_sg = ethtool_op_set_sg, | 5454 | .set_sg = ethtool_op_set_sg, |
| 5446 | #ifdef BCM_TSO | 5455 | #ifdef BCM_TSO |
| 5447 | .get_tso = ethtool_op_get_tso, | 5456 | .get_tso = ethtool_op_get_tso, |
| 5448 | .set_tso = ethtool_op_set_tso, | 5457 | .set_tso = bnx2_set_tso, |
| 5449 | #endif | 5458 | #endif |
| 5450 | .self_test_count = bnx2_self_test_count, | 5459 | .self_test_count = bnx2_self_test_count, |
| 5451 | .self_test = bnx2_self_test, | 5460 | .self_test = bnx2_self_test, |
| @@ -5926,7 +5935,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 5926 | dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; | 5935 | dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; |
| 5927 | #endif | 5936 | #endif |
| 5928 | #ifdef BCM_TSO | 5937 | #ifdef BCM_TSO |
| 5929 | dev->features |= NETIF_F_TSO; | 5938 | dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN; |
| 5930 | #endif | 5939 | #endif |
| 5931 | 5940 | ||
| 5932 | netif_carrier_off(bp->dev); | 5941 | netif_carrier_off(bp->dev); |
| @@ -5968,7 +5977,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 5968 | netif_device_detach(dev); | 5977 | netif_device_detach(dev); |
| 5969 | del_timer_sync(&bp->timer); | 5978 | del_timer_sync(&bp->timer); |
| 5970 | if (bp->flags & NO_WOL_FLAG) | 5979 | if (bp->flags & NO_WOL_FLAG) |
| 5971 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD; | 5980 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN; |
| 5972 | else if (bp->wol) | 5981 | else if (bp->wol) |
| 5973 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; | 5982 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; |
| 5974 | else | 5983 | else |
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 5845e334941b..658c5ee95c73 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
| @@ -4174,6 +4174,7 @@ struct fw_info { | |||
| 4174 | #define BNX2_DRV_MSG_CODE_PULSE 0x06000000 | 4174 | #define BNX2_DRV_MSG_CODE_PULSE 0x06000000 |
| 4175 | #define BNX2_DRV_MSG_CODE_DIAG 0x07000000 | 4175 | #define BNX2_DRV_MSG_CODE_DIAG 0x07000000 |
| 4176 | #define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL 0x09000000 | 4176 | #define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL 0x09000000 |
| 4177 | #define BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN 0x0b000000 | ||
| 4177 | 4178 | ||
| 4178 | #define BNX2_DRV_MSG_DATA 0x00ff0000 | 4179 | #define BNX2_DRV_MSG_DATA 0x00ff0000 |
| 4179 | #define BNX2_DRV_MSG_DATA_WAIT0 0x00010000 | 4180 | #define BNX2_DRV_MSG_DATA_WAIT0 0x00010000 |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 8171cae06688..8b951238f3a2 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | //#define BONDING_DEBUG 1 | 34 | //#define BONDING_DEBUG 1 |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 5a9bd95884be..cfe4dc3a93a3 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * file called LICENSE. | 20 | * file called LICENSE. |
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 565a54f1d06a..b89c7bb2c591 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | * by default, the selective clear mask is set up to process rx packets. | 66 | * by default, the selective clear mask is set up to process rx packets. |
| 67 | */ | 67 | */ |
| 68 | 68 | ||
| 69 | #include <linux/config.h> | ||
| 70 | 69 | ||
| 71 | #include <linux/module.h> | 70 | #include <linux/module.h> |
| 72 | #include <linux/kernel.h> | 71 | #include <linux/kernel.h> |
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h index bf3e7b6a7a18..5d9dd14427c5 100644 --- a/drivers/net/chelsio/common.h +++ b/drivers/net/chelsio/common.h | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #ifndef _CXGB_COMMON_H_ | 39 | #ifndef _CXGB_COMMON_H_ |
| 40 | #define _CXGB_COMMON_H_ | 40 | #define _CXGB_COMMON_H_ |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 44 | #include <linux/netdevice.h> | 43 | #include <linux/netdevice.h> |
| 45 | #include <linux/types.h> | 44 | #include <linux/types.h> |
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c index 7fe2638ae06d..c490a862e79c 100644 --- a/drivers/net/chelsio/cxgb2.c +++ b/drivers/net/chelsio/cxgb2.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | ****************************************************************************/ | 37 | ****************************************************************************/ |
| 38 | 38 | ||
| 39 | #include "common.h" | 39 | #include "common.h" |
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
| 43 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c index 53efff6da784..87f94d939ff8 100644 --- a/drivers/net/chelsio/sge.c +++ b/drivers/net/chelsio/sge.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | 39 | ||
| 40 | #include "common.h" | 40 | #include "common.h" |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/types.h> | 42 | #include <linux/types.h> |
| 44 | #include <linux/errno.h> | 43 | #include <linux/errno.h> |
| 45 | #include <linux/pci.h> | 44 | #include <linux/pci.h> |
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 64105e4eaf31..d3654fd71604 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
| @@ -218,7 +218,6 @@ | |||
| 218 | * | 218 | * |
| 219 | */ | 219 | */ |
| 220 | 220 | ||
| 221 | #include <linux/config.h> | ||
| 222 | 221 | ||
| 223 | #include <linux/module.h> | 222 | #include <linux/module.h> |
| 224 | 223 | ||
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index ef54ebeb29b8..47eecce35fa4 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -100,7 +100,6 @@ | |||
| 100 | 100 | ||
| 101 | /* Always include 'config.h' first in case the user wants to turn on | 101 | /* Always include 'config.h' first in case the user wants to turn on |
| 102 | or override something. */ | 102 | or override something. */ |
| 103 | #include <linux/config.h> | ||
| 104 | #include <linux/module.h> | 103 | #include <linux/module.h> |
| 105 | 104 | ||
| 106 | /* | 105 | /* |
diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h index bd954aaa636f..968fe11a0bf0 100644 --- a/drivers/net/cs89x0.h +++ b/drivers/net/cs89x0.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 14 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #define PP_ChipID 0x0000 /* offset 0h -> Corp -ID */ | 18 | #define PP_ChipID 0x0000 /* offset 0h -> Corp -ID */ |
| 20 | /* offset 2h -> Model/Product Number */ | 19 | /* offset 2h -> Model/Product Number */ |
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index d3d958e7ac56..2038ca7e49ce 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | * bits. macro | 42 | * bits. macro |
| 43 | */ | 43 | */ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/crc32.h> | 45 | #include <linux/crc32.h> |
| 47 | #include <linux/delay.h> | 46 | #include <linux/delay.h> |
| 48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index e946c43d3b10..b1cbe99249c1 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
| @@ -235,7 +235,6 @@ | |||
| 235 | ========================================================================= | 235 | ========================================================================= |
| 236 | */ | 236 | */ |
| 237 | 237 | ||
| 238 | #include <linux/config.h> | ||
| 239 | #include <linux/module.h> | 238 | #include <linux/module.h> |
| 240 | #include <linux/kernel.h> | 239 | #include <linux/kernel.h> |
| 241 | #include <linux/string.h> | 240 | #include <linux/string.h> |
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 038447fb5c5e..29778055223b 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
| @@ -390,7 +390,7 @@ parse_eeprom (struct net_device *dev) | |||
| 390 | for (i = 0; i < 6; i++) | 390 | for (i = 0; i < 6; i++) |
| 391 | dev->dev_addr[i] = psrom->mac_addr[i]; | 391 | dev->dev_addr[i] = psrom->mac_addr[i]; |
| 392 | 392 | ||
| 393 | /* Parse Software Infomation Block */ | 393 | /* Parse Software Information Block */ |
| 394 | i = 0x30; | 394 | i = 0x30; |
| 395 | psib = (u8 *) sromdata; | 395 | psib = (u8 *) sromdata; |
| 396 | do { | 396 | do { |
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index dd8c15ac5c77..36d511729f71 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | Alan Cox, 30th May 1994 | 28 | Alan Cox, 30th May 1994 |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/netdevice.h> | 33 | #include <linux/netdevice.h> |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 93a286570923..a1d676a0df7c 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -138,7 +138,6 @@ | |||
| 138 | * - Stratus87247: protect MDI control register manipulations | 138 | * - Stratus87247: protect MDI control register manipulations |
| 139 | */ | 139 | */ |
| 140 | 140 | ||
| 141 | #include <linux/config.h> | ||
| 142 | #include <linux/module.h> | 141 | #include <linux/module.h> |
| 143 | #include <linux/moduleparam.h> | 142 | #include <linux/moduleparam.h> |
| 144 | #include <linux/kernel.h> | 143 | #include <linux/kernel.h> |
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 2bc34fbfa69c..3042d33e2d4d 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #define _E1000_H_ | 34 | #define _E1000_H_ |
| 35 | 35 | ||
| 36 | #include <linux/stddef.h> | 36 | #include <linux/stddef.h> |
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 40 | #include <asm/byteorder.h> | 39 | #include <asm/byteorder.h> |
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index ecf5ad85a684..1e2fbbbb966e 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
| @@ -87,7 +87,6 @@ static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
| 87 | /* Size of an pre-allocated Rx buffer: <Ethernet MTU> + slack.*/ | 87 | /* Size of an pre-allocated Rx buffer: <Ethernet MTU> + slack.*/ |
| 88 | #define PKT_BUF_SZ 1536 | 88 | #define PKT_BUF_SZ 1536 |
| 89 | 89 | ||
| 90 | #include <linux/config.h> | ||
| 91 | #include <linux/module.h> | 90 | #include <linux/module.h> |
| 92 | 91 | ||
| 93 | #include <linux/kernel.h> | 92 | #include <linux/kernel.h> |
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index a74b20715755..33291bcf6d4c 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
| @@ -97,7 +97,6 @@ | |||
| 97 | #define LOCKUP16 0 | 97 | #define LOCKUP16 0 |
| 98 | #endif | 98 | #endif |
| 99 | 99 | ||
| 100 | #include <linux/config.h> | ||
| 101 | #include <linux/module.h> | 100 | #include <linux/module.h> |
| 102 | #include <linux/kernel.h> | 101 | #include <linux/kernel.h> |
| 103 | #include <linux/types.h> | 102 | #include <linux/types.h> |
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index ee34a16eb4e2..b160abed8dd7 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
| @@ -114,7 +114,6 @@ static int rx_copybreak; | |||
| 114 | #define TX_FIFO_THRESH 256 | 114 | #define TX_FIFO_THRESH 256 |
| 115 | #define RX_FIFO_THRESH 1 /* 0-3, 0==32, 64,96, or 3==128 bytes */ | 115 | #define RX_FIFO_THRESH 1 /* 0-3, 0==32, 64,96, or 3==128 bytes */ |
| 116 | 116 | ||
| 117 | #include <linux/config.h> | ||
| 118 | #include <linux/module.h> | 117 | #include <linux/module.h> |
| 119 | #include <linux/kernel.h> | 118 | #include <linux/kernel.h> |
| 120 | #include <linux/string.h> | 119 | #include <linux/string.h> |
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index db694c832989..9b4030031744 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * Copyright (c) 2004-2006 Macq Electronique SA. | 25 | * Copyright (c) 2004-2006 Macq Electronique SA. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/string.h> | 30 | #include <linux/string.h> |
diff --git a/drivers/net/fec_8xx/fec_8xx-netta.c b/drivers/net/fec_8xx/fec_8xx-netta.c index 29c275e1d566..790d9dbe42dd 100644 --- a/drivers/net/fec_8xx/fec_8xx-netta.c +++ b/drivers/net/fec_8xx/fec_8xx-netta.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * FEC instantatiation file for NETTA | 2 | * FEC instantatiation file for NETTA |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c index 7e4338097139..282b1452c39a 100644 --- a/drivers/net/fec_8xx/fec_main.c +++ b/drivers/net/fec_8xx/fec_main.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Released under the GPL | 10 | * Released under the GPL |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c index 3b44ac1a7bfe..d3c16b85d9a4 100644 --- a/drivers/net/fec_8xx/fec_mii.c +++ b/drivers/net/fec_8xx/fec_mii.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Released under the GPL | 10 | * Released under the GPL |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 196298f33db8..e96a93c94941 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * kind, whether express or implied. | 15 | * kind, whether express or implied. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
diff --git a/drivers/net/fs_enet/fs_enet-mii.c b/drivers/net/fs_enet/fs_enet-mii.c index 0cd07150bf4a..b7e6e21725cb 100644 --- a/drivers/net/fs_enet/fs_enet-mii.c +++ b/drivers/net/fs_enet/fs_enet-mii.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c index 95e2bb8dd7b4..64e20982c1fe 100644 --- a/drivers/net/fs_enet/mac-fcc.c +++ b/drivers/net/fs_enet/mac-fcc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * kind, whether express or implied. | 12 | * kind, whether express or implied. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c index 3dad69dfdb2c..e09547077529 100644 --- a/drivers/net/fs_enet/mac-fec.c +++ b/drivers/net/fs_enet/mac-fec.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * kind, whether express or implied. | 12 | * kind, whether express or implied. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index a772b286f96d..eaa24fab645f 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * kind, whether express or implied. | 12 | * kind, whether express or implied. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c index 24a5e2e23d18..48f9cf83ab6f 100644 --- a/drivers/net/fs_enet/mii-bitbang.c +++ b/drivers/net/fs_enet/mii-bitbang.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/drivers/net/fs_enet/mii-fixed.c b/drivers/net/fs_enet/mii-fixed.c index b3e192d612e5..ae4a9c3bb393 100644 --- a/drivers/net/fs_enet/mii-fixed.c +++ b/drivers/net/fs_enet/mii-fixed.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 218d31764c52..ebbbd6ca6204 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | * The driver then cleans up the buffer. | 64 | * The driver then cleans up the buffer. |
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/config.h> | ||
| 68 | #include <linux/kernel.h> | 67 | #include <linux/kernel.h> |
| 69 | #include <linux/sched.h> | 68 | #include <linux/sched.h> |
| 70 | #include <linux/string.h> | 69 | #include <linux/string.h> |
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index 127c98cf3336..f87bbc408dae 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef __GIANFAR_H | 22 | #ifndef __GIANFAR_H |
| 23 | #define __GIANFAR_H | 23 | #define __GIANFAR_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/string.h> | 27 | #include <linux/string.h> |
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index d69698c695ef..e0f505285e50 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * by reference. | 15 | * by reference. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c index c6b725529af5..c92e65984fd0 100644 --- a/drivers/net/gianfar_mii.c +++ b/drivers/net/gianfar_mii.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/string.h> | 21 | #include <linux/string.h> |
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c index a6d5c43199cb..e8a18f18d08c 100644 --- a/drivers/net/gianfar_sysfs.c +++ b/drivers/net/gianfar_sysfs.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Sysfs file creation and management | 19 | * Sysfs file creation and management |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 25 | #include <linux/string.h> | 24 | #include <linux/string.h> |
diff --git a/drivers/net/gt96100eth.h b/drivers/net/gt96100eth.h index 395869c5ed3e..2a8331938b84 100644 --- a/drivers/net/gt96100eth.h +++ b/drivers/net/gt96100eth.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #ifndef _GT96100ETH_H | 27 | #ifndef _GT96100ETH_H |
| 28 | #define _GT96100ETH_H | 28 | #define _GT96100ETH_H |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <asm/galileo-boards/gt96100.h> | 30 | #include <asm/galileo-boards/gt96100.h> |
| 32 | 31 | ||
| 33 | #define dbg(lvl, format, arg...) \ | 32 | #define dbg(lvl, format, arg...) \ |
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index d12605f0ac7c..86b3bb9bec2d 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> | 12 | * Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <asm/system.h> | 16 | #include <asm/system.h> |
| 18 | #include <asm/uaccess.h> | 17 | #include <asm/uaccess.h> |
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index cb43a9d28774..0641f54fc638 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | * BPQ 004 Joerg(DL1BKE) Fixed to not lock up on ifconfig. | 54 | * BPQ 004 Joerg(DL1BKE) Fixed to not lock up on ifconfig. |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/errno.h> | 57 | #include <linux/errno.h> |
| 59 | #include <linux/types.h> | 58 | #include <linux/types.h> |
| 60 | #include <linux/socket.h> | 59 | #include <linux/socket.h> |
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 3ebbbe56b6e9..d8715b200c17 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Copyright (C) 2004, 05 Ralf Baechle DL5RB <ralf@linux-mips.org> | 16 | * Copyright (C) 2004, 05 Ralf Baechle DL5RB <ralf@linux-mips.org> |
| 17 | * Copyright (C) 2004, 05 Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de> | 17 | * Copyright (C) 2004, 05 Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de> |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 22 | #include <linux/bitops.h> | 21 | #include <linux/bitops.h> |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 5927784df3f9..b9b10caa031c 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
| @@ -148,7 +148,6 @@ | |||
| 148 | 148 | ||
| 149 | /* ----------------------------------------------------------------------- */ | 149 | /* ----------------------------------------------------------------------- */ |
| 150 | 150 | ||
| 151 | #include <linux/config.h> | ||
| 152 | #include <linux/module.h> | 151 | #include <linux/module.h> |
| 153 | #include <linux/errno.h> | 152 | #include <linux/errno.h> |
| 154 | #include <linux/signal.h> | 153 | #include <linux/signal.h> |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index b49884048caa..dd2f11c98530 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | /*****************************************************************************/ | 43 | /*****************************************************************************/ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 47 | #include <linux/types.h> | 46 | #include <linux/types.h> |
| 48 | #include <linux/net.h> | 47 | #include <linux/net.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac.h b/drivers/net/ibm_emac/ibm_emac.h index c2dae6092c4c..97ed22bb4320 100644 --- a/drivers/net/ibm_emac/ibm_emac.h +++ b/drivers/net/ibm_emac/ibm_emac.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __IBM_EMAC_H_ | 20 | #ifndef __IBM_EMAC_H_ |
| 21 | #define __IBM_EMAC_H_ | 21 | #define __IBM_EMAC_H_ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 25 | 24 | ||
| 26 | /* This is a simple check to prevent use of this driver on non-tested SoCs */ | 25 | /* This is a simple check to prevent use of this driver on non-tested SoCs */ |
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c index 7e49522b8b3c..82468e2dc799 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.c +++ b/drivers/net/ibm_emac/ibm_emac_core.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h index f61273b2e94f..dabb94afeb98 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.h +++ b/drivers/net/ibm_emac/ibm_emac_core.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __IBM_EMAC_CORE_H_ | 20 | #ifndef __IBM_EMAC_CORE_H_ |
| 21 | #define __IBM_EMAC_CORE_H_ | 21 | #define __IBM_EMAC_CORE_H_ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 25 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 26 | #include <asm/ocp.h> | 25 | #include <asm/ocp.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.c b/drivers/net/ibm_emac/ibm_emac_debug.c index c7e1ecfa08fe..c3645908034d 100644 --- a/drivers/net/ibm_emac/ibm_emac_debug.c +++ b/drivers/net/ibm_emac/ibm_emac_debug.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * option) any later version. | 12 | * option) any later version. |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.h b/drivers/net/ibm_emac/ibm_emac_debug.h index e85fbe0a8da9..5761389495d0 100644 --- a/drivers/net/ibm_emac/ibm_emac_debug.h +++ b/drivers/net/ibm_emac/ibm_emac_debug.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __IBM_EMAC_DEBUG_H_ | 15 | #ifndef __IBM_EMAC_DEBUG_H_ |
| 16 | #define __IBM_EMAC_DEBUG_H_ | 16 | #define __IBM_EMAC_DEBUG_H_ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include "ibm_emac_core.h" | 19 | #include "ibm_emac_core.h" |
| 21 | #include "ibm_emac_mal.h" | 20 | #include "ibm_emac_mal.h" |
diff --git a/drivers/net/ibm_emac/ibm_emac_mal.c b/drivers/net/ibm_emac/ibm_emac_mal.c index da88d43081cc..af50e7b2e0d7 100644 --- a/drivers/net/ibm_emac/ibm_emac_mal.c +++ b/drivers/net/ibm_emac/ibm_emac_mal.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * option) any later version. | 19 | * option) any later version. |
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_mal.h b/drivers/net/ibm_emac/ibm_emac_mal.h index 2a2d3b24b037..f73f10a0a562 100644 --- a/drivers/net/ibm_emac/ibm_emac_mal.h +++ b/drivers/net/ibm_emac/ibm_emac_mal.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef __IBM_EMAC_MAL_H_ | 19 | #ifndef __IBM_EMAC_MAL_H_ |
| 20 | #define __IBM_EMAC_MAL_H_ | 20 | #define __IBM_EMAC_MAL_H_ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/list.h> | 23 | #include <linux/list.h> |
| 25 | #include <linux/netdevice.h> | 24 | #include <linux/netdevice.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_phy.c b/drivers/net/ibm_emac/ibm_emac_phy.c index 67935dd33a65..4a97024061e5 100644 --- a/drivers/net/ibm_emac/ibm_emac_phy.c +++ b/drivers/net/ibm_emac/ibm_emac_phy.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * (c) 2004-2005, Eugene Surovegin <ebs@ebshome.net> | 12 | * (c) 2004-2005, Eugene Surovegin <ebs@ebshome.net> |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.c b/drivers/net/ibm_emac/ibm_emac_rgmii.c index f0b1ffb2dbbf..53d281cb9a16 100644 --- a/drivers/net/ibm_emac/ibm_emac_rgmii.c +++ b/drivers/net/ibm_emac/ibm_emac_rgmii.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * option) any later version. | 16 | * option) any later version. |
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/ethtool.h> | 20 | #include <linux/ethtool.h> |
| 22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h index 7f03d536c9a3..94abde55e2e9 100644 --- a/drivers/net/ibm_emac/ibm_emac_rgmii.h +++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #ifndef _IBM_EMAC_RGMII_H_ | 21 | #ifndef _IBM_EMAC_RGMII_H_ |
| 22 | #define _IBM_EMAC_RGMII_H_ | 22 | #define _IBM_EMAC_RGMII_H_ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | 24 | ||
| 26 | /* RGMII bridge */ | 25 | /* RGMII bridge */ |
| 27 | struct rgmii_regs { | 26 | struct rgmii_regs { |
diff --git a/drivers/net/ibm_emac/ibm_emac_tah.c b/drivers/net/ibm_emac/ibm_emac_tah.c index af08afc22f9f..e287b451bb44 100644 --- a/drivers/net/ibm_emac/ibm_emac_tah.c +++ b/drivers/net/ibm_emac/ibm_emac_tah.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Free Software Foundation; either version 2 of the License, or (at your | 13 | * Free Software Foundation; either version 2 of the License, or (at your |
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <asm/io.h> | 16 | #include <asm/io.h> |
| 18 | 17 | ||
| 19 | #include "ibm_emac_core.h" | 18 | #include "ibm_emac_core.h" |
diff --git a/drivers/net/ibm_emac/ibm_emac_tah.h b/drivers/net/ibm_emac/ibm_emac_tah.h index 9299b5dd7eb1..38153945a240 100644 --- a/drivers/net/ibm_emac/ibm_emac_tah.h +++ b/drivers/net/ibm_emac/ibm_emac_tah.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef _IBM_EMAC_TAH_H | 17 | #ifndef _IBM_EMAC_TAH_H |
| 18 | #define _IBM_EMAC_TAH_H | 18 | #define _IBM_EMAC_TAH_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <asm/ocp.h> | 21 | #include <asm/ocp.h> |
| 23 | 22 | ||
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.c b/drivers/net/ibm_emac/ibm_emac_zmii.c index e129e0aaa045..37dc8f342868 100644 --- a/drivers/net/ibm_emac/ibm_emac_zmii.c +++ b/drivers/net/ibm_emac/ibm_emac_zmii.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * option) any later version. | 16 | * option) any later version. |
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/ethtool.h> | 20 | #include <linux/ethtool.h> |
| 22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.h b/drivers/net/ibm_emac/ibm_emac_zmii.h index 92c854410753..972e3a44a09f 100644 --- a/drivers/net/ibm_emac/ibm_emac_zmii.h +++ b/drivers/net/ibm_emac/ibm_emac_zmii.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #ifndef _IBM_EMAC_ZMII_H_ | 19 | #ifndef _IBM_EMAC_ZMII_H_ |
| 20 | #define _IBM_EMAC_ZMII_H_ | 20 | #define _IBM_EMAC_ZMII_H_ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <asm/ocp.h> | 23 | #include <asm/ocp.h> |
| 25 | 24 | ||
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 4c2e7279ba34..0464e78f733a 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | - possibly remove procfs support | 33 | - possibly remove procfs support |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 39 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 2e222ef91e22..3a42afab5036 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/netdevice.h> | 32 | #include <linux/netdevice.h> |
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index e76e6e7be0b1..dbf67750d899 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #define IOC3_NAME "ioc3-eth" | 30 | #define IOC3_NAME "ioc3-eth" |
| 31 | #define IOC3_VERSION "2.6.3-3" | 31 | #define IOC3_VERSION "2.6.3-3" |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index d2ce4896abff..e9e6d99a9add 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig | |||
| @@ -350,7 +350,7 @@ config TOSHIBA_FIR | |||
| 350 | 350 | ||
| 351 | config AU1000_FIR | 351 | config AU1000_FIR |
| 352 | tristate "Alchemy Au1000 SIR/FIR" | 352 | tristate "Alchemy Au1000 SIR/FIR" |
| 353 | depends on MIPS_AU1000 && IRDA | 353 | depends on SOC_AU1000 && IRDA |
| 354 | 354 | ||
| 355 | config SMC_IRCC_FIR | 355 | config SMC_IRCC_FIR |
| 356 | tristate "SMSC IrCC (EXPERIMENTAL)" | 356 | tristate "SMSC IrCC (EXPERIMENTAL)" |
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index e6b1985767c2..7b2b4135bb23 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * with this program; if not, write to the Free Software Foundation, Inc., | 18 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 19 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 19 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index 754297fc8f22..47f6f64d604c 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
| @@ -101,7 +101,7 @@ static int transceiver_type = MCS_TSC_VISHAY; | |||
| 101 | module_param(transceiver_type, int, 0444); | 101 | module_param(transceiver_type, int, 0444); |
| 102 | MODULE_PARM_DESC(transceiver_type, "IR transceiver type, see mcs7780.h."); | 102 | MODULE_PARM_DESC(transceiver_type, "IR transceiver type, see mcs7780.h."); |
| 103 | 103 | ||
| 104 | struct usb_driver mcs_driver = { | 104 | static struct usb_driver mcs_driver = { |
| 105 | .name = "mcs7780", | 105 | .name = "mcs7780", |
| 106 | .probe = mcs_probe, | 106 | .probe = mcs_probe, |
| 107 | .disconnect = mcs_disconnect, | 107 | .disconnect = mcs_disconnect, |
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index e1aa9910503b..afb19e8d95c8 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Infra-red driver (SIR/FIR) for the PXA2xx embedded microprocessor | 12 | * Infra-red driver (SIR/FIR) for the PXA2xx embedded microprocessor |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index f530686bd09f..8d5a288d7976 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * power_leve:level - set the transmitter power level | 18 | * power_leve:level - set the transmitter power level |
| 19 | * tx_lpm:0|1 - set transmit low power mode | 19 | * tx_lpm:0|1 - set transmit low power mode |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/moduleparam.h> | 22 | #include <linux/moduleparam.h> |
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index d70b9e8d6e60..b9f28b14b3ae 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | ********************************************************************/ | 22 | ********************************************************************/ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | 25 | ||
| 27 | #define DRIVER_NAME "vlsi_ir" | 26 | #define DRIVER_NAME "vlsi_ir" |
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 93394d76587a..cdc14401cdbe 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | * number of packets outstanding to a remote partition at a time. | 56 | * number of packets outstanding to a remote partition at a time. |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <linux/config.h> | ||
| 60 | #include <linux/module.h> | 59 | #include <linux/module.h> |
| 61 | #include <linux/types.h> | 60 | #include <linux/types.h> |
| 62 | #include <linux/errno.h> | 61 | #include <linux/errno.h> |
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index a83ef28dadb0..82b67af54c94 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #define _IXGB_H_ | 30 | #define _IXGB_H_ |
| 31 | 31 | ||
| 32 | #include <linux/stddef.h> | 32 | #include <linux/stddef.h> |
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 36 | #include <asm/byteorder.h> | 35 | #include <asm/byteorder.h> |
diff --git a/drivers/net/ixp2000/caleb.c b/drivers/net/ixp2000/caleb.c index 3595e107df22..7dea5b95012c 100644 --- a/drivers/net/ixp2000/caleb.c +++ b/drivers/net/ixp2000/caleb.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c index b67f586d7392..d3f4235c585d 100644 --- a/drivers/net/ixp2000/enp2611.c +++ b/drivers/net/ixp2000/enp2611.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ixp2000/ixp2400-msf.c index 48a3a891d3a4..9ec38eebfb56 100644 --- a/drivers/net/ixp2000/ixp2400-msf.c +++ b/drivers/net/ixp2000/ixp2400-msf.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * License, or (at your option) any later version. | 11 | * License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <asm/hardware.h> | 16 | #include <asm/hardware.h> |
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index fbc2d21020f4..99229a0456d9 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ixp2000/pm3386.c index 5224651c9aac..e08d3f9863b8 100644 --- a/drivers/net/ixp2000/pm3386.c +++ b/drivers/net/ixp2000/pm3386.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 15 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 77792b286027..f2c0bf89f0c7 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1996 Paul Mackerras. | 5 | * Copyright (C) 1996 Paul Mackerras. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/netdevice.h> | 10 | #include <linux/netdevice.h> |
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h index 4262c1da6d4a..33c5fafdbbd3 100644 --- a/drivers/net/mv643xx_eth.h +++ b/drivers/net/mv643xx_eth.h | |||
| @@ -258,7 +258,7 @@ struct pkt_info { | |||
| 258 | struct sk_buff *return_info; /* User resource return information */ | 258 | struct sk_buff *return_info; /* User resource return information */ |
| 259 | }; | 259 | }; |
| 260 | 260 | ||
| 261 | /* Ethernet port specific infomation */ | 261 | /* Ethernet port specific information */ |
| 262 | 262 | ||
| 263 | struct mv643xx_mib_counters { | 263 | struct mv643xx_mib_counters { |
| 264 | u64 good_octets_received; | 264 | u64 good_octets_received; |
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index d9f616fea3d9..19981065efb4 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -7,7 +7,6 @@ static char version[] = | |||
| 7 | "myri_sbus.c:v2.0 June 23, 2006 David S. Miller (davem@davemloft.net)\n"; | 7 | "myri_sbus.c:v2.0 June 23, 2006 David S. Miller (davem@davemloft.net)\n"; |
| 8 | 8 | ||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 5657049c2160..438c63f940b9 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
| @@ -138,7 +138,6 @@ | |||
| 138 | * big endian support with CFG:BEM instead of cpu_to_le32 | 138 | * big endian support with CFG:BEM instead of cpu_to_le32 |
| 139 | */ | 139 | */ |
| 140 | 140 | ||
| 141 | #include <linux/config.h> | ||
| 142 | #include <linux/module.h> | 141 | #include <linux/module.h> |
| 143 | #include <linux/kernel.h> | 142 | #include <linux/kernel.h> |
| 144 | #include <linux/string.h> | 143 | #include <linux/string.h> |
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 706aed7d717f..deedd7b2af5d 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
| @@ -96,7 +96,6 @@ | |||
| 96 | //#define dprintk printk | 96 | //#define dprintk printk |
| 97 | #define dprintk(x...) do { } while (0) | 97 | #define dprintk(x...) do { } while (0) |
| 98 | 98 | ||
| 99 | #include <linux/config.h> | ||
| 100 | #include <linux/module.h> | 99 | #include <linux/module.h> |
| 101 | #include <linux/moduleparam.h> | 100 | #include <linux/moduleparam.h> |
| 102 | #include <linux/types.h> | 101 | #include <linux/types.h> |
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index a7bb54df75a8..978b95afc721 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
| @@ -85,7 +85,6 @@ IVc. Errata | |||
| 85 | 85 | ||
| 86 | */ | 86 | */ |
| 87 | 87 | ||
| 88 | #include <linux/config.h> | ||
| 89 | #include <linux/module.h> | 88 | #include <linux/module.h> |
| 90 | #include <linux/kernel.h> | 89 | #include <linux/kernel.h> |
| 91 | #include <linux/pci.h> | 90 | #include <linux/pci.h> |
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 441de824ab6b..48434d7924eb 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
| @@ -387,7 +387,10 @@ static int com20020_resume(struct pcmcia_device *link) | |||
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | static struct pcmcia_device_id com20020_ids[] = { | 389 | static struct pcmcia_device_id com20020_ids[] = { |
| 390 | PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf), | 390 | PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", |
| 391 | "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf), | ||
| 392 | PCMCIA_DEVICE_PROD_ID12("SoHard AG", | ||
| 393 | "SH ARC PCMCIA", 0xf8991729, 0x69dff0c7), | ||
| 391 | PCMCIA_DEVICE_NULL | 394 | PCMCIA_DEVICE_NULL |
| 392 | }; | 395 | }; |
| 393 | MODULE_DEVICE_TABLE(pcmcia, com20020_ids); | 396 | MODULE_DEVICE_TABLE(pcmcia, com20020_ids); |
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c index 7d8d534255c0..3efb715c28dc 100644 --- a/drivers/net/phy/cicada.c +++ b/drivers/net/phy/cicada.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 5e9002e444c5..aa7983f55838 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 3f702c503afe..69d2325f848c 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index a2d6386d13bc..0ad253282d0d 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 1b236bdf6b92..1dde390c164d 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 33cec2dab942..44bcd3eb2b83 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/string.h> | 19 | #include <linux/string.h> |
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 7da0e3dd5fe3..1bc1e032c5d6 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/string.h> | 19 | #include <linux/string.h> |
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c index 65d995b02b25..2b50e1739aa5 100644 --- a/drivers/net/phy/qsemi.c +++ b/drivers/net/phy/qsemi.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * option) any later version. | 13 | * option) any later version. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 425ff5b117f1..0ec6e9d57b94 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * ==FILEVERSION 20041108== | 22 | * ==FILEVERSION 20041108== |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/kmod.h> | 27 | #include <linux/kmod.h> |
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index 1985d1b57c45..51ff9a9d1bb5 100644 --- a/drivers/net/ppp_mppe.c +++ b/drivers/net/ppp_mppe.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | * deprecated in 2.6 | 43 | * deprecated in 2.6 |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/config.h> | ||
| 47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 48 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
| 49 | #include <linux/version.h> | 48 | #include <linux/version.h> |
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index 19c2df9c86fe..757c542ac40a 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #define RX_DMA_SKBUFF 1 | 28 | #define RX_DMA_SKBUFF 1 |
| 29 | #define PKT_COPY_THRESHOLD 512 | 29 | #define PKT_COPY_THRESHOLD 512 |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
diff --git a/drivers/net/rrunner.h b/drivers/net/rrunner.h index 10baae55953a..2c3c91ebd99f 100644 --- a/drivers/net/rrunner.h +++ b/drivers/net/rrunner.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _RRUNNER_H_ | 1 | #ifndef _RRUNNER_H_ |
| 2 | #define _RRUNNER_H_ | 2 | #define _RRUNNER_H_ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
| 6 | 5 | ||
| 7 | #if ((BITS_PER_LONG != 32) && (BITS_PER_LONG != 64)) | 6 | #if ((BITS_PER_LONG != 32) && (BITS_PER_LONG != 64)) |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 3defe5d4f7d3..001344c0763e 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * aggregated as a single large packet | 44 | * aggregated as a single large packet |
| 45 | ************************************************************************/ | 45 | ************************************************************************/ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 49 | #include <linux/types.h> | 48 | #include <linux/types.h> |
| 50 | #include <linux/errno.h> | 49 | #include <linux/errno.h> |
| @@ -3960,7 +3959,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 3960 | txdp->Control_2 = 0; | 3959 | txdp->Control_2 = 0; |
| 3961 | #ifdef NETIF_F_TSO | 3960 | #ifdef NETIF_F_TSO |
| 3962 | mss = skb_shinfo(skb)->gso_size; | 3961 | mss = skb_shinfo(skb)->gso_size; |
| 3963 | if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV4) { | 3962 | if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) { |
| 3964 | txdp->Control_1 |= TXD_TCP_LSO_EN; | 3963 | txdp->Control_1 |= TXD_TCP_LSO_EN; |
| 3965 | txdp->Control_1 |= TXD_TCP_LSO_MSS(mss); | 3964 | txdp->Control_1 |= TXD_TCP_LSO_MSS(mss); |
| 3966 | } | 3965 | } |
| @@ -3980,7 +3979,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 3980 | } | 3979 | } |
| 3981 | 3980 | ||
| 3982 | frg_len = skb->len - skb->data_len; | 3981 | frg_len = skb->len - skb->data_len; |
| 3983 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4) { | 3982 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP) { |
| 3984 | int ufo_size; | 3983 | int ufo_size; |
| 3985 | 3984 | ||
| 3986 | ufo_size = skb_shinfo(skb)->gso_size; | 3985 | ufo_size = skb_shinfo(skb)->gso_size; |
| @@ -4009,7 +4008,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 4009 | txdp->Host_Control = (unsigned long) skb; | 4008 | txdp->Host_Control = (unsigned long) skb; |
| 4010 | txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len); | 4009 | txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len); |
| 4011 | 4010 | ||
| 4012 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4) | 4011 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP) |
| 4013 | txdp->Control_1 |= TXD_UFO_EN; | 4012 | txdp->Control_1 |= TXD_UFO_EN; |
| 4014 | 4013 | ||
| 4015 | frg_cnt = skb_shinfo(skb)->nr_frags; | 4014 | frg_cnt = skb_shinfo(skb)->nr_frags; |
| @@ -4024,12 +4023,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 4024 | (sp->pdev, frag->page, frag->page_offset, | 4023 | (sp->pdev, frag->page, frag->page_offset, |
| 4025 | frag->size, PCI_DMA_TODEVICE); | 4024 | frag->size, PCI_DMA_TODEVICE); |
| 4026 | txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size); | 4025 | txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size); |
| 4027 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4) | 4026 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP) |
| 4028 | txdp->Control_1 |= TXD_UFO_EN; | 4027 | txdp->Control_1 |= TXD_UFO_EN; |
| 4029 | } | 4028 | } |
| 4030 | txdp->Control_1 |= TXD_GATHER_CODE_LAST; | 4029 | txdp->Control_1 |= TXD_GATHER_CODE_LAST; |
| 4031 | 4030 | ||
| 4032 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4) | 4031 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP) |
| 4033 | frg_cnt++; /* as Txd0 was used for inband header */ | 4032 | frg_cnt++; /* as Txd0 was used for inband header */ |
| 4034 | 4033 | ||
| 4035 | tx_fifo = mac_control->tx_FIFO_start[queue]; | 4034 | tx_fifo = mac_control->tx_FIFO_start[queue]; |
| @@ -4043,7 +4042,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 4043 | if (mss) | 4042 | if (mss) |
| 4044 | val64 |= TX_FIFO_SPECIAL_FUNC; | 4043 | val64 |= TX_FIFO_SPECIAL_FUNC; |
| 4045 | #endif | 4044 | #endif |
| 4046 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDPV4) | 4045 | if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP) |
| 4047 | val64 |= TX_FIFO_SPECIAL_FUNC; | 4046 | val64 |= TX_FIFO_SPECIAL_FUNC; |
| 4048 | writeq(val64, &tx_fifo->List_Control); | 4047 | writeq(val64, &tx_fifo->List_Control); |
| 4049 | 4048 | ||
| @@ -7021,6 +7020,9 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
| 7021 | #ifdef NETIF_F_TSO | 7020 | #ifdef NETIF_F_TSO |
| 7022 | dev->features |= NETIF_F_TSO; | 7021 | dev->features |= NETIF_F_TSO; |
| 7023 | #endif | 7022 | #endif |
| 7023 | #ifdef NETIF_F_TSO6 | ||
| 7024 | dev->features |= NETIF_F_TSO6; | ||
| 7025 | #endif | ||
| 7024 | if (sp->device_type & XFRAME_II_DEVICE) { | 7026 | if (sp->device_type & XFRAME_II_DEVICE) { |
| 7025 | dev->features |= NETIF_F_UFO; | 7027 | dev->features |= NETIF_F_UFO; |
| 7026 | dev->features |= NETIF_F_HW_CSUM; | 7028 | dev->features |= NETIF_F_HW_CSUM; |
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 3203732a668d..c43f52179708 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
| @@ -652,7 +652,7 @@ typedef struct fifo_info { | |||
| 652 | nic_t *nic; | 652 | nic_t *nic; |
| 653 | }fifo_info_t; | 653 | }fifo_info_t; |
| 654 | 654 | ||
| 655 | /* Infomation related to the Tx and Rx FIFOs and Rings of Xena | 655 | /* Information related to the Tx and Rx FIFOs and Rings of Xena |
| 656 | * is maintained in this structure. | 656 | * is maintained in this structure. |
| 657 | */ | 657 | */ |
| 658 | typedef struct mac_info { | 658 | typedef struct mac_info { |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index f2be9f83f091..c7b5f0004e54 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
| 32 | #include <linux/skbuff.h> | 32 | #include <linux/skbuff.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/bitops.h> | 34 | #include <linux/bitops.h> |
| 36 | #include <asm/processor.h> /* Processor type for cache alignment. */ | 35 | #include <asm/processor.h> /* Processor type for cache alignment. */ |
| 37 | #include <asm/io.h> | 36 | #include <asm/io.h> |
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c index 88e212043a43..c7832e69f177 100644 --- a/drivers/net/shaper.c +++ b/drivers/net/shaper.c | |||
| @@ -69,7 +69,6 @@ | |||
| 69 | * 2000/03 Andi Kleen | 69 | * 2000/03 Andi Kleen |
| 70 | */ | 70 | */ |
| 71 | 71 | ||
| 72 | #include <linux/config.h> | ||
| 73 | #include <linux/module.h> | 72 | #include <linux/module.h> |
| 74 | #include <linux/kernel.h> | 73 | #include <linux/kernel.h> |
| 75 | #include <linux/fcntl.h> | 74 | #include <linux/fcntl.h> |
diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c index 17786056c66a..1e662aaebf84 100644 --- a/drivers/net/sk98lin/skvpd.c +++ b/drivers/net/sk98lin/skvpd.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | ******************************************************************************/ | 22 | ******************************************************************************/ |
| 23 | 23 | ||
| 24 | /* | 24 | /* |
| 25 | Please refer skvpd.txt for infomation how to include this module | 25 | Please refer skvpd.txt for information how to include this module |
| 26 | */ | 26 | */ |
| 27 | static const char SysKonnectFileId[] = | 27 | static const char SysKonnectFileId[] = |
| 28 | "@(#)$Id: skvpd.c,v 1.37 2003/01/13 10:42:45 rschmidt Exp $ (C) SK"; | 28 | "@(#)$Id: skvpd.c,v 1.37 2003/01/13 10:42:45 rschmidt Exp $ (C) SK"; |
diff --git a/drivers/net/skfp/h/sba.h b/drivers/net/skfp/h/sba.h index df716cd5784a..638cf0283bc4 100644 --- a/drivers/net/skfp/h/sba.h +++ b/drivers/net/skfp/h/sba.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
| 14 | 14 | ||
| 15 | /* | 15 | /* |
| 16 | * Synchronous Bandwith Allocation (SBA) structs | 16 | * Synchronous Bandwidth Allocation (SBA) structs |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #ifndef _SBA_ | 19 | #ifndef _SBA_ |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 1608efab4e3d..82df13be3d40 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/in.h> | 27 | #include <linux/in.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index e122007e16da..3f1b0fef13e7 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/crc32.h> | 26 | #include <linux/crc32.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/version.h> | 28 | #include <linux/version.h> |
diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c index c6fbb1ede0ed..3a1b7131681c 100644 --- a/drivers/net/slhc.c +++ b/drivers/net/slhc.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | * driver code belonging close to PPP and SLIP | 50 | * driver code belonging close to PPP and SLIP |
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #include <linux/config.h> | ||
| 54 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 55 | #include <linux/types.h> | 54 | #include <linux/types.h> |
| 56 | #include <linux/string.h> | 55 | #include <linux/string.h> |
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index b2e18d28850d..1588cb7f6c83 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #define SL_CHECK_TRANSMIT | 57 | #define SL_CHECK_TRANSMIT |
| 58 | #include <linux/config.h> | ||
| 59 | #include <linux/module.h> | 58 | #include <linux/module.h> |
| 60 | #include <linux/moduleparam.h> | 59 | #include <linux/moduleparam.h> |
| 61 | 60 | ||
diff --git a/drivers/net/slip.h b/drivers/net/slip.h index ab3efe66a642..29d87dd45a24 100644 --- a/drivers/net/slip.h +++ b/drivers/net/slip.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef _LINUX_SLIP_H | 22 | #ifndef _LINUX_SLIP_H |
| 23 | #define _LINUX_SLIP_H | 23 | #define _LINUX_SLIP_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | #if defined(CONFIG_INET) && defined(CONFIG_SLIP_COMPRESSED) | 26 | #if defined(CONFIG_INET) && defined(CONFIG_SLIP_COMPRESSED) |
| 28 | # define SL_INCLUDE_CSLIP | 27 | # define SL_INCLUDE_CSLIP |
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index 5b4e8529d4ab..45449353a958 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | static const char version[] = | 57 | static const char version[] = |
| 58 | "smc-ultra.c:v2.02 2/3/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n"; | 58 | "smc-ultra.c:v2.02 2/3/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n"; |
| 59 | 59 | ||
| 60 | #include <linux/config.h> | ||
| 61 | #include <linux/module.h> | 60 | #include <linux/module.h> |
| 62 | #include <linux/kernel.h> | 61 | #include <linux/kernel.h> |
| 63 | #include <linux/errno.h> | 62 | #include <linux/errno.h> |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 0e9833adf9fe..3d8dcb6c8758 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -66,7 +66,6 @@ static const char version[] = | |||
| 66 | #endif | 66 | #endif |
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | #include <linux/config.h> | ||
| 70 | #include <linux/init.h> | 69 | #include <linux/init.h> |
| 71 | #include <linux/module.h> | 70 | #include <linux/module.h> |
| 72 | #include <linux/kernel.h> | 71 | #include <linux/kernel.h> |
diff --git a/drivers/net/sonic.h b/drivers/net/sonic.h index cede969a8baa..7f5c4ebcc17a 100644 --- a/drivers/net/sonic.h +++ b/drivers/net/sonic.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef SONIC_H | 22 | #ifndef SONIC_H |
| 23 | #define SONIC_H | 23 | #define SONIC_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | /* | 26 | /* |
| 28 | * SONIC register offsets | 27 | * SONIC register offsets |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 394339d5e87c..e0b72676922c 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
| 26 | #include <linux/crc32.h> | 25 | #include <linux/crc32.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index c158eedc7813..f91be95356a4 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
| @@ -146,7 +146,6 @@ TODO: - fix forced speed/duplexing code (broken a long time ago, when | |||
| 146 | #define DRV_VERSION "1.03+LK1.4.2.1" | 146 | #define DRV_VERSION "1.03+LK1.4.2.1" |
| 147 | #define DRV_RELDATE "October 3, 2005" | 147 | #define DRV_RELDATE "October 3, 2005" |
| 148 | 148 | ||
| 149 | #include <linux/config.h> | ||
| 150 | #include <linux/module.h> | 149 | #include <linux/module.h> |
| 151 | #include <linux/kernel.h> | 150 | #include <linux/kernel.h> |
| 152 | #include <linux/pci.h> | 151 | #include <linux/pci.h> |
diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c index b6dfdf8f44da..74228348995d 100644 --- a/drivers/net/stnic.c +++ b/drivers/net/stnic.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1999 kaz Kojima | 7 | * Copyright (C) 1999 kaz Kojima |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index 9282b4b0c022..278c7cb22216 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * of darwin, still need to reverse engineer that | 19 | * of darwin, still need to reverse engineer that |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index c33ead3470db..d85b83204f6b 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * argument : macaddr=0x00,0x10,0x20,0x30,0x40,0x50 | 13 | * argument : macaddr=0x00,0x10,0x20,0x30,0x40,0x50 |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| @@ -2523,7 +2522,7 @@ static struct ethtool_ops hme_ethtool_ops = { | |||
| 2523 | static int hme_version_printed; | 2522 | static int hme_version_printed; |
| 2524 | 2523 | ||
| 2525 | #ifdef CONFIG_SBUS | 2524 | #ifdef CONFIG_SBUS |
| 2526 | void __init quattro_get_ranges(struct quattro *qp) | 2525 | void __devinit quattro_get_ranges(struct quattro *qp) |
| 2527 | { | 2526 | { |
| 2528 | struct sbus_dev *sdev = qp->quattro_dev; | 2527 | struct sbus_dev *sdev = qp->quattro_dev; |
| 2529 | int err; | 2528 | int err; |
| @@ -2539,7 +2538,7 @@ void __init quattro_get_ranges(struct quattro *qp) | |||
| 2539 | qp->nranges = (err / sizeof(struct linux_prom_ranges)); | 2538 | qp->nranges = (err / sizeof(struct linux_prom_ranges)); |
| 2540 | } | 2539 | } |
| 2541 | 2540 | ||
| 2542 | static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp) | 2541 | static void __devinit quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp) |
| 2543 | { | 2542 | { |
| 2544 | struct sbus_dev *sdev = hp->happy_dev; | 2543 | struct sbus_dev *sdev = hp->happy_dev; |
| 2545 | int rng; | 2544 | int rng; |
| @@ -2566,7 +2565,7 @@ static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *h | |||
| 2566 | * | 2565 | * |
| 2567 | * Return NULL on failure. | 2566 | * Return NULL on failure. |
| 2568 | */ | 2567 | */ |
| 2569 | static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev) | 2568 | static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev) |
| 2570 | { | 2569 | { |
| 2571 | struct sbus_dev *sdev; | 2570 | struct sbus_dev *sdev; |
| 2572 | struct quattro *qp; | 2571 | struct quattro *qp; |
| @@ -2618,7 +2617,7 @@ static void __init quattro_sbus_register_irqs(void) | |||
| 2618 | } | 2617 | } |
| 2619 | } | 2618 | } |
| 2620 | 2619 | ||
| 2621 | static void __devexit quattro_sbus_free_irqs(void) | 2620 | static void quattro_sbus_free_irqs(void) |
| 2622 | { | 2621 | { |
| 2623 | struct quattro *qp; | 2622 | struct quattro *qp; |
| 2624 | 2623 | ||
| @@ -2662,7 +2661,7 @@ static struct quattro * __init quattro_pci_find(struct pci_dev *pdev) | |||
| 2662 | #endif /* CONFIG_PCI */ | 2661 | #endif /* CONFIG_PCI */ |
| 2663 | 2662 | ||
| 2664 | #ifdef CONFIG_SBUS | 2663 | #ifdef CONFIG_SBUS |
| 2665 | static int __init happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe) | 2664 | static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe) |
| 2666 | { | 2665 | { |
| 2667 | struct device_node *dp = sdev->ofdev.node; | 2666 | struct device_node *dp = sdev->ofdev.node; |
| 2668 | struct quattro *qp = NULL; | 2667 | struct quattro *qp = NULL; |
diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h index 9b7ccaeeee89..90f446db9ba2 100644 --- a/drivers/net/sunhme.h +++ b/drivers/net/sunhme.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _SUNHME_H | 8 | #ifndef _SUNHME_H |
| 9 | #define _SUNHME_H | 9 | #define _SUNHME_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
| 13 | 12 | ||
| 14 | /* Happy Meal global registers. */ | 13 | /* Happy Meal global registers. */ |
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 2c239ab63a80..5b0b60f4d20e 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
| @@ -71,7 +71,6 @@ | |||
| 71 | 71 | ||
| 72 | static char lancestr[] = "LANCE"; | 72 | static char lancestr[] = "LANCE"; |
| 73 | 73 | ||
| 74 | #include <linux/config.h> | ||
| 75 | #include <linux/module.h> | 74 | #include <linux/module.h> |
| 76 | #include <linux/kernel.h> | 75 | #include <linux/kernel.h> |
| 77 | #include <linux/types.h> | 76 | #include <linux/types.h> |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 35f931638750..953255e92633 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * notice is accompanying it. | 15 | * notice is accompanying it. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/moduleparam.h> | 20 | #include <linux/moduleparam.h> |
| @@ -69,8 +68,8 @@ | |||
| 69 | 68 | ||
| 70 | #define DRV_MODULE_NAME "tg3" | 69 | #define DRV_MODULE_NAME "tg3" |
| 71 | #define PFX DRV_MODULE_NAME ": " | 70 | #define PFX DRV_MODULE_NAME ": " |
| 72 | #define DRV_MODULE_VERSION "3.60" | 71 | #define DRV_MODULE_VERSION "3.61" |
| 73 | #define DRV_MODULE_RELDATE "June 17, 2006" | 72 | #define DRV_MODULE_RELDATE "June 29, 2006" |
| 74 | 73 | ||
| 75 | #define TG3_DEF_MAC_MODE 0 | 74 | #define TG3_DEF_MAC_MODE 0 |
| 76 | #define TG3_DEF_RX_MODE 0 | 75 | #define TG3_DEF_RX_MODE 0 |
| @@ -3195,7 +3194,7 @@ static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag) | |||
| 3195 | */ | 3194 | */ |
| 3196 | static int tg3_rx(struct tg3 *tp, int budget) | 3195 | static int tg3_rx(struct tg3 *tp, int budget) |
| 3197 | { | 3196 | { |
| 3198 | u32 work_mask; | 3197 | u32 work_mask, rx_std_posted = 0; |
| 3199 | u32 sw_idx = tp->rx_rcb_ptr; | 3198 | u32 sw_idx = tp->rx_rcb_ptr; |
| 3200 | u16 hw_idx; | 3199 | u16 hw_idx; |
| 3201 | int received; | 3200 | int received; |
| @@ -3222,6 +3221,7 @@ static int tg3_rx(struct tg3 *tp, int budget) | |||
| 3222 | mapping); | 3221 | mapping); |
| 3223 | skb = tp->rx_std_buffers[desc_idx].skb; | 3222 | skb = tp->rx_std_buffers[desc_idx].skb; |
| 3224 | post_ptr = &tp->rx_std_ptr; | 3223 | post_ptr = &tp->rx_std_ptr; |
| 3224 | rx_std_posted++; | ||
| 3225 | } else if (opaque_key == RXD_OPAQUE_RING_JUMBO) { | 3225 | } else if (opaque_key == RXD_OPAQUE_RING_JUMBO) { |
| 3226 | dma_addr = pci_unmap_addr(&tp->rx_jumbo_buffers[desc_idx], | 3226 | dma_addr = pci_unmap_addr(&tp->rx_jumbo_buffers[desc_idx], |
| 3227 | mapping); | 3227 | mapping); |
| @@ -3309,6 +3309,15 @@ static int tg3_rx(struct tg3 *tp, int budget) | |||
| 3309 | 3309 | ||
| 3310 | next_pkt: | 3310 | next_pkt: |
| 3311 | (*post_ptr)++; | 3311 | (*post_ptr)++; |
| 3312 | |||
| 3313 | if (unlikely(rx_std_posted >= tp->rx_std_max_post)) { | ||
| 3314 | u32 idx = *post_ptr % TG3_RX_RING_SIZE; | ||
| 3315 | |||
| 3316 | tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX + | ||
| 3317 | TG3_64BIT_REG_LOW, idx); | ||
| 3318 | work_mask &= ~RXD_OPAQUE_RING_STD; | ||
| 3319 | rx_std_posted = 0; | ||
| 3320 | } | ||
| 3312 | next_pkt_nopost: | 3321 | next_pkt_nopost: |
| 3313 | sw_idx++; | 3322 | sw_idx++; |
| 3314 | sw_idx %= TG3_RX_RCB_RING_SIZE(tp); | 3323 | sw_idx %= TG3_RX_RCB_RING_SIZE(tp); |
| @@ -3870,6 +3879,40 @@ out_unlock: | |||
| 3870 | return NETDEV_TX_OK; | 3879 | return NETDEV_TX_OK; |
| 3871 | } | 3880 | } |
| 3872 | 3881 | ||
| 3882 | #if TG3_TSO_SUPPORT != 0 | ||
| 3883 | static int tg3_start_xmit_dma_bug(struct sk_buff *, struct net_device *); | ||
| 3884 | |||
| 3885 | /* Use GSO to workaround a rare TSO bug that may be triggered when the | ||
| 3886 | * TSO header is greater than 80 bytes. | ||
| 3887 | */ | ||
| 3888 | static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb) | ||
| 3889 | { | ||
| 3890 | struct sk_buff *segs, *nskb; | ||
| 3891 | |||
| 3892 | /* Estimate the number of fragments in the worst case */ | ||
| 3893 | if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->gso_segs * 3))) { | ||
| 3894 | netif_stop_queue(tp->dev); | ||
| 3895 | return NETDEV_TX_BUSY; | ||
| 3896 | } | ||
| 3897 | |||
| 3898 | segs = skb_gso_segment(skb, tp->dev->features & ~NETIF_F_TSO); | ||
| 3899 | if (unlikely(IS_ERR(segs))) | ||
| 3900 | goto tg3_tso_bug_end; | ||
| 3901 | |||
| 3902 | do { | ||
| 3903 | nskb = segs; | ||
| 3904 | segs = segs->next; | ||
| 3905 | nskb->next = NULL; | ||
| 3906 | tg3_start_xmit_dma_bug(nskb, tp->dev); | ||
| 3907 | } while (segs); | ||
| 3908 | |||
| 3909 | tg3_tso_bug_end: | ||
| 3910 | dev_kfree_skb(skb); | ||
| 3911 | |||
| 3912 | return NETDEV_TX_OK; | ||
| 3913 | } | ||
| 3914 | #endif | ||
| 3915 | |||
| 3873 | /* hard_start_xmit for devices that have the 4G bug and/or 40-bit bug and | 3916 | /* hard_start_xmit for devices that have the 4G bug and/or 40-bit bug and |
| 3874 | * support TG3_FLG2_HW_TSO_1 or firmware TSO only. | 3917 | * support TG3_FLG2_HW_TSO_1 or firmware TSO only. |
| 3875 | */ | 3918 | */ |
| @@ -3906,7 +3949,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev) | |||
| 3906 | mss = 0; | 3949 | mss = 0; |
| 3907 | if (skb->len > (tp->dev->mtu + ETH_HLEN) && | 3950 | if (skb->len > (tp->dev->mtu + ETH_HLEN) && |
| 3908 | (mss = skb_shinfo(skb)->gso_size) != 0) { | 3951 | (mss = skb_shinfo(skb)->gso_size) != 0) { |
| 3909 | int tcp_opt_len, ip_tcp_len; | 3952 | int tcp_opt_len, ip_tcp_len, hdr_len; |
| 3910 | 3953 | ||
| 3911 | if (skb_header_cloned(skb) && | 3954 | if (skb_header_cloned(skb) && |
| 3912 | pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { | 3955 | pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { |
| @@ -3917,11 +3960,16 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev) | |||
| 3917 | tcp_opt_len = ((skb->h.th->doff - 5) * 4); | 3960 | tcp_opt_len = ((skb->h.th->doff - 5) * 4); |
| 3918 | ip_tcp_len = (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr); | 3961 | ip_tcp_len = (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr); |
| 3919 | 3962 | ||
| 3963 | hdr_len = ip_tcp_len + tcp_opt_len; | ||
| 3964 | if (unlikely((ETH_HLEN + hdr_len) > 80) && | ||
| 3965 | (tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG)) | ||
| 3966 | return (tg3_tso_bug(tp, skb)); | ||
| 3967 | |||
| 3920 | base_flags |= (TXD_FLAG_CPU_PRE_DMA | | 3968 | base_flags |= (TXD_FLAG_CPU_PRE_DMA | |
| 3921 | TXD_FLAG_CPU_POST_DMA); | 3969 | TXD_FLAG_CPU_POST_DMA); |
| 3922 | 3970 | ||
| 3923 | skb->nh.iph->check = 0; | 3971 | skb->nh.iph->check = 0; |
| 3924 | skb->nh.iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len); | 3972 | skb->nh.iph->tot_len = htons(mss + hdr_len); |
| 3925 | if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) { | 3973 | if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) { |
| 3926 | skb->h.th->check = 0; | 3974 | skb->h.th->check = 0; |
| 3927 | base_flags &= ~TXD_FLAG_TCPUDP_CSUM; | 3975 | base_flags &= ~TXD_FLAG_TCPUDP_CSUM; |
| @@ -5981,7 +6029,13 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) | |||
| 5981 | } | 6029 | } |
| 5982 | 6030 | ||
| 5983 | /* Setup replenish threshold. */ | 6031 | /* Setup replenish threshold. */ |
| 5984 | tw32(RCVBDI_STD_THRESH, tp->rx_pending / 8); | 6032 | val = tp->rx_pending / 8; |
| 6033 | if (val == 0) | ||
| 6034 | val = 1; | ||
| 6035 | else if (val > tp->rx_std_max_post) | ||
| 6036 | val = tp->rx_std_max_post; | ||
| 6037 | |||
| 6038 | tw32(RCVBDI_STD_THRESH, val); | ||
| 5985 | 6039 | ||
| 5986 | /* Initialize TG3_BDINFO's at: | 6040 | /* Initialize TG3_BDINFO's at: |
| 5987 | * RCVDBDI_STD_BD: standard eth size rx ring | 6041 | * RCVDBDI_STD_BD: standard eth size rx ring |
| @@ -6141,8 +6195,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) | |||
| 6141 | #endif | 6195 | #endif |
| 6142 | 6196 | ||
| 6143 | /* Receive/send statistics. */ | 6197 | /* Receive/send statistics. */ |
| 6144 | if ((rdmac_mode & RDMAC_MODE_FIFO_SIZE_128) && | 6198 | if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) { |
| 6145 | (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)) { | 6199 | val = tr32(RCVLPC_STATS_ENABLE); |
| 6200 | val &= ~RCVLPC_STATSENAB_DACK_FIX; | ||
| 6201 | tw32(RCVLPC_STATS_ENABLE, val); | ||
| 6202 | } else if ((rdmac_mode & RDMAC_MODE_FIFO_SIZE_128) && | ||
| 6203 | (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)) { | ||
| 6146 | val = tr32(RCVLPC_STATS_ENABLE); | 6204 | val = tr32(RCVLPC_STATS_ENABLE); |
| 6147 | val &= ~RCVLPC_STATSENAB_LNGBRST_RFIX; | 6205 | val &= ~RCVLPC_STATSENAB_LNGBRST_RFIX; |
| 6148 | tw32(RCVLPC_STATS_ENABLE, val); | 6206 | tw32(RCVLPC_STATS_ENABLE, val); |
| @@ -8738,6 +8796,9 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) | |||
| 8738 | { | 8796 | { |
| 8739 | struct tg3 *tp = netdev_priv(dev); | 8797 | struct tg3 *tp = netdev_priv(dev); |
| 8740 | 8798 | ||
| 8799 | if (netif_running(dev)) | ||
| 8800 | tg3_netif_stop(tp); | ||
| 8801 | |||
| 8741 | tg3_full_lock(tp, 0); | 8802 | tg3_full_lock(tp, 0); |
| 8742 | 8803 | ||
| 8743 | tp->vlgrp = grp; | 8804 | tp->vlgrp = grp; |
| @@ -8746,16 +8807,25 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) | |||
| 8746 | __tg3_set_rx_mode(dev); | 8807 | __tg3_set_rx_mode(dev); |
| 8747 | 8808 | ||
| 8748 | tg3_full_unlock(tp); | 8809 | tg3_full_unlock(tp); |
| 8810 | |||
| 8811 | if (netif_running(dev)) | ||
| 8812 | tg3_netif_start(tp); | ||
| 8749 | } | 8813 | } |
| 8750 | 8814 | ||
| 8751 | static void tg3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) | 8815 | static void tg3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) |
| 8752 | { | 8816 | { |
| 8753 | struct tg3 *tp = netdev_priv(dev); | 8817 | struct tg3 *tp = netdev_priv(dev); |
| 8754 | 8818 | ||
| 8819 | if (netif_running(dev)) | ||
| 8820 | tg3_netif_stop(tp); | ||
| 8821 | |||
| 8755 | tg3_full_lock(tp, 0); | 8822 | tg3_full_lock(tp, 0); |
| 8756 | if (tp->vlgrp) | 8823 | if (tp->vlgrp) |
| 8757 | tp->vlgrp->vlan_devices[vid] = NULL; | 8824 | tp->vlgrp->vlan_devices[vid] = NULL; |
| 8758 | tg3_full_unlock(tp); | 8825 | tg3_full_unlock(tp); |
| 8826 | |||
| 8827 | if (netif_running(dev)) | ||
| 8828 | tg3_netif_start(tp); | ||
| 8759 | } | 8829 | } |
| 8760 | #endif | 8830 | #endif |
| 8761 | 8831 | ||
| @@ -10160,8 +10230,14 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
| 10160 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787) { | 10230 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787) { |
| 10161 | tp->tg3_flags2 |= TG3_FLG2_HW_TSO_2; | 10231 | tp->tg3_flags2 |= TG3_FLG2_HW_TSO_2; |
| 10162 | tp->tg3_flags2 |= TG3_FLG2_1SHOT_MSI; | 10232 | tp->tg3_flags2 |= TG3_FLG2_1SHOT_MSI; |
| 10163 | } else | 10233 | } else { |
| 10164 | tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1; | 10234 | tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1 | |
| 10235 | TG3_FLG2_HW_TSO_1_BUG; | ||
| 10236 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == | ||
| 10237 | ASIC_REV_5750 && | ||
| 10238 | tp->pci_chip_rev_id >= CHIPREV_ID_5750_C2) | ||
| 10239 | tp->tg3_flags2 &= ~TG3_FLG2_HW_TSO_1_BUG; | ||
| 10240 | } | ||
| 10165 | } | 10241 | } |
| 10166 | 10242 | ||
| 10167 | if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 && | 10243 | if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 && |
| @@ -10533,6 +10609,16 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
| 10533 | (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) | 10609 | (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) |
| 10534 | tp->rx_offset = 0; | 10610 | tp->rx_offset = 0; |
| 10535 | 10611 | ||
| 10612 | tp->rx_std_max_post = TG3_RX_RING_SIZE; | ||
| 10613 | |||
| 10614 | /* Increment the rx prod index on the rx std ring by at most | ||
| 10615 | * 8 for these chips to workaround hw errata. | ||
| 10616 | */ | ||
| 10617 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 || | ||
| 10618 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752 || | ||
| 10619 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755) | ||
| 10620 | tp->rx_std_max_post = 8; | ||
| 10621 | |||
| 10536 | /* By default, disable wake-on-lan. User can change this | 10622 | /* By default, disable wake-on-lan. User can change this |
| 10537 | * using ETHTOOL_SWOL. | 10623 | * using ETHTOOL_SWOL. |
| 10538 | */ | 10624 | */ |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 8209da5dd15f..ba2c98711c88 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
| @@ -125,6 +125,7 @@ | |||
| 125 | #define CHIPREV_ID_5750_A0 0x4000 | 125 | #define CHIPREV_ID_5750_A0 0x4000 |
| 126 | #define CHIPREV_ID_5750_A1 0x4001 | 126 | #define CHIPREV_ID_5750_A1 0x4001 |
| 127 | #define CHIPREV_ID_5750_A3 0x4003 | 127 | #define CHIPREV_ID_5750_A3 0x4003 |
| 128 | #define CHIPREV_ID_5750_C2 0x4202 | ||
| 128 | #define CHIPREV_ID_5752_A0_HW 0x5000 | 129 | #define CHIPREV_ID_5752_A0_HW 0x5000 |
| 129 | #define CHIPREV_ID_5752_A0 0x6000 | 130 | #define CHIPREV_ID_5752_A0 0x6000 |
| 130 | #define CHIPREV_ID_5752_A1 0x6001 | 131 | #define CHIPREV_ID_5752_A1 0x6001 |
| @@ -760,6 +761,7 @@ | |||
| 760 | #define RCVLPC_STATSCTRL_ENABLE 0x00000001 | 761 | #define RCVLPC_STATSCTRL_ENABLE 0x00000001 |
| 761 | #define RCVLPC_STATSCTRL_FASTUPD 0x00000002 | 762 | #define RCVLPC_STATSCTRL_FASTUPD 0x00000002 |
| 762 | #define RCVLPC_STATS_ENABLE 0x00002018 | 763 | #define RCVLPC_STATS_ENABLE 0x00002018 |
| 764 | #define RCVLPC_STATSENAB_DACK_FIX 0x00040000 | ||
| 763 | #define RCVLPC_STATSENAB_LNGBRST_RFIX 0x00400000 | 765 | #define RCVLPC_STATSENAB_LNGBRST_RFIX 0x00400000 |
| 764 | #define RCVLPC_STATS_INCMASK 0x0000201c | 766 | #define RCVLPC_STATS_INCMASK 0x0000201c |
| 765 | /* 0x2020 --> 0x2100 unused */ | 767 | /* 0x2020 --> 0x2100 unused */ |
| @@ -2137,6 +2139,7 @@ struct tg3 { | |||
| 2137 | struct tg3_rx_buffer_desc *rx_std; | 2139 | struct tg3_rx_buffer_desc *rx_std; |
| 2138 | struct ring_info *rx_std_buffers; | 2140 | struct ring_info *rx_std_buffers; |
| 2139 | dma_addr_t rx_std_mapping; | 2141 | dma_addr_t rx_std_mapping; |
| 2142 | u32 rx_std_max_post; | ||
| 2140 | 2143 | ||
| 2141 | struct tg3_rx_buffer_desc *rx_jumbo; | 2144 | struct tg3_rx_buffer_desc *rx_jumbo; |
| 2142 | struct ring_info *rx_jumbo_buffers; | 2145 | struct ring_info *rx_jumbo_buffers; |
| @@ -2191,7 +2194,7 @@ struct tg3 { | |||
| 2191 | #define TG3_FLAG_INIT_COMPLETE 0x80000000 | 2194 | #define TG3_FLAG_INIT_COMPLETE 0x80000000 |
| 2192 | u32 tg3_flags2; | 2195 | u32 tg3_flags2; |
| 2193 | #define TG3_FLG2_RESTART_TIMER 0x00000001 | 2196 | #define TG3_FLG2_RESTART_TIMER 0x00000001 |
| 2194 | /* 0x00000002 available */ | 2197 | #define TG3_FLG2_HW_TSO_1_BUG 0x00000002 |
| 2195 | #define TG3_FLG2_NO_ETH_WIRE_SPEED 0x00000004 | 2198 | #define TG3_FLG2_NO_ETH_WIRE_SPEED 0x00000004 |
| 2196 | #define TG3_FLG2_IS_5788 0x00000008 | 2199 | #define TG3_FLG2_IS_5788 0x00000008 |
| 2197 | #define TG3_FLG2_MAX_RXPEND_64 0x00000010 | 2200 | #define TG3_FLG2_MAX_RXPEND_64 0x00000010 |
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 41e0cd8f4786..77bb298129d7 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | #define XL_DEBUG 0 | 43 | #define XL_DEBUG 0 |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 47 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| 48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index c58a4c31d0dd..30dcdaebf41a 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
| @@ -100,7 +100,6 @@ | |||
| 100 | 100 | ||
| 101 | #define STREAMER_IOCTL 0 | 101 | #define STREAMER_IOCTL 0 |
| 102 | 102 | ||
| 103 | #include <linux/config.h> | ||
| 104 | #include <linux/module.h> | 103 | #include <linux/module.h> |
| 105 | #include <linux/kernel.h> | 104 | #include <linux/kernel.h> |
| 106 | #include <linux/errno.h> | 105 | #include <linux/errno.h> |
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index c3cb8d26cfe3..d7a30d99ae8f 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
| @@ -80,7 +80,6 @@ | |||
| 80 | #define OLYMPIC_DEBUG 0 | 80 | #define OLYMPIC_DEBUG 0 |
| 81 | 81 | ||
| 82 | 82 | ||
| 83 | #include <linux/config.h> | ||
| 84 | #include <linux/module.h> | 83 | #include <linux/module.h> |
| 85 | #include <linux/kernel.h> | 84 | #include <linux/kernel.h> |
| 86 | #include <linux/errno.h> | 85 | #include <linux/errno.h> |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 67d2b596ce22..f2807ab5a2be 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 35 | #include <linux/fcntl.h> | 34 | #include <linux/fcntl.h> |
diff --git a/drivers/net/tokenring/smctr_firmware.h b/drivers/net/tokenring/smctr_firmware.h index 48994b043b7c..292e50ddf01a 100644 --- a/drivers/net/tokenring/smctr_firmware.h +++ b/drivers/net/tokenring/smctr_firmware.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * - Jay Schulist <jschlst@samba.org> | 17 | * - Jay Schulist <jschlst@samba.org> |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | #if defined(CONFIG_SMCTR) || defined(CONFIG_SMCTR_MODULE) | 21 | #if defined(CONFIG_SMCTR) || defined(CONFIG_SMCTR_MODULE) |
| 23 | 22 | ||
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index fc2468ecce0b..354294c6271e 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #define DRV_VERSION "0.7" | 31 | #define DRV_VERSION "0.7" |
| 32 | #define DRV_RELDATE "Mar 17, 2004" | 32 | #define DRV_RELDATE "Mar 17, 2004" |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 37 | #include <linux/netdevice.h> | 36 | #include <linux/netdevice.h> |
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index da8bd0d62a3f..2647a5bc5211 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
| @@ -443,7 +443,6 @@ | |||
| 443 | ========================================================================= | 443 | ========================================================================= |
| 444 | */ | 444 | */ |
| 445 | 445 | ||
| 446 | #include <linux/config.h> | ||
| 447 | #include <linux/module.h> | 446 | #include <linux/module.h> |
| 448 | #include <linux/kernel.h> | 447 | #include <linux/kernel.h> |
| 449 | #include <linux/string.h> | 448 | #include <linux/string.h> |
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index da4f7593c50f..99ccf2ebb342 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include "tulip.h" | 18 | #include "tulip.h" |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/etherdevice.h> | 19 | #include <linux/etherdevice.h> |
| 21 | 20 | ||
| 22 | int tulip_rx_copybreak; | 21 | int tulip_rx_copybreak; |
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h index d25020da6798..3bcfbf3d23ed 100644 --- a/drivers/net/tulip/tulip.h +++ b/drivers/net/tulip/tulip.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef __NET_TULIP_H__ | 16 | #ifndef __NET_TULIP_H__ |
| 17 | #define __NET_TULIP_H__ | 17 | #define __NET_TULIP_H__ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 53fd9b56d0bd..8f4f4840fc12 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | 17 | ||
| 19 | #define DRV_NAME "tulip" | 18 | #define DRV_NAME "tulip" |
| 20 | #ifdef CONFIG_TULIP_NAPI | 19 | #ifdef CONFIG_TULIP_NAPI |
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c index 887d7245fe7b..aecafdabbc91 100644 --- a/drivers/net/tulip/xircom_tulip_cb.c +++ b/drivers/net/tulip/xircom_tulip_cb.c | |||
| @@ -98,7 +98,6 @@ static int csr0 = 0x00A00000 | 0x4800; | |||
| 98 | /* PCI registers */ | 98 | /* PCI registers */ |
| 99 | #define PCI_POWERMGMT 0x40 | 99 | #define PCI_POWERMGMT 0x40 |
| 100 | 100 | ||
| 101 | #include <linux/config.h> | ||
| 102 | #include <linux/module.h> | 101 | #include <linux/module.h> |
| 103 | #include <linux/moduleparam.h> | 102 | #include <linux/moduleparam.h> |
| 104 | #include <linux/kernel.h> | 103 | #include <linux/kernel.h> |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 732c5edec2e5..329d9feb9b89 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #define DRV_DESCRIPTION "Universal TUN/TAP device driver" | 39 | #define DRV_DESCRIPTION "Universal TUN/TAP device driver" |
| 40 | #define DRV_COPYRIGHT "(C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>" | 40 | #define DRV_COPYRIGHT "(C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>" |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 44 | #include <linux/errno.h> | 43 | #include <linux/errno.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 09e05fe40c38..857d71c3c017 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | 47 | ||
| 48 | #include <linux/module.h> | 48 | #include <linux/module.h> |
| 49 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| 50 | #include <linux/config.h> | ||
| 51 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 52 | #include <linux/mm.h> | 51 | #include <linux/mm.h> |
| 53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| @@ -65,7 +64,6 @@ | |||
| 65 | #include <linux/wait.h> | 64 | #include <linux/wait.h> |
| 66 | #include <asm/io.h> | 65 | #include <asm/io.h> |
| 67 | #include <linux/if.h> | 66 | #include <linux/if.h> |
| 68 | #include <linux/config.h> | ||
| 69 | #include <asm/uaccess.h> | 67 | #include <asm/uaccess.h> |
| 70 | #include <linux/proc_fs.h> | 68 | #include <linux/proc_fs.h> |
| 71 | #include <linux/inetdevice.h> | 69 | #include <linux/inetdevice.h> |
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index be5e33814cb1..1f95b4864ea1 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
| @@ -79,7 +79,6 @@ | |||
| 79 | 79 | ||
| 80 | /* ---------- Headers, macros, data structures ---------- */ | 80 | /* ---------- Headers, macros, data structures ---------- */ |
| 81 | 81 | ||
| 82 | #include <linux/config.h> | ||
| 83 | #include <linux/module.h> | 82 | #include <linux/module.h> |
| 84 | #include <linux/kernel.h> | 83 | #include <linux/kernel.h> |
| 85 | #include <linux/slab.h> | 84 | #include <linux/slab.h> |
diff --git a/drivers/net/wan/hdlc_generic.c b/drivers/net/wan/hdlc_generic.c index 57f9538b8fb5..b7da55140fbd 100644 --- a/drivers/net/wan/hdlc_generic.c +++ b/drivers/net/wan/hdlc_generic.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * - proto.start() and stop() are called with spin_lock_irq held. | 22 | * - proto.start() and stop() are called with spin_lock_irq held. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c index af8b55fdd9d9..ae01555d24cf 100644 --- a/drivers/net/wan/lmc/lmc_media.c +++ b/drivers/net/wan/lmc/lmc_media.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | /* $Id: lmc_media.c,v 1.13 2000/04/11 05:25:26 asj Exp $ */ | 1 | /* $Id: lmc_media.c,v 1.13 2000/04/11 05:25:26 asj Exp $ */ |
| 2 | 2 | ||
| 3 | #include <linux/config.h> | ||
| 4 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 5 | #include <linux/string.h> | 4 | #include <linux/string.h> |
| 6 | #include <linux/timer.h> | 5 | #include <linux/timer.h> |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 175ba13bce41..f2d071272cee 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * Known problem: this driver wasn't tested on multiprocessor machine. | 37 | * Known problem: this driver wasn't tested on multiprocessor machine. |
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 42 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 43 | #include <linux/ptrace.h> | 42 | #include <linux/ptrace.h> |
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index 2d1bba06a085..c13b459a0137 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | */ | 37 | */ |
| 38 | #undef DEBUG | 38 | #undef DEBUG |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 42 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 43 | #include <linux/errno.h> | 42 | #include <linux/errno.h> |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 4069b79d8259..89328d119efa 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | ======================================================================*/ | 20 | ======================================================================*/ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | 23 | ||
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index af0cbb6c5c0c..ac9437d497f0 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | ======================================================================*/ | 21 | ======================================================================*/ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #ifdef __IN_PCMCIA_PACKAGE__ | 23 | #ifdef __IN_PCMCIA_PACKAGE__ |
| 25 | #include <pcmcia/k_compat.h> | 24 | #include <pcmcia/k_compat.h> |
| 26 | #endif | 25 | #endif |
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index 7b321f7cf358..38fac3bbcd82 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #define DRIVER_NAME "airport" | 14 | #define DRIVER_NAME "airport" |
| 15 | #define PFX DRIVER_NAME ": " | 15 | #define PFX DRIVER_NAME ": " |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index bed6823d9809..bb6bea4f3233 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * This module provides support for the Arlan 655 card made by Aironet | 5 | * This module provides support for the Arlan 655 card made by Aironet |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include "arlan.h" | 8 | #include "arlan.h" |
| 10 | 9 | ||
| 11 | #if BITS_PER_LONG != 32 | 10 | #if BITS_PER_LONG != 32 |
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c index a2cca521f444..5fa985435ffa 100644 --- a/drivers/net/wireless/arlan-proc.c +++ b/drivers/net/wireless/arlan-proc.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include "arlan.h" | 1 | #include "arlan.h" |
| 3 | 2 | ||
| 4 | #include <linux/sysctl.h> | 3 | #include <linux/sysctl.h> |
diff --git a/drivers/net/wireless/arlan.h b/drivers/net/wireless/arlan.h index 70a6d7b83c4a..3ed1df75900f 100644 --- a/drivers/net/wireless/arlan.h +++ b/drivers/net/wireless/arlan.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/skbuff.h> | 10 | #include <linux/skbuff.h> |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 8606c88886fc..54e31fa2d402 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | 39 | ||
| 40 | ******************************************************************************/ | 40 | ******************************************************************************/ |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 44 | 43 | ||
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 26bf1127524d..785664090bb4 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | ******************************************************************************/ | 30 | ******************************************************************************/ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #ifdef __IN_PCMCIA_PACKAGE__ | 32 | #ifdef __IN_PCMCIA_PACKAGE__ |
| 34 | #include <pcmcia/k_compat.h> | 33 | #include <pcmcia/k_compat.h> |
| 35 | #endif | 34 | #endif |
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c index a61b3bc6cccf..d425c3cefded 100644 --- a/drivers/net/wireless/atmel_pci.c +++ b/drivers/net/wireless/atmel_pci.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | 20 | ||
| 21 | ******************************************************************************/ | 21 | ******************************************************************************/ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
diff --git a/drivers/net/wireless/hermes.c b/drivers/net/wireless/hermes.c index 2aa2f389c0d5..29d39105f5b8 100644 --- a/drivers/net/wireless/hermes.c +++ b/drivers/net/wireless/hermes.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * under either the MPL or the GPL. | 38 | * under either the MPL or the GPL. |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/module.h> | 41 | #include <linux/module.h> |
| 43 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
| 44 | #include <linux/init.h> | 43 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index db03dc2646df..52e6df5c1a92 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #define PRISM2_PCCARD | 1 | #define PRISM2_PCCARD |
| 2 | 2 | ||
| 3 | #include <linux/config.h> | ||
| 4 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 5 | #include <linux/init.h> | 4 | #include <linux/init.h> |
| 6 | #include <linux/if.h> | 5 | #include <linux/if.h> |
| @@ -844,7 +843,7 @@ static struct pcmcia_device_id hostap_cs_ids[] = { | |||
| 844 | PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), | 843 | PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), |
| 845 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), | 844 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), |
| 846 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), | 845 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), |
| 847 | PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), | 846 | /* PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), conflict with pcnet_cs */ |
| 848 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), | 847 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), |
| 849 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), | 848 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), |
| 850 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), | 849 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), |
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index 328e9a1d13b5..b764cfda6e84 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | 33 | ||
| 35 | #include <asm/delay.h> | 34 | #include <asm/delay.h> |
| 36 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 93786f4218f0..53374fcba77e 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * more details. | 12 | * more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index 194f07097581..5ea8ac835857 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * driver patches from Reyk Floeter <reyk@vantronix.net> and | 4 | * driver patches from Reyk Floeter <reyk@vantronix.net> and |
| 5 | * Andy Warner <andyw@pobox.com> */ | 5 | * Andy Warner <andyw@pobox.com> */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/if.h> | 9 | #include <linux/if.h> |
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c index edaaa943eb8f..4ee6abbc65ec 100644 --- a/drivers/net/wireless/hostap/hostap_plx.c +++ b/drivers/net/wireless/hostap/hostap_plx.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/if.h> | 12 | #include <linux/if.h> |
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 94aeb23a7729..27f744e43095 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
| @@ -134,7 +134,6 @@ that only one external action is invoked at a time. | |||
| 134 | */ | 134 | */ |
| 135 | 135 | ||
| 136 | #include <linux/compiler.h> | 136 | #include <linux/compiler.h> |
| 137 | #include <linux/config.h> | ||
| 138 | #include <linux/errno.h> | 137 | #include <linux/errno.h> |
| 139 | #include <linux/if_arp.h> | 138 | #include <linux/if_arp.h> |
| 140 | #include <linux/in6.h> | 139 | #include <linux/in6.h> |
| @@ -5358,7 +5357,7 @@ static int ipw2100_set_key(struct ipw2100_priv *priv, | |||
| 5358 | idx, keylen, len); | 5357 | idx, keylen, len); |
| 5359 | 5358 | ||
| 5360 | /* NOTE: We don't check cached values in case the firmware was reset | 5359 | /* NOTE: We don't check cached values in case the firmware was reset |
| 5361 | * or some other problem is occuring. If the user is setting the key, | 5360 | * or some other problem is occurring. If the user is setting the key, |
| 5362 | * then we push the change */ | 5361 | * then we push the change */ |
| 5363 | 5362 | ||
| 5364 | wep_key->idx = idx; | 5363 | wep_key->idx = idx; |
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index ea12ad66b8e8..8b1cd7c749a4 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | 31 | ||
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/moduleparam.h> | 33 | #include <linux/moduleparam.h> |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 36 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
| 37 | 36 | ||
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index 9343d970537b..36b5e004305e 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | /* To have statistics (just packets sent) define this */ | 37 | /* To have statistics (just packets sent) define this */ |
| 38 | #undef NETWAVE_STATS | 38 | #undef NETWAVE_STATS |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 42 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 43 | #include <linux/init.h> | 42 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 8a31b591a901..d6ed5781b93a 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
| @@ -76,7 +76,6 @@ | |||
| 76 | 76 | ||
| 77 | #define DRIVER_NAME "orinoco" | 77 | #define DRIVER_NAME "orinoco" |
| 78 | 78 | ||
| 79 | #include <linux/config.h> | ||
| 80 | #include <linux/module.h> | 79 | #include <linux/module.h> |
| 81 | #include <linux/kernel.h> | 80 | #include <linux/kernel.h> |
| 82 | #include <linux/init.h> | 81 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index b2aec4d9fbb1..bc14689cbf24 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define DRIVER_NAME "orinoco_cs" | 13 | #define DRIVER_NAME "orinoco_cs" |
| 14 | #define PFX DRIVER_NAME ": " | 14 | #define PFX DRIVER_NAME ": " |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c index 74b9d5b2ba9e..4597fe1d1979 100644 --- a/drivers/net/wireless/orinoco_nortel.c +++ b/drivers/net/wireless/orinoco_nortel.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #define DRIVER_NAME "orinoco_nortel" | 40 | #define DRIVER_NAME "orinoco_nortel" |
| 41 | #define PFX DRIVER_NAME ": " | 41 | #define PFX DRIVER_NAME ": " |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 46 | #include <linux/init.h> | 45 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c index 1c105f40f8d5..de3eae082a0d 100644 --- a/drivers/net/wireless/orinoco_pci.c +++ b/drivers/net/wireless/orinoco_pci.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #define DRIVER_NAME "orinoco_pci" | 44 | #define DRIVER_NAME "orinoco_pci" |
| 45 | #define PFX DRIVER_NAME ": " | 45 | #define PFX DRIVER_NAME ": " |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 49 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c index 84f696c77551..3f928b8939f0 100644 --- a/drivers/net/wireless/orinoco_plx.c +++ b/drivers/net/wireless/orinoco_plx.c | |||
| @@ -86,7 +86,6 @@ | |||
| 86 | #define DRIVER_NAME "orinoco_plx" | 86 | #define DRIVER_NAME "orinoco_plx" |
| 87 | #define PFX DRIVER_NAME ": " | 87 | #define PFX DRIVER_NAME ": " |
| 88 | 88 | ||
| 89 | #include <linux/config.h> | ||
| 90 | #include <linux/module.h> | 89 | #include <linux/module.h> |
| 91 | #include <linux/kernel.h> | 90 | #include <linux/kernel.h> |
| 92 | #include <linux/init.h> | 91 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c index d2b4decb7a7d..160a642185f0 100644 --- a/drivers/net/wireless/orinoco_tmd.c +++ b/drivers/net/wireless/orinoco_tmd.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #define DRIVER_NAME "orinoco_tmd" | 40 | #define DRIVER_NAME "orinoco_tmd" |
| 41 | #define PFX DRIVER_NAME ": " | 41 | #define PFX DRIVER_NAME ": " |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 46 | #include <linux/init.h> | 45 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c index 6a60c5970cb5..2e061a80b294 100644 --- a/drivers/net/wireless/prism54/islpci_mgt.c +++ b/drivers/net/wireless/prism54/islpci_mgt.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/netdevice.h> | 21 | #include <linux/netdevice.h> |
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
diff --git a/drivers/net/wireless/prism54/prismcompat.h b/drivers/net/wireless/prism54/prismcompat.h index 55541c01752e..d71eca55a302 100644 --- a/drivers/net/wireless/prism54/prismcompat.h +++ b/drivers/net/wireless/prism54/prismcompat.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
| 31 | #include <linux/firmware.h> | 31 | #include <linux/firmware.h> |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/moduleparam.h> | 32 | #include <linux/moduleparam.h> |
| 34 | #include <linux/workqueue.h> | 33 | #include <linux/workqueue.h> |
| 35 | #include <linux/compiler.h> | 34 | #include <linux/compiler.h> |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index a915fe6c6aa5..61b83a5e737a 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * | 30 | * |
| 31 | =============================================================================*/ | 31 | =============================================================================*/ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 36 | #include <linux/proc_fs.h> | 35 | #include <linux/proc_fs.h> |
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c index 7f9aa139c347..15465278c789 100644 --- a/drivers/net/wireless/spectrum_cs.c +++ b/drivers/net/wireless/spectrum_cs.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #define DRIVER_NAME "spectrum_cs" | 21 | #define DRIVER_NAME "spectrum_cs" |
| 22 | #define PFX DRIVER_NAME ": " | 22 | #define PFX DRIVER_NAME ": " |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index 18a44580b53b..fd31885c6844 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
| @@ -81,7 +81,6 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE"; | |||
| 81 | /************************************************************************/ | 81 | /************************************************************************/ |
| 82 | /* Header files */ | 82 | /* Header files */ |
| 83 | 83 | ||
| 84 | #include <linux/config.h> | ||
| 85 | #include <linux/kernel.h> | 84 | #include <linux/kernel.h> |
| 86 | #include <linux/module.h> | 85 | #include <linux/module.h> |
| 87 | #include <linux/init.h> | 86 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h index c65fe7a391ec..f34a36b0c7b0 100644 --- a/drivers/net/wireless/wavelan_cs.p.h +++ b/drivers/net/wireless/wavelan_cs.p.h | |||
| @@ -411,7 +411,6 @@ | |||
| 411 | /***************************** INCLUDES *****************************/ | 411 | /***************************** INCLUDES *****************************/ |
| 412 | 412 | ||
| 413 | /* Linux headers that we need */ | 413 | /* Linux headers that we need */ |
| 414 | #include <linux/config.h> | ||
| 415 | #include <linux/module.h> | 414 | #include <linux/module.h> |
| 416 | #include <linux/kernel.h> | 415 | #include <linux/kernel.h> |
| 417 | #include <linux/init.h> | 416 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index e52a650f6737..c03e400facee 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | */ | 28 | */ |
| 29 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 29 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/ethtool.h> | 33 | #include <linux/ethtool.h> |
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index a7c089df66e6..9f0291f35290 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
| @@ -85,7 +85,6 @@ | |||
| 85 | - Understand why some traffic patterns add a 1s latency... | 85 | - Understand why some traffic patterns add a 1s latency... |
| 86 | */ | 86 | */ |
| 87 | 87 | ||
| 88 | #include <linux/config.h> | ||
| 89 | #include <linux/module.h> | 88 | #include <linux/module.h> |
| 90 | #include <linux/kernel.h> | 89 | #include <linux/kernel.h> |
| 91 | #include <linux/string.h> | 90 | #include <linux/string.h> |
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index 14cbe34eb897..3a0a3a734933 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * and others. | 7 | * and others. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
diff --git a/drivers/nubus/nubus_syms.c b/drivers/nubus/nubus_syms.c index 22c1dc9f87b3..9204f04fbf0b 100644 --- a/drivers/nubus/nubus_syms.c +++ b/drivers/nubus/nubus_syms.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | (c) 1999 David Huggins-Daines <dhd@debian.org> */ | 3 | (c) 1999 David Huggins-Daines <dhd@debian.org> */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 8 | #include <linux/nubus.h> | 7 | #include <linux/nubus.h> |
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index a5d826237b26..68cb3a080050 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | ** the coherency design originally worked out. Only PCX-W does. | 31 | ** the coherency design originally worked out. Only PCX-W does. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 37 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index ce0a6ebcff15..0d96c50ffe9c 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | ** for PCI drivers devices which implement/use MMIO registers. | 43 | ** for PCI drivers devices which implement/use MMIO registers. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/config.h> | ||
| 47 | #include <linux/delay.h> | 46 | #include <linux/delay.h> |
| 48 | #include <linux/types.h> | 47 | #include <linux/types.h> |
| 49 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c index 5476ba7709b3..b45aa5c675a0 100644 --- a/drivers/parisc/gsc.c +++ b/drivers/parisc/gsc.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 298f2ddb2c17..bf00fa2537bb 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * David Pye <dmp@davidmpye.dyndns.org> | 23 | * David Pye <dmp@davidmpye.dyndns.org> |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/stddef.h> /* for offsetof() */ | 27 | #include <linux/stddef.h> /* for offsetof() */ |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| @@ -411,16 +410,17 @@ static __inline__ int led_get_net_activity(void) | |||
| 411 | static __inline__ int led_get_diskio_activity(void) | 410 | static __inline__ int led_get_diskio_activity(void) |
| 412 | { | 411 | { |
| 413 | static unsigned long last_pgpgin, last_pgpgout; | 412 | static unsigned long last_pgpgin, last_pgpgout; |
| 414 | struct page_state pgstat; | 413 | unsigned long events[NR_VM_EVENT_ITEMS]; |
| 415 | int changed; | 414 | int changed; |
| 416 | 415 | ||
| 417 | get_full_page_state(&pgstat); /* get no of sectors in & out */ | 416 | all_vm_events(events); |
| 418 | 417 | ||
| 419 | /* Just use a very simple calculation here. Do not care about overflow, | 418 | /* Just use a very simple calculation here. Do not care about overflow, |
| 420 | since we only want to know if there was activity or not. */ | 419 | since we only want to know if there was activity or not. */ |
| 421 | changed = (pgstat.pgpgin != last_pgpgin) || (pgstat.pgpgout != last_pgpgout); | 420 | changed = (events[PGPGIN] != last_pgpgin) || |
| 422 | last_pgpgin = pgstat.pgpgin; | 421 | (events[PGPGOUT] != last_pgpgout); |
| 423 | last_pgpgout = pgstat.pgpgout; | 422 | last_pgpgin = events[PGPGIN]; |
| 423 | last_pgpgout = events[PGPGOUT]; | ||
| 424 | 424 | ||
| 425 | return (changed ? LED_DISK_IO : 0); | 425 | return (changed ? LED_DISK_IO : 0); |
| 426 | } | 426 | } |
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c index 0bcab83b4080..fad5a33bf0fa 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * runtime through the "/proc/sys/kernel/power" procfs entry. | 35 | * runtime through the "/proc/sys/kernel/power" procfs entry. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index d09e39e39c60..8b4732815511 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | ** FIXME: add DMA hint support programming in both sba and lba modules. | 19 | ** FIXME: add DMA hint support programming in both sba and lba modules. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c index 690b239ad3a7..7ff09f0f858f 100644 --- a/drivers/parport/ieee1284.c +++ b/drivers/parport/ieee1284.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Various hacks, Fred Barnes <frmb2@ukc.ac.uk>, 04/2000 | 16 | * Various hacks, Fred Barnes <frmb2@ukc.ac.uk>, 04/2000 |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/threads.h> | 20 | #include <linux/threads.h> |
| 22 | #include <linux/parport.h> | 21 | #include <linux/parport.h> |
diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c index d6c77658231e..525312f2fe9c 100644 --- a/drivers/parport/ieee1284_ops.c +++ b/drivers/parport/ieee1284_ops.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/parport.h> | 18 | #include <linux/parport.h> |
| 20 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 7318e4a9e436..fe800dc0be9f 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | * but rather will start at port->base_hi. | 42 | * but rather will start at port->base_hi. |
| 43 | */ | 43 | */ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 47 | #include <linux/init.h> | 46 | #include <linux/init.h> |
| 48 | #include <linux/sched.h> | 47 | #include <linux/sched.h> |
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index 8610ae88b92d..2e744a274517 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
diff --git a/drivers/parport/share.c b/drivers/parport/share.c index 2cb22c8d3357..94dc506b83d1 100644 --- a/drivers/parport/share.c +++ b/drivers/parport/share.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #undef PARPORT_DEBUG_SHARING /* undef for production */ | 18 | #undef PARPORT_DEBUG_SHARING /* undef for production */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 23 | #include <linux/threads.h> | 22 | #include <linux/threads.h> |
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c index 037ce4c91687..30d87143b5d9 100644 --- a/drivers/pci/hotplug/cpci_hotplug_core.c +++ b/drivers/pci/hotplug/cpci_hotplug_core.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * Send feedback to <scottm@somanetworks.com> | 25 | * Send feedback to <scottm@somanetworks.com> |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c index 225b5e551dd6..02be74caa89f 100644 --- a/drivers/pci/hotplug/cpci_hotplug_pci.c +++ b/drivers/pci/hotplug/cpci_hotplug_pci.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Send feedback to <scottm@somanetworks.com> | 23 | * Send feedback to <scottm@somanetworks.com> |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c index 2d4639d6841f..e847f0d6c7fe 100644 --- a/drivers/pci/hotplug/cpcihp_generic.c +++ b/drivers/pci/hotplug/cpcihp_generic.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * Send feedback to <scottm@somanetworks.com> | 34 | * Send feedback to <scottm@somanetworks.com> |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c index 1ec165df8522..584f8538da13 100644 --- a/drivers/pci/hotplug/cpcihp_zt5550.c +++ b/drivers/pci/hotplug/cpcihp_zt5550.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * Send feedback to <scottm@somanetworks.com> | 30 | * Send feedback to <scottm@somanetworks.com> |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/moduleparam.h> | 34 | #include <linux/moduleparam.h> |
| 36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c index f8658d63f077..e6e171f77c34 100644 --- a/drivers/pci/hotplug/cpqphp_core.c +++ b/drivers/pci/hotplug/cpqphp_core.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * | 29 | * |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/moduleparam.h> | 33 | #include <linux/moduleparam.h> |
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c index 55d2dc7e39ca..ae2dd36efef2 100644 --- a/drivers/pci/hotplug/cpqphp_ctrl.c +++ b/drivers/pci/hotplug/cpqphp_ctrl.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c index ac98a11bd1eb..cf0878917537 100644 --- a/drivers/pci/hotplug/cpqphp_nvram.c +++ b/drivers/pci/hotplug/cpqphp_nvram.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c index 00b81a7bdd26..0d9688952f4a 100644 --- a/drivers/pci/hotplug/cpqphp_pci.c +++ b/drivers/pci/hotplug/cpqphp_pci.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c index bbfeed767ff1..8b3da007e859 100644 --- a/drivers/pci/hotplug/cpqphp_sysfs.c +++ b/drivers/pci/hotplug/cpqphp_sysfs.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index 71b80c23e8ce..dd2b762777c4 100644 --- a/drivers/pci/hotplug/fakephp.c +++ b/drivers/pci/hotplug/fakephp.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * Enabling PCI devices is left as an exercise for the reader... | 32 | * Enabling PCI devices is left as an exercise for the reader... |
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c index c4282902cb52..b7b378df89e3 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/moduleparam.h> | 31 | #include <linux/moduleparam.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c index 0a46f549676a..8ad446605f75 100644 --- a/drivers/pci/hotplug/pcihp_skeleton.c +++ b/drivers/pci/hotplug/pcihp_skeleton.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/moduleparam.h> | 32 | #include <linux/moduleparam.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 638004546700..076bd6dcafae 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Send feedback to <lxie@us.ibm.com> | 22 | * Send feedback to <lxie@us.ibm.com> |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 76d023d8a33b..36bc7c415af7 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/ioport.h> | 13 | #include <linux/ioport.h> |
| 15 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
| 16 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 606f9b6f70eb..fdefa7dcd156 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 21 | #include <linux/stat.h> | 20 | #include <linux/stat.h> |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 4364d793f73b..d1d7333bb71b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * use the PowerTweak utility (see http://powertweak.sourceforge.net). | 15 | * use the PowerTweak utility (see http://powertweak.sourceforge.net). |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index cbb69cf41311..f5ee7ce16fa6 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * PCI ROM access routines | 7 | * PCI ROM access routines |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
| 12 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index a4d50940ebeb..5256342e8532 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c | |||
| @@ -214,11 +214,10 @@ static struct pccard_operations at91_cf_ops = { | |||
| 214 | 214 | ||
| 215 | /*--------------------------------------------------------------------------*/ | 215 | /*--------------------------------------------------------------------------*/ |
| 216 | 216 | ||
| 217 | static int __init at91_cf_probe(struct device *dev) | 217 | static int __init at91_cf_probe(struct platform_device *pdev) |
| 218 | { | 218 | { |
| 219 | struct at91_cf_socket *cf; | 219 | struct at91_cf_socket *cf; |
| 220 | struct at91_cf_data *board = dev->platform_data; | 220 | struct at91_cf_data *board = pdev->dev.platform_data; |
| 221 | struct platform_device *pdev = to_platform_device(dev); | ||
| 222 | struct resource *io; | 221 | struct resource *io; |
| 223 | unsigned int csa; | 222 | unsigned int csa; |
| 224 | int status; | 223 | int status; |
| @@ -236,7 +235,7 @@ static int __init at91_cf_probe(struct device *dev) | |||
| 236 | 235 | ||
| 237 | cf->board = board; | 236 | cf->board = board; |
| 238 | cf->pdev = pdev; | 237 | cf->pdev = pdev; |
| 239 | dev_set_drvdata(dev, cf); | 238 | platform_set_drvdata(pdev, cf); |
| 240 | 239 | ||
| 241 | /* CF takes over CS4, CS5, CS6 */ | 240 | /* CF takes over CS4, CS5, CS6 */ |
| 242 | csa = at91_sys_read(AT91_EBI_CSA); | 241 | csa = at91_sys_read(AT91_EBI_CSA); |
| @@ -271,6 +270,7 @@ static int __init at91_cf_probe(struct device *dev) | |||
| 271 | SA_SAMPLE_RANDOM, driver_name, cf); | 270 | SA_SAMPLE_RANDOM, driver_name, cf); |
| 272 | if (status < 0) | 271 | if (status < 0) |
| 273 | goto fail0; | 272 | goto fail0; |
| 273 | device_init_wakeup(&pdev->dev, 1); | ||
| 274 | 274 | ||
| 275 | /* | 275 | /* |
| 276 | * The card driver will request this irq later as needed. | 276 | * The card driver will request this irq later as needed. |
| @@ -301,7 +301,7 @@ static int __init at91_cf_probe(struct device *dev) | |||
| 301 | board->det_pin, board->irq_pin); | 301 | board->det_pin, board->irq_pin); |
| 302 | 302 | ||
| 303 | cf->socket.owner = THIS_MODULE; | 303 | cf->socket.owner = THIS_MODULE; |
| 304 | cf->socket.dev.dev = dev; | 304 | cf->socket.dev.dev = &pdev->dev; |
| 305 | cf->socket.ops = &at91_cf_ops; | 305 | cf->socket.ops = &at91_cf_ops; |
| 306 | cf->socket.resource_ops = &pccard_static_ops; | 306 | cf->socket.resource_ops = &pccard_static_ops; |
| 307 | cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP | 307 | cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP |
| @@ -323,21 +323,25 @@ fail1: | |||
| 323 | free_irq(board->irq_pin, cf); | 323 | free_irq(board->irq_pin, cf); |
| 324 | fail0a: | 324 | fail0a: |
| 325 | free_irq(board->det_pin, cf); | 325 | free_irq(board->det_pin, cf); |
| 326 | device_init_wakeup(&pdev->dev, 0); | ||
| 326 | fail0: | 327 | fail0: |
| 327 | at91_sys_write(AT91_EBI_CSA, csa); | 328 | at91_sys_write(AT91_EBI_CSA, csa); |
| 328 | kfree(cf); | 329 | kfree(cf); |
| 329 | return status; | 330 | return status; |
| 330 | } | 331 | } |
| 331 | 332 | ||
| 332 | static int __exit at91_cf_remove(struct device *dev) | 333 | static int __exit at91_cf_remove(struct platform_device *pdev) |
| 333 | { | 334 | { |
| 334 | struct at91_cf_socket *cf = dev_get_drvdata(dev); | 335 | struct at91_cf_socket *cf = platform_get_drvdata(pdev); |
| 336 | struct at91_cf_data *board = cf->board; | ||
| 335 | struct resource *io = cf->socket.io[0].res; | 337 | struct resource *io = cf->socket.io[0].res; |
| 336 | unsigned int csa; | 338 | unsigned int csa; |
| 337 | 339 | ||
| 338 | pcmcia_unregister_socket(&cf->socket); | 340 | pcmcia_unregister_socket(&cf->socket); |
| 339 | free_irq(cf->board->irq_pin, cf); | 341 | if (board->irq_pin) |
| 340 | free_irq(cf->board->det_pin, cf); | 342 | free_irq(board->irq_pin, cf); |
| 343 | free_irq(board->det_pin, cf); | ||
| 344 | device_init_wakeup(&pdev->dev, 0); | ||
| 341 | iounmap((void __iomem *) cf->socket.io_offset); | 345 | iounmap((void __iomem *) cf->socket.io_offset); |
| 342 | release_mem_region(io->start, io->end + 1 - io->start); | 346 | release_mem_region(io->start, io->end + 1 - io->start); |
| 343 | 347 | ||
| @@ -348,26 +352,65 @@ static int __exit at91_cf_remove(struct device *dev) | |||
| 348 | return 0; | 352 | return 0; |
| 349 | } | 353 | } |
| 350 | 354 | ||
| 351 | static struct device_driver at91_cf_driver = { | 355 | #ifdef CONFIG_PM |
| 352 | .name = (char *) driver_name, | 356 | |
| 353 | .bus = &platform_bus_type, | 357 | static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg) |
| 358 | { | ||
| 359 | struct at91_cf_socket *cf = platform_get_drvdata(pdev); | ||
| 360 | struct at91_cf_data *board = cf->board; | ||
| 361 | |||
| 362 | pcmcia_socket_dev_suspend(&pdev->dev, mesg); | ||
| 363 | if (device_may_wakeup(&pdev->dev)) | ||
| 364 | enable_irq_wake(board->det_pin); | ||
| 365 | else { | ||
| 366 | disable_irq_wake(board->det_pin); | ||
| 367 | disable_irq(board->det_pin); | ||
| 368 | } | ||
| 369 | if (board->irq_pin) | ||
| 370 | disable_irq(board->irq_pin); | ||
| 371 | return 0; | ||
| 372 | } | ||
| 373 | |||
| 374 | static int at91_cf_resume(struct platform_device *pdev) | ||
| 375 | { | ||
| 376 | struct at91_cf_socket *cf = platform_get_drvdata(pdev); | ||
| 377 | struct at91_cf_data *board = cf->board; | ||
| 378 | |||
| 379 | if (board->irq_pin) | ||
| 380 | enable_irq(board->irq_pin); | ||
| 381 | if (!device_may_wakeup(&pdev->dev)) | ||
| 382 | enable_irq(board->det_pin); | ||
| 383 | pcmcia_socket_dev_resume(&pdev->dev); | ||
| 384 | return 0; | ||
| 385 | } | ||
| 386 | |||
| 387 | #else | ||
| 388 | #define at91_cf_suspend NULL | ||
| 389 | #define at91_cf_resume NULL | ||
| 390 | #endif | ||
| 391 | |||
| 392 | static struct platform_driver at91_cf_driver = { | ||
| 393 | .driver = { | ||
| 394 | .name = (char *) driver_name, | ||
| 395 | .owner = THIS_MODULE, | ||
| 396 | }, | ||
| 354 | .probe = at91_cf_probe, | 397 | .probe = at91_cf_probe, |
| 355 | .remove = __exit_p(at91_cf_remove), | 398 | .remove = __exit_p(at91_cf_remove), |
| 356 | .suspend = pcmcia_socket_dev_suspend, | 399 | .suspend = at91_cf_suspend, |
| 357 | .resume = pcmcia_socket_dev_resume, | 400 | .resume = at91_cf_resume, |
| 358 | }; | 401 | }; |
| 359 | 402 | ||
| 360 | /*--------------------------------------------------------------------------*/ | 403 | /*--------------------------------------------------------------------------*/ |
| 361 | 404 | ||
| 362 | static int __init at91_cf_init(void) | 405 | static int __init at91_cf_init(void) |
| 363 | { | 406 | { |
| 364 | return driver_register(&at91_cf_driver); | 407 | return platform_driver_register(&at91_cf_driver); |
| 365 | } | 408 | } |
| 366 | module_init(at91_cf_init); | 409 | module_init(at91_cf_init); |
| 367 | 410 | ||
| 368 | static void __exit at91_cf_exit(void) | 411 | static void __exit at91_cf_exit(void) |
| 369 | { | 412 | { |
| 370 | driver_unregister(&at91_cf_driver); | 413 | platform_driver_unregister(&at91_cf_driver); |
| 371 | } | 414 | } |
| 372 | module_exit(at91_cf_exit); | 415 | module_exit(at91_cf_exit); |
| 373 | 416 | ||
diff --git a/drivers/pcmcia/au1000_db1x00.c b/drivers/pcmcia/au1000_db1x00.c index abc13f28ba3f..74e051535d6c 100644 --- a/drivers/pcmcia/au1000_db1x00.c +++ b/drivers/pcmcia/au1000_db1x00.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * | 30 | * |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 36 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
| @@ -296,7 +295,7 @@ struct pcmcia_low_level db1x00_pcmcia_ops = { | |||
| 296 | .socket_suspend = db1x00_socket_suspend | 295 | .socket_suspend = db1x00_socket_suspend |
| 297 | }; | 296 | }; |
| 298 | 297 | ||
| 299 | int __init au1x_board_init(struct device *dev) | 298 | int au1x_board_init(struct device *dev) |
| 300 | { | 299 | { |
| 301 | int ret = -ENODEV; | 300 | int ret = -ENODEV; |
| 302 | bcsr->pcmcia = 0; /* turn off power, if it's not already off */ | 301 | bcsr->pcmcia = 0; /* turn off power, if it's not already off */ |
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c index 971a35281649..d5dd0ce65536 100644 --- a/drivers/pcmcia/au1000_generic.c +++ b/drivers/pcmcia/au1000_generic.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/moduleparam.h> | 34 | #include <linux/moduleparam.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/cpufreq.h> | 36 | #include <linux/cpufreq.h> |
| 38 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h index f2c970b5f4ff..1e467bb54077 100644 --- a/drivers/pcmcia/au1000_generic.h +++ b/drivers/pcmcia/au1000_generic.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #define __ASM_AU1000_PCMCIA_H | 22 | #define __ASM_AU1000_PCMCIA_H |
| 23 | 23 | ||
| 24 | /* include the world */ | 24 | /* include the world */ |
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | #include <pcmcia/cs_types.h> | 26 | #include <pcmcia/cs_types.h> |
| 28 | #include <pcmcia/cs.h> | 27 | #include <pcmcia/cs.h> |
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c index fd5522ede867..86c0808d6a05 100644 --- a/drivers/pcmcia/au1000_pb1x00.c +++ b/drivers/pcmcia/au1000_pb1x00.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * with this program; if not, write to the Free Software Foundation, Inc., | 21 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 22 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 22 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 3162998579c1..f9cd831a3f31 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/pm.h> | 28 | #include <linux/pm.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
| 31 | #include <linux/kthread.h> | ||
| 31 | #include <asm/system.h> | 32 | #include <asm/system.h> |
| 32 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
| 33 | 34 | ||
| @@ -176,6 +177,7 @@ static int pccardd(void *__skt); | |||
| 176 | */ | 177 | */ |
| 177 | int pcmcia_register_socket(struct pcmcia_socket *socket) | 178 | int pcmcia_register_socket(struct pcmcia_socket *socket) |
| 178 | { | 179 | { |
| 180 | struct task_struct *tsk; | ||
| 179 | int ret; | 181 | int ret; |
| 180 | 182 | ||
| 181 | if (!socket || !socket->ops || !socket->dev.dev || !socket->resource_ops) | 183 | if (!socket || !socket->ops || !socket->dev.dev || !socket->resource_ops) |
| @@ -239,15 +241,18 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) | |||
| 239 | mutex_init(&socket->skt_mutex); | 241 | mutex_init(&socket->skt_mutex); |
| 240 | spin_lock_init(&socket->thread_lock); | 242 | spin_lock_init(&socket->thread_lock); |
| 241 | 243 | ||
| 242 | ret = kernel_thread(pccardd, socket, CLONE_KERNEL); | 244 | tsk = kthread_run(pccardd, socket, "pccardd"); |
| 243 | if (ret < 0) | 245 | if (IS_ERR(tsk)) { |
| 246 | ret = PTR_ERR(tsk); | ||
| 244 | goto err; | 247 | goto err; |
| 248 | } | ||
| 245 | 249 | ||
| 246 | wait_for_completion(&socket->thread_done); | 250 | wait_for_completion(&socket->thread_done); |
| 247 | if(!socket->thread) { | 251 | if (!socket->thread) { |
| 248 | printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket); | 252 | printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket); |
| 249 | return -EIO; | 253 | return -EIO; |
| 250 | } | 254 | } |
| 255 | |||
| 251 | pcmcia_parse_events(socket, SS_DETECT); | 256 | pcmcia_parse_events(socket, SS_DETECT); |
| 252 | 257 | ||
| 253 | return 0; | 258 | return 0; |
| @@ -272,10 +277,8 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket) | |||
| 272 | cs_dbg(socket, 0, "pcmcia_unregister_socket(0x%p)\n", socket->ops); | 277 | cs_dbg(socket, 0, "pcmcia_unregister_socket(0x%p)\n", socket->ops); |
| 273 | 278 | ||
| 274 | if (socket->thread) { | 279 | if (socket->thread) { |
| 275 | init_completion(&socket->thread_done); | ||
| 276 | socket->thread = NULL; | ||
| 277 | wake_up(&socket->thread_wait); | 280 | wake_up(&socket->thread_wait); |
| 278 | wait_for_completion(&socket->thread_done); | 281 | kthread_stop(socket->thread); |
| 279 | } | 282 | } |
| 280 | release_cis_mem(socket); | 283 | release_cis_mem(socket); |
| 281 | 284 | ||
| @@ -630,8 +633,6 @@ static int pccardd(void *__skt) | |||
| 630 | DECLARE_WAITQUEUE(wait, current); | 633 | DECLARE_WAITQUEUE(wait, current); |
| 631 | int ret; | 634 | int ret; |
| 632 | 635 | ||
| 633 | daemonize("pccardd"); | ||
| 634 | |||
| 635 | skt->thread = current; | 636 | skt->thread = current; |
| 636 | skt->socket = dead_socket; | 637 | skt->socket = dead_socket; |
| 637 | skt->ops->init(skt); | 638 | skt->ops->init(skt); |
| @@ -643,7 +644,8 @@ static int pccardd(void *__skt) | |||
| 643 | printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n", | 644 | printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n", |
| 644 | skt); | 645 | skt); |
| 645 | skt->thread = NULL; | 646 | skt->thread = NULL; |
| 646 | complete_and_exit(&skt->thread_done, 0); | 647 | complete(&skt->thread_done); |
| 648 | return 0; | ||
| 647 | } | 649 | } |
| 648 | 650 | ||
| 649 | add_wait_queue(&skt->thread_wait, &wait); | 651 | add_wait_queue(&skt->thread_wait, &wait); |
| @@ -674,7 +676,7 @@ static int pccardd(void *__skt) | |||
| 674 | continue; | 676 | continue; |
| 675 | } | 677 | } |
| 676 | 678 | ||
| 677 | if (!skt->thread) | 679 | if (kthread_should_stop()) |
| 678 | break; | 680 | break; |
| 679 | 681 | ||
| 680 | schedule(); | 682 | schedule(); |
| @@ -688,7 +690,7 @@ static int pccardd(void *__skt) | |||
| 688 | /* remove from the device core */ | 690 | /* remove from the device core */ |
| 689 | class_device_unregister(&skt->dev); | 691 | class_device_unregister(&skt->dev); |
| 690 | 692 | ||
| 691 | complete_and_exit(&skt->thread_done, 0); | 693 | return 0; |
| 692 | } | 694 | } |
| 693 | 695 | ||
| 694 | /* | 696 | /* |
| @@ -697,11 +699,12 @@ static int pccardd(void *__skt) | |||
| 697 | */ | 699 | */ |
| 698 | void pcmcia_parse_events(struct pcmcia_socket *s, u_int events) | 700 | void pcmcia_parse_events(struct pcmcia_socket *s, u_int events) |
| 699 | { | 701 | { |
| 702 | unsigned long flags; | ||
| 700 | cs_dbg(s, 4, "parse_events: events %08x\n", events); | 703 | cs_dbg(s, 4, "parse_events: events %08x\n", events); |
| 701 | if (s->thread) { | 704 | if (s->thread) { |
| 702 | spin_lock(&s->thread_lock); | 705 | spin_lock_irqsave(&s->thread_lock, flags); |
| 703 | s->thread_events |= events; | 706 | s->thread_events |= events; |
| 704 | spin_unlock(&s->thread_lock); | 707 | spin_unlock_irqrestore(&s->thread_lock, flags); |
| 705 | 708 | ||
| 706 | wake_up(&s->thread_wait); | 709 | wake_up(&s->thread_wait); |
| 707 | } | 710 | } |
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index 071cf485e1a3..9e768eaef17a 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/moduleparam.h> | 11 | #include <linux/moduleparam.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/fcntl.h> | 14 | #include <linux/fcntl.h> |
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index 70d5f0748d55..61d50b5620dd 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/moduleparam.h> | 11 | #include <linux/moduleparam.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/fcntl.h> | 14 | #include <linux/fcntl.h> |
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 3131bb0a0095..3281e519e714 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
| @@ -788,6 +788,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
| 788 | struct pcmcia_socket *s = p_dev->socket; | 788 | struct pcmcia_socket *s = p_dev->socket; |
| 789 | config_t *c; | 789 | config_t *c; |
| 790 | int ret = CS_IN_USE, irq = 0; | 790 | int ret = CS_IN_USE, irq = 0; |
| 791 | int type; | ||
| 791 | 792 | ||
| 792 | if (!(s->state & SOCKET_PRESENT)) | 793 | if (!(s->state & SOCKET_PRESENT)) |
| 793 | return CS_NO_CARD; | 794 | return CS_NO_CARD; |
| @@ -797,6 +798,13 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
| 797 | if (c->state & CONFIG_IRQ_REQ) | 798 | if (c->state & CONFIG_IRQ_REQ) |
| 798 | return CS_IN_USE; | 799 | return CS_IN_USE; |
| 799 | 800 | ||
| 801 | /* Decide what type of interrupt we are registering */ | ||
| 802 | type = 0; | ||
| 803 | if (s->functions > 1) /* All of this ought to be handled higher up */ | ||
| 804 | type = SA_SHIRQ; | ||
| 805 | if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) | ||
| 806 | type = SA_SHIRQ; | ||
| 807 | |||
| 800 | #ifdef CONFIG_PCMCIA_PROBE | 808 | #ifdef CONFIG_PCMCIA_PROBE |
| 801 | if (s->irq.AssignedIRQ != 0) { | 809 | if (s->irq.AssignedIRQ != 0) { |
| 802 | /* If the interrupt is already assigned, it must be the same */ | 810 | /* If the interrupt is already assigned, it must be the same */ |
| @@ -822,9 +830,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
| 822 | * marked as used by the kernel resource management core */ | 830 | * marked as used by the kernel resource management core */ |
| 823 | ret = request_irq(irq, | 831 | ret = request_irq(irq, |
| 824 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Handler : test_action, | 832 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Handler : test_action, |
| 825 | ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) || | 833 | type, |
| 826 | (s->functions > 1) || | ||
| 827 | (irq == s->pci_irq)) ? SA_SHIRQ : 0, | ||
| 828 | p_dev->devname, | 834 | p_dev->devname, |
| 829 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data); | 835 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data); |
| 830 | if (!ret) { | 836 | if (!ret) { |
| @@ -839,18 +845,21 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
| 839 | if (ret && !s->irq.AssignedIRQ) { | 845 | if (ret && !s->irq.AssignedIRQ) { |
| 840 | if (!s->pci_irq) | 846 | if (!s->pci_irq) |
| 841 | return ret; | 847 | return ret; |
| 848 | type = SA_SHIRQ; | ||
| 842 | irq = s->pci_irq; | 849 | irq = s->pci_irq; |
| 843 | } | 850 | } |
| 844 | 851 | ||
| 845 | if (ret && req->Attributes & IRQ_HANDLE_PRESENT) { | 852 | if (ret && (req->Attributes & IRQ_HANDLE_PRESENT)) { |
| 846 | if (request_irq(irq, req->Handler, | 853 | if (request_irq(irq, req->Handler, type, p_dev->devname, req->Instance)) |
| 847 | ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) || | ||
| 848 | (s->functions > 1) || | ||
| 849 | (irq == s->pci_irq)) ? SA_SHIRQ : 0, | ||
| 850 | p_dev->devname, req->Instance)) | ||
| 851 | return CS_IN_USE; | 854 | return CS_IN_USE; |
| 852 | } | 855 | } |
| 853 | 856 | ||
| 857 | /* Make sure the fact the request type was overridden is passed back */ | ||
| 858 | if (type == SA_SHIRQ && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) { | ||
| 859 | req->Attributes |= IRQ_TYPE_DYNAMIC_SHARING; | ||
| 860 | printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n"); | ||
| 861 | printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n"); | ||
| 862 | } | ||
| 854 | c->irq.Attributes = req->Attributes; | 863 | c->irq.Attributes = req->Attributes; |
| 855 | s->irq.AssignedIRQ = req->AssignedIRQ = irq; | 864 | s->irq.AssignedIRQ = req->AssignedIRQ = irq; |
| 856 | s->irq.Config++; | 865 | s->irq.Config++; |
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 7fa18fb814bc..b3518131ea0d 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/cpufreq.h> | 21 | #include <linux/cpufreq.h> |
| 23 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 6d441ec75c6a..c5b2a44b4c37 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
| 37 | 36 | ||
| 38 | #include <pcmcia/cs_types.h> | 37 | #include <pcmcia/cs_types.h> |
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 81ded52c8959..658cddfbcf29 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * basically means we handle everything except controlling the | 5 | * basically means we handle everything except controlling the |
| 6 | * power. Power is machine specific... | 6 | * power. Power is machine specific... |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/ioport.h> | 10 | #include <linux/ioport.h> |
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 59c5d968e9f6..31a7abc55b23 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/cpufreq.h> | 35 | #include <linux/cpufreq.h> |
| 37 | #include <linux/ioport.h> | 36 | #include <linux/ioport.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index ea7d9ca160b2..ecf65d4c4e95 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | ======================================================================*/ | 31 | ======================================================================*/ |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h index 7a3d1b8e16b9..62e9ebf967f9 100644 --- a/drivers/pcmcia/ti113x.h +++ b/drivers/pcmcia/ti113x.h | |||
| @@ -647,6 +647,7 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket) | |||
| 647 | */ | 647 | */ |
| 648 | break; | 648 | break; |
| 649 | 649 | ||
| 650 | case PCI_DEVICE_ID_TI_XX12: | ||
| 650 | case PCI_DEVICE_ID_TI_X515: | 651 | case PCI_DEVICE_ID_TI_X515: |
| 651 | case PCI_DEVICE_ID_TI_X420: | 652 | case PCI_DEVICE_ID_TI_X420: |
| 652 | case PCI_DEVICE_ID_TI_X620: | 653 | case PCI_DEVICE_ID_TI_X620: |
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 4145eb83b9b6..47e57602d5ea 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
| @@ -287,7 +287,10 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state) | |||
| 287 | struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket); | 287 | struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket); |
| 288 | u16 bridge; | 288 | u16 bridge; |
| 289 | 289 | ||
| 290 | yenta_set_power(socket, state); | 290 | /* if powering down: do it immediately */ |
| 291 | if (state->Vcc == 0) | ||
| 292 | yenta_set_power(socket, state); | ||
| 293 | |||
| 291 | socket->io_irq = state->io_irq; | 294 | socket->io_irq = state->io_irq; |
| 292 | bridge = config_readw(socket, CB_BRIDGE_CONTROL) & ~(CB_BRIDGE_CRST | CB_BRIDGE_INTR); | 295 | bridge = config_readw(socket, CB_BRIDGE_CONTROL) & ~(CB_BRIDGE_CRST | CB_BRIDGE_INTR); |
| 293 | if (cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) { | 296 | if (cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) { |
| @@ -339,6 +342,10 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state) | |||
| 339 | /* Socket event mask: get card insert/remove events.. */ | 342 | /* Socket event mask: get card insert/remove events.. */ |
| 340 | cb_writel(socket, CB_SOCKET_EVENT, -1); | 343 | cb_writel(socket, CB_SOCKET_EVENT, -1); |
| 341 | cb_writel(socket, CB_SOCKET_MASK, CB_CDMASK); | 344 | cb_writel(socket, CB_SOCKET_MASK, CB_CDMASK); |
| 345 | |||
| 346 | /* if powering up: do it as the last step when the socket is configured */ | ||
| 347 | if (state->Vcc != 0) | ||
| 348 | yenta_set_power(socket, state); | ||
| 342 | return 0; | 349 | return 0; |
| 343 | } | 350 | } |
| 344 | 351 | ||
| @@ -998,6 +1005,77 @@ static void yenta_config_init(struct yenta_socket *socket) | |||
| 998 | config_writew(socket, CB_BRIDGE_CONTROL, bridge); | 1005 | config_writew(socket, CB_BRIDGE_CONTROL, bridge); |
| 999 | } | 1006 | } |
| 1000 | 1007 | ||
| 1008 | /** | ||
| 1009 | * yenta_fixup_parent_bridge - Fix subordinate bus# of the parent bridge | ||
| 1010 | * @cardbus_bridge: The PCI bus which the CardBus bridge bridges to | ||
| 1011 | * | ||
| 1012 | * Checks if devices on the bus which the CardBus bridge bridges to would be | ||
| 1013 | * invisible during PCI scans because of a misconfigured subordinate number | ||
| 1014 | * of the parent brige - some BIOSes seem to be too lazy to set it right. | ||
| 1015 | * Does the fixup carefully by checking how far it can go without conflicts. | ||
| 1016 | * See http://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information. | ||
| 1017 | */ | ||
| 1018 | static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) | ||
| 1019 | { | ||
| 1020 | struct list_head *tmp; | ||
| 1021 | unsigned char upper_limit; | ||
| 1022 | /* | ||
| 1023 | * We only check and fix the parent bridge: All systems which need | ||
| 1024 | * this fixup that have been reviewed are laptops and the only bridge | ||
| 1025 | * which needed fixing was the parent bridge of the CardBus bridge: | ||
| 1026 | */ | ||
| 1027 | struct pci_bus *bridge_to_fix = cardbus_bridge->parent; | ||
| 1028 | |||
| 1029 | /* Check bus numbers are already set up correctly: */ | ||
| 1030 | if (bridge_to_fix->subordinate >= cardbus_bridge->subordinate) | ||
| 1031 | return; /* The subordinate number is ok, nothing to do */ | ||
| 1032 | |||
| 1033 | if (!bridge_to_fix->parent) | ||
| 1034 | return; /* Root bridges are ok */ | ||
| 1035 | |||
| 1036 | /* stay within the limits of the bus range of the parent: */ | ||
| 1037 | upper_limit = bridge_to_fix->parent->subordinate; | ||
| 1038 | |||
| 1039 | /* check the bus ranges of all silbling bridges to prevent overlap */ | ||
| 1040 | list_for_each(tmp, &bridge_to_fix->parent->children) { | ||
| 1041 | struct pci_bus * silbling = pci_bus_b(tmp); | ||
| 1042 | /* | ||
| 1043 | * If the silbling has a higher secondary bus number | ||
| 1044 | * and it's secondary is equal or smaller than our | ||
| 1045 | * current upper limit, set the new upper limit to | ||
| 1046 | * the bus number below the silbling's range: | ||
| 1047 | */ | ||
| 1048 | if (silbling->secondary > bridge_to_fix->subordinate | ||
| 1049 | && silbling->secondary <= upper_limit) | ||
| 1050 | upper_limit = silbling->secondary - 1; | ||
| 1051 | } | ||
| 1052 | |||
| 1053 | /* Show that the wanted subordinate number is not possible: */ | ||
| 1054 | if (cardbus_bridge->subordinate > upper_limit) | ||
| 1055 | printk(KERN_WARNING "Yenta: Upper limit for fixing this " | ||
| 1056 | "bridge's parent bridge: #%02x\n", upper_limit); | ||
| 1057 | |||
| 1058 | /* If we have room to increase the bridge's subordinate number, */ | ||
| 1059 | if (bridge_to_fix->subordinate < upper_limit) { | ||
| 1060 | |||
| 1061 | /* use the highest number of the hidden bus, within limits */ | ||
| 1062 | unsigned char subordinate_to_assign = | ||
| 1063 | min(cardbus_bridge->subordinate, upper_limit); | ||
| 1064 | |||
| 1065 | printk(KERN_INFO "Yenta: Raising subordinate bus# of parent " | ||
| 1066 | "bus (#%02x) from #%02x to #%02x\n", | ||
| 1067 | bridge_to_fix->number, | ||
| 1068 | bridge_to_fix->subordinate, subordinate_to_assign); | ||
| 1069 | |||
| 1070 | /* Save the new subordinate in the bus struct of the bridge */ | ||
| 1071 | bridge_to_fix->subordinate = subordinate_to_assign; | ||
| 1072 | |||
| 1073 | /* and update the PCI config space with the new subordinate */ | ||
| 1074 | pci_write_config_byte(bridge_to_fix->self, | ||
| 1075 | PCI_SUBORDINATE_BUS, bridge_to_fix->subordinate); | ||
| 1076 | } | ||
| 1077 | } | ||
| 1078 | |||
| 1001 | /* | 1079 | /* |
| 1002 | * Initialize a cardbus controller. Make sure we have a usable | 1080 | * Initialize a cardbus controller. Make sure we have a usable |
| 1003 | * interrupt, and that we can map the cardbus area. Fill in the | 1081 | * interrupt, and that we can map the cardbus area. Fill in the |
| @@ -1113,6 +1191,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i | |||
| 1113 | yenta_get_socket_capabilities(socket, isa_interrupts); | 1191 | yenta_get_socket_capabilities(socket, isa_interrupts); |
| 1114 | printk(KERN_INFO "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); | 1192 | printk(KERN_INFO "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); |
| 1115 | 1193 | ||
| 1194 | yenta_fixup_parent_bridge(dev->subordinate); | ||
| 1195 | |||
| 1116 | /* Register it with the pcmcia layer.. */ | 1196 | /* Register it with the pcmcia layer.. */ |
| 1117 | ret = pcmcia_register_socket(&socket->socket); | 1197 | ret = pcmcia_register_socket(&socket->socket); |
| 1118 | if (ret == 0) { | 1198 | if (ret == 0) { |
| @@ -1232,6 +1312,7 @@ static struct pci_device_id yenta_table [] = { | |||
| 1232 | 1312 | ||
| 1233 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX21_XX11, TI12XX), | 1313 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX21_XX11, TI12XX), |
| 1234 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X515, TI12XX), | 1314 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X515, TI12XX), |
| 1315 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX12, TI12XX), | ||
| 1235 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X420, TI12XX), | 1316 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X420, TI12XX), |
| 1236 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X620, TI12XX), | 1317 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X620, TI12XX), |
| 1237 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_7410, TI12XX), | 1318 | CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_7410, TI12XX), |
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 0b4adcb60df4..227600cd6360 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 11 | #include <linux/pnp.h> | 10 | #include <linux/pnp.h> |
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index e54c15383193..e161423b4300 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/string.h> | 8 | #include <linux/string.h> |
| 10 | #include <linux/list.h> | 9 | #include <linux/list.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
diff --git a/drivers/pnp/isapnp/compat.c b/drivers/pnp/isapnp/compat.c index 3ff7e76b33bd..0697ab88a9ac 100644 --- a/drivers/pnp/isapnp/compat.c +++ b/drivers/pnp/isapnp/compat.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | /* TODO: see if more isapnp functions are needed here */ | 9 | /* TODO: see if more isapnp functions are needed here */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/isapnp.h> | 12 | #include <linux/isapnp.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index ac7c2bb6c69e..f2e0179962e2 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * 2003-08-11 Resource Management Updates - Adam Belay <ambx1@neo.rr.com> | 34 | * 2003-08-11 Resource Management Updates - Adam Belay <ambx1@neo.rr.com> |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c index cf54b0a3628e..958c11bedd0d 100644 --- a/drivers/pnp/isapnp/proc.c +++ b/drivers/pnp/isapnp/proc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/isapnp.h> | 23 | #include <linux/isapnp.h> |
| 25 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index 1d7a5b87f4cb..5026b345cb30 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index f104577f73e0..6cf34a63c790 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/acpi.h> | 22 | #include <linux/acpi.h> |
| 24 | #include <linux/pnp.h> | 23 | #include <linux/pnp.h> |
| 25 | #include <acpi/acpi_bus.h> | 24 | #include <acpi/acpi_bus.h> |
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c index c89c98a2cca8..ef508a4de557 100644 --- a/drivers/pnp/pnpbios/rsparser.c +++ b/drivers/pnp/pnpbios/rsparser.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/ctype.h> | 6 | #include <linux/ctype.h> |
| 8 | #include <linux/pnp.h> | 7 | #include <linux/pnp.h> |
| 9 | #include <linux/pnpbios.h> | 8 | #include <linux/pnpbios.h> |
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index 8936b0cb2ec3..e97ecefe8584 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Copyright (c) 1999 Martin Mares <mj@ucw.cz> | 11 | * Copyright (c) 1999 Martin Mares <mj@ucw.cz> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 7bb892f58cc0..9fefe563f8fc 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| @@ -396,7 +395,8 @@ int pnp_check_irq(struct pnp_dev * dev, int idx) | |||
| 396 | /* check if the resource is already in use, skip if the | 395 | /* check if the resource is already in use, skip if the |
| 397 | * device is active because it itself may be in use */ | 396 | * device is active because it itself may be in use */ |
| 398 | if(!dev->active) { | 397 | if(!dev->active) { |
| 399 | if (request_irq(*irq, pnp_test_handler, SA_INTERRUPT, "pnp", NULL)) | 398 | if (request_irq(*irq, pnp_test_handler, |
| 399 | SA_INTERRUPT|SA_PROBEIRQ, "pnp", NULL)) | ||
| 400 | return 0; | 400 | return 0; |
| 401 | free_irq(*irq, NULL); | 401 | free_irq(*irq, NULL); |
| 402 | } | 402 | } |
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c index 61fe998944bd..946a0dcd627d 100644 --- a/drivers/pnp/support.c +++ b/drivers/pnp/support.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/ctype.h> | 9 | #include <linux/ctype.h> |
| 11 | #include <linux/pnp.h> | 10 | #include <linux/pnp.h> |
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index 94e30fe4b8f3..7bf7b2c88245 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | 15 | ||
diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c index bef9316e95df..5687b8fcbf93 100644 --- a/drivers/rapidio/rio-sysfs.c +++ b/drivers/rapidio/rio-sysfs.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/rio.h> | 14 | #include <linux/rio.h> |
| 16 | #include <linux/rio_drv.h> | 15 | #include <linux/rio_drv.h> |
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index 5e382470faa2..f644807da2f9 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * option) any later version. | 11 | * option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | 16 | ||
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index f2fc81a9074d..f5b9f187a930 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -15,7 +15,7 @@ config RTC_CLASS | |||
| 15 | help | 15 | help |
| 16 | Generic RTC class support. If you say yes here, you will | 16 | Generic RTC class support. If you say yes here, you will |
| 17 | be allowed to plug one or more RTCs to your system. You will | 17 | be allowed to plug one or more RTCs to your system. You will |
| 18 | probably want to enable one of more of the interfaces below. | 18 | probably want to enable one or more of the interfaces below. |
| 19 | 19 | ||
| 20 | This driver can also be built as a module. If so, the module | 20 | This driver can also be built as a module. If so, the module |
| 21 | will be called rtc-class. | 21 | will be called rtc-class. |
| @@ -182,6 +182,22 @@ config RTC_DRV_RS5C372 | |||
| 182 | This driver can also be built as a module. If so, the module | 182 | This driver can also be built as a module. If so, the module |
| 183 | will be called rtc-rs5c372. | 183 | will be called rtc-rs5c372. |
| 184 | 184 | ||
| 185 | config RTC_DRV_S3C | ||
| 186 | tristate "Samsung S3C series SoC RTC" | ||
| 187 | depends on RTC_CLASS && ARCH_S3C2410 | ||
| 188 | help | ||
| 189 | RTC (Realtime Clock) driver for the clock inbuilt into the | ||
| 190 | Samsung S3C24XX series of SoCs. This can provide periodic | ||
| 191 | interrupt rates from 1Hz to 64Hz for user programs, and | ||
| 192 | wakeup from Alarm. | ||
| 193 | |||
| 194 | The driver currently supports the common features on all the | ||
| 195 | S3C24XX range, such as the S3C2410, S3C2412, S3C2413, S3C2440 | ||
| 196 | and S3C2442. | ||
| 197 | |||
| 198 | This driver can also be build as a module. If so, the module | ||
| 199 | will be called rtc-s3c. | ||
| 200 | |||
| 185 | config RTC_DRV_M48T86 | 201 | config RTC_DRV_M48T86 |
| 186 | tristate "ST M48T86/Dallas DS12887" | 202 | tristate "ST M48T86/Dallas DS12887" |
| 187 | depends on RTC_CLASS | 203 | depends on RTC_CLASS |
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index da5e38774e13..54220714ff49 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile | |||
| @@ -19,6 +19,7 @@ obj-$(CONFIG_RTC_DRV_DS1742) += rtc-ds1742.o | |||
| 19 | obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o | 19 | obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o |
| 20 | obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o | 20 | obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o |
| 21 | obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o | 21 | obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o |
| 22 | obj-$(CONFIG_RTC_DRV_S3C) += rtc-s3c.o | ||
| 22 | obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o | 23 | obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o |
| 23 | obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o | 24 | obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o |
| 24 | obj-$(CONFIG_RTC_DRV_DS1553) += rtc-ds1553.o | 25 | obj-$(CONFIG_RTC_DRV_DS1553) += rtc-ds1553.o |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c new file mode 100644 index 000000000000..d6d1bff52b8e --- /dev/null +++ b/drivers/rtc/rtc-s3c.c | |||
| @@ -0,0 +1,607 @@ | |||
| 1 | /* drivers/rtc/rtc-s3c.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2004,2006 Simtec Electronics | ||
| 4 | * Ben Dooks, <ben@simtec.co.uk> | ||
| 5 | * http://armlinux.simtec.co.uk/ | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | * S3C2410/S3C2440/S3C24XX Internal RTC Driver | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/module.h> | ||
| 15 | #include <linux/fs.h> | ||
| 16 | #include <linux/string.h> | ||
| 17 | #include <linux/init.h> | ||
| 18 | #include <linux/platform_device.h> | ||
| 19 | #include <linux/interrupt.h> | ||
| 20 | #include <linux/rtc.h> | ||
| 21 | #include <linux/bcd.h> | ||
| 22 | #include <linux/clk.h> | ||
| 23 | |||
| 24 | #include <asm/hardware.h> | ||
| 25 | #include <asm/uaccess.h> | ||
| 26 | #include <asm/io.h> | ||
| 27 | #include <asm/irq.h> | ||
| 28 | #include <asm/rtc.h> | ||
| 29 | |||
| 30 | #include <asm/mach/time.h> | ||
| 31 | |||
| 32 | #include <asm/arch/regs-rtc.h> | ||
| 33 | |||
| 34 | /* I have yet to find an S3C implementation with more than one | ||
| 35 | * of these rtc blocks in */ | ||
| 36 | |||
| 37 | static struct resource *s3c_rtc_mem; | ||
| 38 | |||
| 39 | static void __iomem *s3c_rtc_base; | ||
| 40 | static int s3c_rtc_alarmno = NO_IRQ; | ||
| 41 | static int s3c_rtc_tickno = NO_IRQ; | ||
| 42 | static int s3c_rtc_freq = 1; | ||
| 43 | |||
| 44 | static DEFINE_SPINLOCK(s3c_rtc_pie_lock); | ||
| 45 | static unsigned int tick_count; | ||
| 46 | |||
| 47 | /* IRQ Handlers */ | ||
| 48 | |||
| 49 | static irqreturn_t s3c_rtc_alarmirq(int irq, void *id, struct pt_regs *r) | ||
| 50 | { | ||
| 51 | struct rtc_device *rdev = id; | ||
| 52 | |||
| 53 | rtc_update_irq(&rdev->class_dev, 1, RTC_AF | RTC_IRQF); | ||
| 54 | return IRQ_HANDLED; | ||
| 55 | } | ||
| 56 | |||
| 57 | static irqreturn_t s3c_rtc_tickirq(int irq, void *id, struct pt_regs *r) | ||
| 58 | { | ||
| 59 | struct rtc_device *rdev = id; | ||
| 60 | |||
| 61 | rtc_update_irq(&rdev->class_dev, tick_count++, RTC_PF | RTC_IRQF); | ||
| 62 | return IRQ_HANDLED; | ||
| 63 | } | ||
| 64 | |||
| 65 | /* Update control registers */ | ||
| 66 | static void s3c_rtc_setaie(int to) | ||
| 67 | { | ||
| 68 | unsigned int tmp; | ||
| 69 | |||
| 70 | pr_debug("%s: aie=%d\n", __FUNCTION__, to); | ||
| 71 | |||
| 72 | tmp = readb(S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN; | ||
| 73 | |||
| 74 | if (to) | ||
| 75 | tmp |= S3C2410_RTCALM_ALMEN; | ||
| 76 | |||
| 77 | writeb(tmp, S3C2410_RTCALM); | ||
| 78 | } | ||
| 79 | |||
| 80 | static void s3c_rtc_setpie(int to) | ||
| 81 | { | ||
| 82 | unsigned int tmp; | ||
| 83 | |||
| 84 | pr_debug("%s: pie=%d\n", __FUNCTION__, to); | ||
| 85 | |||
| 86 | spin_lock_irq(&s3c_rtc_pie_lock); | ||
| 87 | tmp = readb(S3C2410_TICNT) & ~S3C2410_TICNT_ENABLE; | ||
| 88 | |||
| 89 | if (to) | ||
| 90 | tmp |= S3C2410_TICNT_ENABLE; | ||
| 91 | |||
| 92 | writeb(tmp, S3C2410_TICNT); | ||
| 93 | spin_unlock_irq(&s3c_rtc_pie_lock); | ||
| 94 | } | ||
| 95 | |||
| 96 | static void s3c_rtc_setfreq(int freq) | ||
| 97 | { | ||
| 98 | unsigned int tmp; | ||
| 99 | |||
| 100 | spin_lock_irq(&s3c_rtc_pie_lock); | ||
| 101 | tmp = readb(S3C2410_TICNT) & S3C2410_TICNT_ENABLE; | ||
| 102 | |||
| 103 | s3c_rtc_freq = freq; | ||
| 104 | |||
| 105 | tmp |= (128 / freq)-1; | ||
| 106 | |||
| 107 | writeb(tmp, S3C2410_TICNT); | ||
| 108 | spin_unlock_irq(&s3c_rtc_pie_lock); | ||
| 109 | } | ||
| 110 | |||
| 111 | /* Time read/write */ | ||
| 112 | |||
| 113 | static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) | ||
| 114 | { | ||
| 115 | unsigned int have_retried = 0; | ||
| 116 | |||
| 117 | retry_get_time: | ||
| 118 | rtc_tm->tm_min = readb(S3C2410_RTCMIN); | ||
| 119 | rtc_tm->tm_hour = readb(S3C2410_RTCHOUR); | ||
| 120 | rtc_tm->tm_mday = readb(S3C2410_RTCDATE); | ||
| 121 | rtc_tm->tm_mon = readb(S3C2410_RTCMON); | ||
| 122 | rtc_tm->tm_year = readb(S3C2410_RTCYEAR); | ||
| 123 | rtc_tm->tm_sec = readb(S3C2410_RTCSEC); | ||
| 124 | |||
| 125 | /* the only way to work out wether the system was mid-update | ||
| 126 | * when we read it is to check the second counter, and if it | ||
| 127 | * is zero, then we re-try the entire read | ||
| 128 | */ | ||
| 129 | |||
| 130 | if (rtc_tm->tm_sec == 0 && !have_retried) { | ||
| 131 | have_retried = 1; | ||
| 132 | goto retry_get_time; | ||
| 133 | } | ||
| 134 | |||
| 135 | pr_debug("read time %02x.%02x.%02x %02x/%02x/%02x\n", | ||
| 136 | rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday, | ||
| 137 | rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec); | ||
| 138 | |||
| 139 | BCD_TO_BIN(rtc_tm->tm_sec); | ||
| 140 | BCD_TO_BIN(rtc_tm->tm_min); | ||
| 141 | BCD_TO_BIN(rtc_tm->tm_hour); | ||
| 142 | BCD_TO_BIN(rtc_tm->tm_mday); | ||
| 143 | BCD_TO_BIN(rtc_tm->tm_mon); | ||
| 144 | BCD_TO_BIN(rtc_tm->tm_year); | ||
| 145 | |||
| 146 | rtc_tm->tm_year += 100; | ||
| 147 | rtc_tm->tm_mon -= 1; | ||
| 148 | |||
| 149 | return 0; | ||
| 150 | } | ||
| 151 | |||
| 152 | static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm) | ||
| 153 | { | ||
| 154 | /* the rtc gets round the y2k problem by just not supporting it */ | ||
| 155 | |||
| 156 | if (tm->tm_year < 100) | ||
| 157 | return -EINVAL; | ||
| 158 | |||
| 159 | writeb(BIN2BCD(tm->tm_sec), S3C2410_RTCSEC); | ||
| 160 | writeb(BIN2BCD(tm->tm_min), S3C2410_RTCMIN); | ||
| 161 | writeb(BIN2BCD(tm->tm_hour), S3C2410_RTCHOUR); | ||
| 162 | writeb(BIN2BCD(tm->tm_mday), S3C2410_RTCDATE); | ||
| 163 | writeb(BIN2BCD(tm->tm_mon + 1), S3C2410_RTCMON); | ||
| 164 | writeb(BIN2BCD(tm->tm_year - 100), S3C2410_RTCYEAR); | ||
| 165 | |||
| 166 | return 0; | ||
| 167 | } | ||
| 168 | |||
| 169 | static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm) | ||
| 170 | { | ||
| 171 | struct rtc_time *alm_tm = &alrm->time; | ||
| 172 | unsigned int alm_en; | ||
| 173 | |||
| 174 | alm_tm->tm_sec = readb(S3C2410_ALMSEC); | ||
| 175 | alm_tm->tm_min = readb(S3C2410_ALMMIN); | ||
| 176 | alm_tm->tm_hour = readb(S3C2410_ALMHOUR); | ||
| 177 | alm_tm->tm_mon = readb(S3C2410_ALMMON); | ||
| 178 | alm_tm->tm_mday = readb(S3C2410_ALMDATE); | ||
| 179 | alm_tm->tm_year = readb(S3C2410_ALMYEAR); | ||
| 180 | |||
| 181 | alm_en = readb(S3C2410_RTCALM); | ||
| 182 | |||
| 183 | pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n", | ||
| 184 | alm_en, | ||
| 185 | alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday, | ||
| 186 | alm_tm->tm_hour, alm_tm->tm_min, alm_tm->tm_sec); | ||
| 187 | |||
| 188 | |||
| 189 | /* decode the alarm enable field */ | ||
| 190 | |||
| 191 | if (alm_en & S3C2410_RTCALM_SECEN) | ||
| 192 | BCD_TO_BIN(alm_tm->tm_sec); | ||
| 193 | else | ||
| 194 | alm_tm->tm_sec = 0xff; | ||
| 195 | |||
| 196 | if (alm_en & S3C2410_RTCALM_MINEN) | ||
| 197 | BCD_TO_BIN(alm_tm->tm_min); | ||
| 198 | else | ||
| 199 | alm_tm->tm_min = 0xff; | ||
| 200 | |||
| 201 | if (alm_en & S3C2410_RTCALM_HOUREN) | ||
| 202 | BCD_TO_BIN(alm_tm->tm_hour); | ||
| 203 | else | ||
| 204 | alm_tm->tm_hour = 0xff; | ||
| 205 | |||
| 206 | if (alm_en & S3C2410_RTCALM_DAYEN) | ||
| 207 | BCD_TO_BIN(alm_tm->tm_mday); | ||
| 208 | else | ||
| 209 | alm_tm->tm_mday = 0xff; | ||
| 210 | |||
| 211 | if (alm_en & S3C2410_RTCALM_MONEN) { | ||
| 212 | BCD_TO_BIN(alm_tm->tm_mon); | ||
| 213 | alm_tm->tm_mon -= 1; | ||
| 214 | } else { | ||
| 215 | alm_tm->tm_mon = 0xff; | ||
| 216 | } | ||
| 217 | |||
| 218 | if (alm_en & S3C2410_RTCALM_YEAREN) | ||
| 219 | BCD_TO_BIN(alm_tm->tm_year); | ||
| 220 | else | ||
| 221 | alm_tm->tm_year = 0xffff; | ||
| 222 | |||
| 223 | return 0; | ||
| 224 | } | ||
| 225 | |||
| 226 | static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) | ||
| 227 | { | ||
| 228 | struct rtc_time *tm = &alrm->time; | ||
| 229 | unsigned int alrm_en; | ||
| 230 | |||
| 231 | pr_debug("s3c_rtc_setalarm: %d, %02x/%02x/%02x %02x.%02x.%02x\n", | ||
| 232 | alrm->enabled, | ||
| 233 | tm->tm_mday & 0xff, tm->tm_mon & 0xff, tm->tm_year & 0xff, | ||
| 234 | tm->tm_hour & 0xff, tm->tm_min & 0xff, tm->tm_sec); | ||
| 235 | |||
| 236 | |||
| 237 | alrm_en = readb(S3C2410_RTCALM) & S3C2410_RTCALM_ALMEN; | ||
| 238 | writeb(0x00, S3C2410_RTCALM); | ||
| 239 | |||
| 240 | if (tm->tm_sec < 60 && tm->tm_sec >= 0) { | ||
| 241 | alrm_en |= S3C2410_RTCALM_SECEN; | ||
| 242 | writeb(BIN2BCD(tm->tm_sec), S3C2410_ALMSEC); | ||
| 243 | } | ||
| 244 | |||
| 245 | if (tm->tm_min < 60 && tm->tm_min >= 0) { | ||
| 246 | alrm_en |= S3C2410_RTCALM_MINEN; | ||
| 247 | writeb(BIN2BCD(tm->tm_min), S3C2410_ALMMIN); | ||
| 248 | } | ||
| 249 | |||
| 250 | if (tm->tm_hour < 24 && tm->tm_hour >= 0) { | ||
| 251 | alrm_en |= S3C2410_RTCALM_HOUREN; | ||
| 252 | writeb(BIN2BCD(tm->tm_hour), S3C2410_ALMHOUR); | ||
| 253 | } | ||
| 254 | |||
| 255 | pr_debug("setting S3C2410_RTCALM to %08x\n", alrm_en); | ||
| 256 | |||
| 257 | writeb(alrm_en, S3C2410_RTCALM); | ||
| 258 | |||
| 259 | if (0) { | ||
| 260 | alrm_en = readb(S3C2410_RTCALM); | ||
| 261 | alrm_en &= ~S3C2410_RTCALM_ALMEN; | ||
| 262 | writeb(alrm_en, S3C2410_RTCALM); | ||
| 263 | disable_irq_wake(s3c_rtc_alarmno); | ||
| 264 | } | ||
| 265 | |||
| 266 | if (alrm->enabled) | ||
| 267 | enable_irq_wake(s3c_rtc_alarmno); | ||
| 268 | else | ||
| 269 | disable_irq_wake(s3c_rtc_alarmno); | ||
| 270 | |||
| 271 | return 0; | ||
| 272 | } | ||
| 273 | |||
| 274 | static int s3c_rtc_ioctl(struct device *dev, | ||
| 275 | unsigned int cmd, unsigned long arg) | ||
| 276 | { | ||
| 277 | unsigned int ret = -ENOIOCTLCMD; | ||
| 278 | |||
| 279 | switch (cmd) { | ||
| 280 | case RTC_AIE_OFF: | ||
| 281 | case RTC_AIE_ON: | ||
| 282 | s3c_rtc_setaie((cmd == RTC_AIE_ON) ? 1 : 0); | ||
| 283 | ret = 0; | ||
| 284 | break; | ||
| 285 | |||
| 286 | case RTC_PIE_OFF: | ||
| 287 | case RTC_PIE_ON: | ||
| 288 | tick_count = 0; | ||
| 289 | s3c_rtc_setpie((cmd == RTC_PIE_ON) ? 1 : 0); | ||
| 290 | ret = 0; | ||
| 291 | break; | ||
| 292 | |||
| 293 | case RTC_IRQP_READ: | ||
| 294 | ret = put_user(s3c_rtc_freq, (unsigned long __user *)arg); | ||
| 295 | break; | ||
| 296 | |||
| 297 | case RTC_IRQP_SET: | ||
| 298 | /* check for power of 2 */ | ||
| 299 | |||
| 300 | if ((arg & (arg-1)) != 0 || arg < 1) { | ||
| 301 | ret = -EINVAL; | ||
| 302 | goto exit; | ||
| 303 | } | ||
| 304 | |||
| 305 | pr_debug("s3c2410_rtc: setting frequency %ld\n", arg); | ||
| 306 | |||
| 307 | s3c_rtc_setfreq(arg); | ||
| 308 | ret = 0; | ||
| 309 | break; | ||
| 310 | |||
| 311 | case RTC_UIE_ON: | ||
| 312 | case RTC_UIE_OFF: | ||
| 313 | ret = -EINVAL; | ||
| 314 | } | ||
| 315 | |||
| 316 | exit: | ||
| 317 | return ret; | ||
| 318 | } | ||
| 319 | |||
| 320 | static int s3c_rtc_proc(struct device *dev, struct seq_file *seq) | ||
| 321 | { | ||
| 322 | unsigned int rtcalm = readb(S3C2410_RTCALM); | ||
| 323 | unsigned int ticnt = readb (S3C2410_TICNT); | ||
| 324 | |||
| 325 | seq_printf(seq, "alarm_IRQ\t: %s\n", | ||
| 326 | (rtcalm & S3C2410_RTCALM_ALMEN) ? "yes" : "no" ); | ||
| 327 | |||
| 328 | seq_printf(seq, "periodic_IRQ\t: %s\n", | ||
| 329 | (ticnt & S3C2410_TICNT_ENABLE) ? "yes" : "no" ); | ||
| 330 | |||
| 331 | seq_printf(seq, "periodic_freq\t: %d\n", s3c_rtc_freq); | ||
| 332 | |||
| 333 | return 0; | ||
| 334 | } | ||
| 335 | |||
| 336 | static int s3c_rtc_open(struct device *dev) | ||
| 337 | { | ||
| 338 | struct platform_device *pdev = to_platform_device(dev); | ||
| 339 | struct rtc_device *rtc_dev = platform_get_drvdata(pdev); | ||
| 340 | int ret; | ||
| 341 | |||
| 342 | ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, | ||
| 343 | SA_INTERRUPT, "s3c2410-rtc alarm", rtc_dev); | ||
| 344 | |||
| 345 | if (ret) { | ||
| 346 | dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); | ||
| 347 | return ret; | ||
| 348 | } | ||
| 349 | |||
| 350 | ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, | ||
| 351 | SA_INTERRUPT, "s3c2410-rtc tick", rtc_dev); | ||
| 352 | |||
| 353 | if (ret) { | ||
| 354 | dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); | ||
| 355 | goto tick_err; | ||
| 356 | } | ||
| 357 | |||
| 358 | return ret; | ||
| 359 | |||
| 360 | tick_err: | ||
| 361 | free_irq(s3c_rtc_alarmno, rtc_dev); | ||
| 362 | return ret; | ||
| 363 | } | ||
| 364 | |||
| 365 | static void s3c_rtc_release(struct device *dev) | ||
| 366 | { | ||
| 367 | struct platform_device *pdev = to_platform_device(dev); | ||
| 368 | struct rtc_device *rtc_dev = platform_get_drvdata(pdev); | ||
| 369 | |||
| 370 | /* do not clear AIE here, it may be needed for wake */ | ||
| 371 | |||
| 372 | s3c_rtc_setpie(0); | ||
| 373 | free_irq(s3c_rtc_alarmno, rtc_dev); | ||
| 374 | free_irq(s3c_rtc_tickno, rtc_dev); | ||
| 375 | } | ||
| 376 | |||
| 377 | static struct rtc_class_ops s3c_rtcops = { | ||
| 378 | .open = s3c_rtc_open, | ||
| 379 | .release = s3c_rtc_release, | ||
| 380 | .ioctl = s3c_rtc_ioctl, | ||
| 381 | .read_time = s3c_rtc_gettime, | ||
| 382 | .set_time = s3c_rtc_settime, | ||
| 383 | .read_alarm = s3c_rtc_getalarm, | ||
| 384 | .set_alarm = s3c_rtc_setalarm, | ||
| 385 | .proc = s3c_rtc_proc, | ||
| 386 | }; | ||
| 387 | |||
| 388 | static void s3c_rtc_enable(struct platform_device *pdev, int en) | ||
| 389 | { | ||
| 390 | unsigned int tmp; | ||
| 391 | |||
| 392 | if (s3c_rtc_base == NULL) | ||
| 393 | return; | ||
| 394 | |||
| 395 | if (!en) { | ||
| 396 | tmp = readb(S3C2410_RTCCON); | ||
| 397 | writeb(tmp & ~S3C2410_RTCCON_RTCEN, S3C2410_RTCCON); | ||
| 398 | |||
| 399 | tmp = readb(S3C2410_TICNT); | ||
| 400 | writeb(tmp & ~S3C2410_TICNT_ENABLE, S3C2410_TICNT); | ||
| 401 | } else { | ||
| 402 | /* re-enable the device, and check it is ok */ | ||
| 403 | |||
| 404 | if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_RTCEN) == 0){ | ||
| 405 | dev_info(&pdev->dev, "rtc disabled, re-enabling\n"); | ||
| 406 | |||
| 407 | tmp = readb(S3C2410_RTCCON); | ||
| 408 | writeb(tmp | S3C2410_RTCCON_RTCEN , S3C2410_RTCCON); | ||
| 409 | } | ||
| 410 | |||
| 411 | if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CNTSEL)){ | ||
| 412 | dev_info(&pdev->dev, "removing RTCCON_CNTSEL\n"); | ||
| 413 | |||
| 414 | tmp = readb(S3C2410_RTCCON); | ||
| 415 | writeb(tmp& ~S3C2410_RTCCON_CNTSEL , S3C2410_RTCCON); | ||
| 416 | } | ||
| 417 | |||
| 418 | if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CLKRST)){ | ||
| 419 | dev_info(&pdev->dev, "removing RTCCON_CLKRST\n"); | ||
| 420 | |||
| 421 | tmp = readb(S3C2410_RTCCON); | ||
| 422 | writeb(tmp & ~S3C2410_RTCCON_CLKRST, S3C2410_RTCCON); | ||
| 423 | } | ||
| 424 | } | ||
| 425 | } | ||
| 426 | |||
| 427 | static int s3c_rtc_remove(struct platform_device *dev) | ||
| 428 | { | ||
| 429 | struct rtc_device *rtc = platform_get_drvdata(dev); | ||
| 430 | |||
| 431 | platform_set_drvdata(dev, NULL); | ||
| 432 | rtc_device_unregister(rtc); | ||
| 433 | |||
| 434 | s3c_rtc_setpie(0); | ||
| 435 | s3c_rtc_setaie(0); | ||
| 436 | |||
| 437 | iounmap(s3c_rtc_base); | ||
| 438 | release_resource(s3c_rtc_mem); | ||
| 439 | kfree(s3c_rtc_mem); | ||
| 440 | |||
| 441 | return 0; | ||
| 442 | } | ||
| 443 | |||
| 444 | static int s3c_rtc_probe(struct platform_device *pdev) | ||
| 445 | { | ||
| 446 | struct rtc_device *rtc; | ||
| 447 | struct resource *res; | ||
| 448 | int ret; | ||
| 449 | |||
| 450 | pr_debug("%s: probe=%p\n", __FUNCTION__, pdev); | ||
| 451 | |||
| 452 | /* find the IRQs */ | ||
| 453 | |||
| 454 | s3c_rtc_tickno = platform_get_irq(pdev, 1); | ||
| 455 | if (s3c_rtc_tickno < 0) { | ||
| 456 | dev_err(&pdev->dev, "no irq for rtc tick\n"); | ||
| 457 | return -ENOENT; | ||
| 458 | } | ||
| 459 | |||
| 460 | s3c_rtc_alarmno = platform_get_irq(pdev, 0); | ||
| 461 | if (s3c_rtc_alarmno < 0) { | ||
| 462 | dev_err(&pdev->dev, "no irq for alarm\n"); | ||
| 463 | return -ENOENT; | ||
| 464 | } | ||
| 465 | |||
| 466 | pr_debug("s3c2410_rtc: tick irq %d, alarm irq %d\n", | ||
| 467 | s3c_rtc_tickno, s3c_rtc_alarmno); | ||
| 468 | |||
| 469 | /* get the memory region */ | ||
| 470 | |||
| 471 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 472 | if (res == NULL) { | ||
| 473 | dev_err(&pdev->dev, "failed to get memory region resource\n"); | ||
| 474 | return -ENOENT; | ||
| 475 | } | ||
| 476 | |||
| 477 | s3c_rtc_mem = request_mem_region(res->start, | ||
| 478 | res->end-res->start+1, | ||
| 479 | pdev->name); | ||
| 480 | |||
| 481 | if (s3c_rtc_mem == NULL) { | ||
| 482 | dev_err(&pdev->dev, "failed to reserve memory region\n"); | ||
| 483 | ret = -ENOENT; | ||
| 484 | goto err_nores; | ||
| 485 | } | ||
| 486 | |||
| 487 | s3c_rtc_base = ioremap(res->start, res->end - res->start + 1); | ||
| 488 | if (s3c_rtc_base == NULL) { | ||
| 489 | dev_err(&pdev->dev, "failed ioremap()\n"); | ||
| 490 | ret = -EINVAL; | ||
| 491 | goto err_nomap; | ||
| 492 | } | ||
| 493 | |||
| 494 | /* check to see if everything is setup correctly */ | ||
| 495 | |||
| 496 | s3c_rtc_enable(pdev, 1); | ||
| 497 | |||
| 498 | pr_debug("s3c2410_rtc: RTCCON=%02x\n", readb(S3C2410_RTCCON)); | ||
| 499 | |||
| 500 | s3c_rtc_setfreq(s3c_rtc_freq); | ||
| 501 | |||
| 502 | /* register RTC and exit */ | ||
| 503 | |||
| 504 | rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops, | ||
| 505 | THIS_MODULE); | ||
| 506 | |||
| 507 | if (IS_ERR(rtc)) { | ||
| 508 | dev_err(&pdev->dev, "cannot attach rtc\n"); | ||
| 509 | ret = PTR_ERR(rtc); | ||
| 510 | goto err_nortc; | ||
| 511 | } | ||
| 512 | |||
| 513 | rtc->max_user_freq = 128; | ||
| 514 | |||
| 515 | platform_set_drvdata(pdev, rtc); | ||
| 516 | return 0; | ||
| 517 | |||
| 518 | err_nortc: | ||
| 519 | s3c_rtc_enable(pdev, 0); | ||
| 520 | iounmap(s3c_rtc_base); | ||
| 521 | |||
| 522 | err_nomap: | ||
| 523 | release_resource(s3c_rtc_mem); | ||
| 524 | |||
| 525 | err_nores: | ||
| 526 | return ret; | ||
| 527 | } | ||
| 528 | |||
| 529 | #ifdef CONFIG_PM | ||
| 530 | |||
| 531 | /* RTC Power management control */ | ||
| 532 | |||
| 533 | static struct timespec s3c_rtc_delta; | ||
| 534 | |||
| 535 | static int ticnt_save; | ||
| 536 | |||
| 537 | static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state) | ||
| 538 | { | ||
| 539 | struct rtc_time tm; | ||
| 540 | struct timespec time; | ||
| 541 | |||
| 542 | time.tv_nsec = 0; | ||
| 543 | |||
| 544 | /* save TICNT for anyone using periodic interrupts */ | ||
| 545 | |||
| 546 | ticnt_save = readb(S3C2410_TICNT); | ||
| 547 | |||
| 548 | /* calculate time delta for suspend */ | ||
| 549 | |||
| 550 | s3c_rtc_gettime(&pdev->dev, &tm); | ||
| 551 | rtc_tm_to_time(&tm, &time.tv_sec); | ||
| 552 | save_time_delta(&s3c_rtc_delta, &time); | ||
| 553 | s3c_rtc_enable(pdev, 0); | ||
| 554 | |||
| 555 | return 0; | ||
| 556 | } | ||
| 557 | |||
| 558 | static int s3c_rtc_resume(struct platform_device *pdev) | ||
| 559 | { | ||
| 560 | struct rtc_time tm; | ||
| 561 | struct timespec time; | ||
| 562 | |||
| 563 | time.tv_nsec = 0; | ||
| 564 | |||
| 565 | s3c_rtc_enable(pdev, 1); | ||
| 566 | s3c_rtc_gettime(&pdev->dev, &tm); | ||
| 567 | rtc_tm_to_time(&tm, &time.tv_sec); | ||
| 568 | restore_time_delta(&s3c_rtc_delta, &time); | ||
| 569 | |||
| 570 | writeb(ticnt_save, S3C2410_TICNT); | ||
| 571 | return 0; | ||
| 572 | } | ||
| 573 | #else | ||
| 574 | #define s3c_rtc_suspend NULL | ||
| 575 | #define s3c_rtc_resume NULL | ||
| 576 | #endif | ||
| 577 | |||
| 578 | static struct platform_driver s3c2410_rtcdrv = { | ||
| 579 | .probe = s3c_rtc_probe, | ||
| 580 | .remove = s3c_rtc_remove, | ||
| 581 | .suspend = s3c_rtc_suspend, | ||
| 582 | .resume = s3c_rtc_resume, | ||
| 583 | .driver = { | ||
| 584 | .name = "s3c2410-rtc", | ||
| 585 | .owner = THIS_MODULE, | ||
| 586 | }, | ||
| 587 | }; | ||
| 588 | |||
| 589 | static char __initdata banner[] = "S3C24XX RTC, (c) 2004,2006 Simtec Electronics\n"; | ||
| 590 | |||
| 591 | static int __init s3c_rtc_init(void) | ||
| 592 | { | ||
| 593 | printk(banner); | ||
| 594 | return platform_driver_register(&s3c2410_rtcdrv); | ||
| 595 | } | ||
| 596 | |||
| 597 | static void __exit s3c_rtc_exit(void) | ||
| 598 | { | ||
| 599 | platform_driver_unregister(&s3c2410_rtcdrv); | ||
| 600 | } | ||
| 601 | |||
| 602 | module_init(s3c_rtc_init); | ||
| 603 | module_exit(s3c_rtc_exit); | ||
| 604 | |||
| 605 | MODULE_DESCRIPTION("Samsung S3C RTC Driver"); | ||
| 606 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); | ||
| 607 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 2dc179b14ce6..4bf03fb67f8d 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kmod.h> | 12 | #include <linux/kmod.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index 9e9ae7179602..d7295386821c 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/ctype.h> | 16 | #include <linux/ctype.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c index 4002f6c1c1b3..23fa0b289173 100644 --- a/drivers/s390/block/dasd_diag.c +++ b/drivers/s390/block/dasd_diag.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/stddef.h> | 11 | #include <linux/stddef.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 0dfab30e8089..2e655f466743 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/stddef.h> | 12 | #include <linux/stddef.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c index 4108d96f6a5a..58a65097922b 100644 --- a/drivers/s390/block/dasd_erp.c +++ b/drivers/s390/block/dasd_erp.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/ctype.h> | 12 | #include <linux/ctype.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index bb7755b9b19d..808434d38526 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/stddef.h> | 9 | #include <linux/stddef.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <asm/debug.h> | 11 | #include <asm/debug.h> |
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 61ffde718a7a..12c7d296eaa8 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 17 | #include <linux/blkpg.h> | 16 | #include <linux/blkpg.h> |
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 302bcd0f28be..e97f5316ad2d 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * i/o controls for the dasd driver. | 10 | * i/o controls for the dasd driver. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 14 | #include <linux/major.h> | 13 | #include <linux/major.h> |
| 15 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index ad23aede356c..bfa010f6dab2 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
| 16 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
| 17 | #include <linux/vmalloc.h> | 16 | #include <linux/vmalloc.h> |
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 606f6ad285a0..f25c6d116f6f 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Dan Morrison, IBM Corporation (dmorriso@cse.buffalo.edu) | 11 | * Dan Morrison, IBM Corporation (dmorriso@cse.buffalo.edu) |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/kdev_t.h> | 16 | #include <linux/kdev_t.h> |
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c index ef607a1de55a..7566be890688 100644 --- a/drivers/s390/char/con3270.c +++ b/drivers/s390/char/con3270.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation | 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/bootmem.h> | 11 | #include <linux/bootmem.h> |
| 13 | #include <linux/console.h> | 12 | #include <linux/console.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c index be463242cf0f..0ea6f36a2527 100644 --- a/drivers/s390/char/ctrlchar.c +++ b/drivers/s390/char/ctrlchar.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/stddef.h> | 10 | #include <linux/stddef.h> |
| 12 | #include <asm/errno.h> | 11 | #include <asm/errno.h> |
| 13 | #include <linux/sysrq.h> | 12 | #include <linux/sysrq.h> |
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index a6415377bc73..6099c14de429 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation | 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/bootmem.h> | 11 | #include <linux/bootmem.h> |
| 13 | #include <linux/console.h> | 12 | #include <linux/console.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index d4d2ff0a9da2..547ef906ae2c 100644 --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com), | 7 | * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com), |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/sysrq.h> | 12 | #include <linux/sysrq.h> |
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index 3c1314b7391b..e95b56f810db 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation | 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/bootmem.h> | 11 | #include <linux/bootmem.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/err.h> | 13 | #include <linux/err.h> |
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c index 10ef22f13541..86864f641716 100644 --- a/drivers/s390/char/sclp_con.c +++ b/drivers/s390/char/sclp_con.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> | 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kmod.h> | 11 | #include <linux/kmod.h> |
| 13 | #include <linux/console.h> | 12 | #include <linux/console.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c index 80f7f31310e6..732dfbdb85c4 100644 --- a/drivers/s390/char/sclp_cpi.c +++ b/drivers/s390/char/sclp_cpi.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * SCLP Control-Program Identification. | 5 | * SCLP Control-Program Identification. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/version.h> | 8 | #include <linux/version.h> |
| 10 | #include <linux/kmod.h> | 9 | #include <linux/kmod.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c index a4c53c172db6..32004aae95c1 100644 --- a/drivers/s390/char/sclp_quiesce.c +++ b/drivers/s390/char/sclp_quiesce.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 7 | * Peter Oberparleiter <peter.oberparleiter@de.ibm.com> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/cpumask.h> | 12 | #include <linux/cpumask.h> |
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c index 91e93c78f57a..0c92d3909cca 100644 --- a/drivers/s390/char/sclp_rw.c +++ b/drivers/s390/char/sclp_rw.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> | 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kmod.h> | 11 | #include <linux/kmod.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/err.h> | 13 | #include <linux/err.h> |
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 6cbf067f1a8f..f6cf9023039e 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> | 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kmod.h> | 12 | #include <linux/kmod.h> |
| 14 | #include <linux/tty.h> | 13 | #include <linux/tty.h> |
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c index 9e02625c82cf..54fba6f17188 100644 --- a/drivers/s390/char/sclp_vt220.c +++ b/drivers/s390/char/sclp_vt220.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Author(s): Peter Oberparleiter <Peter.Oberparleiter@de.ibm.com> | 7 | * Author(s): Peter Oberparleiter <Peter.Oberparleiter@de.ibm.com> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 13 | #include <linux/list.h> | 12 | #include <linux/list.h> |
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h index cd51ace8b610..1f4c89967be4 100644 --- a/drivers/s390/char/tape.h +++ b/drivers/s390/char/tape.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <asm/ccwdev.h> | 16 | #include <asm/ccwdev.h> |
| 17 | #include <asm/debug.h> | 17 | #include <asm/debug.h> |
| 18 | #include <asm/idals.h> | 18 | #include <asm/idals.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/blkdev.h> | 19 | #include <linux/blkdev.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c index d4f2da738078..48b4d30a7256 100644 --- a/drivers/s390/char/tape_34xx.c +++ b/drivers/s390/char/tape_34xx.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> | 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/bio.h> | 13 | #include <linux/bio.h> |
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c index d71ef1adea59..928cbefc49d5 100644 --- a/drivers/s390/char/tape_3590.c +++ b/drivers/s390/char/tape_3590.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> | 8 | * Martin Schwidefsky <schwidefsky@de.ibm.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/bio.h> | 13 | #include <linux/bio.h> |
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index b70d92690242..3225fcd1dcb4 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/blkdev.h> | 15 | #include <linux/blkdev.h> |
| 17 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c index 5ce7ca38ace0..97f75237bed6 100644 --- a/drivers/s390/char/tape_char.c +++ b/drivers/s390/char/tape_char.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Martin Schwidefsky <schwidefsky@de.ibm.com> | 10 | * Martin Schwidefsky <schwidefsky@de.ibm.com> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/proc_fs.h> | 15 | #include <linux/proc_fs.h> |
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c index e6e4086d3224..122b4d8965c3 100644 --- a/drivers/s390/char/tape_core.c +++ b/drivers/s390/char/tape_core.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Stefan Bader <shbader@de.ibm.com> | 11 | * Stefan Bader <shbader@de.ibm.com> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/init.h> // for kernel parameters | 15 | #include <linux/init.h> // for kernel parameters |
| 17 | #include <linux/kmod.h> // for requesting modules | 16 | #include <linux/kmod.h> // for requesting modules |
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c index 5fec0a10cc3d..655d375ab22b 100644 --- a/drivers/s390/char/tape_proc.c +++ b/drivers/s390/char/tape_proc.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * PROCFS Functions | 11 | * PROCFS Functions |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/vmalloc.h> | 15 | #include <linux/vmalloc.h> |
| 17 | #include <linux/seq_file.h> | 16 | #include <linux/seq_file.h> |
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c index 99cf881f41db..7a76ec413a3a 100644 --- a/drivers/s390/char/tape_std.c +++ b/drivers/s390/char/tape_std.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Stefan Bader <shbader@de.ibm.com> | 11 | * Stefan Bader <shbader@de.ibm.com> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/bio.h> | 16 | #include <linux/bio.h> |
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 7d26a3e4cb80..f496f236b9c0 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation | 8 | * -- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/kdev_t.h> | 13 | #include <linux/kdev_t.h> |
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index 15b895496a45..12c2d6b746e6 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Arnd Bergmann (arndb@de.ibm.com) | 9 | * Arnd Bergmann (arndb@de.ibm.com) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/vmalloc.h> | 13 | #include <linux/vmalloc.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index b00f3ed051a0..a01f3bba4a7b 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/device.h> | 15 | #include <linux/device.h> |
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 5b20d8c9c025..a3423267467f 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 17 | #include <linux/device.h> | 16 | #include <linux/device.h> |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index eafde43e8410..67f0de6aed33 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Cornelia Huck (cornelia.huck@de.ibm.com) | 8 | * Cornelia Huck (cornelia.huck@de.ibm.com) |
| 9 | * Martin Schwidefsky (schwidefsky@de.ibm.com) | 9 | * Martin Schwidefsky (schwidefsky@de.ibm.com) |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 7d0dd72635eb..cb1af0b6f033 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/jiffies.h> | 13 | #include <linux/jiffies.h> |
| 15 | #include <linux/string.h> | 14 | #include <linux/string.h> |
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c index e60b2d8103b8..438db483035d 100644 --- a/drivers/s390/cio/device_id.c +++ b/drivers/s390/cio/device_id.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
| 16 | #include <asm/ccwdev.h> | 15 | #include <asm/ccwdev.h> |
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c index b266ad8e14ff..a60124264bee 100644 --- a/drivers/s390/cio/device_ops.c +++ b/drivers/s390/cio/device_ops.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com) | 6 | * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com) |
| 7 | * Cornelia Huck (cornelia.huck@de.ibm.com) | 7 | * Cornelia Huck (cornelia.huck@de.ibm.com) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c index 85b1020a1fcc..54cb64ed0786 100644 --- a/drivers/s390/cio/device_pgid.c +++ b/drivers/s390/cio/device_pgid.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Path Group ID functions. | 9 | * Path Group ID functions. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c index 6c762b43f921..14bef2c179bf 100644 --- a/drivers/s390/cio/device_status.c +++ b/drivers/s390/cio/device_status.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Status accumulation and basic sense functions. | 9 | * Status accumulation and basic sense functions. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | 14 | ||
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index 96f519281d92..b70039af70d6 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 36 | 35 | ||
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index 7145e2134cf0..2c1db8036b7c 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include "fsm.h" | 6 | #include "fsm.h" |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/timer.h> | 8 | #include <linux/timer.h> |
| 10 | 9 | ||
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c index e0c7deb98831..189a49275433 100644 --- a/drivers/s390/net/iucv.c +++ b/drivers/s390/net/iucv.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 36 | #include <linux/config.h> | ||
| 37 | 36 | ||
| 38 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c index 38aad8321456..8491598f9149 100644 --- a/drivers/s390/net/qeth_eddp.c +++ b/drivers/s390/net/qeth_eddp.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Author(s): Thomas Spatzier <tspat@de.ibm.com> | 8 | * Author(s): Thomas Spatzier <tspat@de.ibm.com> |
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/ip.h> | 12 | #include <linux/ip.h> |
| 14 | #include <linux/inetdevice.h> | 13 | #include <linux/inetdevice.h> |
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 56009d768326..36733b9823c6 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/moduleparam.h> | 31 | #include <linux/moduleparam.h> |
| 33 | #include <linux/string.h> | 32 | #include <linux/string.h> |
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c index 8dc75002acbe..432136f96e64 100644 --- a/drivers/s390/s390mach.c +++ b/drivers/s390/s390mach.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Martin Schwidefsky (schwidefsky@de.ibm.com) | 8 | * Martin Schwidefsky (schwidefsky@de.ibm.com) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c index 66da840c9316..d1c1e75bfd60 100644 --- a/drivers/s390/sysinfo.c +++ b/drivers/s390/sysinfo.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Author(s): Ulrich Weigand (Ulrich.Weigand@de.ibm.com) | 5 | * Author(s): Ulrich Weigand (Ulrich.Weigand@de.ibm.com) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/proc_fs.h> | 10 | #include <linux/proc_fs.h> |
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index cf97e9efe9b6..063e676a3ac0 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #define __KERNEL_SYSCALLS__ | 22 | #define __KERNEL_SYSCALLS__ |
| 23 | static int errno; | 23 | static int errno; |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 28 | #include <linux/kthread.h> | 27 | #include <linux/kthread.h> |
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 31b8a5f6116f..fa2418f7ad39 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index d7e4bb41bd79..293bb2fdb1d5 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 29 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 35 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
diff --git a/drivers/sbus/dvma.c b/drivers/sbus/dvma.c index 378a1d68024d..57e1526746a2 100644 --- a/drivers/sbus/dvma.c +++ b/drivers/sbus/dvma.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 387a6aa8c020..16b59773c0bb 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
| 11 | 10 | ||
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index 3c683dc23541..eb7a6a4ded75 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c | |||
| @@ -114,7 +114,6 @@ | |||
| 114 | * */ | 114 | * */ |
| 115 | #define NCR_700_VERSION "2.8" | 115 | #define NCR_700_VERSION "2.8" |
| 116 | 116 | ||
| 117 | #include <linux/config.h> | ||
| 118 | #include <linux/kernel.h> | 117 | #include <linux/kernel.h> |
| 119 | #include <linux/types.h> | 118 | #include <linux/types.h> |
| 120 | #include <linux/string.h> | 119 | #include <linux/string.h> |
diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c index 765769a629e4..c9bd0335995d 100644 --- a/drivers/scsi/53c7xx.c +++ b/drivers/scsi/53c7xx.c | |||
| @@ -232,7 +232,6 @@ | |||
| 232 | 232 | ||
| 233 | #include <linux/module.h> | 233 | #include <linux/module.h> |
| 234 | 234 | ||
| 235 | #include <linux/config.h> | ||
| 236 | 235 | ||
| 237 | #include <linux/types.h> | 236 | #include <linux/types.h> |
| 238 | #include <asm/setup.h> | 237 | #include <asm/setup.h> |
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index bde3d5834ade..259b47ec4f54 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #define BusLogic_DriverVersion "2.1.16" | 29 | #define BusLogic_DriverVersion "2.1.16" |
| 30 | #define BusLogic_DriverDate "18 July 2002" | 30 | #define BusLogic_DriverDate "18 July 2002" |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 35 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
diff --git a/drivers/scsi/BusLogic.h b/drivers/scsi/BusLogic.h index 1aaa6569edac..9792e5af5252 100644 --- a/drivers/scsi/BusLogic.h +++ b/drivers/scsi/BusLogic.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #ifndef _BUSLOGIC_H | 28 | #ifndef _BUSLOGIC_H |
| 29 | #define _BUSLOGIC_H | 29 | #define _BUSLOGIC_H |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | 31 | ||
| 33 | #ifndef PACKED | 32 | #ifndef PACKED |
| 34 | #define PACKED __attribute__((packed)) | 33 | #define PACKED __attribute__((packed)) |
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index 8e3d949b7118..7c0068049586 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifndef CONFIG_SCSI_OMIT_FLASHPOINT | 19 | #ifndef CONFIG_SCSI_OMIT_FLASHPOINT |
| 21 | 20 | ||
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c index c7dd0154d012..8a4659e94105 100644 --- a/drivers/scsi/NCR53C9x.c +++ b/drivers/scsi/NCR53C9x.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h index 65a9b377a410..481653c977cf 100644 --- a/drivers/scsi/NCR53C9x.h +++ b/drivers/scsi/NCR53C9x.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef NCR53C9X_H | 13 | #ifndef NCR53C9X_H |
| 14 | #define NCR53C9X_H | 14 | #define NCR53C9X_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 18 | 17 | ||
| 19 | /* djweis for mac driver */ | 18 | /* djweis for mac driver */ |
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index dd9fb3d91000..537136457ea0 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
| @@ -754,7 +754,6 @@ | |||
| 754 | * --- Linux Include Files | 754 | * --- Linux Include Files |
| 755 | */ | 755 | */ |
| 756 | 756 | ||
| 757 | #include <linux/config.h> | ||
| 758 | #include <linux/module.h> | 757 | #include <linux/module.h> |
| 759 | 758 | ||
| 760 | #if defined(CONFIG_X86) && !defined(CONFIG_ISA) | 759 | #if defined(CONFIG_X86) && !defined(CONFIG_ISA) |
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 86c6bd234591..24f0f5461792 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * Added proper detection of the AHA-1640 (MCA version of AHA-1540) | 25 | * Added proper detection of the AHA-1640 (MCA version of AHA-1540) |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h index 2b8331649eeb..92c6154575e7 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/drivers/scsi/aic7xxx/aic79xx_osm.h | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #ifndef _AIC79XX_LINUX_H_ | 42 | #ifndef _AIC79XX_LINUX_H_ |
| 43 | #define _AIC79XX_LINUX_H_ | 43 | #define _AIC79XX_LINUX_H_ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/types.h> | 45 | #include <linux/types.h> |
| 47 | #include <linux/blkdev.h> | 46 | #include <linux/blkdev.h> |
| 48 | #include <linux/delay.h> | 47 | #include <linux/delay.h> |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index a20b08c9ff15..d42a71ee076d 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | #ifndef _AIC7XXX_LINUX_H_ | 59 | #ifndef _AIC7XXX_LINUX_H_ |
| 60 | #define _AIC7XXX_LINUX_H_ | 60 | #define _AIC7XXX_LINUX_H_ |
| 61 | 61 | ||
| 62 | #include <linux/config.h> | ||
| 63 | #include <linux/types.h> | 62 | #include <linux/types.h> |
| 64 | #include <linux/blkdev.h> | 63 | #include <linux/blkdev.h> |
| 65 | #include <linux/delay.h> | 64 | #include <linux/delay.h> |
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx_proc.c b/drivers/scsi/aic7xxx_old/aic7xxx_proc.c index 3bf334931a8a..b07e4f04fd00 100644 --- a/drivers/scsi/aic7xxx_old/aic7xxx_proc.c +++ b/drivers/scsi/aic7xxx_old/aic7xxx_proc.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * $Id: aic7xxx_proc.c,v 4.1 1997/06/97 08:23:42 deang Exp $ | 29 | * $Id: aic7xxx_proc.c,v 4.1 1997/06/97 08:23:42 deang Exp $ |
| 30 | *-M*************************************************************************/ | 30 | *-M*************************************************************************/ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | 32 | ||
| 34 | #define BLS (&aic7xxx_buffer[size]) | 33 | #define BLS (&aic7xxx_buffer[size]) |
| 35 | #define HDRB \ | 34 | #define HDRB \ |
diff --git a/drivers/scsi/amiga7xx.c b/drivers/scsi/amiga7xx.c index c0844fa32c5d..9099d531d5a4 100644 --- a/drivers/scsi/amiga7xx.c +++ b/drivers/scsi/amiga7xx.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 12 | #include <linux/blkdev.h> | 12 | #include <linux/blkdev.h> |
| 13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/zorro.h> | 14 | #include <linux/zorro.h> |
| 16 | #include <linux/stat.h> | 15 | #include <linux/stat.h> |
| 17 | 16 | ||
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index dda5a5f79c53..1b9900b58956 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c | |||
| @@ -129,7 +129,6 @@ | |||
| 129 | #define STRx(x) STRINGIFY(x) | 129 | #define STRx(x) STRINGIFY(x) |
| 130 | #define NO_WRITE_STR STRx(NO_WRITE) | 130 | #define NO_WRITE_STR STRx(NO_WRITE) |
| 131 | 131 | ||
| 132 | #include <linux/config.h> | ||
| 133 | #include <linux/module.h> | 132 | #include <linux/module.h> |
| 134 | #include <linux/kernel.h> | 133 | #include <linux/kernel.h> |
| 135 | #include <linux/sched.h> | 134 | #include <linux/sched.h> |
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index 57295bcea3e7..007a14e5c3fd 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c | |||
| @@ -524,7 +524,6 @@ static __inline__ void initialize_SCp(Scsi_Cmnd *cmd) | |||
| 524 | } | 524 | } |
| 525 | } | 525 | } |
| 526 | 526 | ||
| 527 | #include <linux/config.h> | ||
| 528 | #include <linux/delay.h> | 527 | #include <linux/delay.h> |
| 529 | 528 | ||
| 530 | #if NDEBUG | 529 | #if NDEBUG |
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index f677c5a32a68..e1be4a4387cd 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | 65 | ||
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | #include <linux/config.h> | ||
| 69 | #include <linux/module.h> | 68 | #include <linux/module.h> |
| 70 | 69 | ||
| 71 | #define NDEBUG (0) | 70 | #define NDEBUG (0) |
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index d9abd1645d15..f6caa4307768 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #define VERSION "0.25" | 8 | #define VERSION "0.25" |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index d92d5040a9fe..dddd2acce76f 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Additions for SPC-3 T10/1416-D Rev 21 22 Sept 2004, D. Gilbert 20041025 | 7 | * Additions for SPC-3 T10/1416-D Rev 21 22 Sept 2004, D. Gilbert 20041025 |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h index a9585f5235d9..d84a281ad944 100644 --- a/drivers/scsi/dpt/dpti_i2o.h +++ b/drivers/scsi/dpt/dpti_i2o.h | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | #include <asm/semaphore.h> /* Needed for MUTEX init macros */ | 24 | #include <asm/semaphore.h> /* Needed for MUTEX init macros */ |
| 25 | #include <linux/version.h> | 25 | #include <linux/version.h> |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/notifier.h> | 26 | #include <linux/notifier.h> |
| 28 | #include <asm/atomic.h> | 27 | #include <asm/atomic.h> |
| 29 | 28 | ||
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 059eeee4b554..67c419402d8a 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c | |||
| @@ -477,7 +477,6 @@ | |||
| 477 | * the driver sets host->wish_block = 1 for all ISA boards. | 477 | * the driver sets host->wish_block = 1 for all ISA boards. |
| 478 | */ | 478 | */ |
| 479 | 479 | ||
| 480 | #include <linux/config.h> | ||
| 481 | #include <linux/string.h> | 480 | #include <linux/string.h> |
| 482 | #include <linux/kernel.h> | 481 | #include <linux/kernel.h> |
| 483 | #include <linux/ioport.h> | 482 | #include <linux/ioport.h> |
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 23beb48c79c5..d8c9ec21e0ef 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * last change: 2002/11/02 OS: Linux 2.5.45 * | 46 | * last change: 2002/11/02 OS: Linux 2.5.45 * |
| 47 | ************************************************************/ | 47 | ************************************************************/ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 51 | #include <linux/kernel.h> | 50 | #include <linux/kernel.h> |
| 52 | #include <linux/sched.h> | 51 | #include <linux/sched.h> |
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index ddb512463b45..36c50b61f94d 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 3) Add tagged queueing. | 12 | * 3) Add tagged queueing. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c index 03416548f20c..7f891023aa15 100644 --- a/drivers/scsi/fcal.c +++ b/drivers/scsi/fcal.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
| 14 | #include <linux/stat.h> | 14 | #include <linux/stat.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #ifdef CONFIG_KMOD | 16 | #ifdef CONFIG_KMOD |
| 18 | #include <linux/kmod.h> | 17 | #include <linux/kmod.h> |
| 19 | #endif | 18 | #endif |
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index e16013f0ad6e..03356887202d 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c | |||
| @@ -266,7 +266,6 @@ | |||
| 266 | 266 | ||
| 267 | **************************************************************************/ | 267 | **************************************************************************/ |
| 268 | 268 | ||
| 269 | #include <linux/config.h> | ||
| 270 | #include <linux/module.h> | 269 | #include <linux/module.h> |
| 271 | #include <linux/init.h> | 270 | #include <linux/init.h> |
| 272 | #include <linux/interrupt.h> | 271 | #include <linux/interrupt.h> |
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index 5f313c93b7a9..fbc8e16c8d15 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c | |||
| @@ -91,7 +91,6 @@ | |||
| 91 | #define AUTOPROBE_IRQ | 91 | #define AUTOPROBE_IRQ |
| 92 | #define AUTOSENSE | 92 | #define AUTOSENSE |
| 93 | 93 | ||
| 94 | #include <linux/config.h> | ||
| 95 | 94 | ||
| 96 | #ifdef CONFIG_SCSI_GENERIC_NCR53C400 | 95 | #ifdef CONFIG_SCSI_GENERIC_NCR53C400 |
| 97 | #define NCR53C400_PSEUDO_DMA 1 | 96 | #define NCR53C400_PSEUDO_DMA 1 |
diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h index d60a89cb8052..df0b3f69ef63 100644 --- a/drivers/scsi/g_NCR5380.h +++ b/drivers/scsi/g_NCR5380.h | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #ifndef GENERIC_NCR5380_H | 32 | #ifndef GENERIC_NCR5380_H |
| 33 | #define GENERIC_NCR5380_H | 33 | #define GENERIC_NCR5380_H |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | 35 | ||
| 37 | #define GENERIC_NCR5380_PUBLIC_RELEASE 1 | 36 | #define GENERIC_NCR5380_PUBLIC_RELEASE 1 |
| 38 | 37 | ||
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 497f6642b2dc..1cbc94842cc6 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | */ | 18 | */ |
| 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/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 988e6f7af01a..f7b5d7372d26 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #define IDESCSI_VERSION "0.92" | 34 | #define IDESCSI_VERSION "0.92" |
| 35 | 35 | ||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 39 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 40 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index 681bd18493f3..2d95ac9c32c1 100644 --- a/drivers/scsi/imm.c +++ b/drivers/scsi/imm.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * future expansion to five letters. | 8 | * future expansion to five letters. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index 913ba95f85bd..43acb1fe90b4 100644 --- a/drivers/scsi/initio.c +++ b/drivers/scsi/initio.c | |||
| @@ -118,7 +118,6 @@ | |||
| 118 | #include <linux/blkdev.h> | 118 | #include <linux/blkdev.h> |
| 119 | #include <linux/spinlock.h> | 119 | #include <linux/spinlock.h> |
| 120 | #include <linux/stat.h> | 120 | #include <linux/stat.h> |
| 121 | #include <linux/config.h> | ||
| 122 | #include <linux/kernel.h> | 121 | #include <linux/kernel.h> |
| 123 | #include <linux/proc_fs.h> | 122 | #include <linux/proc_fs.h> |
| 124 | #include <linux/string.h> | 123 | #include <linux/string.h> |
diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h index 3efb1184fc39..acb67a4af2cc 100644 --- a/drivers/scsi/initio.h +++ b/drivers/scsi/initio.h | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | **************************************************************************/ | 54 | **************************************************************************/ |
| 55 | 55 | ||
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/types.h> | 57 | #include <linux/types.h> |
| 59 | 58 | ||
| 60 | #define ULONG unsigned long | 59 | #define ULONG unsigned long |
| @@ -193,13 +192,13 @@ typedef struct { | |||
| 193 | #define TSC_SEL_ATN_DIRECT_OUT 0x15 /* Select With ATN Sequence */ | 192 | #define TSC_SEL_ATN_DIRECT_OUT 0x15 /* Select With ATN Sequence */ |
| 194 | #define TSC_SEL_ATN3_DIRECT_IN 0xB5 /* Select With ATN3 Sequence */ | 193 | #define TSC_SEL_ATN3_DIRECT_IN 0xB5 /* Select With ATN3 Sequence */ |
| 195 | #define TSC_SEL_ATN3_DIRECT_OUT 0x35 /* Select With ATN3 Sequence */ | 194 | #define TSC_SEL_ATN3_DIRECT_OUT 0x35 /* Select With ATN3 Sequence */ |
| 196 | #define TSC_XF_DMA_OUT_DIRECT 0x06 /* DMA Xfer Infomation out */ | 195 | #define TSC_XF_DMA_OUT_DIRECT 0x06 /* DMA Xfer Information out */ |
| 197 | #define TSC_XF_DMA_IN_DIRECT 0x86 /* DMA Xfer Infomation in */ | 196 | #define TSC_XF_DMA_IN_DIRECT 0x86 /* DMA Xfer Information in */ |
| 198 | 197 | ||
| 199 | #define TSC_XF_DMA_OUT 0x43 /* DMA Xfer Infomation out */ | 198 | #define TSC_XF_DMA_OUT 0x43 /* DMA Xfer Information out */ |
| 200 | #define TSC_XF_DMA_IN 0xC3 /* DMA Xfer Infomation in */ | 199 | #define TSC_XF_DMA_IN 0xC3 /* DMA Xfer Information in */ |
| 201 | #define TSC_XF_FIFO_OUT 0x03 /* FIFO Xfer Infomation out */ | 200 | #define TSC_XF_FIFO_OUT 0x03 /* FIFO Xfer Information out */ |
| 202 | #define TSC_XF_FIFO_IN 0x83 /* FIFO Xfer Infomation in */ | 201 | #define TSC_XF_FIFO_IN 0x83 /* FIFO Xfer Information in */ |
| 203 | 202 | ||
| 204 | #define TSC_MSG_ACCEPT 0x0F /* Message Accept */ | 203 | #define TSC_MSG_ACCEPT 0x0F /* Message Accept */ |
| 205 | 204 | ||
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 96b65b307dd0..e19bf690cdf1 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | * | 54 | * |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/fs.h> | 57 | #include <linux/fs.h> |
| 59 | #include <linux/init.h> | 58 | #include <linux/init.h> |
| 60 | #include <linux/types.h> | 59 | #include <linux/types.h> |
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 78f2ff736c3e..7436793c3ad3 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
| @@ -196,7 +196,6 @@ | |||
| 196 | #include <linux/module.h> | 196 | #include <linux/module.h> |
| 197 | 197 | ||
| 198 | #include <linux/stat.h> | 198 | #include <linux/stat.h> |
| 199 | #include <linux/config.h> | ||
| 200 | 199 | ||
| 201 | #include <linux/spinlock.h> | 200 | #include <linux/spinlock.h> |
| 202 | #include <linux/init.h> | 201 | #include <linux/init.h> |
diff --git a/drivers/scsi/libata-bmdma.c b/drivers/scsi/libata-bmdma.c index 004e1a0d8b71..38bfebf4fe8f 100644 --- a/drivers/scsi/libata-bmdma.c +++ b/drivers/scsi/libata-bmdma.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * | 32 | * |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 37 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
| 38 | #include <linux/libata.h> | 37 | #include <linux/libata.h> |
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index d1c1c30d123f..82caba464291 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * | 32 | * |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index f852421002ef..c88717727be8 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * - retry arbitration if lost (unless higher levels do this for us) | 18 | * - retry arbitration if lost (unless higher levels do this for us) |
| 19 | * - power down the chip when no device is detected | 19 | * - power down the chip when no device is detected |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
diff --git a/drivers/scsi/ncr53c8xx.h b/drivers/scsi/ncr53c8xx.h index 0e4e46a01336..78818b6684f8 100644 --- a/drivers/scsi/ncr53c8xx.h +++ b/drivers/scsi/ncr53c8xx.h | |||
| @@ -53,10 +53,8 @@ | |||
| 53 | #ifndef NCR53C8XX_H | 53 | #ifndef NCR53C8XX_H |
| 54 | #define NCR53C8XX_H | 54 | #define NCR53C8XX_H |
| 55 | 55 | ||
| 56 | #include <linux/config.h> | ||
| 57 | #include <scsi/scsi_host.h> | 56 | #include <scsi/scsi_host.h> |
| 58 | 57 | ||
| 59 | #include <linux/config.h> | ||
| 60 | 58 | ||
| 61 | /* | 59 | /* |
| 62 | ** If you want a driver as small as possible, donnot define the | 60 | ** If you want a driver as small as possible, donnot define the |
diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c index dee426f8c07b..d7a0bcc6c670 100644 --- a/drivers/scsi/oktagon_esp.c +++ b/drivers/scsi/oktagon_esp.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Based on cyber_esp.c | 6 | * Based on cyber_esp.c |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | 9 | ||
| 11 | #if defined(CONFIG_AMIGA) || defined(CONFIG_APUS) | 10 | #if defined(CONFIG_AMIGA) || defined(CONFIG_APUS) |
| 12 | #define USE_BOTTOM_HALF | 11 | #define USE_BOTTOM_HALF |
diff --git a/drivers/scsi/oktagon_io.S b/drivers/scsi/oktagon_io.S index 08ce8d80d8f5..8a7340b02707 100644 --- a/drivers/scsi/oktagon_io.S +++ b/drivers/scsi/oktagon_io.S | |||
| @@ -23,7 +23,6 @@ int oktag_from_io(long *addr,long *paddr,long len) | |||
| 23 | * is moved to/from the IO register. | 23 | * is moved to/from the IO register. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | 26 | ||
| 28 | #ifdef CONFIG_APUS | 27 | #ifdef CONFIG_APUS |
| 29 | 28 | ||
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h index 011d4d6ca9f9..1e426f5d0ed8 100644 --- a/drivers/scsi/osst.h +++ b/drivers/scsi/osst.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <asm/byteorder.h> | 5 | #include <asm/byteorder.h> |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/completion.h> | 6 | #include <linux/completion.h> |
| 8 | 7 | ||
| 9 | /* FIXME - rename and use the following two types or delete them! | 8 | /* FIXME - rename and use the following two types or delete them! |
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c index 83a671799934..7abf64d1bfc9 100644 --- a/drivers/scsi/pluto.c +++ b/drivers/scsi/pluto.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
| 14 | #include <linux/stat.h> | 14 | #include <linux/stat.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #ifdef CONFIG_KMOD | 16 | #ifdef CONFIG_KMOD |
| 18 | #include <linux/kmod.h> | 17 | #include <linux/kmod.h> |
| 19 | #endif | 18 | #endif |
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index d58ac5ad509d..b0eba39f208a 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 680f6063954b..a7e4183462b8 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
| @@ -331,7 +331,6 @@ | |||
| 331 | *****************************************************************************/ | 331 | *****************************************************************************/ |
| 332 | 332 | ||
| 333 | 333 | ||
| 334 | #include <linux/config.h> | ||
| 335 | #include <linux/module.h> | 334 | #include <linux/module.h> |
| 336 | 335 | ||
| 337 | #include <linux/version.h> | 336 | #include <linux/version.h> |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index d6f6579cfd27..6734453ea28a 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
| @@ -2134,7 +2134,7 @@ typedef struct scsi_qla_host { | |||
| 2134 | mempool_t *srb_mempool; | 2134 | mempool_t *srb_mempool; |
| 2135 | 2135 | ||
| 2136 | /* This spinlock is used to protect "io transactions", you must | 2136 | /* This spinlock is used to protect "io transactions", you must |
| 2137 | * aquire it before doing any IO to the card, eg with RD_REG*() and | 2137 | * acquire it before doing any IO to the card, eg with RD_REG*() and |
| 2138 | * WRT_REG*() for the duration of your entire commandtransaction. | 2138 | * WRT_REG*() for the duration of your entire commandtransaction. |
| 2139 | * | 2139 | * |
| 2140 | * This spinlock is of lower priority than the io request lock. | 2140 | * This spinlock is of lower priority than the io request lock. |
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 5cc42c6054eb..56da25581f31 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index 809d337ed641..ee6b5df41d30 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * | 30 | * |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c index 7566c2cabaf7..a958b45e597c 100644 --- a/drivers/scsi/sata_svw.c +++ b/drivers/scsi/sata_svw.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * | 36 | * |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 41 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 42 | #include <linux/pci.h> | 41 | #include <linux/pci.h> |
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index 64f3c1aeed21..33cdb4867ef1 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 5a5d2af8ee43..e1168860045c 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * module options to "modprobe scsi_debug num_tgts=2" [20021221] | 24 | * module options to "modprobe scsi_debug num_tgts=2" [20021221] |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h index a3e2af6a846c..1f65139e14f8 100644 --- a/drivers/scsi/scsi_logging.h +++ b/drivers/scsi/scsi_logging.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SCSI_LOGGING_H | 1 | #ifndef _SCSI_LOGGING_H |
| 2 | #define _SCSI_LOGGING_H | 2 | #define _SCSI_LOGGING_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | /* | 5 | /* |
| 7 | * This defines the scsi logging feature. It is a means by which the user | 6 | * This defines the scsi logging feature. It is a means by which the user |
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index a1727a0e1bdd..015c90cf3abc 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SCSI_PRIV_H | 1 | #ifndef _SCSI_PRIV_H |
| 2 | #define _SCSI_PRIV_H | 2 | #define _SCSI_PRIV_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/device.h> | 4 | #include <linux/device.h> |
| 6 | 5 | ||
| 7 | struct request_queue; | 6 | struct request_queue; |
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 0f7e6f94d66b..1341608e9e3b 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * or a LUN is seen that cannot have a device attached to it. | 25 | * or a LUN is seen that cannot have a device attached to it. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 5ec7a4fb0145..e7fe565b96de 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Created to pull SCSI mid layer sysfs routines into one file. | 6 | * Created to pull SCSI mid layer sysfs routines into one file. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/blkdev.h> | 11 | #include <linux/blkdev.h> |
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index ace49d5bd9c4..29a9a53cdd1a 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/ctype.h> | 21 | #include <linux/ctype.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 354199011246..ea38757d12e5 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * than the level indicated above to trigger output. | 32 | * than the level indicated above to trigger output. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/fs.h> | 36 | #include <linux/fs.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 98b9312ba8da..4e607d3065bc 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -28,7 +28,6 @@ static int sg_version_num = 30533; /* 2 digits for each component */ | |||
| 28 | * (otherwise the macros compile to empty statements). | 28 | * (otherwise the macros compile to empty statements). |
| 29 | * | 29 | * |
| 30 | */ | 30 | */ |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | 32 | ||
| 34 | #include <linux/fs.h> | 33 | #include <linux/fs.h> |
diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c index 255886a9ac55..2b2789345c13 100644 --- a/drivers/scsi/sim710.c +++ b/drivers/scsi/sim710.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | 30 | ||
| 32 | #include <linux/blkdev.h> | 31 | #include <linux/blkdev.h> |
diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c index 9dde8df2f5c9..a3e9d0f2eb5b 100644 --- a/drivers/scsi/sr_vendor.c +++ b/drivers/scsi/sr_vendor.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * HP 6020 writers now supported. | 34 | * HP 6020 writers now supported. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/cdrom.h> | 37 | #include <linux/cdrom.h> |
| 39 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 40 | #include <linux/string.h> | 39 | #include <linux/string.h> |
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c index 25cced91c8a6..2ebe0d663899 100644 --- a/drivers/scsi/sun3_NCR5380.c +++ b/drivers/scsi/sun3_NCR5380.c | |||
| @@ -535,7 +535,6 @@ static __inline__ void initialize_SCp(Scsi_Cmnd *cmd) | |||
| 535 | 535 | ||
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | #include <linux/config.h> | ||
| 539 | #include <linux/delay.h> | 538 | #include <linux/delay.h> |
| 540 | 539 | ||
| 541 | #if 1 | 540 | #if 1 |
diff --git a/drivers/scsi/sym53c8xx_2/sym53c8xx.h b/drivers/scsi/sym53c8xx_2/sym53c8xx.h index 481103769729..7519728dfc38 100644 --- a/drivers/scsi/sym53c8xx_2/sym53c8xx.h +++ b/drivers/scsi/sym53c8xx_2/sym53c8xx.h | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #ifndef SYM53C8XX_H | 40 | #ifndef SYM53C8XX_H |
| 41 | #define SYM53C8XX_H | 41 | #define SYM53C8XX_H |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | 43 | ||
| 45 | /* | 44 | /* |
| 46 | * DMA addressing mode. | 45 | * DMA addressing mode. |
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h index a446cda3f64c..e022d3c71b59 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/drivers/scsi/sym53c8xx_2/sym_glue.h | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #ifndef SYM_GLUE_H | 40 | #ifndef SYM_GLUE_H |
| 41 | #define SYM_GLUE_H | 41 | #define SYM_GLUE_H |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 45 | #include <linux/ioport.h> | 44 | #include <linux/ioport.h> |
| 46 | #include <linux/pci.h> | 45 | #include <linux/pci.h> |
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c index 91322aff241d..7540f6a7529f 100644 --- a/drivers/scsi/tmscsim.c +++ b/drivers/scsi/tmscsim.c | |||
| @@ -218,7 +218,6 @@ | |||
| 218 | #endif | 218 | #endif |
| 219 | #define DCBDEBUG1(x) C_NOP | 219 | #define DCBDEBUG1(x) C_NOP |
| 220 | 220 | ||
| 221 | #include <linux/config.h> | ||
| 222 | #include <linux/module.h> | 221 | #include <linux/module.h> |
| 223 | #include <linux/delay.h> | 222 | #include <linux/delay.h> |
| 224 | #include <linux/signal.h> | 223 | #include <linux/signal.h> |
diff --git a/drivers/scsi/tmscsim.h b/drivers/scsi/tmscsim.h index d4495272fb40..9b66fa8d38d9 100644 --- a/drivers/scsi/tmscsim.h +++ b/drivers/scsi/tmscsim.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #define _TMSCSIM_H | 9 | #define _TMSCSIM_H |
| 10 | 10 | ||
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #define SCSI_IRQ_NONE 255 | 13 | #define SCSI_IRQ_NONE 255 |
| 15 | 14 | ||
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c index 33cd90fc657b..35c043e38ed4 100644 --- a/drivers/scsi/u14-34f.c +++ b/drivers/scsi/u14-34f.c | |||
| @@ -405,7 +405,6 @@ | |||
| 405 | * the driver sets host->wish_block = TRUE for all ISA boards. | 405 | * the driver sets host->wish_block = TRUE for all ISA boards. |
| 406 | */ | 406 | */ |
| 407 | 407 | ||
| 408 | #include <linux/config.h> | ||
| 409 | #include <linux/string.h> | 408 | #include <linux/string.h> |
| 410 | #include <linux/kernel.h> | 409 | #include <linux/kernel.h> |
| 411 | #include <linux/ioport.h> | 410 | #include <linux/ioport.h> |
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c index 27307fe5a4c8..680f38ab60d8 100644 --- a/drivers/scsi/wd33c93.c +++ b/drivers/scsi/wd33c93.c | |||
| @@ -71,7 +71,6 @@ | |||
| 71 | * Richard Hirst <richard@sleepie.demon.co.uk> August 2000 | 71 | * Richard Hirst <richard@sleepie.demon.co.uk> August 2000 |
| 72 | */ | 72 | */ |
| 73 | 73 | ||
| 74 | #include <linux/config.h> | ||
| 75 | #include <linux/module.h> | 74 | #include <linux/module.h> |
| 76 | 75 | ||
| 77 | #include <linux/sched.h> | 76 | #include <linux/sched.h> |
diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h index 193ec517d252..edcb0365cf0c 100644 --- a/drivers/scsi/wd33c93.h +++ b/drivers/scsi/wd33c93.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #ifndef WD33C93_H | 22 | #ifndef WD33C93_H |
| 23 | #define WD33C93_H | 23 | #define WD33C93_H |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | #define PROC_INTERFACE /* add code for /proc/scsi/wd33c93/xxx interface */ | 26 | #define PROC_INTERFACE /* add code for /proc/scsi/wd33c93/xxx interface */ |
| 28 | #ifdef PROC_INTERFACE | 27 | #ifdef PROC_INTERFACE |
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 9fd0de4b7afd..57438326b07f 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | * $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $ | 8 | * $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $ |
| 9 | */ | 9 | */ |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/tty.h> | 11 | #include <linux/tty.h> |
| 13 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index bff94541991c..993a702422ec 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/tty.h> | 24 | #include <linux/tty.h> |
| 25 | #include <linux/tty_flip.h> | 25 | #include <linux/tty_flip.h> |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/major.h> | 26 | #include <linux/major.h> |
| 28 | #include <linux/string.h> | 27 | #include <linux/string.h> |
| 29 | #include <linux/fcntl.h> | 28 | #include <linux/fcntl.h> |
diff --git a/drivers/serial/68328serial.h b/drivers/serial/68328serial.h index 978f8a609f3d..58aa2154655b 100644 --- a/drivers/serial/68328serial.h +++ b/drivers/serial/68328serial.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _MC683XX_SERIAL_H | 11 | #ifndef _MC683XX_SERIAL_H |
| 12 | #define _MC683XX_SERIAL_H | 12 | #define _MC683XX_SERIAL_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | struct serial_struct { | 15 | struct serial_struct { |
| 17 | int type; | 16 | int type; |
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index 9843ae3d420e..e80e70e9b126 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * int rs_360_init(void); | 20 | * int rs_360_init(void); |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/signal.h> | 25 | #include <linux/signal.h> |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index f361b356bd1d..9c5d36f50140 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * mapbase is the physical address of the IO port. | 19 | * mapbase is the physical address of the IO port. |
| 20 | * membase is an 'ioremapped' cookie. | 20 | * membase is an 'ioremapped' cookie. |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 23 | #if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 25 | #define SUPPORT_SYSRQ | 24 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h index 490606b87095..91bd28f2bb47 100644 --- a/drivers/serial/8250.h +++ b/drivers/serial/8250.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $ | 15 | * $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $ |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/serial_8250.h> | 18 | #include <linux/serial_8250.h> |
| 20 | 19 | ||
| 21 | struct old_serial_port { | 20 | struct old_serial_port { |
diff --git a/drivers/serial/8250_mca.c b/drivers/serial/8250_mca.c index ac205256d5f3..d10be944ad44 100644 --- a/drivers/serial/8250_mca.c +++ b/drivers/serial/8250_mca.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/mca.h> | 13 | #include <linux/mca.h> |
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index e920d196d0b1..7311d8487c96 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * required, these have to be supplied via some other means (eg, GPIO) | 31 | * required, these have to be supplied via some other means (eg, GPIO) |
| 32 | * and hooked into this driver. | 32 | * and hooked into this driver. |
| 33 | */ | 33 | */ |
| 34 | #include <linux/config.h> | ||
| 35 | 34 | ||
| 36 | #if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 35 | #if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 37 | #define SUPPORT_SYSRQ | 36 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 3d966cfc9a38..a8d7124e84a1 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * required, these have to be supplied via some other means (eg, GPIO) | 31 | * required, these have to be supplied via some other means (eg, GPIO) |
| 32 | * and hooked into this driver. | 32 | * and hooked into this driver. |
| 33 | */ | 33 | */ |
| 34 | #include <linux/config.h> | ||
| 35 | 34 | ||
| 36 | #if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 35 | #if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 37 | #define SUPPORT_SYSRQ | 36 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c index df9500bdaded..7b3b3f3d5101 100644 --- a/drivers/serial/at91_serial.c +++ b/drivers/serial/at91_serial.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/tty.h> | 26 | #include <linux/tty.h> |
| 28 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 2691112c84ad..f27d852ce50d 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $ | 25 | * $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $ |
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 29 | #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 31 | #define SUPPORT_SYSRQ | 30 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index 5cba59ad7dc5..90ff96e3339b 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/tty.h> | 35 | #include <linux/tty.h> |
| 37 | #include <linux/ioport.h> | 36 | #include <linux/ioport.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c index 17406a05ce1f..95afc37297a8 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
| 33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index cdba128250a9..ef3bb476c432 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
| 33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index b84137cdeb2b..901be3483455 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
| @@ -425,7 +425,6 @@ | |||
| 425 | 425 | ||
| 426 | static char *serial_version = "$Revision: 1.25 $"; | 426 | static char *serial_version = "$Revision: 1.25 $"; |
| 427 | 427 | ||
| 428 | #include <linux/config.h> | ||
| 429 | #include <linux/types.h> | 428 | #include <linux/types.h> |
| 430 | #include <linux/errno.h> | 429 | #include <linux/errno.h> |
| 431 | #include <linux/signal.h> | 430 | #include <linux/signal.h> |
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h index 1800c0e7531a..f30b93d6ef79 100644 --- a/drivers/serial/crisv10.h +++ b/drivers/serial/crisv10.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _ETRAX_SERIAL_H | 7 | #ifndef _ETRAX_SERIAL_H |
| 8 | #define _ETRAX_SERIAL_H | 8 | #define _ETRAX_SERIAL_H |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/circ_buf.h> | 10 | #include <linux/circ_buf.h> |
| 12 | #include <asm/termios.h> | 11 | #include <asm/termios.h> |
| 13 | 12 | ||
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c index 466d06cc7d37..ecf824bd2d4e 100644 --- a/drivers/serial/dz.c +++ b/drivers/serial/dz.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #undef DEBUG_DZ | 27 | #undef DEBUG_DZ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 144a7a352b28..ad1e753cbc53 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | #define SERIAL_DO_RESTART | 25 | #define SERIAL_DO_RESTART |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/signal.h> | 29 | #include <linux/signal.h> |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index da85bafa0942..0b5f39d038b9 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * [29-Mar-2005] Mike Lee | 25 | * [29-Mar-2005] Mike Lee |
| 26 | * Added hardware handshake | 26 | * Added hardware handshake |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #if defined(CONFIG_SERIAL_IMX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 29 | #if defined(CONFIG_SERIAL_IMX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 31 | #define SUPPORT_SYSRQ | 30 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c index 56b093ecd779..342042889f6e 100644 --- a/drivers/serial/ip22zilog.c +++ b/drivers/serial/ip22zilog.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 2002 Ralf Baechle (ralf@linux-mips.org) | 12 | * Copyright (C) 2002 Ralf Baechle (ralf@linux-mips.org) |
| 13 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) | 13 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 6a2a25d9b596..fbaae96f4c93 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * membase is an 'ioremapped' cookie. This is compatible with the old | 25 | * membase is an 'ioremapped' cookie. This is compatible with the old |
| 26 | * serial.c driver, and is currently the preferred form. | 26 | * serial.c driver, and is currently the preferred form. |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | ||
| 29 | 28 | ||
| 30 | #if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 29 | #if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 31 | #define SUPPORT_SYSRQ | 30 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/m32r_sio.h b/drivers/serial/m32r_sio.h index 7c3ec24f7e50..849f1b2c2531 100644 --- a/drivers/serial/m32r_sio.h +++ b/drivers/serial/m32r_sio.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * (at your option) any later version. | 15 | * (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | struct m32r_sio_probe { | 19 | struct m32r_sio_probe { |
| 21 | struct module *owner; | 20 | struct module *owner; |
diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/serial/m32r_sio_reg.h index 9c864529451b..4671473793e3 100644 --- a/drivers/serial/m32r_sio_reg.h +++ b/drivers/serial/m32r_sio_reg.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef _M32R_SIO_REG_H | 15 | #ifndef _M32R_SIO_REG_H |
| 16 | #define _M32R_SIO_REG_H | 16 | #define _M32R_SIO_REG_H |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | 18 | ||
| 20 | #ifdef CONFIG_SERIAL_M32R_PLDSIO | 19 | #ifdef CONFIG_SERIAL_M32R_PLDSIO |
| 21 | 20 | ||
diff --git a/drivers/serial/mcfserial.h b/drivers/serial/mcfserial.h index a2b28e8629f9..56420e2cb110 100644 --- a/drivers/serial/mcfserial.h +++ b/drivers/serial/mcfserial.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _MCF_SERIAL_H | 14 | #ifndef _MCF_SERIAL_H |
| 15 | #define _MCF_SERIAL_H | 15 | #define _MCF_SERIAL_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/serial.h> | 17 | #include <linux/serial.h> |
| 19 | 18 | ||
| 20 | #ifdef __KERNEL__ | 19 | #ifdef __KERNEL__ |
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 1aa34844218c..1b8e554f674f 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * will be mapped to. | 44 | * will be mapped to. |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/platform_device.h> | 47 | #include <linux/platform_device.h> |
| 49 | #include <linux/module.h> | 48 | #include <linux/module.h> |
| 50 | #include <linux/tty.h> | 49 | #include <linux/tty.h> |
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index 1cd102f84bfa..8c498f785e21 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. | 50 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. |
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #include <linux/config.h> | ||
| 54 | 53 | ||
| 55 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 54 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 56 | #define SUPPORT_SYSRQ | 55 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 64c0e89124c9..4a1c9983f38f 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | ** | 16 | ** |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index e3ba7e17a240..4d9435451f4a 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #undef DEBUG_HARD | 42 | #undef DEBUG_HARD |
| 43 | #undef USE_CTRL_O_SYSRQ | 43 | #undef USE_CTRL_O_SYSRQ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 47 | #include <linux/tty.h> | 46 | #include <linux/tty.h> |
| 48 | 47 | ||
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 0fa0ccc9ed27..a720953a404e 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * with the serial core maintainer satisfaction to appear soon. | 24 | * with the serial core maintainer satisfaction to appear soon. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | #if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 28 | #if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 30 | #define SUPPORT_SYSRQ | 29 | #define SUPPORT_SYSRQ |
| @@ -390,7 +389,7 @@ static int serial_pxa_startup(struct uart_port *port) | |||
| 390 | 389 | ||
| 391 | /* | 390 | /* |
| 392 | * Finally, enable interrupts. Note: Modem status interrupts | 391 | * Finally, enable interrupts. Note: Modem status interrupts |
| 393 | * are set via set_termios(), which will be occuring imminently | 392 | * are set via set_termios(), which will be occurring imminently |
| 394 | * anyway, so we don't enable them here. | 393 | * anyway, so we don't enable them here. |
| 395 | */ | 394 | */ |
| 396 | up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; | 395 | up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; |
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 4c62ab949ecc..392bffcf96e8 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | * BJD, 04-Nov-2004 | 55 | * BJD, 04-Nov-2004 |
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | #include <linux/config.h> | ||
| 59 | 58 | ||
| 60 | #if defined(CONFIG_SERIAL_S3C2410_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 59 | #if defined(CONFIG_SERIAL_S3C2410_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 61 | #define SUPPORT_SYSRQ | 60 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 8bbd8567669c..db3486d33870 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $ | 24 | * $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $ |
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | #if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 28 | #if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 30 | #define SUPPORT_SYSRQ | 29 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index 7dc1e67b6851..c54af8774393 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * along with this program; if not, write to the Free Software | 22 | * along with this program; if not, write to the Free Software |
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 | */ | 24 | */ |
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/tty.h> | 26 | #include <linux/tty.h> |
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 2c70773543e0..cbf260bc225d 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
| @@ -786,6 +786,7 @@ static struct pcmcia_device_id serial_ids[] = { | |||
| 786 | PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"), | 786 | PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"), |
| 787 | PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"), | 787 | PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"), |
| 788 | PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"), | 788 | PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"), |
| 789 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"), | ||
| 789 | /* too generic */ | 790 | /* too generic */ |
| 790 | /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */ | 791 | /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */ |
| 791 | /* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */ | 792 | /* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */ |
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 776d4ff06084..23ddedbaec08 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | 30 | ||
| 32 | #if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 31 | #if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 33 | #define SUPPORT_SYSRQ | 32 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index a901a7e446f3..28c1881a6691 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * Fix some spin_locks. | 38 | * Fix some spin_locks. |
| 39 | * Do not call uart_add_one_port for absent ports. | 39 | * Do not call uart_add_one_port for absent ports. |
| 40 | */ | 40 | */ |
| 41 | #include <linux/config.h> | ||
| 42 | 41 | ||
| 43 | #if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 42 | #if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 44 | #define SUPPORT_SYSRQ | 43 | #define SUPPORT_SYSRQ |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index d97f3ca6cc29..2509c3237e87 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #undef DEBUG | 21 | #undef DEBUG |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/signal.h> | 25 | #include <linux/signal.h> |
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 1f14bb4382f6..ab320fa3237c 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003). | 10 | * Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003). |
| 11 | * Modified to support H8/300 Series Yoshinori Sato (Feb 2004). | 11 | * Modified to support H8/300 Series Yoshinori Sato (Feb 2004). |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/serial_core.h> | 13 | #include <linux/serial_core.h> |
| 15 | 14 | ||
| 16 | #if defined(__H8300H__) || defined(__H8300S__) | 15 | #if defined(__H8300H__) || defined(__H8300S__) |
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 60ea4a3f0713..4b0afc8f12b9 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan | 37 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan |
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
| 42 | #include <linux/tty.h> | 41 | #include <linux/tty.h> |
| 43 | #include <linux/serial.h> | 42 | #include <linux/serial.h> |
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c index fa4ae94243c2..e35d9ab359f1 100644 --- a/drivers/serial/suncore.c +++ b/drivers/serial/suncore.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) | 10 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/console.h> | 15 | #include <linux/console.h> |
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index d36bc4003399..f851f0f44f9b 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | 20 | ||
| 21 | #include <asm/hypervisor.h> | 21 | #include <asm/hypervisor.h> |
| 22 | #include <asm/spitfire.h> | 22 | #include <asm/spitfire.h> |
| 23 | #include <asm/vdev.h> | 23 | #include <asm/prom.h> |
| 24 | #include <asm/oplib.h> | 24 | #include <asm/of_device.h> |
| 25 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
| 26 | 26 | ||
| 27 | #if defined(CONFIG_MAGIC_SYSRQ) | 27 | #if defined(CONFIG_MAGIC_SYSRQ) |
| @@ -407,144 +407,120 @@ static inline struct console *SUNHV_CONSOLE(void) | |||
| 407 | return &sunhv_console; | 407 | return &sunhv_console; |
| 408 | } | 408 | } |
| 409 | 409 | ||
| 410 | static int __init hv_console_compatible(char *buf, int len) | 410 | static int __devinit hv_probe(struct of_device *op, const struct of_device_id *match) |
| 411 | { | ||
| 412 | while (len) { | ||
| 413 | int this_len; | ||
| 414 | |||
| 415 | if (!strcmp(buf, "qcn")) | ||
| 416 | return 1; | ||
| 417 | |||
| 418 | this_len = strlen(buf) + 1; | ||
| 419 | |||
| 420 | buf += this_len; | ||
| 421 | len -= this_len; | ||
| 422 | } | ||
| 423 | |||
| 424 | return 0; | ||
| 425 | } | ||
| 426 | |||
| 427 | static unsigned int __init get_interrupt(void) | ||
| 428 | { | ||
| 429 | struct device_node *dev_node; | ||
| 430 | |||
| 431 | dev_node = sun4v_vdev_root->child; | ||
| 432 | while (dev_node != NULL) { | ||
| 433 | struct property *prop; | ||
| 434 | |||
| 435 | if (strcmp(dev_node->name, "console")) | ||
| 436 | goto next_sibling; | ||
| 437 | |||
| 438 | prop = of_find_property(dev_node, "compatible", NULL); | ||
| 439 | if (!prop) | ||
| 440 | goto next_sibling; | ||
| 441 | |||
| 442 | if (hv_console_compatible(prop->value, prop->length)) | ||
| 443 | break; | ||
| 444 | |||
| 445 | next_sibling: | ||
| 446 | dev_node = dev_node->sibling; | ||
| 447 | } | ||
| 448 | if (!dev_node) | ||
| 449 | return 0; | ||
| 450 | |||
| 451 | /* Ok, the this is the OBP node for the sun4v hypervisor | ||
| 452 | * console device. Decode the interrupt. | ||
| 453 | */ | ||
| 454 | return sun4v_vdev_device_interrupt(dev_node); | ||
| 455 | } | ||
| 456 | |||
| 457 | static int __init sunhv_init(void) | ||
| 458 | { | 411 | { |
| 459 | struct uart_port *port; | 412 | struct uart_port *port; |
| 460 | int ret; | 413 | int err; |
| 461 | 414 | ||
| 462 | if (tlb_type != hypervisor) | 415 | if (op->irqs[0] == 0xffffffff) |
| 463 | return -ENODEV; | 416 | return -ENODEV; |
| 464 | 417 | ||
| 465 | port = kmalloc(sizeof(struct uart_port), GFP_KERNEL); | 418 | port = kzalloc(sizeof(struct uart_port), GFP_KERNEL); |
| 466 | if (unlikely(!port)) | 419 | if (unlikely(!port)) |
| 467 | return -ENOMEM; | 420 | return -ENOMEM; |
| 468 | 421 | ||
| 469 | memset(port, 0, sizeof(struct uart_port)); | 422 | sunhv_port = port; |
| 470 | 423 | ||
| 471 | port->line = 0; | 424 | port->line = 0; |
| 472 | port->ops = &sunhv_pops; | 425 | port->ops = &sunhv_pops; |
| 473 | port->type = PORT_SUNHV; | 426 | port->type = PORT_SUNHV; |
| 474 | port->uartclk = ( 29491200 / 16 ); /* arbitrary */ | 427 | port->uartclk = ( 29491200 / 16 ); /* arbitrary */ |
| 475 | 428 | ||
| 476 | /* Set this just to make uart_configure_port() happy. */ | ||
| 477 | port->membase = (unsigned char __iomem *) __pa(port); | 429 | port->membase = (unsigned char __iomem *) __pa(port); |
| 478 | 430 | ||
| 479 | port->irq = get_interrupt(); | 431 | port->irq = op->irqs[0]; |
| 480 | if (!port->irq) { | 432 | |
| 481 | kfree(port); | 433 | port->dev = &op->dev; |
| 482 | return -ENODEV; | ||
| 483 | } | ||
| 484 | 434 | ||
| 485 | sunhv_reg.minor = sunserial_current_minor; | 435 | sunhv_reg.minor = sunserial_current_minor; |
| 486 | sunhv_reg.nr = 1; | 436 | sunhv_reg.nr = 1; |
| 487 | 437 | ||
| 488 | ret = uart_register_driver(&sunhv_reg); | 438 | err = uart_register_driver(&sunhv_reg); |
| 489 | if (ret < 0) { | 439 | if (err) |
| 490 | printk(KERN_ERR "SUNHV: uart_register_driver() failed %d\n", | 440 | goto out_free_port; |
| 491 | ret); | ||
| 492 | kfree(port); | ||
| 493 | |||
| 494 | return ret; | ||
| 495 | } | ||
| 496 | 441 | ||
| 497 | sunhv_reg.tty_driver->name_base = sunhv_reg.minor - 64; | 442 | sunhv_reg.tty_driver->name_base = sunhv_reg.minor - 64; |
| 498 | sunserial_current_minor += 1; | 443 | sunserial_current_minor += 1; |
| 499 | 444 | ||
| 500 | sunhv_reg.cons = SUNHV_CONSOLE(); | 445 | sunhv_reg.cons = SUNHV_CONSOLE(); |
| 501 | 446 | ||
| 502 | sunhv_port = port; | 447 | err = uart_add_one_port(&sunhv_reg, port); |
| 448 | if (err) | ||
| 449 | goto out_unregister_driver; | ||
| 503 | 450 | ||
| 504 | ret = uart_add_one_port(&sunhv_reg, port); | 451 | err = request_irq(port->irq, sunhv_interrupt, 0, "hvcons", port); |
| 505 | if (ret < 0) { | 452 | if (err) |
| 506 | printk(KERN_ERR "SUNHV: uart_add_one_port() failed %d\n", ret); | 453 | goto out_remove_port; |
| 507 | sunserial_current_minor -= 1; | ||
| 508 | uart_unregister_driver(&sunhv_reg); | ||
| 509 | kfree(port); | ||
| 510 | sunhv_port = NULL; | ||
| 511 | return -ENODEV; | ||
| 512 | } | ||
| 513 | 454 | ||
| 514 | if (request_irq(port->irq, sunhv_interrupt, | 455 | dev_set_drvdata(&op->dev, port); |
| 515 | SA_SHIRQ, "serial(sunhv)", port)) { | ||
| 516 | printk(KERN_ERR "sunhv: Cannot register IRQ\n"); | ||
| 517 | uart_remove_one_port(&sunhv_reg, port); | ||
| 518 | sunserial_current_minor -= 1; | ||
| 519 | uart_unregister_driver(&sunhv_reg); | ||
| 520 | kfree(port); | ||
| 521 | sunhv_port = NULL; | ||
| 522 | return -ENODEV; | ||
| 523 | } | ||
| 524 | 456 | ||
| 525 | return 0; | 457 | return 0; |
| 458 | |||
| 459 | out_remove_port: | ||
| 460 | uart_remove_one_port(&sunhv_reg, port); | ||
| 461 | |||
| 462 | out_unregister_driver: | ||
| 463 | sunserial_current_minor -= 1; | ||
| 464 | uart_unregister_driver(&sunhv_reg); | ||
| 465 | |||
| 466 | out_free_port: | ||
| 467 | kfree(port); | ||
| 468 | sunhv_port = NULL; | ||
| 469 | return err; | ||
| 526 | } | 470 | } |
| 527 | 471 | ||
| 528 | static void __exit sunhv_exit(void) | 472 | static int __devexit hv_remove(struct of_device *dev) |
| 529 | { | 473 | { |
| 530 | struct uart_port *port = sunhv_port; | 474 | struct uart_port *port = dev_get_drvdata(&dev->dev); |
| 531 | |||
| 532 | BUG_ON(!port); | ||
| 533 | 475 | ||
| 534 | free_irq(port->irq, port); | 476 | free_irq(port->irq, port); |
| 535 | 477 | ||
| 536 | uart_remove_one_port(&sunhv_reg, port); | 478 | uart_remove_one_port(&sunhv_reg, port); |
| 537 | sunserial_current_minor -= 1; | ||
| 538 | 479 | ||
| 480 | sunserial_current_minor -= 1; | ||
| 539 | uart_unregister_driver(&sunhv_reg); | 481 | uart_unregister_driver(&sunhv_reg); |
| 540 | 482 | ||
| 541 | kfree(sunhv_port); | 483 | kfree(port); |
| 542 | sunhv_port = NULL; | 484 | sunhv_port = NULL; |
| 485 | |||
| 486 | dev_set_drvdata(&dev->dev, NULL); | ||
| 487 | |||
| 488 | return 0; | ||
| 489 | } | ||
| 490 | |||
| 491 | static struct of_device_id hv_match[] = { | ||
| 492 | { | ||
| 493 | .name = "console", | ||
| 494 | .compatible = "qcn", | ||
| 495 | }, | ||
| 496 | {}, | ||
| 497 | }; | ||
| 498 | MODULE_DEVICE_TABLE(of, hv_match); | ||
| 499 | |||
| 500 | static struct of_platform_driver hv_driver = { | ||
| 501 | .name = "hv", | ||
| 502 | .match_table = hv_match, | ||
| 503 | .probe = hv_probe, | ||
| 504 | .remove = __devexit_p(hv_remove), | ||
| 505 | }; | ||
| 506 | |||
| 507 | static int __init sunhv_init(void) | ||
| 508 | { | ||
| 509 | if (tlb_type != hypervisor) | ||
| 510 | return -ENODEV; | ||
| 511 | |||
| 512 | return of_register_driver(&hv_driver, &of_bus_type); | ||
| 513 | } | ||
| 514 | |||
| 515 | static void __exit sunhv_exit(void) | ||
| 516 | { | ||
| 517 | of_unregister_driver(&hv_driver); | ||
| 543 | } | 518 | } |
| 544 | 519 | ||
| 545 | module_init(sunhv_init); | 520 | module_init(sunhv_init); |
| 546 | module_exit(sunhv_exit); | 521 | module_exit(sunhv_exit); |
| 547 | 522 | ||
| 548 | MODULE_AUTHOR("David S. Miller"); | 523 | MODULE_AUTHOR("David S. Miller"); |
| 549 | MODULE_DESCRIPTION("SUN4V Hypervisor console driver") | 524 | MODULE_DESCRIPTION("SUN4V Hypervisor console driver"); |
| 525 | MODULE_VERSION("2.0"); | ||
| 550 | MODULE_LICENSE("GPL"); | 526 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 7da02d11c364..20a48697727c 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* sunsab.c: ASYNC Driver for the SIEMENS SAB82532 DUSCC. | 1 | /* sunsab.c: ASYNC Driver for the SIEMENS SAB82532 DUSCC. |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 3 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
| 4 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 2002, 2006 David S. Miller (davem@davemloft.net) |
| 5 | * | 5 | * |
| 6 | * Rewrote buffer handling to use CIRC(Circular Buffer) macros. | 6 | * Rewrote buffer handling to use CIRC(Circular Buffer) macros. |
| 7 | * Maxim Krasnyanskiy <maxk@qualcomm.com> | 7 | * Maxim Krasnyanskiy <maxk@qualcomm.com> |
| @@ -12,10 +12,9 @@ | |||
| 12 | * Theodore Ts'o <tytso@mit.edu>, 2001-Oct-12 | 12 | * Theodore Ts'o <tytso@mit.edu>, 2001-Oct-12 |
| 13 | * | 13 | * |
| 14 | * Ported to new 2.5.x UART layer. | 14 | * Ported to new 2.5.x UART layer. |
| 15 | * David S. Miller <davem@redhat.com> | 15 | * David S. Miller <davem@davemloft.net> |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| @@ -37,8 +36,8 @@ | |||
| 37 | 36 | ||
| 38 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 39 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 40 | #include <asm/oplib.h> | 39 | #include <asm/prom.h> |
| 41 | #include <asm/ebus.h> | 40 | #include <asm/of_device.h> |
| 42 | 41 | ||
| 43 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 42 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 44 | #define SUPPORT_SYSRQ | 43 | #define SUPPORT_SYSRQ |
| @@ -976,199 +975,188 @@ static inline struct console *SUNSAB_CONSOLE(void) | |||
| 976 | #define sunsab_console_init() do { } while (0) | 975 | #define sunsab_console_init() do { } while (0) |
| 977 | #endif | 976 | #endif |
| 978 | 977 | ||
| 979 | static void __init for_each_sab_edev(void (*callback)(struct linux_ebus_device *, void *), void *arg) | 978 | static int __devinit sunsab_init_one(struct uart_sunsab_port *up, |
| 979 | struct of_device *op, | ||
| 980 | unsigned long offset, | ||
| 981 | int line) | ||
| 980 | { | 982 | { |
| 981 | struct linux_ebus *ebus; | 983 | up->port.line = line; |
| 982 | struct linux_ebus_device *edev = NULL; | 984 | up->port.dev = &op->dev; |
| 983 | 985 | ||
| 984 | for_each_ebus(ebus) { | 986 | up->port.mapbase = op->resource[0].start + offset; |
| 985 | for_each_ebusdev(edev, ebus) { | 987 | up->port.membase = of_ioremap(&op->resource[0], offset, |
| 986 | if (!strcmp(edev->prom_node->name, "se")) { | 988 | sizeof(union sab82532_async_regs), |
| 987 | callback(edev, arg); | 989 | "sab"); |
| 988 | continue; | 990 | if (!up->port.membase) |
| 989 | } else if (!strcmp(edev->prom_node->name, "serial")) { | 991 | return -ENOMEM; |
| 990 | char *compat; | 992 | up->regs = (union sab82532_async_regs __iomem *) up->port.membase; |
| 991 | int clen; | ||
| 992 | |||
| 993 | /* On RIO this can be an SE, check it. We could | ||
| 994 | * just check ebus->is_rio, but this is more portable. | ||
| 995 | */ | ||
| 996 | compat = of_get_property(edev->prom_node, | ||
| 997 | "compatible", &clen); | ||
| 998 | if (compat && clen > 0) { | ||
| 999 | if (strncmp(compat, "sab82532", 8) == 0) { | ||
| 1000 | callback(edev, arg); | ||
| 1001 | continue; | ||
| 1002 | } | ||
| 1003 | } | ||
| 1004 | } | ||
| 1005 | } | ||
| 1006 | } | ||
| 1007 | } | ||
| 1008 | 993 | ||
| 1009 | static void __init sab_count_callback(struct linux_ebus_device *edev, void *arg) | 994 | up->port.irq = op->irqs[0]; |
| 1010 | { | ||
| 1011 | int *count_p = arg; | ||
| 1012 | 995 | ||
| 1013 | (*count_p)++; | 996 | up->port.fifosize = SAB82532_XMIT_FIFO_SIZE; |
| 1014 | } | 997 | up->port.iotype = UPIO_MEM; |
| 1015 | 998 | ||
| 1016 | static void __init sab_attach_callback(struct linux_ebus_device *edev, void *arg) | 999 | writeb(SAB82532_IPC_IC_ACT_LOW, &up->regs->w.ipc); |
| 1017 | { | ||
| 1018 | int *instance_p = arg; | ||
| 1019 | struct uart_sunsab_port *up; | ||
| 1020 | unsigned long regs, offset; | ||
| 1021 | int i; | ||
| 1022 | 1000 | ||
| 1023 | /* Note: ports are located in reverse order */ | 1001 | up->port.ops = &sunsab_pops; |
| 1024 | regs = edev->resource[0].start; | 1002 | up->port.type = PORT_SUNSAB; |
| 1025 | offset = sizeof(union sab82532_async_regs); | 1003 | up->port.uartclk = SAB_BASE_BAUD; |
| 1026 | for (i = 0; i < 2; i++) { | ||
| 1027 | up = &sunsab_ports[(*instance_p * 2) + 1 - i]; | ||
| 1028 | 1004 | ||
| 1029 | memset(up, 0, sizeof(*up)); | 1005 | up->type = readb(&up->regs->r.vstr) & 0x0f; |
| 1030 | up->regs = ioremap(regs + offset, sizeof(union sab82532_async_regs)); | 1006 | writeb(~((1 << 1) | (1 << 2) | (1 << 4)), &up->regs->w.pcr); |
| 1031 | up->port.irq = edev->irqs[0]; | 1007 | writeb(0xff, &up->regs->w.pim); |
| 1032 | up->port.fifosize = SAB82532_XMIT_FIFO_SIZE; | 1008 | if ((up->port.line & 0x1) == 0) { |
| 1033 | up->port.mapbase = (unsigned long)up->regs; | 1009 | up->pvr_dsr_bit = (1 << 0); |
| 1034 | up->port.iotype = UPIO_MEM; | 1010 | up->pvr_dtr_bit = (1 << 1); |
| 1011 | } else { | ||
| 1012 | up->pvr_dsr_bit = (1 << 3); | ||
| 1013 | up->pvr_dtr_bit = (1 << 2); | ||
| 1014 | } | ||
| 1015 | up->cached_pvr = (1 << 1) | (1 << 2) | (1 << 4); | ||
| 1016 | writeb(up->cached_pvr, &up->regs->w.pvr); | ||
| 1017 | up->cached_mode = readb(&up->regs->rw.mode); | ||
| 1018 | up->cached_mode |= SAB82532_MODE_FRTS; | ||
| 1019 | writeb(up->cached_mode, &up->regs->rw.mode); | ||
| 1020 | up->cached_mode |= SAB82532_MODE_RTS; | ||
| 1021 | writeb(up->cached_mode, &up->regs->rw.mode); | ||
| 1035 | 1022 | ||
| 1036 | writeb(SAB82532_IPC_IC_ACT_LOW, &up->regs->w.ipc); | 1023 | up->tec_timeout = SAB82532_MAX_TEC_TIMEOUT; |
| 1024 | up->cec_timeout = SAB82532_MAX_CEC_TIMEOUT; | ||
| 1037 | 1025 | ||
| 1038 | offset -= sizeof(union sab82532_async_regs); | 1026 | if (!(up->port.line & 0x01)) { |
| 1027 | int err; | ||
| 1028 | |||
| 1029 | err = request_irq(up->port.irq, sunsab_interrupt, | ||
| 1030 | SA_SHIRQ, "sab", up); | ||
| 1031 | if (err) { | ||
| 1032 | of_iounmap(up->port.membase, | ||
| 1033 | sizeof(union sab82532_async_regs)); | ||
| 1034 | return err; | ||
| 1035 | } | ||
| 1039 | } | 1036 | } |
| 1040 | 1037 | ||
| 1041 | (*instance_p)++; | 1038 | return 0; |
| 1042 | } | 1039 | } |
| 1043 | 1040 | ||
| 1044 | static int __init probe_for_sabs(void) | 1041 | static int __devinit sab_probe(struct of_device *op, const struct of_device_id *match) |
| 1045 | { | 1042 | { |
| 1046 | int this_sab = 0; | 1043 | static int inst; |
| 1044 | struct uart_sunsab_port *up; | ||
| 1045 | int err; | ||
| 1046 | |||
| 1047 | up = &sunsab_ports[inst * 2]; | ||
| 1048 | |||
| 1049 | err = sunsab_init_one(&up[0], op, | ||
| 1050 | sizeof(union sab82532_async_regs), | ||
| 1051 | (inst * 2) + 0); | ||
| 1052 | if (err) | ||
| 1053 | return err; | ||
| 1054 | |||
| 1055 | err = sunsab_init_one(&up[0], op, 0, | ||
| 1056 | (inst * 2) + 1); | ||
| 1057 | if (err) { | ||
| 1058 | of_iounmap(up[0].port.membase, | ||
| 1059 | sizeof(union sab82532_async_regs)); | ||
| 1060 | free_irq(up[0].port.irq, &up[0]); | ||
| 1061 | return err; | ||
| 1062 | } | ||
| 1047 | 1063 | ||
| 1048 | /* Find device instances. */ | 1064 | uart_add_one_port(&sunsab_reg, &up[0].port); |
| 1049 | for_each_sab_edev(&sab_count_callback, &this_sab); | 1065 | uart_add_one_port(&sunsab_reg, &up[1].port); |
| 1050 | if (!this_sab) | ||
| 1051 | return -ENODEV; | ||
| 1052 | 1066 | ||
| 1053 | /* Allocate tables. */ | 1067 | dev_set_drvdata(&op->dev, &up[0]); |
| 1054 | sunsab_ports = kmalloc(sizeof(struct uart_sunsab_port) * this_sab * 2, | ||
| 1055 | GFP_KERNEL); | ||
| 1056 | if (!sunsab_ports) | ||
| 1057 | return -ENOMEM; | ||
| 1058 | 1068 | ||
| 1059 | num_channels = this_sab * 2; | 1069 | inst++; |
| 1060 | 1070 | ||
| 1061 | this_sab = 0; | ||
| 1062 | for_each_sab_edev(&sab_attach_callback, &this_sab); | ||
| 1063 | return 0; | 1071 | return 0; |
| 1064 | } | 1072 | } |
| 1065 | 1073 | ||
| 1066 | static void __init sunsab_init_hw(void) | 1074 | static void __devexit sab_remove_one(struct uart_sunsab_port *up) |
| 1067 | { | 1075 | { |
| 1068 | int i; | 1076 | uart_remove_one_port(&sunsab_reg, &up->port); |
| 1069 | 1077 | if (!(up->port.line & 1)) | |
| 1070 | for (i = 0; i < num_channels; i++) { | 1078 | free_irq(up->port.irq, up); |
| 1071 | struct uart_sunsab_port *up = &sunsab_ports[i]; | 1079 | of_iounmap(up->port.membase, |
| 1072 | 1080 | sizeof(union sab82532_async_regs)); | |
| 1073 | up->port.line = i; | ||
| 1074 | up->port.ops = &sunsab_pops; | ||
| 1075 | up->port.type = PORT_SUNSAB; | ||
| 1076 | up->port.uartclk = SAB_BASE_BAUD; | ||
| 1077 | |||
| 1078 | up->type = readb(&up->regs->r.vstr) & 0x0f; | ||
| 1079 | writeb(~((1 << 1) | (1 << 2) | (1 << 4)), &up->regs->w.pcr); | ||
| 1080 | writeb(0xff, &up->regs->w.pim); | ||
| 1081 | if (up->port.line == 0) { | ||
| 1082 | up->pvr_dsr_bit = (1 << 0); | ||
| 1083 | up->pvr_dtr_bit = (1 << 1); | ||
| 1084 | } else { | ||
| 1085 | up->pvr_dsr_bit = (1 << 3); | ||
| 1086 | up->pvr_dtr_bit = (1 << 2); | ||
| 1087 | } | ||
| 1088 | up->cached_pvr = (1 << 1) | (1 << 2) | (1 << 4); | ||
| 1089 | writeb(up->cached_pvr, &up->regs->w.pvr); | ||
| 1090 | up->cached_mode = readb(&up->regs->rw.mode); | ||
| 1091 | up->cached_mode |= SAB82532_MODE_FRTS; | ||
| 1092 | writeb(up->cached_mode, &up->regs->rw.mode); | ||
| 1093 | up->cached_mode |= SAB82532_MODE_RTS; | ||
| 1094 | writeb(up->cached_mode, &up->regs->rw.mode); | ||
| 1095 | |||
| 1096 | up->tec_timeout = SAB82532_MAX_TEC_TIMEOUT; | ||
| 1097 | up->cec_timeout = SAB82532_MAX_CEC_TIMEOUT; | ||
| 1098 | |||
| 1099 | if (!(up->port.line & 0x01)) { | ||
| 1100 | if (request_irq(up->port.irq, sunsab_interrupt, | ||
| 1101 | SA_SHIRQ, "serial(sab82532)", up)) { | ||
| 1102 | printk("sunsab%d: can't get IRQ %x\n", | ||
| 1103 | i, up->port.irq); | ||
| 1104 | continue; | ||
| 1105 | } | ||
| 1106 | } | ||
| 1107 | } | ||
| 1108 | } | 1081 | } |
| 1109 | 1082 | ||
| 1110 | static int __init sunsab_init(void) | 1083 | static int __devexit sab_remove(struct of_device *op) |
| 1111 | { | 1084 | { |
| 1112 | int ret = probe_for_sabs(); | 1085 | struct uart_sunsab_port *up = dev_get_drvdata(&op->dev); |
| 1113 | int i; | ||
| 1114 | |||
| 1115 | if (ret < 0) | ||
| 1116 | return ret; | ||
| 1117 | 1086 | ||
| 1118 | sunsab_init_hw(); | 1087 | sab_remove_one(&up[0]); |
| 1088 | sab_remove_one(&up[1]); | ||
| 1119 | 1089 | ||
| 1120 | sunsab_reg.minor = sunserial_current_minor; | 1090 | dev_set_drvdata(&op->dev, NULL); |
| 1121 | sunsab_reg.nr = num_channels; | ||
| 1122 | 1091 | ||
| 1123 | ret = uart_register_driver(&sunsab_reg); | 1092 | return 0; |
| 1124 | if (ret < 0) { | 1093 | } |
| 1125 | int i; | ||
| 1126 | 1094 | ||
| 1127 | for (i = 0; i < num_channels; i++) { | 1095 | static struct of_device_id sab_match[] = { |
| 1128 | struct uart_sunsab_port *up = &sunsab_ports[i]; | 1096 | { |
| 1097 | .name = "se", | ||
| 1098 | }, | ||
| 1099 | { | ||
| 1100 | .name = "serial", | ||
| 1101 | .compatible = "sab82532", | ||
| 1102 | }, | ||
| 1103 | {}, | ||
| 1104 | }; | ||
| 1105 | MODULE_DEVICE_TABLE(of, sab_match); | ||
| 1129 | 1106 | ||
| 1130 | if (!(up->port.line & 0x01)) | 1107 | static struct of_platform_driver sab_driver = { |
| 1131 | free_irq(up->port.irq, up); | 1108 | .name = "sab", |
| 1132 | iounmap(up->regs); | 1109 | .match_table = sab_match, |
| 1133 | } | 1110 | .probe = sab_probe, |
| 1134 | kfree(sunsab_ports); | 1111 | .remove = __devexit_p(sab_remove), |
| 1135 | sunsab_ports = NULL; | 1112 | }; |
| 1136 | 1113 | ||
| 1137 | return ret; | 1114 | static int __init sunsab_init(void) |
| 1115 | { | ||
| 1116 | struct device_node *dp; | ||
| 1117 | int err; | ||
| 1118 | |||
| 1119 | num_channels = 0; | ||
| 1120 | for_each_node_by_name(dp, "su") | ||
| 1121 | num_channels += 2; | ||
| 1122 | for_each_node_by_name(dp, "serial") { | ||
| 1123 | if (of_device_is_compatible(dp, "sab82532")) | ||
| 1124 | num_channels += 2; | ||
| 1138 | } | 1125 | } |
| 1139 | 1126 | ||
| 1140 | sunsab_reg.tty_driver->name_base = sunsab_reg.minor - 64; | 1127 | if (num_channels) { |
| 1128 | sunsab_ports = kzalloc(sizeof(struct uart_sunsab_port) * | ||
| 1129 | num_channels, GFP_KERNEL); | ||
| 1130 | if (!sunsab_ports) | ||
| 1131 | return -ENOMEM; | ||
| 1141 | 1132 | ||
| 1142 | sunsab_reg.cons = SUNSAB_CONSOLE(); | 1133 | sunsab_reg.minor = sunserial_current_minor; |
| 1134 | sunsab_reg.nr = num_channels; | ||
| 1143 | 1135 | ||
| 1144 | sunserial_current_minor += num_channels; | 1136 | err = uart_register_driver(&sunsab_reg); |
| 1145 | 1137 | if (err) { | |
| 1146 | for (i = 0; i < num_channels; i++) { | 1138 | kfree(sunsab_ports); |
| 1147 | struct uart_sunsab_port *up = &sunsab_ports[i]; | 1139 | sunsab_ports = NULL; |
| 1148 | 1140 | ||
| 1149 | uart_add_one_port(&sunsab_reg, &up->port); | 1141 | return err; |
| 1142 | } | ||
| 1143 | |||
| 1144 | sunsab_reg.tty_driver->name_base = sunsab_reg.minor - 64; | ||
| 1145 | sunsab_reg.cons = SUNSAB_CONSOLE(); | ||
| 1146 | sunserial_current_minor += num_channels; | ||
| 1150 | } | 1147 | } |
| 1151 | 1148 | ||
| 1152 | return 0; | 1149 | return of_register_driver(&sab_driver, &of_bus_type); |
| 1153 | } | 1150 | } |
| 1154 | 1151 | ||
| 1155 | static void __exit sunsab_exit(void) | 1152 | static void __exit sunsab_exit(void) |
| 1156 | { | 1153 | { |
| 1157 | int i; | 1154 | of_unregister_driver(&sab_driver); |
| 1158 | 1155 | if (num_channels) { | |
| 1159 | for (i = 0; i < num_channels; i++) { | 1156 | sunserial_current_minor -= num_channels; |
| 1160 | struct uart_sunsab_port *up = &sunsab_ports[i]; | 1157 | uart_unregister_driver(&sunsab_reg); |
| 1161 | |||
| 1162 | uart_remove_one_port(&sunsab_reg, &up->port); | ||
| 1163 | |||
| 1164 | if (!(up->port.line & 0x01)) | ||
| 1165 | free_irq(up->port.irq, up); | ||
| 1166 | iounmap(up->regs); | ||
| 1167 | } | 1158 | } |
| 1168 | 1159 | ||
| 1169 | sunserial_current_minor -= num_channels; | ||
| 1170 | uart_unregister_driver(&sunsab_reg); | ||
| 1171 | |||
| 1172 | kfree(sunsab_ports); | 1160 | kfree(sunsab_ports); |
| 1173 | sunsab_ports = NULL; | 1161 | sunsab_ports = NULL; |
| 1174 | } | 1162 | } |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 6e28c25138cf..eabf477fee95 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -12,10 +12,9 @@ | |||
| 12 | * Theodore Ts'o <tytso@mit.edu>, 2001-Oct-12 | 12 | * Theodore Ts'o <tytso@mit.edu>, 2001-Oct-12 |
| 13 | * | 13 | * |
| 14 | * Converted to new 2.5.x UART layer. | 14 | * Converted to new 2.5.x UART layer. |
| 15 | * David S. Miller (davem@redhat.com), 2002-Jul-29 | 15 | * David S. Miller (davem@davemloft.net), 2002-Jul-29 |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| @@ -40,11 +39,8 @@ | |||
| 40 | 39 | ||
| 41 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 42 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
| 43 | #include <asm/oplib.h> | 42 | #include <asm/prom.h> |
| 44 | #include <asm/ebus.h> | 43 | #include <asm/of_device.h> |
| 45 | #ifdef CONFIG_SPARC64 | ||
| 46 | #include <asm/isa.h> | ||
| 47 | #endif | ||
| 48 | 44 | ||
| 49 | #if defined(CONFIG_SERIAL_SUNSU_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 45 | #if defined(CONFIG_SERIAL_SUNSU_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 50 | #define SUPPORT_SYSRQ | 46 | #define SUPPORT_SYSRQ |
| @@ -94,10 +90,10 @@ struct uart_sunsu_port { | |||
| 94 | /* Probing information. */ | 90 | /* Probing information. */ |
| 95 | enum su_type su_type; | 91 | enum su_type su_type; |
| 96 | unsigned int type_probed; /* XXX Stupid */ | 92 | unsigned int type_probed; /* XXX Stupid */ |
| 97 | int port_node; | 93 | unsigned long reg_size; |
| 98 | 94 | ||
| 99 | #ifdef CONFIG_SERIO | 95 | #ifdef CONFIG_SERIO |
| 100 | struct serio *serio; | 96 | struct serio serio; |
| 101 | int serio_open; | 97 | int serio_open; |
| 102 | #endif | 98 | #endif |
| 103 | }; | 99 | }; |
| @@ -509,7 +505,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *reg | |||
| 509 | /* Stop-A is handled by drivers/char/keyboard.c now. */ | 505 | /* Stop-A is handled by drivers/char/keyboard.c now. */ |
| 510 | if (up->su_type == SU_PORT_KBD) { | 506 | if (up->su_type == SU_PORT_KBD) { |
| 511 | #ifdef CONFIG_SERIO | 507 | #ifdef CONFIG_SERIO |
| 512 | serio_interrupt(up->serio, ch, 0, regs); | 508 | serio_interrupt(&up->serio, ch, 0, regs); |
| 513 | #endif | 509 | #endif |
| 514 | } else if (up->su_type == SU_PORT_MS) { | 510 | } else if (up->su_type == SU_PORT_MS) { |
| 515 | int ret = suncore_mouse_baud_detection(ch, is_break); | 511 | int ret = suncore_mouse_baud_detection(ch, is_break); |
| @@ -523,7 +519,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *reg | |||
| 523 | 519 | ||
| 524 | case 0: | 520 | case 0: |
| 525 | #ifdef CONFIG_SERIO | 521 | #ifdef CONFIG_SERIO |
| 526 | serio_interrupt(up->serio, ch, 0, regs); | 522 | serio_interrupt(&up->serio, ch, 0, regs); |
| 527 | #endif | 523 | #endif |
| 528 | break; | 524 | break; |
| 529 | }; | 525 | }; |
| @@ -1031,99 +1027,14 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up) | |||
| 1031 | { | 1027 | { |
| 1032 | unsigned char status1, status2, scratch, scratch2, scratch3; | 1028 | unsigned char status1, status2, scratch, scratch2, scratch3; |
| 1033 | unsigned char save_lcr, save_mcr; | 1029 | unsigned char save_lcr, save_mcr; |
| 1034 | struct linux_ebus_device *dev = NULL; | ||
| 1035 | struct linux_ebus *ebus; | ||
| 1036 | #ifdef CONFIG_SPARC64 | ||
| 1037 | struct sparc_isa_bridge *isa_br; | ||
| 1038 | struct sparc_isa_device *isa_dev; | ||
| 1039 | #endif | ||
| 1040 | #ifndef CONFIG_SPARC64 | ||
| 1041 | struct linux_prom_registers reg0; | ||
| 1042 | #endif | ||
| 1043 | unsigned long flags; | 1030 | unsigned long flags; |
| 1044 | 1031 | ||
| 1045 | if (!up->port_node || !up->su_type) | 1032 | if (up->su_type == SU_PORT_NONE) |
| 1046 | return; | 1033 | return; |
| 1047 | 1034 | ||
| 1048 | up->type_probed = PORT_UNKNOWN; | 1035 | up->type_probed = PORT_UNKNOWN; |
| 1049 | up->port.iotype = UPIO_MEM; | 1036 | up->port.iotype = UPIO_MEM; |
| 1050 | 1037 | ||
| 1051 | /* | ||
| 1052 | * First we look for Ebus-bases su's | ||
| 1053 | */ | ||
| 1054 | for_each_ebus(ebus) { | ||
| 1055 | for_each_ebusdev(dev, ebus) { | ||
| 1056 | if (dev->prom_node->node == up->port_node) { | ||
| 1057 | /* | ||
| 1058 | * The EBus is broken on sparc; it delivers | ||
| 1059 | * virtual addresses in resources. Oh well... | ||
| 1060 | * This is correct on sparc64, though. | ||
| 1061 | */ | ||
| 1062 | up->port.membase = (char *) dev->resource[0].start; | ||
| 1063 | /* | ||
| 1064 | * This is correct on both architectures. | ||
| 1065 | */ | ||
| 1066 | up->port.mapbase = dev->resource[0].start; | ||
| 1067 | up->port.irq = dev->irqs[0]; | ||
| 1068 | goto ebus_done; | ||
| 1069 | } | ||
| 1070 | } | ||
| 1071 | } | ||
| 1072 | |||
| 1073 | #ifdef CONFIG_SPARC64 | ||
| 1074 | for_each_isa(isa_br) { | ||
| 1075 | for_each_isadev(isa_dev, isa_br) { | ||
| 1076 | if (isa_dev->prom_node->node == up->port_node) { | ||
| 1077 | /* Same on sparc64. Cool architecure... */ | ||
| 1078 | up->port.membase = (char *) isa_dev->resource.start; | ||
| 1079 | up->port.mapbase = isa_dev->resource.start; | ||
| 1080 | up->port.irq = isa_dev->irq; | ||
| 1081 | goto ebus_done; | ||
| 1082 | } | ||
| 1083 | } | ||
| 1084 | } | ||
| 1085 | #endif | ||
| 1086 | |||
| 1087 | #ifdef CONFIG_SPARC64 | ||
| 1088 | /* | ||
| 1089 | * Not on Ebus, bailing. | ||
| 1090 | */ | ||
| 1091 | return; | ||
| 1092 | #else | ||
| 1093 | /* | ||
| 1094 | * Not on Ebus, must be OBIO. | ||
| 1095 | */ | ||
| 1096 | if (prom_getproperty(up->port_node, "reg", | ||
| 1097 | (char *)®0, sizeof(reg0)) == -1) { | ||
| 1098 | prom_printf("sunsu: no \"reg\" property\n"); | ||
| 1099 | return; | ||
| 1100 | } | ||
| 1101 | prom_apply_obio_ranges(®0, 1); | ||
| 1102 | if (reg0.which_io != 0) { /* Just in case... */ | ||
| 1103 | prom_printf("sunsu: bus number nonzero: 0x%x:%x\n", | ||
| 1104 | reg0.which_io, reg0.phys_addr); | ||
| 1105 | return; | ||
| 1106 | } | ||
| 1107 | up->port.mapbase = reg0.phys_addr; | ||
| 1108 | if ((up->port.membase = ioremap(reg0.phys_addr, reg0.reg_size)) == 0) { | ||
| 1109 | prom_printf("sunsu: Cannot map registers.\n"); | ||
| 1110 | return; | ||
| 1111 | } | ||
| 1112 | |||
| 1113 | /* | ||
| 1114 | * 0x20 is sun4m thing, Dave Redman heritage. | ||
| 1115 | * See arch/sparc/kernel/irq.c. | ||
| 1116 | */ | ||
| 1117 | #define IRQ_4M(n) ((n)|0x20) | ||
| 1118 | |||
| 1119 | /* | ||
| 1120 | * There is no intr property on MrCoffee, so hardwire it. | ||
| 1121 | */ | ||
| 1122 | up->port.irq = IRQ_4M(13); | ||
| 1123 | #endif | ||
| 1124 | |||
| 1125 | ebus_done: | ||
| 1126 | |||
| 1127 | spin_lock_irqsave(&up->port.lock, flags); | 1038 | spin_lock_irqsave(&up->port.lock, flags); |
| 1128 | 1039 | ||
| 1129 | if (!(up->port.flags & UPF_BUGGY_UART)) { | 1040 | if (!(up->port.flags & UPF_BUGGY_UART)) { |
| @@ -1269,18 +1180,13 @@ static struct uart_driver sunsu_reg = { | |||
| 1269 | .major = TTY_MAJOR, | 1180 | .major = TTY_MAJOR, |
| 1270 | }; | 1181 | }; |
| 1271 | 1182 | ||
| 1272 | static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel) | 1183 | static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up) |
| 1273 | { | 1184 | { |
| 1274 | int quot, baud; | 1185 | int quot, baud; |
| 1275 | #ifdef CONFIG_SERIO | 1186 | #ifdef CONFIG_SERIO |
| 1276 | struct serio *serio; | 1187 | struct serio *serio; |
| 1277 | #endif | 1188 | #endif |
| 1278 | 1189 | ||
| 1279 | spin_lock_init(&up->port.lock); | ||
| 1280 | up->port.line = channel; | ||
| 1281 | up->port.type = PORT_UNKNOWN; | ||
| 1282 | up->port.uartclk = (SU_BASE_BAUD * 16); | ||
| 1283 | |||
| 1284 | if (up->su_type == SU_PORT_KBD) { | 1190 | if (up->su_type == SU_PORT_KBD) { |
| 1285 | up->cflag = B1200 | CS8 | CLOCAL | CREAD; | 1191 | up->cflag = B1200 | CS8 | CLOCAL | CREAD; |
| 1286 | baud = 1200; | 1192 | baud = 1200; |
| @@ -1292,41 +1198,31 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel) | |||
| 1292 | 1198 | ||
| 1293 | sunsu_autoconfig(up); | 1199 | sunsu_autoconfig(up); |
| 1294 | if (up->port.type == PORT_UNKNOWN) | 1200 | if (up->port.type == PORT_UNKNOWN) |
| 1295 | return -1; | 1201 | return -ENODEV; |
| 1296 | |||
| 1297 | printk(KERN_INFO "su%d at 0x%p (irq = %d) is a %s\n", | ||
| 1298 | channel, | ||
| 1299 | up->port.membase, up->port.irq, | ||
| 1300 | sunsu_type(&up->port)); | ||
| 1301 | 1202 | ||
| 1302 | #ifdef CONFIG_SERIO | 1203 | #ifdef CONFIG_SERIO |
| 1303 | up->serio = serio = kmalloc(sizeof(struct serio), GFP_KERNEL); | 1204 | serio = &up->serio; |
| 1304 | if (serio) { | 1205 | serio->port_data = up; |
| 1305 | memset(serio, 0, sizeof(*serio)); | ||
| 1306 | |||
| 1307 | serio->port_data = up; | ||
| 1308 | |||
| 1309 | serio->id.type = SERIO_RS232; | ||
| 1310 | if (up->su_type == SU_PORT_KBD) { | ||
| 1311 | serio->id.proto = SERIO_SUNKBD; | ||
| 1312 | strlcpy(serio->name, "sukbd", sizeof(serio->name)); | ||
| 1313 | } else { | ||
| 1314 | serio->id.proto = SERIO_SUN; | ||
| 1315 | serio->id.extra = 1; | ||
| 1316 | strlcpy(serio->name, "sums", sizeof(serio->name)); | ||
| 1317 | } | ||
| 1318 | strlcpy(serio->phys, (channel == 0 ? "su/serio0" : "su/serio1"), | ||
| 1319 | sizeof(serio->phys)); | ||
| 1320 | |||
| 1321 | serio->write = sunsu_serio_write; | ||
| 1322 | serio->open = sunsu_serio_open; | ||
| 1323 | serio->close = sunsu_serio_close; | ||
| 1324 | 1206 | ||
| 1325 | serio_register_port(serio); | 1207 | serio->id.type = SERIO_RS232; |
| 1208 | if (up->su_type == SU_PORT_KBD) { | ||
| 1209 | serio->id.proto = SERIO_SUNKBD; | ||
| 1210 | strlcpy(serio->name, "sukbd", sizeof(serio->name)); | ||
| 1326 | } else { | 1211 | } else { |
| 1327 | printk(KERN_WARNING "su%d: not enough memory for serio port\n", | 1212 | serio->id.proto = SERIO_SUN; |
| 1328 | channel); | 1213 | serio->id.extra = 1; |
| 1214 | strlcpy(serio->name, "sums", sizeof(serio->name)); | ||
| 1329 | } | 1215 | } |
| 1216 | strlcpy(serio->phys, | ||
| 1217 | (!(up->port.line & 1) ? "su/serio0" : "su/serio1"), | ||
| 1218 | sizeof(serio->phys)); | ||
| 1219 | |||
| 1220 | serio->write = sunsu_serio_write; | ||
| 1221 | serio->open = sunsu_serio_open; | ||
| 1222 | serio->close = sunsu_serio_close; | ||
| 1223 | serio->dev.parent = up->port.dev; | ||
| 1224 | |||
| 1225 | serio_register_port(serio); | ||
| 1330 | #endif | 1226 | #endif |
| 1331 | 1227 | ||
| 1332 | sunsu_change_speed(&up->port, up->cflag, 0, quot); | 1228 | sunsu_change_speed(&up->port, up->cflag, 0, quot); |
| @@ -1458,22 +1354,20 @@ static struct console sunsu_cons = { | |||
| 1458 | * Register console. | 1354 | * Register console. |
| 1459 | */ | 1355 | */ |
| 1460 | 1356 | ||
| 1461 | static inline struct console *SUNSU_CONSOLE(void) | 1357 | static inline struct console *SUNSU_CONSOLE(int num_uart) |
| 1462 | { | 1358 | { |
| 1463 | int i; | 1359 | int i; |
| 1464 | 1360 | ||
| 1465 | if (con_is_present()) | 1361 | if (con_is_present()) |
| 1466 | return NULL; | 1362 | return NULL; |
| 1467 | 1363 | ||
| 1468 | for (i = 0; i < UART_NR; i++) { | 1364 | for (i = 0; i < num_uart; i++) { |
| 1469 | int this_minor = sunsu_reg.minor + i; | 1365 | int this_minor = sunsu_reg.minor + i; |
| 1470 | 1366 | ||
| 1471 | if ((this_minor - 64) == (serial_console - 1)) | 1367 | if ((this_minor - 64) == (serial_console - 1)) |
| 1472 | break; | 1368 | break; |
| 1473 | } | 1369 | } |
| 1474 | if (i == UART_NR) | 1370 | if (i == num_uart) |
| 1475 | return NULL; | ||
| 1476 | if (sunsu_ports[i].port_node == 0) | ||
| 1477 | return NULL; | 1371 | return NULL; |
| 1478 | 1372 | ||
| 1479 | sunsu_cons.index = i; | 1373 | sunsu_cons.index = i; |
| @@ -1481,252 +1375,186 @@ static inline struct console *SUNSU_CONSOLE(void) | |||
| 1481 | return &sunsu_cons; | 1375 | return &sunsu_cons; |
| 1482 | } | 1376 | } |
| 1483 | #else | 1377 | #else |
| 1484 | #define SUNSU_CONSOLE() (NULL) | 1378 | #define SUNSU_CONSOLE(num_uart) (NULL) |
| 1485 | #define sunsu_serial_console_init() do { } while (0) | 1379 | #define sunsu_serial_console_init() do { } while (0) |
| 1486 | #endif | 1380 | #endif |
| 1487 | 1381 | ||
| 1488 | static int __init sunsu_serial_init(void) | 1382 | static enum su_type __devinit su_get_type(struct device_node *dp) |
| 1489 | { | 1383 | { |
| 1490 | int instance, ret, i; | 1384 | struct device_node *ap = of_find_node_by_path("/aliases"); |
| 1491 | 1385 | ||
| 1492 | /* How many instances do we need? */ | 1386 | if (ap) { |
| 1493 | instance = 0; | 1387 | char *keyb = of_get_property(ap, "keyboard", NULL); |
| 1494 | for (i = 0; i < UART_NR; i++) { | 1388 | char *ms = of_get_property(ap, "mouse", NULL); |
| 1495 | struct uart_sunsu_port *up = &sunsu_ports[i]; | ||
| 1496 | 1389 | ||
| 1497 | if (up->su_type == SU_PORT_MS || | 1390 | if (keyb) { |
| 1498 | up->su_type == SU_PORT_KBD) | 1391 | if (dp == of_find_node_by_path(keyb)) |
| 1499 | continue; | 1392 | return SU_PORT_KBD; |
| 1393 | } | ||
| 1394 | if (ms) { | ||
| 1395 | if (dp == of_find_node_by_path(ms)) | ||
| 1396 | return SU_PORT_MS; | ||
| 1397 | } | ||
| 1398 | } | ||
| 1500 | 1399 | ||
| 1501 | spin_lock_init(&up->port.lock); | 1400 | return SU_PORT_PORT; |
| 1502 | up->port.flags |= UPF_BOOT_AUTOCONF; | 1401 | } |
| 1503 | up->port.type = PORT_UNKNOWN; | ||
| 1504 | up->port.uartclk = (SU_BASE_BAUD * 16); | ||
| 1505 | 1402 | ||
| 1506 | sunsu_autoconfig(up); | 1403 | static int __devinit su_probe(struct of_device *op, const struct of_device_id *match) |
| 1507 | if (up->port.type == PORT_UNKNOWN) | 1404 | { |
| 1508 | continue; | 1405 | static int inst; |
| 1406 | struct device_node *dp = op->node; | ||
| 1407 | struct uart_sunsu_port *up; | ||
| 1408 | struct resource *rp; | ||
| 1409 | int err; | ||
| 1509 | 1410 | ||
| 1510 | up->port.line = instance++; | 1411 | if (inst >= UART_NR) |
| 1511 | up->port.ops = &sunsu_pops; | 1412 | return -EINVAL; |
| 1512 | } | ||
| 1513 | 1413 | ||
| 1514 | sunsu_reg.minor = sunserial_current_minor; | 1414 | up = &sunsu_ports[inst]; |
| 1415 | up->port.line = inst; | ||
| 1515 | 1416 | ||
| 1516 | sunsu_reg.nr = instance; | 1417 | spin_lock_init(&up->port.lock); |
| 1517 | 1418 | ||
| 1518 | ret = uart_register_driver(&sunsu_reg); | 1419 | up->su_type = su_get_type(dp); |
| 1519 | if (ret < 0) | ||
| 1520 | return ret; | ||
| 1521 | 1420 | ||
| 1522 | sunsu_reg.tty_driver->name_base = sunsu_reg.minor - 64; | 1421 | rp = &op->resource[0]; |
| 1422 | up->port.mapbase = op->resource[0].start; | ||
| 1523 | 1423 | ||
| 1524 | sunserial_current_minor += instance; | 1424 | up->reg_size = (rp->end - rp->start) + 1; |
| 1425 | up->port.membase = of_ioremap(rp, 0, up->reg_size, "su"); | ||
| 1426 | if (!up->port.membase) | ||
| 1427 | return -ENOMEM; | ||
| 1525 | 1428 | ||
| 1526 | sunsu_reg.cons = SUNSU_CONSOLE(); | 1429 | up->port.irq = op->irqs[0]; |
| 1527 | 1430 | ||
| 1528 | for (i = 0; i < UART_NR; i++) { | 1431 | up->port.dev = &op->dev; |
| 1529 | struct uart_sunsu_port *up = &sunsu_ports[i]; | ||
| 1530 | 1432 | ||
| 1531 | /* Do not register Keyboard/Mouse lines with UART | 1433 | up->port.type = PORT_UNKNOWN; |
| 1532 | * layer. | 1434 | up->port.uartclk = (SU_BASE_BAUD * 16); |
| 1533 | */ | ||
| 1534 | if (up->su_type == SU_PORT_MS || | ||
| 1535 | up->su_type == SU_PORT_KBD) | ||
| 1536 | continue; | ||
| 1537 | 1435 | ||
| 1538 | if (up->port.type == PORT_UNKNOWN) | 1436 | err = 0; |
| 1539 | continue; | 1437 | if (up->su_type == SU_PORT_KBD || up->su_type == SU_PORT_MS) { |
| 1438 | err = sunsu_kbd_ms_init(up); | ||
| 1439 | if (err) | ||
| 1440 | goto out_unmap; | ||
| 1540 | 1441 | ||
| 1541 | uart_add_one_port(&sunsu_reg, &up->port); | 1442 | return 0; |
| 1542 | } | 1443 | } |
| 1543 | 1444 | ||
| 1544 | return 0; | 1445 | up->port.flags |= UPF_BOOT_AUTOCONF; |
| 1545 | } | ||
| 1546 | 1446 | ||
| 1547 | static int su_node_ok(int node, char *name, int namelen) | 1447 | sunsu_autoconfig(up); |
| 1548 | { | ||
| 1549 | if (strncmp(name, "su", namelen) == 0 || | ||
| 1550 | strncmp(name, "su_pnp", namelen) == 0) | ||
| 1551 | return 1; | ||
| 1552 | |||
| 1553 | if (strncmp(name, "serial", namelen) == 0) { | ||
| 1554 | char compat[32]; | ||
| 1555 | int clen; | ||
| 1556 | |||
| 1557 | /* Is it _really_ a 'su' device? */ | ||
| 1558 | clen = prom_getproperty(node, "compatible", compat, sizeof(compat)); | ||
| 1559 | if (clen > 0) { | ||
| 1560 | if (strncmp(compat, "sab82532", 8) == 0) { | ||
| 1561 | /* Nope, Siemens serial, not for us. */ | ||
| 1562 | return 0; | ||
| 1563 | } | ||
| 1564 | } | ||
| 1565 | return 1; | ||
| 1566 | } | ||
| 1567 | 1448 | ||
| 1568 | return 0; | 1449 | err = -ENODEV; |
| 1569 | } | 1450 | if (up->port.type == PORT_UNKNOWN) |
| 1451 | goto out_unmap; | ||
| 1570 | 1452 | ||
| 1571 | #define SU_PROPSIZE 128 | 1453 | up->port.ops = &sunsu_pops; |
| 1572 | 1454 | ||
| 1573 | /* | 1455 | err = uart_add_one_port(&sunsu_reg, &up->port); |
| 1574 | * Scan status structure. | 1456 | if (err) |
| 1575 | * "prop" is a local variable but it eats stack to keep it in each | 1457 | goto out_unmap; |
| 1576 | * stack frame of a recursive procedure. | ||
| 1577 | */ | ||
| 1578 | struct su_probe_scan { | ||
| 1579 | int msnode, kbnode; /* PROM nodes for mouse and keyboard */ | ||
| 1580 | int msx, kbx; /* minors for mouse and keyboard */ | ||
| 1581 | int devices; /* scan index */ | ||
| 1582 | char prop[SU_PROPSIZE]; | ||
| 1583 | }; | ||
| 1584 | 1458 | ||
| 1585 | /* | 1459 | dev_set_drvdata(&op->dev, up); |
| 1586 | * We have several platforms which present 'su' in different parts | ||
| 1587 | * of the device tree. 'su' may be found under obio, ebus, isa and pci. | ||
| 1588 | * We walk over the tree and find them wherever PROM hides them. | ||
| 1589 | */ | ||
| 1590 | static void __init su_probe_any(struct su_probe_scan *t, int sunode) | ||
| 1591 | { | ||
| 1592 | struct uart_sunsu_port *up; | ||
| 1593 | int len; | ||
| 1594 | 1460 | ||
| 1595 | if (t->devices >= UART_NR) | 1461 | inst++; |
| 1596 | return; | ||
| 1597 | 1462 | ||
| 1598 | for (; sunode != 0; sunode = prom_getsibling(sunode)) { | 1463 | return 0; |
| 1599 | len = prom_getproperty(sunode, "name", t->prop, SU_PROPSIZE); | 1464 | |
| 1600 | if (len <= 1) | 1465 | out_unmap: |
| 1601 | continue; /* Broken PROM node */ | 1466 | of_iounmap(up->port.membase, up->reg_size); |
| 1602 | 1467 | return err; | |
| 1603 | if (su_node_ok(sunode, t->prop, len)) { | ||
| 1604 | up = &sunsu_ports[t->devices]; | ||
| 1605 | if (t->kbnode != 0 && sunode == t->kbnode) { | ||
| 1606 | t->kbx = t->devices; | ||
| 1607 | up->su_type = SU_PORT_KBD; | ||
| 1608 | } else if (t->msnode != 0 && sunode == t->msnode) { | ||
| 1609 | t->msx = t->devices; | ||
| 1610 | up->su_type = SU_PORT_MS; | ||
| 1611 | } else { | ||
| 1612 | #ifdef CONFIG_SPARC64 | ||
| 1613 | /* | ||
| 1614 | * Do not attempt to use the truncated | ||
| 1615 | * keyboard/mouse ports as serial ports | ||
| 1616 | * on Ultras with PC keyboard attached. | ||
| 1617 | */ | ||
| 1618 | if (prom_getbool(sunode, "mouse")) | ||
| 1619 | continue; | ||
| 1620 | if (prom_getbool(sunode, "keyboard")) | ||
| 1621 | continue; | ||
| 1622 | #endif | ||
| 1623 | up->su_type = SU_PORT_PORT; | ||
| 1624 | } | ||
| 1625 | up->port_node = sunode; | ||
| 1626 | ++t->devices; | ||
| 1627 | } else { | ||
| 1628 | su_probe_any(t, prom_getchild(sunode)); | ||
| 1629 | } | ||
| 1630 | } | ||
| 1631 | } | 1468 | } |
| 1632 | 1469 | ||
| 1633 | static int __init sunsu_probe(void) | 1470 | static int __devexit su_remove(struct of_device *dev) |
| 1634 | { | 1471 | { |
| 1635 | int node; | 1472 | struct uart_sunsu_port *up = dev_get_drvdata(&dev->dev);; |
| 1636 | int len; | ||
| 1637 | struct su_probe_scan scan; | ||
| 1638 | 1473 | ||
| 1639 | /* | 1474 | if (up->su_type == SU_PORT_MS || |
| 1640 | * First, we scan the tree. | 1475 | up->su_type == SU_PORT_KBD) { |
| 1641 | */ | 1476 | #ifdef CONFIG_SERIO |
| 1642 | scan.devices = 0; | 1477 | serio_unregister_port(&up->serio); |
| 1643 | scan.msx = -1; | 1478 | #endif |
| 1644 | scan.kbx = -1; | 1479 | } else if (up->port.type != PORT_UNKNOWN) |
| 1645 | scan.kbnode = 0; | 1480 | uart_remove_one_port(&sunsu_reg, &up->port); |
| 1646 | scan.msnode = 0; | ||
| 1647 | 1481 | ||
| 1648 | /* | 1482 | return 0; |
| 1649 | * Get the nodes for keyboard and mouse from 'aliases'... | 1483 | } |
| 1650 | */ | ||
| 1651 | node = prom_getchild(prom_root_node); | ||
| 1652 | node = prom_searchsiblings(node, "aliases"); | ||
| 1653 | if (node != 0) { | ||
| 1654 | len = prom_getproperty(node, "keyboard", scan.prop, SU_PROPSIZE); | ||
| 1655 | if (len > 0) { | ||
| 1656 | scan.prop[len] = 0; | ||
| 1657 | scan.kbnode = prom_finddevice(scan.prop); | ||
| 1658 | } | ||
| 1659 | 1484 | ||
| 1660 | len = prom_getproperty(node, "mouse", scan.prop, SU_PROPSIZE); | 1485 | static struct of_device_id su_match[] = { |
| 1661 | if (len > 0) { | 1486 | { |
| 1662 | scan.prop[len] = 0; | 1487 | .name = "su", |
| 1663 | scan.msnode = prom_finddevice(scan.prop); | 1488 | }, |
| 1664 | } | 1489 | { |
| 1665 | } | 1490 | .name = "su_pnp", |
| 1491 | }, | ||
| 1492 | { | ||
| 1493 | .name = "serial", | ||
| 1494 | .compatible = "su", | ||
| 1495 | }, | ||
| 1496 | {}, | ||
| 1497 | }; | ||
| 1498 | MODULE_DEVICE_TABLE(of, su_match); | ||
| 1666 | 1499 | ||
| 1667 | su_probe_any(&scan, prom_getchild(prom_root_node)); | 1500 | static struct of_platform_driver su_driver = { |
| 1501 | .name = "su", | ||
| 1502 | .match_table = su_match, | ||
| 1503 | .probe = su_probe, | ||
| 1504 | .remove = __devexit_p(su_remove), | ||
| 1505 | }; | ||
| 1668 | 1506 | ||
| 1669 | /* | 1507 | static int num_uart; |
| 1670 | * Second, we process the special case of keyboard and mouse. | ||
| 1671 | * | ||
| 1672 | * Currently if we got keyboard and mouse hooked to "su" ports | ||
| 1673 | * we do not use any possible remaining "su" as a serial port. | ||
| 1674 | * Thus, we ignore values of .msx and .kbx, then compact ports. | ||
| 1675 | */ | ||
| 1676 | if (scan.msx != -1 && scan.kbx != -1) { | ||
| 1677 | sunsu_ports[0].su_type = SU_PORT_MS; | ||
| 1678 | sunsu_ports[0].port_node = scan.msnode; | ||
| 1679 | sunsu_kbd_ms_init(&sunsu_ports[0], 0); | ||
| 1680 | 1508 | ||
| 1681 | sunsu_ports[1].su_type = SU_PORT_KBD; | 1509 | static int __init sunsu_init(void) |
| 1682 | sunsu_ports[1].port_node = scan.kbnode; | 1510 | { |
| 1683 | sunsu_kbd_ms_init(&sunsu_ports[1], 1); | 1511 | struct device_node *dp; |
| 1512 | int err; | ||
| 1684 | 1513 | ||
| 1685 | return 0; | 1514 | num_uart = 0; |
| 1515 | for_each_node_by_name(dp, "su") { | ||
| 1516 | if (su_get_type(dp) == SU_PORT_PORT) | ||
| 1517 | num_uart++; | ||
| 1686 | } | 1518 | } |
| 1687 | 1519 | for_each_node_by_name(dp, "su_pnp") { | |
| 1688 | if (scan.msx != -1 || scan.kbx != -1) { | 1520 | if (su_get_type(dp) == SU_PORT_PORT) |
| 1689 | printk("sunsu_probe: cannot match keyboard and mouse, confused\n"); | 1521 | num_uart++; |
| 1690 | return -ENODEV; | 1522 | } |
| 1523 | for_each_node_by_name(dp, "serial") { | ||
| 1524 | if (of_device_is_compatible(dp, "su")) { | ||
| 1525 | if (su_get_type(dp) == SU_PORT_PORT) | ||
| 1526 | num_uart++; | ||
| 1527 | } | ||
| 1691 | } | 1528 | } |
| 1692 | 1529 | ||
| 1693 | if (scan.devices == 0) | 1530 | if (num_uart) { |
| 1694 | return -ENODEV; | 1531 | sunsu_reg.minor = sunserial_current_minor; |
| 1532 | sunsu_reg.nr = num_uart; | ||
| 1533 | err = uart_register_driver(&sunsu_reg); | ||
| 1534 | if (err) | ||
| 1535 | return err; | ||
| 1536 | sunsu_reg.tty_driver->name_base = sunsu_reg.minor - 64; | ||
| 1537 | sunserial_current_minor += num_uart; | ||
| 1538 | sunsu_reg.cons = SUNSU_CONSOLE(num_uart); | ||
| 1539 | } | ||
| 1695 | 1540 | ||
| 1696 | /* | 1541 | err = of_register_driver(&su_driver, &of_bus_type); |
| 1697 | * Console must be initiated after the generic initialization. | 1542 | if (err && num_uart) |
| 1698 | */ | 1543 | uart_unregister_driver(&sunsu_reg); |
| 1699 | sunsu_serial_init(); | ||
| 1700 | 1544 | ||
| 1701 | return 0; | 1545 | return err; |
| 1702 | } | 1546 | } |
| 1703 | 1547 | ||
| 1704 | static void __exit sunsu_exit(void) | 1548 | static void __exit sunsu_exit(void) |
| 1705 | { | 1549 | { |
| 1706 | int i, saw_uart; | 1550 | if (num_uart) |
| 1707 | |||
| 1708 | saw_uart = 0; | ||
| 1709 | for (i = 0; i < UART_NR; i++) { | ||
| 1710 | struct uart_sunsu_port *up = &sunsu_ports[i]; | ||
| 1711 | |||
| 1712 | if (up->su_type == SU_PORT_MS || | ||
| 1713 | up->su_type == SU_PORT_KBD) { | ||
| 1714 | #ifdef CONFIG_SERIO | ||
| 1715 | if (up->serio) { | ||
| 1716 | serio_unregister_port(up->serio); | ||
| 1717 | up->serio = NULL; | ||
| 1718 | } | ||
| 1719 | #endif | ||
| 1720 | } else if (up->port.type != PORT_UNKNOWN) { | ||
| 1721 | uart_remove_one_port(&sunsu_reg, &up->port); | ||
| 1722 | saw_uart++; | ||
| 1723 | } | ||
| 1724 | } | ||
| 1725 | |||
| 1726 | if (saw_uart) | ||
| 1727 | uart_unregister_driver(&sunsu_reg); | 1551 | uart_unregister_driver(&sunsu_reg); |
| 1728 | } | 1552 | } |
| 1729 | 1553 | ||
| 1730 | module_init(sunsu_probe); | 1554 | module_init(sunsu_init); |
| 1731 | module_exit(sunsu_exit); | 1555 | module_exit(sunsu_exit); |
| 1556 | |||
| 1557 | MODULE_AUTHOR("Eddie C. Dost, Peter Zaitcev, and David S. Miller"); | ||
| 1558 | MODULE_DESCRIPTION("Sun SU serial port driver"); | ||
| 1559 | MODULE_VERSION("2.0"); | ||
| 1732 | MODULE_LICENSE("GPL"); | 1560 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 9f42677287ad..9ee7f3af9ae2 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | /* | 1 | /* sunzilog.c: Zilog serial driver for Sparc systems. |
| 2 | * sunzilog.c | ||
| 3 | * | 2 | * |
| 4 | * Driver for Zilog serial chips found on Sun workstations and | 3 | * Driver for Zilog serial chips found on Sun workstations and |
| 5 | * servers. This driver could actually be made more generic. | 4 | * servers. This driver could actually be made more generic. |
| @@ -10,10 +9,9 @@ | |||
| 10 | * C. Dost, Pete Zaitcev, Ted Ts'o and Alex Buell for their | 9 | * C. Dost, Pete Zaitcev, Ted Ts'o and Alex Buell for their |
| 11 | * work there. | 10 | * work there. |
| 12 | * | 11 | * |
| 13 | * Copyright (C) 2002 David S. Miller (davem@redhat.com) | 12 | * Copyright (C) 2002, 2006 David S. Miller (davem@davemloft.net) |
| 14 | */ | 13 | */ |
| 15 | 14 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 18 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 19 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| @@ -38,10 +36,8 @@ | |||
| 38 | 36 | ||
| 39 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 40 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 41 | #ifdef CONFIG_SPARC64 | 39 | #include <asm/prom.h> |
| 42 | #include <asm/fhc.h> | 40 | #include <asm/of_device.h> |
| 43 | #endif | ||
| 44 | #include <asm/sbus.h> | ||
| 45 | 41 | ||
| 46 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 42 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 47 | #define SUPPORT_SYSRQ | 43 | #define SUPPORT_SYSRQ |
| @@ -65,7 +61,7 @@ | |||
| 65 | #define ZSDELAY() | 61 | #define ZSDELAY() |
| 66 | #define ZSDELAY_LONG() | 62 | #define ZSDELAY_LONG() |
| 67 | #define ZS_WSYNC(__channel) \ | 63 | #define ZS_WSYNC(__channel) \ |
| 68 | sbus_readb(&((__channel)->control)) | 64 | readb(&((__channel)->control)) |
| 69 | #endif | 65 | #endif |
| 70 | 66 | ||
| 71 | static int num_sunzilog; | 67 | static int num_sunzilog; |
| @@ -107,7 +103,7 @@ struct uart_sunzilog_port { | |||
| 107 | unsigned char prev_status; | 103 | unsigned char prev_status; |
| 108 | 104 | ||
| 109 | #ifdef CONFIG_SERIO | 105 | #ifdef CONFIG_SERIO |
| 110 | struct serio *serio; | 106 | struct serio serio; |
| 111 | int serio_open; | 107 | int serio_open; |
| 112 | #endif | 108 | #endif |
| 113 | }; | 109 | }; |
| @@ -138,9 +134,9 @@ static unsigned char read_zsreg(struct zilog_channel __iomem *channel, | |||
| 138 | { | 134 | { |
| 139 | unsigned char retval; | 135 | unsigned char retval; |
| 140 | 136 | ||
| 141 | sbus_writeb(reg, &channel->control); | 137 | writeb(reg, &channel->control); |
| 142 | ZSDELAY(); | 138 | ZSDELAY(); |
| 143 | retval = sbus_readb(&channel->control); | 139 | retval = readb(&channel->control); |
| 144 | ZSDELAY(); | 140 | ZSDELAY(); |
| 145 | 141 | ||
| 146 | return retval; | 142 | return retval; |
| @@ -149,9 +145,9 @@ static unsigned char read_zsreg(struct zilog_channel __iomem *channel, | |||
| 149 | static void write_zsreg(struct zilog_channel __iomem *channel, | 145 | static void write_zsreg(struct zilog_channel __iomem *channel, |
| 150 | unsigned char reg, unsigned char value) | 146 | unsigned char reg, unsigned char value) |
| 151 | { | 147 | { |
| 152 | sbus_writeb(reg, &channel->control); | 148 | writeb(reg, &channel->control); |
| 153 | ZSDELAY(); | 149 | ZSDELAY(); |
| 154 | sbus_writeb(value, &channel->control); | 150 | writeb(value, &channel->control); |
| 155 | ZSDELAY(); | 151 | ZSDELAY(); |
| 156 | } | 152 | } |
| 157 | 153 | ||
| @@ -162,17 +158,17 @@ static void sunzilog_clear_fifo(struct zilog_channel __iomem *channel) | |||
| 162 | for (i = 0; i < 32; i++) { | 158 | for (i = 0; i < 32; i++) { |
| 163 | unsigned char regval; | 159 | unsigned char regval; |
| 164 | 160 | ||
| 165 | regval = sbus_readb(&channel->control); | 161 | regval = readb(&channel->control); |
| 166 | ZSDELAY(); | 162 | ZSDELAY(); |
| 167 | if (regval & Rx_CH_AV) | 163 | if (regval & Rx_CH_AV) |
| 168 | break; | 164 | break; |
| 169 | 165 | ||
| 170 | regval = read_zsreg(channel, R1); | 166 | regval = read_zsreg(channel, R1); |
| 171 | sbus_readb(&channel->data); | 167 | readb(&channel->data); |
| 172 | ZSDELAY(); | 168 | ZSDELAY(); |
| 173 | 169 | ||
| 174 | if (regval & (PAR_ERR | Rx_OVR | CRC_ERR)) { | 170 | if (regval & (PAR_ERR | Rx_OVR | CRC_ERR)) { |
| 175 | sbus_writeb(ERR_RES, &channel->control); | 171 | writeb(ERR_RES, &channel->control); |
| 176 | ZSDELAY(); | 172 | ZSDELAY(); |
| 177 | ZS_WSYNC(channel); | 173 | ZS_WSYNC(channel); |
| 178 | } | 174 | } |
| @@ -194,7 +190,7 @@ static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char * | |||
| 194 | udelay(100); | 190 | udelay(100); |
| 195 | } | 191 | } |
| 196 | 192 | ||
| 197 | sbus_writeb(ERR_RES, &channel->control); | 193 | writeb(ERR_RES, &channel->control); |
| 198 | ZSDELAY(); | 194 | ZSDELAY(); |
| 199 | ZS_WSYNC(channel); | 195 | ZS_WSYNC(channel); |
| 200 | 196 | ||
| @@ -291,7 +287,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up, | |||
| 291 | /* Stop-A is handled by drivers/char/keyboard.c now. */ | 287 | /* Stop-A is handled by drivers/char/keyboard.c now. */ |
| 292 | #ifdef CONFIG_SERIO | 288 | #ifdef CONFIG_SERIO |
| 293 | if (up->serio_open) | 289 | if (up->serio_open) |
| 294 | serio_interrupt(up->serio, ch, 0, regs); | 290 | serio_interrupt(&up->serio, ch, 0, regs); |
| 295 | #endif | 291 | #endif |
| 296 | } else if (ZS_IS_MOUSE(up)) { | 292 | } else if (ZS_IS_MOUSE(up)) { |
| 297 | int ret = suncore_mouse_baud_detection(ch, is_break); | 293 | int ret = suncore_mouse_baud_detection(ch, is_break); |
| @@ -306,7 +302,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up, | |||
| 306 | case 0: | 302 | case 0: |
| 307 | #ifdef CONFIG_SERIO | 303 | #ifdef CONFIG_SERIO |
| 308 | if (up->serio_open) | 304 | if (up->serio_open) |
| 309 | serio_interrupt(up->serio, ch, 0, regs); | 305 | serio_interrupt(&up->serio, ch, 0, regs); |
| 310 | #endif | 306 | #endif |
| 311 | break; | 307 | break; |
| 312 | }; | 308 | }; |
| @@ -330,12 +326,12 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up, | |||
| 330 | 326 | ||
| 331 | r1 = read_zsreg(channel, R1); | 327 | r1 = read_zsreg(channel, R1); |
| 332 | if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) { | 328 | if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) { |
| 333 | sbus_writeb(ERR_RES, &channel->control); | 329 | writeb(ERR_RES, &channel->control); |
| 334 | ZSDELAY(); | 330 | ZSDELAY(); |
| 335 | ZS_WSYNC(channel); | 331 | ZS_WSYNC(channel); |
| 336 | } | 332 | } |
| 337 | 333 | ||
| 338 | ch = sbus_readb(&channel->control); | 334 | ch = readb(&channel->control); |
| 339 | ZSDELAY(); | 335 | ZSDELAY(); |
| 340 | 336 | ||
| 341 | /* This funny hack depends upon BRK_ABRT not interfering | 337 | /* This funny hack depends upon BRK_ABRT not interfering |
| @@ -347,7 +343,7 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up, | |||
| 347 | if (!(ch & Rx_CH_AV)) | 343 | if (!(ch & Rx_CH_AV)) |
| 348 | break; | 344 | break; |
| 349 | 345 | ||
| 350 | ch = sbus_readb(&channel->data); | 346 | ch = readb(&channel->data); |
| 351 | ZSDELAY(); | 347 | ZSDELAY(); |
| 352 | 348 | ||
| 353 | ch &= up->parity_mask; | 349 | ch &= up->parity_mask; |
| @@ -406,10 +402,10 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up, | |||
| 406 | { | 402 | { |
| 407 | unsigned char status; | 403 | unsigned char status; |
| 408 | 404 | ||
| 409 | status = sbus_readb(&channel->control); | 405 | status = readb(&channel->control); |
| 410 | ZSDELAY(); | 406 | ZSDELAY(); |
| 411 | 407 | ||
| 412 | sbus_writeb(RES_EXT_INT, &channel->control); | 408 | writeb(RES_EXT_INT, &channel->control); |
| 413 | ZSDELAY(); | 409 | ZSDELAY(); |
| 414 | ZS_WSYNC(channel); | 410 | ZS_WSYNC(channel); |
| 415 | 411 | ||
| @@ -421,7 +417,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up, | |||
| 421 | * confusing the PROM. | 417 | * confusing the PROM. |
| 422 | */ | 418 | */ |
| 423 | while (1) { | 419 | while (1) { |
| 424 | status = sbus_readb(&channel->control); | 420 | status = readb(&channel->control); |
| 425 | ZSDELAY(); | 421 | ZSDELAY(); |
| 426 | if (!(status & BRK_ABRT)) | 422 | if (!(status & BRK_ABRT)) |
| 427 | break; | 423 | break; |
| @@ -458,7 +454,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, | |||
| 458 | struct circ_buf *xmit; | 454 | struct circ_buf *xmit; |
| 459 | 455 | ||
| 460 | if (ZS_IS_CONS(up)) { | 456 | if (ZS_IS_CONS(up)) { |
| 461 | unsigned char status = sbus_readb(&channel->control); | 457 | unsigned char status = readb(&channel->control); |
| 462 | ZSDELAY(); | 458 | ZSDELAY(); |
| 463 | 459 | ||
| 464 | /* TX still busy? Just wait for the next TX done interrupt. | 460 | /* TX still busy? Just wait for the next TX done interrupt. |
| @@ -487,7 +483,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, | |||
| 487 | 483 | ||
| 488 | if (up->port.x_char) { | 484 | if (up->port.x_char) { |
| 489 | up->flags |= SUNZILOG_FLAG_TX_ACTIVE; | 485 | up->flags |= SUNZILOG_FLAG_TX_ACTIVE; |
| 490 | sbus_writeb(up->port.x_char, &channel->data); | 486 | writeb(up->port.x_char, &channel->data); |
| 491 | ZSDELAY(); | 487 | ZSDELAY(); |
| 492 | ZS_WSYNC(channel); | 488 | ZS_WSYNC(channel); |
| 493 | 489 | ||
| @@ -506,7 +502,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, | |||
| 506 | goto ack_tx_int; | 502 | goto ack_tx_int; |
| 507 | 503 | ||
| 508 | up->flags |= SUNZILOG_FLAG_TX_ACTIVE; | 504 | up->flags |= SUNZILOG_FLAG_TX_ACTIVE; |
| 509 | sbus_writeb(xmit->buf[xmit->tail], &channel->data); | 505 | writeb(xmit->buf[xmit->tail], &channel->data); |
| 510 | ZSDELAY(); | 506 | ZSDELAY(); |
| 511 | ZS_WSYNC(channel); | 507 | ZS_WSYNC(channel); |
| 512 | 508 | ||
| @@ -519,7 +515,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, | |||
| 519 | return; | 515 | return; |
| 520 | 516 | ||
| 521 | ack_tx_int: | 517 | ack_tx_int: |
| 522 | sbus_writeb(RES_Tx_P, &channel->control); | 518 | writeb(RES_Tx_P, &channel->control); |
| 523 | ZSDELAY(); | 519 | ZSDELAY(); |
| 524 | ZS_WSYNC(channel); | 520 | ZS_WSYNC(channel); |
| 525 | } | 521 | } |
| @@ -540,7 +536,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg | |||
| 540 | /* Channel A */ | 536 | /* Channel A */ |
| 541 | tty = NULL; | 537 | tty = NULL; |
| 542 | if (r3 & (CHAEXT | CHATxIP | CHARxIP)) { | 538 | if (r3 & (CHAEXT | CHATxIP | CHARxIP)) { |
| 543 | sbus_writeb(RES_H_IUS, &channel->control); | 539 | writeb(RES_H_IUS, &channel->control); |
| 544 | ZSDELAY(); | 540 | ZSDELAY(); |
| 545 | ZS_WSYNC(channel); | 541 | ZS_WSYNC(channel); |
| 546 | 542 | ||
| @@ -563,7 +559,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg | |||
| 563 | spin_lock(&up->port.lock); | 559 | spin_lock(&up->port.lock); |
| 564 | tty = NULL; | 560 | tty = NULL; |
| 565 | if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) { | 561 | if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) { |
| 566 | sbus_writeb(RES_H_IUS, &channel->control); | 562 | writeb(RES_H_IUS, &channel->control); |
| 567 | ZSDELAY(); | 563 | ZSDELAY(); |
| 568 | ZS_WSYNC(channel); | 564 | ZS_WSYNC(channel); |
| 569 | 565 | ||
| @@ -594,7 +590,7 @@ static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *p | |||
| 594 | unsigned char status; | 590 | unsigned char status; |
| 595 | 591 | ||
| 596 | channel = ZILOG_CHANNEL_FROM_PORT(port); | 592 | channel = ZILOG_CHANNEL_FROM_PORT(port); |
| 597 | status = sbus_readb(&channel->control); | 593 | status = readb(&channel->control); |
| 598 | ZSDELAY(); | 594 | ZSDELAY(); |
| 599 | 595 | ||
| 600 | return status; | 596 | return status; |
| @@ -682,7 +678,7 @@ static void sunzilog_start_tx(struct uart_port *port) | |||
| 682 | up->flags |= SUNZILOG_FLAG_TX_ACTIVE; | 678 | up->flags |= SUNZILOG_FLAG_TX_ACTIVE; |
| 683 | up->flags &= ~SUNZILOG_FLAG_TX_STOPPED; | 679 | up->flags &= ~SUNZILOG_FLAG_TX_STOPPED; |
| 684 | 680 | ||
| 685 | status = sbus_readb(&channel->control); | 681 | status = readb(&channel->control); |
| 686 | ZSDELAY(); | 682 | ZSDELAY(); |
| 687 | 683 | ||
| 688 | /* TX busy? Just wait for the TX done interrupt. */ | 684 | /* TX busy? Just wait for the TX done interrupt. */ |
| @@ -693,7 +689,7 @@ static void sunzilog_start_tx(struct uart_port *port) | |||
| 693 | * IRQ sending engine. | 689 | * IRQ sending engine. |
| 694 | */ | 690 | */ |
| 695 | if (port->x_char) { | 691 | if (port->x_char) { |
| 696 | sbus_writeb(port->x_char, &channel->data); | 692 | writeb(port->x_char, &channel->data); |
| 697 | ZSDELAY(); | 693 | ZSDELAY(); |
| 698 | ZS_WSYNC(channel); | 694 | ZS_WSYNC(channel); |
| 699 | 695 | ||
| @@ -702,7 +698,7 @@ static void sunzilog_start_tx(struct uart_port *port) | |||
| 702 | } else { | 698 | } else { |
| 703 | struct circ_buf *xmit = &port->info->xmit; | 699 | struct circ_buf *xmit = &port->info->xmit; |
| 704 | 700 | ||
| 705 | sbus_writeb(xmit->buf[xmit->tail], &channel->data); | 701 | writeb(xmit->buf[xmit->tail], &channel->data); |
| 706 | ZSDELAY(); | 702 | ZSDELAY(); |
| 707 | ZS_WSYNC(channel); | 703 | ZS_WSYNC(channel); |
| 708 | 704 | ||
| @@ -779,7 +775,7 @@ static void __sunzilog_startup(struct uart_sunzilog_port *up) | |||
| 779 | struct zilog_channel __iomem *channel; | 775 | struct zilog_channel __iomem *channel; |
| 780 | 776 | ||
| 781 | channel = ZILOG_CHANNEL_FROM_PORT(&up->port); | 777 | channel = ZILOG_CHANNEL_FROM_PORT(&up->port); |
| 782 | up->prev_status = sbus_readb(&channel->control); | 778 | up->prev_status = readb(&channel->control); |
| 783 | 779 | ||
| 784 | /* Enable receiver and transmitter. */ | 780 | /* Enable receiver and transmitter. */ |
| 785 | up->curregs[R3] |= RxENAB; | 781 | up->curregs[R3] |= RxENAB; |
| @@ -963,7 +959,7 @@ sunzilog_set_termios(struct uart_port *port, struct termios *termios, | |||
| 963 | 959 | ||
| 964 | static const char *sunzilog_type(struct uart_port *port) | 960 | static const char *sunzilog_type(struct uart_port *port) |
| 965 | { | 961 | { |
| 966 | return "SunZilog"; | 962 | return "zs"; |
| 967 | } | 963 | } |
| 968 | 964 | ||
| 969 | /* We do not request/release mappings of the registers here, this | 965 | /* We do not request/release mappings of the registers here, this |
| @@ -1012,7 +1008,6 @@ static struct uart_sunzilog_port *sunzilog_port_table; | |||
| 1012 | static struct zilog_layout __iomem **sunzilog_chip_regs; | 1008 | static struct zilog_layout __iomem **sunzilog_chip_regs; |
| 1013 | 1009 | ||
| 1014 | static struct uart_sunzilog_port *sunzilog_irq_chain; | 1010 | static struct uart_sunzilog_port *sunzilog_irq_chain; |
| 1015 | static int zilog_irq = -1; | ||
| 1016 | 1011 | ||
| 1017 | static struct uart_driver sunzilog_reg = { | 1012 | static struct uart_driver sunzilog_reg = { |
| 1018 | .owner = THIS_MODULE, | 1013 | .owner = THIS_MODULE, |
| @@ -1021,232 +1016,47 @@ static struct uart_driver sunzilog_reg = { | |||
| 1021 | .major = TTY_MAJOR, | 1016 | .major = TTY_MAJOR, |
| 1022 | }; | 1017 | }; |
| 1023 | 1018 | ||
| 1024 | static void * __init alloc_one_table(unsigned long size) | 1019 | static int __init sunzilog_alloc_tables(void) |
| 1025 | { | ||
| 1026 | void *ret; | ||
| 1027 | |||
| 1028 | ret = kmalloc(size, GFP_KERNEL); | ||
| 1029 | if (ret != NULL) | ||
| 1030 | memset(ret, 0, size); | ||
| 1031 | |||
| 1032 | return ret; | ||
| 1033 | } | ||
| 1034 | |||
| 1035 | static void __init sunzilog_alloc_tables(void) | ||
| 1036 | { | ||
| 1037 | sunzilog_port_table = | ||
| 1038 | alloc_one_table(NUM_CHANNELS * sizeof(struct uart_sunzilog_port)); | ||
| 1039 | sunzilog_chip_regs = | ||
| 1040 | alloc_one_table(NUM_SUNZILOG * sizeof(struct zilog_layout __iomem *)); | ||
| 1041 | |||
| 1042 | if (sunzilog_port_table == NULL || sunzilog_chip_regs == NULL) { | ||
| 1043 | prom_printf("SunZilog: Cannot allocate tables.\n"); | ||
| 1044 | prom_halt(); | ||
| 1045 | } | ||
| 1046 | } | ||
| 1047 | |||
| 1048 | #ifdef CONFIG_SPARC64 | ||
| 1049 | |||
| 1050 | /* We used to attempt to use the address property of the Zilog device node | ||
| 1051 | * but that totally is not necessary on sparc64. | ||
| 1052 | */ | ||
| 1053 | static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode) | ||
| 1054 | { | 1020 | { |
| 1055 | void __iomem *mapped_addr; | 1021 | struct uart_sunzilog_port *up; |
| 1056 | unsigned int sun4u_ino; | 1022 | unsigned long size; |
| 1057 | struct sbus_bus *sbus = NULL; | 1023 | int i; |
| 1058 | struct sbus_dev *sdev = NULL; | ||
| 1059 | int err; | ||
| 1060 | |||
| 1061 | if (central_bus == NULL) { | ||
| 1062 | for_each_sbus(sbus) { | ||
| 1063 | for_each_sbusdev(sdev, sbus) { | ||
| 1064 | if (sdev->prom_node == zsnode) | ||
| 1065 | goto found; | ||
| 1066 | } | ||
| 1067 | } | ||
| 1068 | } | ||
| 1069 | found: | ||
| 1070 | if (sdev == NULL && central_bus == NULL) { | ||
| 1071 | prom_printf("SunZilog: sdev&¢ral == NULL for " | ||
| 1072 | "Zilog %d in get_zs_sun4u.\n", chip); | ||
| 1073 | prom_halt(); | ||
| 1074 | } | ||
| 1075 | if (central_bus == NULL) { | ||
| 1076 | mapped_addr = | ||
| 1077 | sbus_ioremap(&sdev->resource[0], 0, | ||
| 1078 | PAGE_SIZE, | ||
| 1079 | "Zilog Registers"); | ||
| 1080 | } else { | ||
| 1081 | struct linux_prom_registers zsregs[1]; | ||
| 1082 | |||
| 1083 | err = prom_getproperty(zsnode, "reg", | ||
| 1084 | (char *) &zsregs[0], | ||
| 1085 | sizeof(zsregs)); | ||
| 1086 | if (err == -1) { | ||
| 1087 | prom_printf("SunZilog: Cannot map " | ||
| 1088 | "Zilog %d regs on " | ||
| 1089 | "central bus.\n", chip); | ||
| 1090 | prom_halt(); | ||
| 1091 | } | ||
| 1092 | apply_fhc_ranges(central_bus->child, | ||
| 1093 | &zsregs[0], 1); | ||
| 1094 | apply_central_ranges(central_bus, &zsregs[0], 1); | ||
| 1095 | mapped_addr = (void __iomem *) | ||
| 1096 | ((((u64)zsregs[0].which_io)<<32UL) | | ||
| 1097 | ((u64)zsregs[0].phys_addr)); | ||
| 1098 | } | ||
| 1099 | |||
| 1100 | if (zilog_irq == -1) { | ||
| 1101 | if (central_bus) { | ||
| 1102 | unsigned long iclr, imap; | ||
| 1103 | |||
| 1104 | iclr = central_bus->child->fhc_regs.uregs | ||
| 1105 | + FHC_UREGS_ICLR; | ||
| 1106 | imap = central_bus->child->fhc_regs.uregs | ||
| 1107 | + FHC_UREGS_IMAP; | ||
| 1108 | zilog_irq = build_irq(0, iclr, imap); | ||
| 1109 | } else { | ||
| 1110 | err = prom_getproperty(zsnode, "interrupts", | ||
| 1111 | (char *) &sun4u_ino, | ||
| 1112 | sizeof(sun4u_ino)); | ||
| 1113 | zilog_irq = sbus_build_irq(sbus_root, sun4u_ino); | ||
| 1114 | } | ||
| 1115 | } | ||
| 1116 | |||
| 1117 | return (struct zilog_layout __iomem *) mapped_addr; | ||
| 1118 | } | ||
| 1119 | #else /* CONFIG_SPARC64 */ | ||
| 1120 | |||
| 1121 | /* | ||
| 1122 | * XXX The sun4d case is utterly screwed: it tries to re-walk the tree | ||
| 1123 | * (for the 3rd time) in order to find bootbus and cpu. Streamline it. | ||
| 1124 | */ | ||
| 1125 | static struct zilog_layout __iomem * __init get_zs_sun4cmd(int chip, int node) | ||
| 1126 | { | ||
| 1127 | struct linux_prom_irqs irq_info[2]; | ||
| 1128 | void __iomem *mapped_addr = NULL; | ||
| 1129 | int zsnode, cpunode, bbnode; | ||
| 1130 | struct linux_prom_registers zsreg[4]; | ||
| 1131 | struct resource res; | ||
| 1132 | |||
| 1133 | if (sparc_cpu_model == sun4d) { | ||
| 1134 | int walk; | ||
| 1135 | |||
| 1136 | zsnode = 0; | ||
| 1137 | bbnode = 0; | ||
| 1138 | cpunode = 0; | ||
| 1139 | for (walk = prom_getchild(prom_root_node); | ||
| 1140 | (walk = prom_searchsiblings(walk, "cpu-unit")) != 0; | ||
| 1141 | walk = prom_getsibling(walk)) { | ||
| 1142 | bbnode = prom_getchild(walk); | ||
| 1143 | if (bbnode && | ||
| 1144 | (bbnode = prom_searchsiblings(bbnode, "bootbus"))) { | ||
| 1145 | if ((zsnode = prom_getchild(bbnode)) == node) { | ||
| 1146 | cpunode = walk; | ||
| 1147 | break; | ||
| 1148 | } | ||
| 1149 | } | ||
| 1150 | } | ||
| 1151 | if (!walk) { | ||
| 1152 | prom_printf("SunZilog: Cannot find the %d'th bootbus on sun4d.\n", | ||
| 1153 | (chip / 2)); | ||
| 1154 | prom_halt(); | ||
| 1155 | } | ||
| 1156 | 1024 | ||
| 1157 | if (prom_getproperty(zsnode, "reg", | 1025 | size = NUM_CHANNELS * sizeof(struct uart_sunzilog_port); |
| 1158 | (char *) zsreg, sizeof(zsreg)) == -1) { | 1026 | sunzilog_port_table = kzalloc(size, GFP_KERNEL); |
| 1159 | prom_printf("SunZilog: Cannot map Zilog %d\n", chip); | 1027 | if (!sunzilog_port_table) |
| 1160 | prom_halt(); | 1028 | return -ENOMEM; |
| 1161 | } | ||
| 1162 | /* XXX Looks like an off by one? */ | ||
| 1163 | prom_apply_generic_ranges(bbnode, cpunode, zsreg, 1); | ||
| 1164 | res.start = zsreg[0].phys_addr; | ||
| 1165 | res.end = res.start + (8 - 1); | ||
| 1166 | res.flags = zsreg[0].which_io | IORESOURCE_IO; | ||
| 1167 | mapped_addr = sbus_ioremap(&res, 0, 8, "Zilog Serial"); | ||
| 1168 | 1029 | ||
| 1169 | } else { | 1030 | for (i = 0; i < NUM_CHANNELS; i++) { |
| 1170 | zsnode = node; | 1031 | up = &sunzilog_port_table[i]; |
| 1171 | 1032 | ||
| 1172 | #if 0 /* XXX When was this used? */ | 1033 | spin_lock_init(&up->port.lock); |
| 1173 | if (prom_getintdefault(zsnode, "slave", -1) != chipid) { | ||
| 1174 | zsnode = prom_getsibling(zsnode); | ||
| 1175 | continue; | ||
| 1176 | } | ||
| 1177 | #endif | ||
| 1178 | 1034 | ||
| 1179 | /* | 1035 | if (i == 0) |
| 1180 | * "address" is only present on ports that OBP opened | 1036 | sunzilog_irq_chain = up; |
| 1181 | * (from Mitch Bradley's "Hitchhiker's Guide to OBP"). | ||
| 1182 | * We do not use it. | ||
| 1183 | */ | ||
| 1184 | 1037 | ||
| 1185 | if (prom_getproperty(zsnode, "reg", | 1038 | if (i < NUM_CHANNELS - 1) |
| 1186 | (char *) zsreg, sizeof(zsreg)) == -1) { | 1039 | up->next = up + 1; |
| 1187 | prom_printf("SunZilog: Cannot map Zilog %d\n", chip); | 1040 | else |
| 1188 | prom_halt(); | 1041 | up->next = NULL; |
| 1189 | } | ||
| 1190 | if (sparc_cpu_model == sun4m) /* Crude. Pass parent. XXX */ | ||
| 1191 | prom_apply_obio_ranges(zsreg, 1); | ||
| 1192 | res.start = zsreg[0].phys_addr; | ||
| 1193 | res.end = res.start + (8 - 1); | ||
| 1194 | res.flags = zsreg[0].which_io | IORESOURCE_IO; | ||
| 1195 | mapped_addr = sbus_ioremap(&res, 0, 8, "Zilog Serial"); | ||
| 1196 | } | 1042 | } |
| 1197 | 1043 | ||
| 1198 | if (prom_getproperty(zsnode, "intr", | 1044 | size = NUM_SUNZILOG * sizeof(struct zilog_layout __iomem *); |
| 1199 | (char *) irq_info, sizeof(irq_info)) | 1045 | sunzilog_chip_regs = kzalloc(size, GFP_KERNEL); |
| 1200 | % sizeof(struct linux_prom_irqs)) { | 1046 | if (!sunzilog_chip_regs) { |
| 1201 | prom_printf("SunZilog: Cannot get IRQ property for Zilog %d.\n", | 1047 | kfree(sunzilog_port_table); |
| 1202 | chip); | 1048 | sunzilog_irq_chain = NULL; |
| 1203 | prom_halt(); | 1049 | return -ENOMEM; |
| 1204 | } | ||
| 1205 | if (zilog_irq == -1) { | ||
| 1206 | zilog_irq = irq_info[0].pri; | ||
| 1207 | } else if (zilog_irq != irq_info[0].pri) { | ||
| 1208 | /* XXX. Dumb. Should handle per-chip IRQ, for add-ons. */ | ||
| 1209 | prom_printf("SunZilog: Inconsistent IRQ layout for Zilog %d.\n", | ||
| 1210 | chip); | ||
| 1211 | prom_halt(); | ||
| 1212 | } | 1050 | } |
| 1213 | 1051 | ||
| 1214 | return (struct zilog_layout __iomem *) mapped_addr; | 1052 | return 0; |
| 1215 | } | 1053 | } |
| 1216 | #endif /* !(CONFIG_SPARC64) */ | ||
| 1217 | 1054 | ||
| 1218 | /* Get the address of the registers for SunZilog instance CHIP. */ | 1055 | static void sunzilog_free_tables(void) |
| 1219 | static struct zilog_layout __iomem * __init get_zs(int chip, int node) | ||
| 1220 | { | 1056 | { |
| 1221 | if (chip < 0 || chip >= NUM_SUNZILOG) { | 1057 | kfree(sunzilog_port_table); |
| 1222 | prom_printf("SunZilog: Illegal chip number %d in get_zs.\n", chip); | 1058 | sunzilog_irq_chain = NULL; |
| 1223 | prom_halt(); | 1059 | kfree(sunzilog_chip_regs); |
| 1224 | } | ||
| 1225 | |||
| 1226 | #ifdef CONFIG_SPARC64 | ||
| 1227 | return get_zs_sun4u(chip, node); | ||
| 1228 | #else | ||
| 1229 | |||
| 1230 | if (sparc_cpu_model == sun4) { | ||
| 1231 | struct resource res; | ||
| 1232 | |||
| 1233 | /* Not probe-able, hard code it. */ | ||
| 1234 | switch (chip) { | ||
| 1235 | case 0: | ||
| 1236 | res.start = 0xf1000000; | ||
| 1237 | break; | ||
| 1238 | case 1: | ||
| 1239 | res.start = 0xf0000000; | ||
| 1240 | break; | ||
| 1241 | }; | ||
| 1242 | zilog_irq = 12; | ||
| 1243 | res.end = (res.start + (8 - 1)); | ||
| 1244 | res.flags = IORESOURCE_IO; | ||
| 1245 | return sbus_ioremap(&res, 0, 8, "SunZilog"); | ||
| 1246 | } | ||
| 1247 | |||
| 1248 | return get_zs_sun4cmd(chip, node); | ||
| 1249 | #endif | ||
| 1250 | } | 1060 | } |
| 1251 | 1061 | ||
| 1252 | #define ZS_PUT_CHAR_MAX_DELAY 2000 /* 10 ms */ | 1062 | #define ZS_PUT_CHAR_MAX_DELAY 2000 /* 10 ms */ |
| @@ -1260,7 +1070,7 @@ static void sunzilog_putchar(struct uart_port *port, int ch) | |||
| 1260 | * udelay with ZSDELAY as that is a NOP on some platforms. -DaveM | 1070 | * udelay with ZSDELAY as that is a NOP on some platforms. -DaveM |
| 1261 | */ | 1071 | */ |
| 1262 | do { | 1072 | do { |
| 1263 | unsigned char val = sbus_readb(&channel->control); | 1073 | unsigned char val = readb(&channel->control); |
| 1264 | if (val & Tx_BUF_EMP) { | 1074 | if (val & Tx_BUF_EMP) { |
| 1265 | ZSDELAY(); | 1075 | ZSDELAY(); |
| 1266 | break; | 1076 | break; |
| @@ -1268,7 +1078,7 @@ static void sunzilog_putchar(struct uart_port *port, int ch) | |||
| 1268 | udelay(5); | 1078 | udelay(5); |
| 1269 | } while (--loops); | 1079 | } while (--loops); |
| 1270 | 1080 | ||
| 1271 | sbus_writeb(ch, &channel->data); | 1081 | writeb(ch, &channel->data); |
| 1272 | ZSDELAY(); | 1082 | ZSDELAY(); |
| 1273 | ZS_WSYNC(channel); | 1083 | ZS_WSYNC(channel); |
| 1274 | } | 1084 | } |
| @@ -1385,28 +1195,6 @@ static struct console sunzilog_console = { | |||
| 1385 | .data = &sunzilog_reg, | 1195 | .data = &sunzilog_reg, |
| 1386 | }; | 1196 | }; |
| 1387 | 1197 | ||
| 1388 | static int __init sunzilog_console_init(void) | ||
| 1389 | { | ||
| 1390 | int i; | ||
| 1391 | |||
| 1392 | if (con_is_present()) | ||
| 1393 | return 0; | ||
| 1394 | |||
| 1395 | for (i = 0; i < NUM_CHANNELS; i++) { | ||
| 1396 | int this_minor = sunzilog_reg.minor + i; | ||
| 1397 | |||
| 1398 | if ((this_minor - 64) == (serial_console - 1)) | ||
| 1399 | break; | ||
| 1400 | } | ||
| 1401 | if (i == NUM_CHANNELS) | ||
| 1402 | return 0; | ||
| 1403 | |||
| 1404 | sunzilog_console.index = i; | ||
| 1405 | sunzilog_port_table[i].flags |= SUNZILOG_FLAG_IS_CONS; | ||
| 1406 | register_console(&sunzilog_console); | ||
| 1407 | return 0; | ||
| 1408 | } | ||
| 1409 | |||
| 1410 | static inline struct console *SUNZILOG_CONSOLE(void) | 1198 | static inline struct console *SUNZILOG_CONSOLE(void) |
| 1411 | { | 1199 | { |
| 1412 | int i; | 1200 | int i; |
| @@ -1431,101 +1219,8 @@ static inline struct console *SUNZILOG_CONSOLE(void) | |||
| 1431 | 1219 | ||
| 1432 | #else | 1220 | #else |
| 1433 | #define SUNZILOG_CONSOLE() (NULL) | 1221 | #define SUNZILOG_CONSOLE() (NULL) |
| 1434 | #define sunzilog_console_init() do { } while (0) | ||
| 1435 | #endif | 1222 | #endif |
| 1436 | 1223 | ||
| 1437 | /* | ||
| 1438 | * We scan the PROM tree recursively. This is the most reliable way | ||
| 1439 | * to find Zilog nodes on various platforms. However, we face an extreme | ||
| 1440 | * shortage of kernel stack, so we must be very careful. To that end, | ||
| 1441 | * we scan only to a certain depth, and we use a common property buffer | ||
| 1442 | * in the scan structure. | ||
| 1443 | */ | ||
| 1444 | #define ZS_PROPSIZE 128 | ||
| 1445 | #define ZS_SCAN_DEPTH 5 | ||
| 1446 | |||
| 1447 | struct zs_probe_scan { | ||
| 1448 | int depth; | ||
| 1449 | void (*scanner)(struct zs_probe_scan *t, int node); | ||
| 1450 | |||
| 1451 | int devices; | ||
| 1452 | char prop[ZS_PROPSIZE]; | ||
| 1453 | }; | ||
| 1454 | |||
| 1455 | static int __inline__ sunzilog_node_ok(int node, const char *name, int len) | ||
| 1456 | { | ||
| 1457 | if (strncmp(name, "zs", len) == 0) | ||
| 1458 | return 1; | ||
| 1459 | /* Don't fold this procedure just yet. Compare to su_node_ok(). */ | ||
| 1460 | return 0; | ||
| 1461 | } | ||
| 1462 | |||
| 1463 | static void __init sunzilog_scan(struct zs_probe_scan *t, int node) | ||
| 1464 | { | ||
| 1465 | int len; | ||
| 1466 | |||
| 1467 | for (; node != 0; node = prom_getsibling(node)) { | ||
| 1468 | len = prom_getproperty(node, "name", t->prop, ZS_PROPSIZE); | ||
| 1469 | if (len <= 1) | ||
| 1470 | continue; /* Broken PROM node */ | ||
| 1471 | if (sunzilog_node_ok(node, t->prop, len)) { | ||
| 1472 | (*t->scanner)(t, node); | ||
| 1473 | } else { | ||
| 1474 | if (t->depth < ZS_SCAN_DEPTH) { | ||
| 1475 | t->depth++; | ||
| 1476 | sunzilog_scan(t, prom_getchild(node)); | ||
| 1477 | --t->depth; | ||
| 1478 | } | ||
| 1479 | } | ||
| 1480 | } | ||
| 1481 | } | ||
| 1482 | |||
| 1483 | static void __init sunzilog_prepare(void) | ||
| 1484 | { | ||
| 1485 | struct uart_sunzilog_port *up; | ||
| 1486 | struct zilog_layout __iomem *rp; | ||
| 1487 | int channel, chip; | ||
| 1488 | |||
| 1489 | /* | ||
| 1490 | * Temporary fix. | ||
| 1491 | */ | ||
| 1492 | for (channel = 0; channel < NUM_CHANNELS; channel++) | ||
| 1493 | spin_lock_init(&sunzilog_port_table[channel].port.lock); | ||
| 1494 | |||
| 1495 | sunzilog_irq_chain = up = &sunzilog_port_table[0]; | ||
| 1496 | for (channel = 0; channel < NUM_CHANNELS - 1; channel++) | ||
| 1497 | up[channel].next = &up[channel + 1]; | ||
| 1498 | up[channel].next = NULL; | ||
| 1499 | |||
| 1500 | for (chip = 0; chip < NUM_SUNZILOG; chip++) { | ||
| 1501 | rp = sunzilog_chip_regs[chip]; | ||
| 1502 | up[(chip * 2) + 0].port.membase = (void __iomem *)&rp->channelA; | ||
| 1503 | up[(chip * 2) + 1].port.membase = (void __iomem *)&rp->channelB; | ||
| 1504 | |||
| 1505 | /* Channel A */ | ||
| 1506 | up[(chip * 2) + 0].port.iotype = UPIO_MEM; | ||
| 1507 | up[(chip * 2) + 0].port.irq = zilog_irq; | ||
| 1508 | up[(chip * 2) + 0].port.uartclk = ZS_CLOCK; | ||
| 1509 | up[(chip * 2) + 0].port.fifosize = 1; | ||
| 1510 | up[(chip * 2) + 0].port.ops = &sunzilog_pops; | ||
| 1511 | up[(chip * 2) + 0].port.type = PORT_SUNZILOG; | ||
| 1512 | up[(chip * 2) + 0].port.flags = 0; | ||
| 1513 | up[(chip * 2) + 0].port.line = (chip * 2) + 0; | ||
| 1514 | up[(chip * 2) + 0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A; | ||
| 1515 | |||
| 1516 | /* Channel B */ | ||
| 1517 | up[(chip * 2) + 1].port.iotype = UPIO_MEM; | ||
| 1518 | up[(chip * 2) + 1].port.irq = zilog_irq; | ||
| 1519 | up[(chip * 2) + 1].port.uartclk = ZS_CLOCK; | ||
| 1520 | up[(chip * 2) + 1].port.fifosize = 1; | ||
| 1521 | up[(chip * 2) + 1].port.ops = &sunzilog_pops; | ||
| 1522 | up[(chip * 2) + 1].port.type = PORT_SUNZILOG; | ||
| 1523 | up[(chip * 2) + 1].port.flags = 0; | ||
| 1524 | up[(chip * 2) + 1].port.line = (chip * 2) + 1; | ||
| 1525 | up[(chip * 2) + 1].flags |= 0; | ||
| 1526 | } | ||
| 1527 | } | ||
| 1528 | |||
| 1529 | static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel) | 1224 | static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel) |
| 1530 | { | 1225 | { |
| 1531 | int baud, brg; | 1226 | int baud, brg; |
| @@ -1539,8 +1234,6 @@ static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channe | |||
| 1539 | up->cflag = B4800 | CS8 | CLOCAL | CREAD; | 1234 | up->cflag = B4800 | CS8 | CLOCAL | CREAD; |
| 1540 | baud = 4800; | 1235 | baud = 4800; |
| 1541 | } | 1236 | } |
| 1542 | printk(KERN_INFO "zs%d at 0x%p (irq = %d) is a SunZilog\n", | ||
| 1543 | channel, up->port.membase, zilog_irq); | ||
| 1544 | 1237 | ||
| 1545 | up->curregs[R15] = BRKIE; | 1238 | up->curregs[R15] = BRKIE; |
| 1546 | brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); | 1239 | brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); |
| @@ -1552,216 +1245,268 @@ static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channe | |||
| 1552 | #ifdef CONFIG_SERIO | 1245 | #ifdef CONFIG_SERIO |
| 1553 | static void __init sunzilog_register_serio(struct uart_sunzilog_port *up, int channel) | 1246 | static void __init sunzilog_register_serio(struct uart_sunzilog_port *up, int channel) |
| 1554 | { | 1247 | { |
| 1555 | struct serio *serio; | 1248 | struct serio *serio = &up->serio; |
| 1556 | |||
| 1557 | up->serio = serio = kmalloc(sizeof(struct serio), GFP_KERNEL); | ||
| 1558 | if (serio) { | ||
| 1559 | memset(serio, 0, sizeof(*serio)); | ||
| 1560 | |||
| 1561 | serio->port_data = up; | ||
| 1562 | |||
| 1563 | serio->id.type = SERIO_RS232; | ||
| 1564 | if (channel == KEYBOARD_LINE) { | ||
| 1565 | serio->id.proto = SERIO_SUNKBD; | ||
| 1566 | strlcpy(serio->name, "zskbd", sizeof(serio->name)); | ||
| 1567 | } else { | ||
| 1568 | serio->id.proto = SERIO_SUN; | ||
| 1569 | serio->id.extra = 1; | ||
| 1570 | strlcpy(serio->name, "zsms", sizeof(serio->name)); | ||
| 1571 | } | ||
| 1572 | strlcpy(serio->phys, | ||
| 1573 | (channel == KEYBOARD_LINE ? "zs/serio0" : "zs/serio1"), | ||
| 1574 | sizeof(serio->phys)); | ||
| 1575 | 1249 | ||
| 1576 | serio->write = sunzilog_serio_write; | 1250 | serio->port_data = up; |
| 1577 | serio->open = sunzilog_serio_open; | ||
| 1578 | serio->close = sunzilog_serio_close; | ||
| 1579 | 1251 | ||
| 1580 | serio_register_port(serio); | 1252 | serio->id.type = SERIO_RS232; |
| 1253 | if (channel == KEYBOARD_LINE) { | ||
| 1254 | serio->id.proto = SERIO_SUNKBD; | ||
| 1255 | strlcpy(serio->name, "zskbd", sizeof(serio->name)); | ||
| 1581 | } else { | 1256 | } else { |
| 1582 | printk(KERN_WARNING "zs%d: not enough memory for serio port\n", | 1257 | serio->id.proto = SERIO_SUN; |
| 1583 | channel); | 1258 | serio->id.extra = 1; |
| 1259 | strlcpy(serio->name, "zsms", sizeof(serio->name)); | ||
| 1584 | } | 1260 | } |
| 1261 | strlcpy(serio->phys, | ||
| 1262 | (channel == KEYBOARD_LINE ? "zs/serio0" : "zs/serio1"), | ||
| 1263 | sizeof(serio->phys)); | ||
| 1264 | |||
| 1265 | serio->write = sunzilog_serio_write; | ||
| 1266 | serio->open = sunzilog_serio_open; | ||
| 1267 | serio->close = sunzilog_serio_close; | ||
| 1268 | serio->dev.parent = up->port.dev; | ||
| 1269 | |||
| 1270 | serio_register_port(serio); | ||
| 1585 | } | 1271 | } |
| 1586 | #endif | 1272 | #endif |
| 1587 | 1273 | ||
| 1588 | static void __init sunzilog_init_hw(void) | 1274 | static void __init sunzilog_init_hw(struct uart_sunzilog_port *up) |
| 1589 | { | 1275 | { |
| 1590 | int i; | 1276 | struct zilog_channel __iomem *channel; |
| 1591 | 1277 | unsigned long flags; | |
| 1592 | for (i = 0; i < NUM_CHANNELS; i++) { | 1278 | int baud, brg; |
| 1593 | struct uart_sunzilog_port *up = &sunzilog_port_table[i]; | ||
| 1594 | struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(&up->port); | ||
| 1595 | unsigned long flags; | ||
| 1596 | int baud, brg; | ||
| 1597 | 1279 | ||
| 1598 | spin_lock_irqsave(&up->port.lock, flags); | 1280 | channel = ZILOG_CHANNEL_FROM_PORT(&up->port); |
| 1599 | 1281 | ||
| 1600 | if (ZS_IS_CHANNEL_A(up)) { | 1282 | spin_lock_irqsave(&up->port.lock, flags); |
| 1601 | write_zsreg(channel, R9, FHWRES); | 1283 | if (ZS_IS_CHANNEL_A(up)) { |
| 1602 | ZSDELAY_LONG(); | 1284 | write_zsreg(channel, R9, FHWRES); |
| 1603 | (void) read_zsreg(channel, R0); | 1285 | ZSDELAY_LONG(); |
| 1604 | } | 1286 | (void) read_zsreg(channel, R0); |
| 1287 | } | ||
| 1605 | 1288 | ||
| 1606 | if (i == KEYBOARD_LINE || i == MOUSE_LINE) { | 1289 | if (up->port.line == KEYBOARD_LINE || |
| 1607 | sunzilog_init_kbdms(up, i); | 1290 | up->port.line == MOUSE_LINE) { |
| 1608 | up->curregs[R9] |= (NV | MIE); | 1291 | sunzilog_init_kbdms(up, up->port.line); |
| 1609 | write_zsreg(channel, R9, up->curregs[R9]); | 1292 | up->curregs[R9] |= (NV | MIE); |
| 1610 | } else { | 1293 | write_zsreg(channel, R9, up->curregs[R9]); |
| 1611 | /* Normal serial TTY. */ | 1294 | } else { |
| 1612 | up->parity_mask = 0xff; | 1295 | /* Normal serial TTY. */ |
| 1613 | up->curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB; | 1296 | up->parity_mask = 0xff; |
| 1614 | up->curregs[R4] = PAR_EVEN | X16CLK | SB1; | 1297 | up->curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB; |
| 1615 | up->curregs[R3] = RxENAB | Rx8; | 1298 | up->curregs[R4] = PAR_EVEN | X16CLK | SB1; |
| 1616 | up->curregs[R5] = TxENAB | Tx8; | 1299 | up->curregs[R3] = RxENAB | Rx8; |
| 1617 | up->curregs[R9] = NV | MIE; | 1300 | up->curregs[R5] = TxENAB | Tx8; |
| 1618 | up->curregs[R10] = NRZ; | 1301 | up->curregs[R9] = NV | MIE; |
| 1619 | up->curregs[R11] = TCBR | RCBR; | 1302 | up->curregs[R10] = NRZ; |
| 1620 | baud = 9600; | 1303 | up->curregs[R11] = TCBR | RCBR; |
| 1621 | brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); | 1304 | baud = 9600; |
| 1622 | up->curregs[R12] = (brg & 0xff); | 1305 | brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); |
| 1623 | up->curregs[R13] = (brg >> 8) & 0xff; | 1306 | up->curregs[R12] = (brg & 0xff); |
| 1624 | up->curregs[R14] = BRSRC | BRENAB; | 1307 | up->curregs[R13] = (brg >> 8) & 0xff; |
| 1625 | __load_zsregs(channel, up->curregs); | 1308 | up->curregs[R14] = BRSRC | BRENAB; |
| 1626 | write_zsreg(channel, R9, up->curregs[R9]); | 1309 | __load_zsregs(channel, up->curregs); |
| 1627 | } | 1310 | write_zsreg(channel, R9, up->curregs[R9]); |
| 1311 | } | ||
| 1628 | 1312 | ||
| 1629 | spin_unlock_irqrestore(&up->port.lock, flags); | 1313 | spin_unlock_irqrestore(&up->port.lock, flags); |
| 1630 | 1314 | ||
| 1631 | #ifdef CONFIG_SERIO | 1315 | #ifdef CONFIG_SERIO |
| 1632 | if (i == KEYBOARD_LINE || i == MOUSE_LINE) | 1316 | if (up->port.line == KEYBOARD_LINE || up->port.line == MOUSE_LINE) |
| 1633 | sunzilog_register_serio(up, i); | 1317 | sunzilog_register_serio(up, up->port.line); |
| 1634 | #endif | 1318 | #endif |
| 1635 | } | ||
| 1636 | } | ||
| 1637 | |||
| 1638 | static struct zilog_layout __iomem * __init get_zs(int chip, int node); | ||
| 1639 | |||
| 1640 | static void __init sunzilog_scan_probe(struct zs_probe_scan *t, int node) | ||
| 1641 | { | ||
| 1642 | sunzilog_chip_regs[t->devices] = get_zs(t->devices, node); | ||
| 1643 | t->devices++; | ||
| 1644 | } | 1319 | } |
| 1645 | 1320 | ||
| 1646 | static int __init sunzilog_ports_init(void) | 1321 | static int __devinit zs_get_instance(struct device_node *dp) |
| 1647 | { | 1322 | { |
| 1648 | struct zs_probe_scan scan; | ||
| 1649 | int ret; | 1323 | int ret; |
| 1650 | int uart_count; | ||
| 1651 | int i; | ||
| 1652 | |||
| 1653 | printk(KERN_DEBUG "SunZilog: %d chips.\n", NUM_SUNZILOG); | ||
| 1654 | |||
| 1655 | scan.scanner = sunzilog_scan_probe; | ||
| 1656 | scan.depth = 0; | ||
| 1657 | scan.devices = 0; | ||
| 1658 | sunzilog_scan(&scan, prom_getchild(prom_root_node)); | ||
| 1659 | |||
| 1660 | sunzilog_prepare(); | ||
| 1661 | 1324 | ||
| 1662 | if (request_irq(zilog_irq, sunzilog_interrupt, SA_SHIRQ, | 1325 | ret = of_getintprop_default(dp, "slave", -1); |
| 1663 | "SunZilog", sunzilog_irq_chain)) { | 1326 | if (ret != -1) |
| 1664 | prom_printf("SunZilog: Unable to register zs interrupt handler.\n"); | 1327 | return ret; |
| 1665 | prom_halt(); | ||
| 1666 | } | ||
| 1667 | 1328 | ||
| 1668 | sunzilog_init_hw(); | 1329 | if (of_find_property(dp, "keyboard", NULL)) |
| 1330 | ret = 1; | ||
| 1331 | else | ||
| 1332 | ret = 0; | ||
| 1669 | 1333 | ||
| 1670 | /* We can only init this once we have probed the Zilogs | 1334 | return ret; |
| 1671 | * in the system. Do not count channels assigned to keyboards | 1335 | } |
| 1672 | * or mice when we are deciding how many ports to register. | ||
| 1673 | */ | ||
| 1674 | uart_count = 0; | ||
| 1675 | for (i = 0; i < NUM_CHANNELS; i++) { | ||
| 1676 | struct uart_sunzilog_port *up = &sunzilog_port_table[i]; | ||
| 1677 | 1336 | ||
| 1678 | if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) | 1337 | static int zilog_irq = -1; |
| 1679 | continue; | ||
| 1680 | 1338 | ||
| 1681 | uart_count++; | 1339 | static int __devinit zs_probe(struct of_device *dev, const struct of_device_id *match) |
| 1682 | } | 1340 | { |
| 1683 | 1341 | struct of_device *op = to_of_device(&dev->dev); | |
| 1684 | sunzilog_reg.nr = uart_count; | 1342 | struct uart_sunzilog_port *up; |
| 1685 | sunzilog_reg.minor = sunserial_current_minor; | 1343 | struct zilog_layout __iomem *rp; |
| 1344 | int inst = zs_get_instance(dev->node); | ||
| 1345 | int err; | ||
| 1686 | 1346 | ||
| 1687 | ret = uart_register_driver(&sunzilog_reg); | 1347 | sunzilog_chip_regs[inst] = of_ioremap(&op->resource[0], 0, |
| 1688 | if (ret == 0) { | 1348 | sizeof(struct zilog_layout), |
| 1689 | sunzilog_reg.tty_driver->name_base = sunzilog_reg.minor - 64; | 1349 | "zs"); |
| 1690 | sunzilog_reg.cons = SUNZILOG_CONSOLE(); | 1350 | if (!sunzilog_chip_regs[inst]) |
| 1351 | return -ENOMEM; | ||
| 1691 | 1352 | ||
| 1692 | sunserial_current_minor += uart_count; | 1353 | rp = sunzilog_chip_regs[inst]; |
| 1693 | 1354 | ||
| 1694 | for (i = 0; i < NUM_CHANNELS; i++) { | 1355 | if (zilog_irq == -1) { |
| 1695 | struct uart_sunzilog_port *up = &sunzilog_port_table[i]; | 1356 | zilog_irq = op->irqs[0]; |
| 1357 | err = request_irq(zilog_irq, sunzilog_interrupt, SA_SHIRQ, | ||
| 1358 | "zs", sunzilog_irq_chain); | ||
| 1359 | if (err) { | ||
| 1360 | of_iounmap(rp, sizeof(struct zilog_layout)); | ||
| 1696 | 1361 | ||
| 1697 | if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) | 1362 | return err; |
| 1698 | continue; | 1363 | } |
| 1364 | } | ||
| 1699 | 1365 | ||
| 1700 | if (uart_add_one_port(&sunzilog_reg, &up->port)) { | 1366 | up = &sunzilog_port_table[inst * 2]; |
| 1701 | printk(KERN_ERR | 1367 | |
| 1702 | "SunZilog: failed to add port zs%d\n", i); | 1368 | /* Channel A */ |
| 1703 | } | 1369 | up[0].port.mapbase = op->resource[0].start + 0x00; |
| 1370 | up[0].port.membase = (void __iomem *) &rp->channelA; | ||
| 1371 | up[0].port.iotype = UPIO_MEM; | ||
| 1372 | up[0].port.irq = op->irqs[0]; | ||
| 1373 | up[0].port.uartclk = ZS_CLOCK; | ||
| 1374 | up[0].port.fifosize = 1; | ||
| 1375 | up[0].port.ops = &sunzilog_pops; | ||
| 1376 | up[0].port.type = PORT_SUNZILOG; | ||
| 1377 | up[0].port.flags = 0; | ||
| 1378 | up[0].port.line = (inst * 2) + 0; | ||
| 1379 | up[0].port.dev = &op->dev; | ||
| 1380 | up[0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A; | ||
| 1381 | if (inst == 1) | ||
| 1382 | up[0].flags |= SUNZILOG_FLAG_CONS_KEYB; | ||
| 1383 | sunzilog_init_hw(&up[0]); | ||
| 1384 | |||
| 1385 | /* Channel B */ | ||
| 1386 | up[1].port.mapbase = op->resource[0].start + 0x04; | ||
| 1387 | up[1].port.membase = (void __iomem *) &rp->channelB; | ||
| 1388 | up[1].port.iotype = UPIO_MEM; | ||
| 1389 | up[1].port.irq = op->irqs[0]; | ||
| 1390 | up[1].port.uartclk = ZS_CLOCK; | ||
| 1391 | up[1].port.fifosize = 1; | ||
| 1392 | up[1].port.ops = &sunzilog_pops; | ||
| 1393 | up[1].port.type = PORT_SUNZILOG; | ||
| 1394 | up[1].port.flags = 0; | ||
| 1395 | up[1].port.line = (inst * 2) + 1; | ||
| 1396 | up[1].port.dev = &op->dev; | ||
| 1397 | up[1].flags |= 0; | ||
| 1398 | if (inst == 1) | ||
| 1399 | up[1].flags |= SUNZILOG_FLAG_CONS_MOUSE; | ||
| 1400 | sunzilog_init_hw(&up[1]); | ||
| 1401 | |||
| 1402 | if (inst != 1) { | ||
| 1403 | err = uart_add_one_port(&sunzilog_reg, &up[0].port); | ||
| 1404 | if (err) { | ||
| 1405 | of_iounmap(rp, sizeof(struct zilog_layout)); | ||
| 1406 | return err; | ||
| 1407 | } | ||
| 1408 | err = uart_add_one_port(&sunzilog_reg, &up[1].port); | ||
| 1409 | if (err) { | ||
| 1410 | uart_remove_one_port(&sunzilog_reg, &up[0].port); | ||
| 1411 | of_iounmap(rp, sizeof(struct zilog_layout)); | ||
| 1412 | return err; | ||
| 1704 | } | 1413 | } |
| 1705 | } | 1414 | } |
| 1706 | 1415 | ||
| 1707 | return ret; | 1416 | dev_set_drvdata(&dev->dev, &up[0]); |
| 1417 | |||
| 1418 | return 0; | ||
| 1708 | } | 1419 | } |
| 1709 | 1420 | ||
| 1710 | static void __init sunzilog_scan_count(struct zs_probe_scan *t, int node) | 1421 | static void __devexit zs_remove_one(struct uart_sunzilog_port *up) |
| 1711 | { | 1422 | { |
| 1712 | t->devices++; | 1423 | if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) { |
| 1424 | #ifdef CONFIG_SERIO | ||
| 1425 | serio_unregister_port(&up->serio); | ||
| 1426 | #endif | ||
| 1427 | } else | ||
| 1428 | uart_remove_one_port(&sunzilog_reg, &up->port); | ||
| 1713 | } | 1429 | } |
| 1714 | 1430 | ||
| 1715 | static int __init sunzilog_ports_count(void) | 1431 | static int __devexit zs_remove(struct of_device *dev) |
| 1716 | { | 1432 | { |
| 1717 | struct zs_probe_scan scan; | 1433 | struct uart_sunzilog_port *up = dev_get_drvdata(&dev->dev); |
| 1434 | struct zilog_layout __iomem *regs; | ||
| 1718 | 1435 | ||
| 1719 | /* Sun4 Zilog setup is hard coded, no probing to do. */ | 1436 | zs_remove_one(&up[0]); |
| 1720 | if (sparc_cpu_model == sun4) | 1437 | zs_remove_one(&up[1]); |
| 1721 | return 2; | ||
| 1722 | 1438 | ||
| 1723 | scan.scanner = sunzilog_scan_count; | 1439 | regs = sunzilog_chip_regs[up[0].port.line / 2]; |
| 1724 | scan.depth = 0; | 1440 | of_iounmap(regs, sizeof(struct zilog_layout)); |
| 1725 | scan.devices = 0; | ||
| 1726 | 1441 | ||
| 1727 | sunzilog_scan(&scan, prom_getchild(prom_root_node)); | 1442 | dev_set_drvdata(&dev->dev, NULL); |
| 1728 | 1443 | ||
| 1729 | return scan.devices; | 1444 | return 0; |
| 1730 | } | 1445 | } |
| 1731 | 1446 | ||
| 1447 | static struct of_device_id zs_match[] = { | ||
| 1448 | { | ||
| 1449 | .name = "zs", | ||
| 1450 | }, | ||
| 1451 | {}, | ||
| 1452 | }; | ||
| 1453 | MODULE_DEVICE_TABLE(of, zs_match); | ||
| 1454 | |||
| 1455 | static struct of_platform_driver zs_driver = { | ||
| 1456 | .name = "zs", | ||
| 1457 | .match_table = zs_match, | ||
| 1458 | .probe = zs_probe, | ||
| 1459 | .remove = __devexit_p(zs_remove), | ||
| 1460 | }; | ||
| 1461 | |||
| 1732 | static int __init sunzilog_init(void) | 1462 | static int __init sunzilog_init(void) |
| 1733 | { | 1463 | { |
| 1464 | struct device_node *dp; | ||
| 1465 | int err; | ||
| 1734 | 1466 | ||
| 1735 | NUM_SUNZILOG = sunzilog_ports_count(); | 1467 | NUM_SUNZILOG = 0; |
| 1736 | if (NUM_SUNZILOG == 0) | 1468 | for_each_node_by_name(dp, "zs") |
| 1737 | return -ENODEV; | 1469 | NUM_SUNZILOG++; |
| 1738 | 1470 | ||
| 1739 | sunzilog_alloc_tables(); | 1471 | if (NUM_SUNZILOG) { |
| 1472 | int uart_count; | ||
| 1740 | 1473 | ||
| 1741 | sunzilog_ports_init(); | 1474 | err = sunzilog_alloc_tables(); |
| 1475 | if (err) | ||
| 1476 | return err; | ||
| 1742 | 1477 | ||
| 1743 | return 0; | 1478 | /* Subtract 1 for keyboard, 1 for mouse. */ |
| 1479 | uart_count = (NUM_SUNZILOG * 2) - 2; | ||
| 1480 | |||
| 1481 | sunzilog_reg.nr = uart_count; | ||
| 1482 | sunzilog_reg.minor = sunserial_current_minor; | ||
| 1483 | err = uart_register_driver(&sunzilog_reg); | ||
| 1484 | if (err) { | ||
| 1485 | sunzilog_free_tables(); | ||
| 1486 | return err; | ||
| 1487 | } | ||
| 1488 | sunzilog_reg.tty_driver->name_base = sunzilog_reg.minor - 64; | ||
| 1489 | sunzilog_reg.cons = SUNZILOG_CONSOLE(); | ||
| 1490 | |||
| 1491 | sunserial_current_minor += uart_count; | ||
| 1492 | } | ||
| 1493 | |||
| 1494 | return of_register_driver(&zs_driver, &of_bus_type); | ||
| 1744 | } | 1495 | } |
| 1745 | 1496 | ||
| 1746 | static void __exit sunzilog_exit(void) | 1497 | static void __exit sunzilog_exit(void) |
| 1747 | { | 1498 | { |
| 1748 | int i; | 1499 | of_unregister_driver(&zs_driver); |
| 1749 | 1500 | ||
| 1750 | for (i = 0; i < NUM_CHANNELS; i++) { | 1501 | if (zilog_irq != -1) { |
| 1751 | struct uart_sunzilog_port *up = &sunzilog_port_table[i]; | 1502 | free_irq(zilog_irq, sunzilog_irq_chain); |
| 1752 | 1503 | zilog_irq = -1; | |
| 1753 | if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) { | ||
| 1754 | #ifdef CONFIG_SERIO | ||
| 1755 | if (up->serio) { | ||
| 1756 | serio_unregister_port(up->serio); | ||
| 1757 | up->serio = NULL; | ||
| 1758 | } | ||
| 1759 | #endif | ||
| 1760 | } else | ||
| 1761 | uart_remove_one_port(&sunzilog_reg, &up->port); | ||
| 1762 | } | 1504 | } |
| 1763 | 1505 | ||
| 1764 | uart_unregister_driver(&sunzilog_reg); | 1506 | if (NUM_SUNZILOG) { |
| 1507 | uart_unregister_driver(&sunzilog_reg); | ||
| 1508 | sunzilog_free_tables(); | ||
| 1509 | } | ||
| 1765 | } | 1510 | } |
| 1766 | 1511 | ||
| 1767 | module_init(sunzilog_init); | 1512 | module_init(sunzilog_init); |
| @@ -1769,4 +1514,5 @@ module_exit(sunzilog_exit); | |||
| 1769 | 1514 | ||
| 1770 | MODULE_AUTHOR("David S. Miller"); | 1515 | MODULE_AUTHOR("David S. Miller"); |
| 1771 | MODULE_DESCRIPTION("Sun Zilog serial port driver"); | 1516 | MODULE_DESCRIPTION("Sun Zilog serial port driver"); |
| 1517 | MODULE_VERSION("2.0"); | ||
| 1772 | MODULE_LICENSE("GPL"); | 1518 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c index 017571ffa19c..e93d0edc2e08 100644 --- a/drivers/serial/vr41xx_siu.c +++ b/drivers/serial/vr41xx_siu.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * along with this program; if not, write to the Free Software | 19 | * along with this program; if not, write to the Free Software |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 23 | #if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 25 | #define SUPPORT_SYSRQ | 24 | #define SUPPORT_SYSRQ |
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index ed946311d3a4..0040f10c9e39 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Pat Gefre <pfg@sgi.com> - IOC3 serial port IRQ demuxer | 7 | * Pat Gefre <pfg@sgi.com> - IOC3 serial port IRQ demuxer |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index dd2f950b21a7..a23862ef72b2 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
| 22 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c index a006a1ee27ac..39d9b20f2038 100644 --- a/drivers/spi/spi_butterfly.c +++ b/drivers/spi/spi_butterfly.c | |||
| @@ -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., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/tc/lk201.c b/drivers/tc/lk201.c index cf10d5cdfb93..757dec9c7ee9 100644 --- a/drivers/tc/lk201.c +++ b/drivers/tc/lk201.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 2001, 2002, 2003, 2004 Maciej W. Rozycki | 8 | * Copyright (C) 2001, 2002, 2003, 2004 Maciej W. Rozycki |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 7f27b356eaf7..93bc90b8ff92 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | * is shared with DSRS(DTE) at pin 23. | 39 | * is shared with DSRS(DTE) at pin 23. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/errno.h> | 42 | #include <linux/errno.h> |
| 44 | #include <linux/signal.h> | 43 | #include <linux/signal.h> |
| 45 | #include <linux/sched.h> | 44 | #include <linux/sched.h> |
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c index ad742cec94fa..f4f4ef0f377a 100644 --- a/drivers/usb/core/buffer.c +++ b/drivers/usb/core/buffer.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * and should work with all USB controllers, regardles of bus type. | 5 | * and should work with all USB controllers, regardles of bus type. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index a9d89c78cc20..4c9e63e665b6 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/usb.h> | 1 | #include <linux/usb.h> |
| 3 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index bcbeaf7101d1..f7bdd94b3aa8 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/usbdevice_fs.h> | 47 | #include <linux/usbdevice_fs.h> |
| 48 | #include <linux/cdev.h> | 48 | #include <linux/cdev.h> |
| 49 | #include <linux/notifier.h> | 49 | #include <linux/notifier.h> |
| 50 | #include <linux/security.h> | ||
| 50 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
| 51 | #include <asm/byteorder.h> | 52 | #include <asm/byteorder.h> |
| 52 | #include <linux/moduleparam.h> | 53 | #include <linux/moduleparam.h> |
| @@ -68,6 +69,7 @@ struct async { | |||
| 68 | void __user *userbuffer; | 69 | void __user *userbuffer; |
| 69 | void __user *userurb; | 70 | void __user *userurb; |
| 70 | struct urb *urb; | 71 | struct urb *urb; |
| 72 | u32 secid; | ||
| 71 | }; | 73 | }; |
| 72 | 74 | ||
| 73 | static int usbfs_snoop = 0; | 75 | static int usbfs_snoop = 0; |
| @@ -312,7 +314,7 @@ static void async_completed(struct urb *urb, struct pt_regs *regs) | |||
| 312 | sinfo.si_code = SI_ASYNCIO; | 314 | sinfo.si_code = SI_ASYNCIO; |
| 313 | sinfo.si_addr = as->userurb; | 315 | sinfo.si_addr = as->userurb; |
| 314 | kill_proc_info_as_uid(as->signr, &sinfo, as->pid, as->uid, | 316 | kill_proc_info_as_uid(as->signr, &sinfo, as->pid, as->uid, |
| 315 | as->euid); | 317 | as->euid, as->secid); |
| 316 | } | 318 | } |
| 317 | snoop(&urb->dev->dev, "urb complete\n"); | 319 | snoop(&urb->dev->dev, "urb complete\n"); |
| 318 | snoop_urb(urb, as->userurb); | 320 | snoop_urb(urb, as->userurb); |
| @@ -572,6 +574,7 @@ static int usbdev_open(struct inode *inode, struct file *file) | |||
| 572 | ps->disc_euid = current->euid; | 574 | ps->disc_euid = current->euid; |
| 573 | ps->disccontext = NULL; | 575 | ps->disccontext = NULL; |
| 574 | ps->ifclaimed = 0; | 576 | ps->ifclaimed = 0; |
| 577 | security_task_getsecid(current, &ps->secid); | ||
| 575 | wmb(); | 578 | wmb(); |
| 576 | list_add_tail(&ps->list, &dev->filelist); | 579 | list_add_tail(&ps->list, &dev->filelist); |
| 577 | file->private_data = ps; | 580 | file->private_data = ps; |
| @@ -1053,6 +1056,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, | |||
| 1053 | as->pid = current->pid; | 1056 | as->pid = current->pid; |
| 1054 | as->uid = current->uid; | 1057 | as->uid = current->uid; |
| 1055 | as->euid = current->euid; | 1058 | as->euid = current->euid; |
| 1059 | security_task_getsecid(current, &as->secid); | ||
| 1056 | if (!(uurb->endpoint & USB_DIR_IN)) { | 1060 | if (!(uurb->endpoint & USB_DIR_IN)) { |
| 1057 | if (copy_from_user(as->urb->transfer_buffer, uurb->buffer, as->urb->transfer_buffer_length)) { | 1061 | if (copy_from_user(as->urb->transfer_buffer, uurb->buffer, as->urb->transfer_buffer_length)) { |
| 1058 | free_async(as); | 1062 | free_async(as); |
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index c196f3845305..ec8906501415 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 26 | #include <linux/usb.h> | 25 | #include <linux/usb.h> |
| 27 | #include "hcd.h" | 26 | #include "hcd.h" |
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index f65b193cde3d..abee0f5b6a66 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 66b78404ab34..9d16716d166e 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 16 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 4bf914d00a14..fb4d058bbde0 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/version.h> | 26 | #include <linux/version.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index e1731ff8af4d..875596e98e42 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index bfc9b28a7242..e47e3a8ed6e4 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | /*****************************************************************************/ | 28 | /*****************************************************************************/ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/fs.h> | 31 | #include <linux/fs.h> |
| 33 | #include <linux/mount.h> | 32 | #include <linux/mount.h> |
| @@ -700,7 +699,7 @@ static void usbfs_remove_device(struct usb_device *dev) | |||
| 700 | sinfo.si_errno = EPIPE; | 699 | sinfo.si_errno = EPIPE; |
| 701 | sinfo.si_code = SI_ASYNCIO; | 700 | sinfo.si_code = SI_ASYNCIO; |
| 702 | sinfo.si_addr = ds->disccontext; | 701 | sinfo.si_addr = ds->disccontext; |
| 703 | kill_proc_info_as_uid(ds->discsignr, &sinfo, ds->disc_pid, ds->disc_uid, ds->disc_euid); | 702 | kill_proc_info_as_uid(ds->discsignr, &sinfo, ds->disc_pid, ds->disc_uid, ds->disc_euid, ds->secid); |
| 704 | } | 703 | } |
| 705 | } | 704 | } |
| 706 | } | 705 | } |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 8569600f3130..4cc8d3e67db7 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * message.c - synchronous message handling | 2 | * message.c - synchronous message handling |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/pci.h> /* for scatterlist macros */ | 5 | #include <linux/pci.h> /* for scatterlist macros */ |
| 7 | #include <linux/usb.h> | 6 | #include <linux/usb.h> |
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c index fe0ed54fa0ae..b042676af0a5 100644 --- a/drivers/usb/core/notify.c +++ b/drivers/usb/core/notify.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/notifier.h> | 13 | #include <linux/notifier.h> |
| 15 | #include <linux/usb.h> | 14 | #include <linux/usb.h> |
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index 3f49bf51cff7..dec973affb0f 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/usb.h> | 14 | #include <linux/usb.h> |
| 16 | #include "usb.h" | 15 | #include "usb.h" |
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index dad4d8fd8180..9864988377c7 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/string.h> | 2 | #include <linux/string.h> |
| 4 | #include <linux/bitops.h> | 3 | #include <linux/bitops.h> |
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index fb488c8a860c..184c24660a4c 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * are evil. | 21 | * are evil. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 27 | #include <linux/bitops.h> | 26 | #include <linux/bitops.h> |
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 7a650c763a62..49f69236b420 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h | |||
| @@ -80,6 +80,7 @@ struct dev_state { | |||
| 80 | uid_t disc_uid, disc_euid; | 80 | uid_t disc_uid, disc_euid; |
| 81 | void __user *disccontext; | 81 | void __user *disccontext; |
| 82 | unsigned long ifclaimed; | 82 | unsigned long ifclaimed; |
| 83 | u32 secid; | ||
| 83 | }; | 84 | }; |
| 84 | 85 | ||
| 85 | /* internal notify stuff */ | 86 | /* internal notify stuff */ |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index b8d0b7825bf3..acb3c3d2e888 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #undef VERBOSE | 25 | #undef VERBOSE |
| 26 | #undef PACKET_TRACE | 26 | #undef PACKET_TRACE |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 42ce41d71b7f..4be47195bd38 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | #define DEBUG | 37 | #define DEBUG |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 42 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 078daa026718..8320fcef0425 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | // #define DEBUG 1 | 23 | // #define DEBUG 1 |
| 24 | // #define VERBOSE | 24 | // #define VERBOSE |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index a43dc908ac59..b1a9cf06f3e6 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c | |||
| @@ -221,7 +221,6 @@ | |||
| 221 | #undef VERBOSE | 221 | #undef VERBOSE |
| 222 | #undef DUMP_MSGS | 222 | #undef DUMP_MSGS |
| 223 | 223 | ||
| 224 | #include <linux/config.h> | ||
| 225 | 224 | ||
| 226 | #include <asm/system.h> | 225 | #include <asm/system.h> |
| 227 | #include <asm/uaccess.h> | 226 | #include <asm/uaccess.h> |
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index 5378c1757292..3f827ded8cdf 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | // #define VERBOSE /* extra debug messages (success too) */ | 24 | // #define VERBOSE /* extra debug messages (success too) */ |
| 25 | // #define USB_TRACE /* packet-level success messages */ | 25 | // #define USB_TRACE /* packet-level success messages */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
diff --git a/drivers/usb/gadget/lh7a40x_udc.h b/drivers/usb/gadget/lh7a40x_udc.h index 9b2e6f7cbb8b..e3bb78524c88 100644 --- a/drivers/usb/gadget/lh7a40x_udc.h +++ b/drivers/usb/gadget/lh7a40x_udc.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef __LH7A40X_H_ | 24 | #ifndef __LH7A40X_H_ |
| 25 | #define __LH7A40X_H_ | 25 | #define __LH7A40X_H_ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 1facdea56a8a..570996d7eb34 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #undef DEBUG /* messages on error and most fault paths */ | 46 | #undef DEBUG /* messages on error and most fault paths */ |
| 47 | #undef VERBOSE /* extra debug messages (success too) */ | 47 | #undef VERBOSE /* extra debug messages (success too) */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 51 | #include <linux/pci.h> | 50 | #include <linux/pci.h> |
| 52 | #include <linux/dma-mapping.h> | 51 | #include <linux/dma-mapping.h> |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index fbea51448909..0d642ac70055 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #undef DEBUG | 22 | #undef DEBUG |
| 23 | #undef VERBOSE | 23 | #undef VERBOSE |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index 735e9dbd39fd..c88650dffdeb 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #undef DEBUG | 27 | #undef DEBUG |
| 28 | // #define VERBOSE DBG_VERBOSE | 28 | // #define VERBOSE DBG_VERBOSE |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index 3ff6db7828a0..354670d12308 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * updates to merge with Linux 2.6, better match RNDIS spec | 23 | * updates to merge with Linux 2.6, better match RNDIS spec |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index 416acac879df..30d7664d449d 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 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/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 68e3d8f5da89..3a08a7ab4ce0 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | #define DEBUG 1 | 62 | #define DEBUG 1 |
| 63 | // #define VERBOSE | 63 | // #define VERBOSE |
| 64 | 64 | ||
| 65 | #include <linux/config.h> | ||
| 66 | #include <linux/module.h> | 65 | #include <linux/module.h> |
| 67 | #include <linux/kernel.h> | 66 | #include <linux/kernel.h> |
| 68 | #include <linux/delay.h> | 67 | #include <linux/delay.h> |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 9b37e508ada3..cee6f538de0a 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 16 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 22 | #include <linux/dmapool.h> | 21 | #include <linux/dmapool.h> |
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c index 4a22909518f5..61e571782cf7 100644 --- a/drivers/usb/host/hc_crisv10.c +++ b/drivers/usb/host/hc_crisv10.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (c) 2002, 2003 Axis Communications AB. | 4 | * Copyright (c) 2002, 2003 Axis Communications AB. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/delay.h> | 8 | #include <linux/delay.h> |
| 10 | #include <linux/ioport.h> | 9 | #include <linux/ioport.h> |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 73f5a379d9b3..8fb842ed5f6e 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | * This file is licenced under the GPL. | 74 | * This file is licenced under the GPL. |
| 75 | */ | 75 | */ |
| 76 | 76 | ||
| 77 | #include <linux/config.h> | ||
| 78 | #include <linux/module.h> | 77 | #include <linux/module.h> |
| 79 | #include <linux/moduleparam.h> | 78 | #include <linux/moduleparam.h> |
| 80 | #include <linux/pci.h> | 79 | #include <linux/pci.h> |
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 1045f846fbe2..dff60568b4a1 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * (and others) | 8 | * (and others) |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 89bcda5a3298..c327168255cd 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #undef VERBOSE | 31 | #undef VERBOSE |
| 32 | #undef PACKET_TRACE | 32 | #undef PACKET_TRACE |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 37 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c index 6637a0e49978..dc286a48cafd 100644 --- a/drivers/usb/host/uhci-debug.c +++ b/drivers/usb/host/uhci-debug.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * (C) Copyright 1999-2001 Johannes Erdfelt | 9 | * (C) Copyright 1999-2001 Johannes Erdfelt |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/debugfs.h> | 13 | #include <linux/debugfs.h> |
| 15 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 7b48567622ef..4151f618602d 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c index 36855062eacc..9e3f13903371 100644 --- a/drivers/usb/input/appletouch.c +++ b/drivers/usb/input/appletouch.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c index 07c8c0e665dd..05d2d6012eb2 100644 --- a/drivers/usb/input/ati_remote.c +++ b/drivers/usb/input/ati_remote.c | |||
| @@ -85,7 +85,6 @@ | |||
| 85 | * | 85 | * |
| 86 | */ | 86 | */ |
| 87 | 87 | ||
| 88 | #include <linux/config.h> | ||
| 89 | #include <linux/kernel.h> | 88 | #include <linux/kernel.h> |
| 90 | #include <linux/errno.h> | 89 | #include <linux/errno.h> |
| 91 | #include <linux/init.h> | 90 | #include <linux/init.h> |
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index c4670e1d4654..70477f02cc29 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * e-mail - mail your message to Paul Stewart <stewart@wetlogic.net> | 25 | * e-mail - mail your message to Paul Stewart <stewart@wetlogic.net> |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/poll.h> | 28 | #include <linux/poll.h> |
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c index 5c570cc703f3..86acb5f1907a 100644 --- a/drivers/usb/input/itmtouch.c +++ b/drivers/usb/input/itmtouch.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | * | 39 | * |
| 40 | *****************************************************************************/ | 40 | *****************************************************************************/ |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
| 44 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
| 45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c index 70af985b5db9..4723b310f277 100644 --- a/drivers/usb/input/keyspan_remote.c +++ b/drivers/usb/input/keyspan_remote.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * and Keyspan, Inc the manufacturers of the Keyspan USB DMR product. | 11 | * and Keyspan, Inc the manufacturers of the Keyspan USB DMR product. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c index 4fdee4db0729..a9ccda8810e0 100644 --- a/drivers/usb/input/mtouchusb.c +++ b/drivers/usb/input/mtouchusb.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | * | 39 | * |
| 40 | *****************************************************************************/ | 40 | *****************************************************************************/ |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
| 44 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
| 45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c index da7b0bf51aff..0149043ffb97 100644 --- a/drivers/usb/input/touchkitusb.c +++ b/drivers/usb/input/touchkitusb.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | //#define DEBUG | 25 | //#define DEBUG |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c index cfd4a4e04334..9889b1cda05b 100644 --- a/drivers/usb/input/xpad.c +++ b/drivers/usb/input/xpad.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | * 2002-07-17 - 0.0.5 : simplified d-pad handling | 54 | * 2002-07-17 - 0.0.5 : simplified d-pad handling |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/kernel.h> | 57 | #include <linux/kernel.h> |
| 59 | #include <linux/init.h> | 58 | #include <linux/init.h> |
| 60 | #include <linux/slab.h> | 59 | #include <linux/slab.h> |
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c index 24aedbb20f03..575a4e672e96 100644 --- a/drivers/usb/input/yealink.c +++ b/drivers/usb/input/yealink.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * 20050816 henk Merge 2.6.13-rc6 | 46 | * 20050816 henk Merge 2.6.13-rc6 |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
| 51 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 52 | #include <linux/slab.h> | 51 | #include <linux/slab.h> |
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c index a04204292aa3..b20bec445552 100644 --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index d0b167256699..fcd69c52aea9 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index 966acb474f67..f30ab1fbb3c8 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * V0.13 (mh) Added support for LD X-Ray and Machine Test System | 27 | * V0.13 (mh) Added support for LD X-Ray and Machine Test System |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c index 779bcf0373ad..7699d970e680 100644 --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c | |||
| @@ -75,7 +75,6 @@ | |||
| 75 | * - move reset into open to clean out spurious data | 75 | * - move reset into open to clean out spurious data |
| 76 | */ | 76 | */ |
| 77 | 77 | ||
| 78 | #include <linux/config.h> | ||
| 79 | #include <linux/kernel.h> | 78 | #include <linux/kernel.h> |
| 80 | #include <linux/errno.h> | 79 | #include <linux/errno.h> |
| 81 | #include <linux/init.h> | 80 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c index 13aeea2026cc..bfbbbfbb92bc 100644 --- a/drivers/usb/misc/phidgetkit.c +++ b/drivers/usb/misc/phidgetkit.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * This is a driver for the USB PhidgetInterfaceKit. | 13 | * This is a driver for the USB PhidgetInterfaceKit. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c index 5a040c205eed..c0df79c96538 100644 --- a/drivers/usb/misc/phidgetservo.c +++ b/drivers/usb/misc/phidgetservo.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.c b/drivers/usb/misc/sisusbvga/sisusb_init.c index 968f0d38cff7..9b30f8962814 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_init.c +++ b/drivers/usb/misc/sisusbvga/sisusb_init.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * | 36 | * |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c index f441964132c0..0c5ee0ad6bb9 100644 --- a/drivers/usb/misc/usbled.c +++ b/drivers/usb/misc/usbled.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 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/init.h> | 14 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 81ba14c73dc7..786e1dbe88ec 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c index 37111acec875..2e2bbc003e93 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/usb/net/asix.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | // #define DEBUG // error path messages, extra info | 22 | // #define DEBUG // error path messages, extra info |
| 23 | // #define VERBOSE // more; success messages | 23 | // #define VERBOSE // more; success messages |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kmod.h> | 26 | #include <linux/kmod.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c index efd195b5912c..82ce0358d9a3 100644 --- a/drivers/usb/net/cdc_ether.c +++ b/drivers/usb/net/cdc_ether.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
| 21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/cdc_subset.c b/drivers/usb/net/cdc_subset.c index ec801e8bb1bb..e2fae85851a3 100644 --- a/drivers/usb/net/cdc_subset.c +++ b/drivers/usb/net/cdc_subset.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/kmod.h> | 21 | #include <linux/kmod.h> |
| 23 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c index faf1e86be687..3155f25f1d48 100644 --- a/drivers/usb/net/gl620a.c +++ b/drivers/usb/net/gl620a.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | // #define DEBUG // error path messages, extra info | 21 | // #define DEBUG // error path messages, extra info |
| 22 | // #define VERBOSE // more; success messages | 22 | // #define VERBOSE // more; success messages |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c index 78e6a43b1087..a9b6eeac3e3f 100644 --- a/drivers/usb/net/net1080.c +++ b/drivers/usb/net/net1080.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
| 21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/plusb.c b/drivers/usb/net/plusb.c index 4fe863389cb7..5d17cdfc7bab 100644 --- a/drivers/usb/net/plusb.c +++ b/drivers/usb/net/plusb.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
| 21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c index f551546d7521..c2a28d88ef3c 100644 --- a/drivers/usb/net/rndis_host.c +++ b/drivers/usb/net/rndis_host.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
| 21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index 1bbbae283c0b..718f8e2b552b 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * version 2 as published by the Free Software Foundation. | 6 | * version 2 as published by the Free Software Foundation. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 362d6907c9bb..54183e173a6d 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | // #define DEBUG // error path messages, extra info | 33 | // #define DEBUG // error path messages, extra info |
| 34 | // #define VERBOSE // more; success messages | 34 | // #define VERBOSE // more; success messages |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c index 813e470d0600..144566bda583 100644 --- a/drivers/usb/net/zaurus.c +++ b/drivers/usb/net/zaurus.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | // #define DEBUG // error path messages, extra info | 20 | // #define DEBUG // error path messages, extra info |
| 21 | // #define VERBOSE // more; success messages | 21 | // #define VERBOSE // more; success messages |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c index 4144777ea18b..3faa7aa0111a 100644 --- a/drivers/usb/serial/belkin_sa.c +++ b/drivers/usb/serial/belkin_sa.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | * UsbSnoop on Windows2000 and from examining the other USB drivers. | 63 | * UsbSnoop on Windows2000 and from examining the other USB drivers. |
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | #include <linux/config.h> | ||
| 67 | #include <linux/kernel.h> | 66 | #include <linux/kernel.h> |
| 68 | #include <linux/errno.h> | 67 | #include <linux/errno.h> |
| 69 | #include <linux/init.h> | 68 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index e9f9f4bafa17..f2d993b70c18 100644 --- a/drivers/usb/serial/bus.c +++ b/drivers/usb/serial/bus.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * 2 as published by the Free Software Foundation. | 8 | * 2 as published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/tty.h> | 13 | #include <linux/tty.h> |
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index f3404e10afb4..3d456b32c316 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c index f8c0cb287736..df0a4f98b4ae 100644 --- a/drivers/usb/serial/cp2101.c +++ b/drivers/usb/serial/cp2101.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index 1fd5c5a9f2ef..49b51ab0d4cb 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 5de76efe1b37..4ff2dfb299bd 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | /* Code originates and was built up from ftdi_sio, belkin, pl2303 and others. */ | 48 | /* Code originates and was built up from ftdi_sio, belkin, pl2303 and others. */ |
| 49 | 49 | ||
| 50 | 50 | ||
| 51 | #include <linux/config.h> | ||
| 52 | #include <linux/kernel.h> | 51 | #include <linux/kernel.h> |
| 53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index b3f776a90c93..6953d3ef5738 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
| @@ -233,7 +233,6 @@ | |||
| 233 | * $Id: digi_acceleport.c,v 1.80.1.2 2000/11/02 05:45:08 root Exp $ | 233 | * $Id: digi_acceleport.c,v 1.80.1.2 2000/11/02 05:45:08 root Exp $ |
| 234 | */ | 234 | */ |
| 235 | 235 | ||
| 236 | #include <linux/config.h> | ||
| 237 | #include <linux/kernel.h> | 236 | #include <linux/kernel.h> |
| 238 | #include <linux/errno.h> | 237 | #include <linux/errno.h> |
| 239 | #include <linux/init.h> | 238 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index afca1eae5fb5..1e2b31eeb497 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | * | 51 | * |
| 52 | */ | 52 | */ |
| 53 | 53 | ||
| 54 | #include <linux/config.h> | ||
| 55 | #include <linux/kernel.h> | 54 | #include <linux/kernel.h> |
| 56 | #include <linux/errno.h> | 55 | #include <linux/errno.h> |
| 57 | #include <linux/init.h> | 56 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c index 1e419c8d7392..debc3b0f9662 100644 --- a/drivers/usb/serial/ezusb.c +++ b/drivers/usb/serial/ezusb.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * 2 as published by the Free Software Foundation. | 8 | * 2 as published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index b2bfea7c815a..8a74b19f1283 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -245,7 +245,6 @@ | |||
| 245 | /* to talk to the device */ | 245 | /* to talk to the device */ |
| 246 | /* Thanx to gkh and the rest of the usb dev group for all code I have assimilated :-) */ | 246 | /* Thanx to gkh and the rest of the usb dev group for all code I have assimilated :-) */ |
| 247 | 247 | ||
| 248 | #include <linux/config.h> | ||
| 249 | #include <linux/kernel.h> | 248 | #include <linux/kernel.h> |
| 250 | #include <linux/errno.h> | 249 | #include <linux/errno.h> |
| 251 | #include <linux/init.h> | 250 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 04767759cf8a..1f5d1620baa1 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA | 23 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 07a478c59fb2..945b8bb38c92 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 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/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c index e9719da2aca1..7e06358b0310 100644 --- a/drivers/usb/serial/hp4x.c +++ b/drivers/usb/serial/hp4x.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * See Documentation/usb/usb-serial.txt for more information on using this driver | 12 | * See Documentation/usb/usb-serial.txt for more information on using this driver |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/tty.h> | 17 | #include <linux/tty.h> |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index b85d2156dfdc..bd2c05dac2a9 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * | 29 | * |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/jiffies.h> | 33 | #include <linux/jiffies.h> |
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 8e1e2253748b..723a12ae87b5 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | #include <linux/jiffies.h> | 28 | #include <linux/jiffies.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index 9da6d2a8f2b0..dbcfe172a5cc 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * Thanks to info from Heath Robinson and Arieh Davidoff. | 44 | * Thanks to info from Heath Robinson and Arieh Davidoff. |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
| 49 | #include <linux/errno.h> | 48 | #include <linux/errno.h> |
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index d7f3f736a692..2cf1fed3de43 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * initial version released. | 46 | * initial version released. |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
| 51 | #include <linux/errno.h> | 50 | #include <linux/errno.h> |
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 2cf6ade704e4..d7c58f1bc960 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c | |||
| @@ -95,7 +95,6 @@ | |||
| 95 | */ | 95 | */ |
| 96 | 96 | ||
| 97 | 97 | ||
| 98 | #include <linux/config.h> | ||
| 99 | #include <linux/kernel.h> | 98 | #include <linux/kernel.h> |
| 100 | #include <linux/jiffies.h> | 99 | #include <linux/jiffies.h> |
| 101 | #include <linux/errno.h> | 100 | #include <linux/errno.h> |
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index b0441c35f98f..03ab3c0f3cce 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | */ | 66 | */ |
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | #include <linux/config.h> | ||
| 70 | #include <linux/kernel.h> | 69 | #include <linux/kernel.h> |
| 71 | #include <linux/errno.h> | 70 | #include <linux/errno.h> |
| 72 | #include <linux/init.h> | 71 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index 65d79f630fa4..b45ff3e7ab40 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | #include <linux/config.h> | ||
| 49 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 50 | #include <linux/errno.h> | 49 | #include <linux/errno.h> |
| 51 | #include <linux/init.h> | 50 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 87dfcd89ffab..457733374772 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index 35bd29b6c408..ca05d3275f3e 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | * (via linux-usb-devel). | 64 | * (via linux-usb-devel). |
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/config.h> | ||
| 68 | #include <linux/kernel.h> | 67 | #include <linux/kernel.h> |
| 69 | #include <linux/errno.h> | 68 | #include <linux/errno.h> |
| 70 | #include <linux/init.h> | 69 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 6dcdb5f598b8..cfb711a21a45 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * | 35 | * |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index b0861b61bba7..78ad4b3126a6 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | #define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>" | 57 | #define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>" |
| 58 | #define DRIVER_DESC "USB Driver for GSM modems" | 58 | #define DRIVER_DESC "USB Driver for GSM modems" |
| 59 | 59 | ||
| 60 | #include <linux/config.h> | ||
| 61 | #include <linux/kernel.h> | 60 | #include <linux/kernel.h> |
| 62 | #include <linux/jiffies.h> | 61 | #include <linux/jiffies.h> |
| 63 | #include <linux/errno.h> | 62 | #include <linux/errno.h> |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index d88704387202..de93a2b909e7 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index f0215f850d2d..897d8447252b 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | */ | 60 | */ |
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | #include <linux/config.h> | ||
| 64 | #include <linux/kernel.h> | 63 | #include <linux/kernel.h> |
| 65 | #include <linux/errno.h> | 64 | #include <linux/errno.h> |
| 66 | #include <linux/init.h> | 65 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index c3a2071b802d..a9afff31a921 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | * fi | 68 | * fi |
| 69 | */ | 69 | */ |
| 70 | 70 | ||
| 71 | #include <linux/config.h> | ||
| 72 | #include <linux/kernel.h> | 71 | #include <linux/kernel.h> |
| 73 | #include <linux/errno.h> | 72 | #include <linux/errno.h> |
| 74 | #include <linux/init.h> | 73 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index f466f89eeb6d..b59a0536ea5c 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h index d53ea9b11e81..0f2802a60194 100644 --- a/drivers/usb/serial/usb-serial.h +++ b/drivers/usb/serial/usb-serial.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __LINUX_USB_SERIAL_H | 14 | #ifndef __LINUX_USB_SERIAL_H |
| 15 | #define __LINUX_USB_SERIAL_H | 15 | #define __LINUX_USB_SERIAL_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/kref.h> | 17 | #include <linux/kref.h> |
| 19 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
| 20 | 19 | ||
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 9e89b8d54f72..95a2936e902e 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 56ffc81302fc..540438c3f381 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | * | 65 | * |
| 66 | */ | 66 | */ |
| 67 | 67 | ||
| 68 | #include <linux/config.h> | ||
| 69 | #include <linux/kernel.h> | 68 | #include <linux/kernel.h> |
| 70 | #include <linux/errno.h> | 69 | #include <linux/errno.h> |
| 71 | #include <linux/init.h> | 70 | #include <linux/init.h> |
diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h index cd2096acc723..77e244a8c376 100644 --- a/drivers/usb/storage/debug.h +++ b/drivers/usb/storage/debug.h | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #ifndef _DEBUG_H_ | 44 | #ifndef _DEBUG_H_ |
| 45 | #define _DEBUG_H_ | 45 | #define _DEBUG_H_ |
| 46 | 46 | ||
| 47 | #include <linux/config.h> | ||
| 48 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
| 49 | 48 | ||
| 50 | #define USB_STORAGE "usb-storage: " | 49 | #define USB_STORAGE "usb-storage: " |
diff --git a/drivers/usb/storage/dpcm.c b/drivers/usb/storage/dpcm.c index 92b69e4c8047..1628cb258562 100644 --- a/drivers/usb/storage/dpcm.c +++ b/drivers/usb/storage/dpcm.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 29 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <scsi/scsi.h> | 32 | #include <scsi/scsi.h> |
| 34 | #include <scsi/scsi_cmnd.h> | 33 | #include <scsi/scsi_cmnd.h> |
| 35 | #include <scsi/scsi_device.h> | 34 | #include <scsi/scsi_device.h> |
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c index 30e96050fe0c..88aa59ab7563 100644 --- a/drivers/usb/storage/freecom.c +++ b/drivers/usb/storage/freecom.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * (http://www.freecom.de/) | 28 | * (http://www.freecom.de/) |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/hdreg.h> | 31 | #include <linux/hdreg.h> |
| 33 | 32 | ||
| 34 | #include <scsi/scsi.h> | 33 | #include <scsi/scsi.h> |
diff --git a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h index f9907a5cf129..927f7781080f 100644 --- a/drivers/usb/storage/initializers.h +++ b/drivers/usb/storage/initializers.h | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 37 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include "usb.h" | 40 | #include "usb.h" |
| 42 | #include "transport.h" | 41 | #include "transport.h" |
| 43 | 42 | ||
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 026a587eb8dd..313920d980c9 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/input.h> | 32 | #include <linux/input.h> |
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index 19b25c5cafd4..eb7188b3565c 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 45 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | #include <linux/config.h> | ||
| 49 | #include <linux/sched.h> | 48 | #include <linux/sched.h> |
| 50 | #include <linux/errno.h> | 49 | #include <linux/errno.h> |
| 51 | #include <linux/slab.h> | 50 | #include <linux/slab.h> |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 543244d421c1..c7e84e653df9 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * the following thing for it to work: | 31 | * the following thing for it to work: |
| 32 | * The macro UNUSUAL_DEV() must be defined before this file is included | 32 | * The macro UNUSUAL_DEV() must be defined before this file is included |
| 33 | */ | 33 | */ |
| 34 | #include <linux/config.h> | ||
| 35 | 34 | ||
| 36 | /* If you edit this file, please try to keep it sorted first by VendorID, | 35 | /* If you edit this file, please try to keep it sorted first by VendorID, |
| 37 | * then by ProductID. | 36 | * then by ProductID. |
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index e232c7c89909..1185acac4b21 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 47 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 48 | */ | 48 | */ |
| 49 | 49 | ||
| 50 | #include <linux/config.h> | ||
| 51 | #include <linux/sched.h> | 50 | #include <linux/sched.h> |
| 52 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| 53 | #include <linux/suspend.h> | 52 | #include <linux/suspend.h> |
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c index 4de9fb56ebfc..b362039792b3 100644 --- a/drivers/usb/usb-skeleton.c +++ b/drivers/usb/usb-skeleton.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c index 455fda990ff7..e714e8449c1d 100644 --- a/drivers/video/S3triofb.c +++ b/drivers/video/S3triofb.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 98baecccb3fd..61a8bf159cb0 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * - Blanking 8bpp displays with VIDC | 17 | * - Blanking 8bpp displays with VIDC |
| 18 | */ | 18 | */ |
| 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/errno.h> | 22 | #include <linux/errno.h> |
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 3033c72dea20..f9bc9f777e75 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <linux/tty.h> | 48 | #include <linux/tty.h> |
| 49 | #include <linux/slab.h> | 49 | #include <linux/slab.h> |
| 50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 51 | #include <linux/config.h> | ||
| 52 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
| 53 | #include <linux/fb.h> | 52 | #include <linux/fb.h> |
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c index 29f9f0dfe3b4..eaeaf4d1a094 100644 --- a/drivers/video/asiliantfb.c +++ b/drivers/video/asiliantfb.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * more details. | 29 | * more details. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 11cf7fcb1d55..72c589109471 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 51 | #include <linux/moduleparam.h> | 50 | #include <linux/moduleparam.h> |
| 52 | #include <linux/kernel.h> | 51 | #include <linux/kernel.h> |
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h index 43d2cb58af87..55fb8b04489b 100644 --- a/drivers/video/aty/atyfb.h +++ b/drivers/video/aty/atyfb.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * ATI Frame Buffer Device Driver Core Definitions | 2 | * ATI Frame Buffer Device Driver Core Definitions |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
| 7 | #include <linux/wait.h> | 6 | #include <linux/wait.h> |
| 8 | /* | 7 | /* |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 22e720611bf6..85fcd22e6ed5 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | ******************************************************************************/ | 49 | ******************************************************************************/ |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | #include <linux/config.h> | ||
| 53 | #include <linux/module.h> | 52 | #include <linux/module.h> |
| 54 | #include <linux/moduleparam.h> | 53 | #include <linux/moduleparam.h> |
| 55 | #include <linux/kernel.h> | 54 | #include <linux/kernel.h> |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 68b15645b893..51b78f8de949 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | 52 | ||
| 53 | #define RADEON_VERSION "0.2.0" | 53 | #define RADEON_VERSION "0.2.0" |
| 54 | 54 | ||
| 55 | #include <linux/config.h> | ||
| 56 | #include <linux/module.h> | 55 | #include <linux/module.h> |
| 57 | #include <linux/moduleparam.h> | 56 | #include <linux/moduleparam.h> |
| 58 | #include <linux/kernel.h> | 57 | #include <linux/kernel.h> |
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c index a9d0414e4655..9aaca58c074a 100644 --- a/drivers/video/aty/radeon_i2c.c +++ b/drivers/video/aty/radeon_i2c.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 4 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h index 1645943b1123..38657b2d10eb 100644 --- a/drivers/video/aty/radeonfb.h +++ b/drivers/video/aty/radeonfb.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __RADEONFB_H__ | 1 | #ifndef __RADEONFB_H__ |
| 2 | #define __RADEONFB_H__ | 2 | #define __RADEONFB_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/module.h> | 4 | #include <linux/module.h> |
| 6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 7 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| @@ -382,7 +381,7 @@ struct radeonfb_info { | |||
| 382 | /* Note about this function: we have some rare cases where we must not schedule, | 381 | /* Note about this function: we have some rare cases where we must not schedule, |
| 383 | * this typically happen with our special "wake up early" hook which allows us to | 382 | * this typically happen with our special "wake up early" hook which allows us to |
| 384 | * wake up the graphic chip (and thus get the console back) before everything else | 383 | * wake up the graphic chip (and thus get the console back) before everything else |
| 385 | * on some machines that support that mecanism. At this point, interrupts are off | 384 | * on some machines that support that mechanism. At this point, interrupts are off |
| 386 | * and scheduling is not permitted | 385 | * and scheduling is not permitted |
| 387 | */ | 386 | */ |
| 388 | static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms) | 387 | static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms) |
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c index 9ef68cd83bb4..a92a91fef16f 100644 --- a/drivers/video/au1100fb.c +++ b/drivers/video/au1100fb.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | * with this program; if not, write to the Free Software Foundation, Inc., | 40 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 41 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 41 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 42 | */ | 42 | */ |
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 46 | #include <linux/errno.h> | 45 | #include <linux/errno.h> |
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index bd879b7ec119..caf1eca199b0 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | /* LCD power functions */ | 13 | /* LCD power functions */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index 6577fdfdfc16..c66e3d52cbf3 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* bw2.c: BWTWO frame buffer driver | 1 | /* bw2.c: BWTWO frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) | 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 6 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 6 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
| @@ -19,14 +19,11 @@ | |||
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | 20 | ||
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/sbus.h> | ||
| 23 | #include <asm/oplib.h> | 22 | #include <asm/oplib.h> |
| 23 | #include <asm/prom.h> | ||
| 24 | #include <asm/of_device.h> | ||
| 24 | #include <asm/fbio.h> | 25 | #include <asm/fbio.h> |
| 25 | 26 | ||
| 26 | #ifdef CONFIG_SPARC32 | ||
| 27 | #include <asm/sun4paddr.h> | ||
| 28 | #endif | ||
| 29 | |||
| 30 | #include "sbuslib.h" | 27 | #include "sbuslib.h" |
| 31 | 28 | ||
| 32 | /* | 29 | /* |
| @@ -59,30 +56,30 @@ static struct fb_ops bw2_ops = { | |||
| 59 | #define BWTWO_REGISTER_OFFSET 0x400000 | 56 | #define BWTWO_REGISTER_OFFSET 0x400000 |
| 60 | 57 | ||
| 61 | struct bt_regs { | 58 | struct bt_regs { |
| 62 | volatile u32 addr; | 59 | u32 addr; |
| 63 | volatile u32 color_map; | 60 | u32 color_map; |
| 64 | volatile u32 control; | 61 | u32 control; |
| 65 | volatile u32 cursor; | 62 | u32 cursor; |
| 66 | }; | 63 | }; |
| 67 | 64 | ||
| 68 | struct bw2_regs { | 65 | struct bw2_regs { |
| 69 | struct bt_regs cmap; | 66 | struct bt_regs cmap; |
| 70 | volatile u8 control; | 67 | u8 control; |
| 71 | volatile u8 status; | 68 | u8 status; |
| 72 | volatile u8 cursor_start; | 69 | u8 cursor_start; |
| 73 | volatile u8 cursor_end; | 70 | u8 cursor_end; |
| 74 | volatile u8 h_blank_start; | 71 | u8 h_blank_start; |
| 75 | volatile u8 h_blank_end; | 72 | u8 h_blank_end; |
| 76 | volatile u8 h_sync_start; | 73 | u8 h_sync_start; |
| 77 | volatile u8 h_sync_end; | 74 | u8 h_sync_end; |
| 78 | volatile u8 comp_sync_end; | 75 | u8 comp_sync_end; |
| 79 | volatile u8 v_blank_start_high; | 76 | u8 v_blank_start_high; |
| 80 | volatile u8 v_blank_start_low; | 77 | u8 v_blank_start_low; |
| 81 | volatile u8 v_blank_end; | 78 | u8 v_blank_end; |
| 82 | volatile u8 v_sync_start; | 79 | u8 v_sync_start; |
| 83 | volatile u8 v_sync_end; | 80 | u8 v_sync_end; |
| 84 | volatile u8 xfer_holdoff_start; | 81 | u8 xfer_holdoff_start; |
| 85 | volatile u8 xfer_holdoff_end; | 82 | u8 xfer_holdoff_end; |
| 86 | }; | 83 | }; |
| 87 | 84 | ||
| 88 | /* Status Register Constants */ | 85 | /* Status Register Constants */ |
| @@ -117,9 +114,8 @@ struct bw2_par { | |||
| 117 | #define BW2_FLAG_BLANKED 0x00000001 | 114 | #define BW2_FLAG_BLANKED 0x00000001 |
| 118 | 115 | ||
| 119 | unsigned long physbase; | 116 | unsigned long physbase; |
| 117 | unsigned long which_io; | ||
| 120 | unsigned long fbsize; | 118 | unsigned long fbsize; |
| 121 | |||
| 122 | struct sbus_dev *sdev; | ||
| 123 | }; | 119 | }; |
| 124 | 120 | ||
| 125 | /** | 121 | /** |
| @@ -174,9 +170,7 @@ static int bw2_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 174 | 170 | ||
| 175 | return sbusfb_mmap_helper(bw2_mmap_map, | 171 | return sbusfb_mmap_helper(bw2_mmap_map, |
| 176 | par->physbase, par->fbsize, | 172 | par->physbase, par->fbsize, |
| 177 | (par->sdev ? | 173 | par->which_io, |
| 178 | par->sdev->reg_addrs[0].which_io : | ||
| 179 | 0), | ||
| 180 | vma); | 174 | vma); |
| 181 | } | 175 | } |
| 182 | 176 | ||
| @@ -288,139 +282,124 @@ static void bw2_do_default_mode(struct bw2_par *par, struct fb_info *info, | |||
| 288 | struct all_info { | 282 | struct all_info { |
| 289 | struct fb_info info; | 283 | struct fb_info info; |
| 290 | struct bw2_par par; | 284 | struct bw2_par par; |
| 291 | struct list_head list; | ||
| 292 | }; | 285 | }; |
| 293 | static LIST_HEAD(bw2_list); | ||
| 294 | 286 | ||
| 295 | static void bw2_init_one(struct sbus_dev *sdev) | 287 | static int __devinit bw2_init_one(struct of_device *op) |
| 296 | { | 288 | { |
| 289 | struct device_node *dp = op->node; | ||
| 297 | struct all_info *all; | 290 | struct all_info *all; |
| 298 | struct resource *resp; | 291 | int linebytes, err; |
| 299 | #ifdef CONFIG_SUN4 | ||
| 300 | struct resource res; | ||
| 301 | #endif | ||
| 302 | int linebytes; | ||
| 303 | 292 | ||
| 304 | all = kmalloc(sizeof(*all), GFP_KERNEL); | 293 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 305 | if (!all) { | 294 | if (!all) |
| 306 | printk(KERN_ERR "bw2: Cannot allocate memory.\n"); | 295 | return -ENOMEM; |
| 307 | return; | ||
| 308 | } | ||
| 309 | memset(all, 0, sizeof(*all)); | ||
| 310 | |||
| 311 | INIT_LIST_HEAD(&all->list); | ||
| 312 | 296 | ||
| 313 | spin_lock_init(&all->par.lock); | 297 | spin_lock_init(&all->par.lock); |
| 314 | all->par.sdev = sdev; | 298 | |
| 315 | 299 | all->par.physbase = op->resource[0].start; | |
| 316 | #ifdef CONFIG_SUN4 | 300 | all->par.which_io = op->resource[0].flags & IORESOURCE_BITS; |
| 317 | if (!sdev) { | 301 | |
| 318 | all->par.physbase = sun4_bwtwo_physaddr; | 302 | sbusfb_fill_var(&all->info.var, dp->node, 1); |
| 319 | res.start = sun4_bwtwo_physaddr; | 303 | linebytes = of_getintprop_default(dp, "linebytes", |
| 320 | res.end = res.start + BWTWO_REGISTER_OFFSET + sizeof(struct bw2_regs) - 1; | 304 | all->info.var.xres); |
| 321 | res.flags = IORESOURCE_IO; | 305 | |
| 322 | resp = &res; | ||
| 323 | all->info.var.xres = all->info.var.xres_virtual = 1152; | ||
| 324 | all->info.var.yres = all->info.var.yres_virtual = 900; | ||
| 325 | all->info.var.bits_per_pixel = 1; | ||
| 326 | linebytes = 1152 / 8; | ||
| 327 | } else | ||
| 328 | #else | ||
| 329 | { | ||
| 330 | BUG_ON(!sdev); | ||
| 331 | all->par.physbase = sdev->reg_addrs[0].phys_addr; | ||
| 332 | resp = &sdev->resource[0]; | ||
| 333 | sbusfb_fill_var(&all->info.var, (sdev ? sdev->prom_node : 0), 1); | ||
| 334 | linebytes = prom_getintdefault(sdev->prom_node, "linebytes", | ||
| 335 | all->info.var.xres); | ||
| 336 | } | ||
| 337 | #endif | ||
| 338 | all->info.var.red.length = all->info.var.green.length = | 306 | all->info.var.red.length = all->info.var.green.length = |
| 339 | all->info.var.blue.length = all->info.var.bits_per_pixel; | 307 | all->info.var.blue.length = all->info.var.bits_per_pixel; |
| 340 | all->info.var.red.offset = all->info.var.green.offset = | 308 | all->info.var.red.offset = all->info.var.green.offset = |
| 341 | all->info.var.blue.offset = 0; | 309 | all->info.var.blue.offset = 0; |
| 342 | 310 | ||
| 343 | all->par.regs = sbus_ioremap(resp, BWTWO_REGISTER_OFFSET, | 311 | all->par.regs = of_ioremap(&op->resource[0], BWTWO_REGISTER_OFFSET, |
| 344 | sizeof(struct bw2_regs), "bw2 regs"); | 312 | sizeof(struct bw2_regs), "bw2 regs"); |
| 345 | 313 | ||
| 346 | if (sdev && !prom_getbool(sdev->prom_node, "width")) | 314 | if (!of_find_property(dp, "width", NULL)) |
| 347 | bw2_do_default_mode(&all->par, &all->info, &linebytes); | 315 | bw2_do_default_mode(&all->par, &all->info, &linebytes); |
| 348 | 316 | ||
| 349 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); | 317 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); |
| 350 | 318 | ||
| 351 | all->info.flags = FBINFO_DEFAULT; | 319 | all->info.flags = FBINFO_DEFAULT; |
| 352 | all->info.fbops = &bw2_ops; | 320 | all->info.fbops = &bw2_ops; |
| 353 | #if defined(CONFIG_SPARC32) | 321 | |
| 354 | if (sdev) | 322 | all->info.screen_base = |
| 355 | all->info.screen_base = (char __iomem *) | 323 | sbus_ioremap(&op->resource[0], 0, all->par.fbsize, "bw2 ram"); |
| 356 | prom_getintdefault(sdev->prom_node, "address", 0); | ||
| 357 | #endif | ||
| 358 | if (!all->info.screen_base) | ||
| 359 | all->info.screen_base = | ||
| 360 | sbus_ioremap(resp, 0, all->par.fbsize, "bw2 ram"); | ||
| 361 | all->info.par = &all->par; | 324 | all->info.par = &all->par; |
| 362 | 325 | ||
| 363 | bw2_blank(0, &all->info); | 326 | bw2_blank(0, &all->info); |
| 364 | 327 | ||
| 365 | bw2_init_fix(&all->info, linebytes); | 328 | bw2_init_fix(&all->info, linebytes); |
| 366 | 329 | ||
| 367 | if (register_framebuffer(&all->info) < 0) { | 330 | err= register_framebuffer(&all->info); |
| 368 | printk(KERN_ERR "bw2: Could not register framebuffer.\n"); | 331 | if (err < 0) { |
| 332 | of_iounmap(all->par.regs, sizeof(struct bw2_regs)); | ||
| 333 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 369 | kfree(all); | 334 | kfree(all); |
| 370 | return; | 335 | return err; |
| 371 | } | 336 | } |
| 372 | 337 | ||
| 373 | list_add(&all->list, &bw2_list); | 338 | dev_set_drvdata(&op->dev, all); |
| 339 | |||
| 340 | printk("%s: bwtwo at %lx:%lx\n", | ||
| 341 | dp->full_name, | ||
| 342 | all->par.which_io, all->par.physbase); | ||
| 374 | 343 | ||
| 375 | printk("bw2: bwtwo at %lx:%lx\n", | 344 | return 0; |
| 376 | (long) (sdev ? sdev->reg_addrs[0].which_io : 0), | ||
| 377 | (long) all->par.physbase); | ||
| 378 | } | 345 | } |
| 379 | 346 | ||
| 380 | int __init bw2_init(void) | 347 | static int __devinit bw2_probe(struct of_device *dev, const struct of_device_id *match) |
| 381 | { | 348 | { |
| 382 | struct sbus_bus *sbus; | 349 | struct of_device *op = to_of_device(&dev->dev); |
| 383 | struct sbus_dev *sdev; | ||
| 384 | 350 | ||
| 385 | if (fb_get_options("bw2fb", NULL)) | 351 | return bw2_init_one(op); |
| 386 | return -ENODEV; | 352 | } |
| 387 | 353 | ||
| 388 | #ifdef CONFIG_SUN4 | 354 | static int __devexit bw2_remove(struct of_device *dev) |
| 389 | bw2_init_one(NULL); | 355 | { |
| 390 | #endif | 356 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 391 | for_all_sbusdev(sdev, sbus) { | 357 | |
| 392 | if (!strcmp(sdev->prom_name, "bwtwo")) | 358 | unregister_framebuffer(&all->info); |
| 393 | bw2_init_one(sdev); | 359 | |
| 394 | } | 360 | of_iounmap(all->par.regs, sizeof(struct bw2_regs)); |
| 361 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 362 | |||
| 363 | kfree(all); | ||
| 364 | |||
| 365 | dev_set_drvdata(&dev->dev, NULL); | ||
| 395 | 366 | ||
| 396 | return 0; | 367 | return 0; |
| 397 | } | 368 | } |
| 398 | 369 | ||
| 399 | void __exit bw2_exit(void) | 370 | static struct of_device_id bw2_match[] = { |
| 400 | { | 371 | { |
| 401 | struct list_head *pos, *tmp; | 372 | .name = "bwtwo", |
| 373 | }, | ||
| 374 | {}, | ||
| 375 | }; | ||
| 376 | MODULE_DEVICE_TABLE(of, bw2_match); | ||
| 402 | 377 | ||
| 403 | list_for_each_safe(pos, tmp, &bw2_list) { | 378 | static struct of_platform_driver bw2_driver = { |
| 404 | struct all_info *all = list_entry(pos, typeof(*all), list); | 379 | .name = "bw2", |
| 380 | .match_table = bw2_match, | ||
| 381 | .probe = bw2_probe, | ||
| 382 | .remove = __devexit_p(bw2_remove), | ||
| 383 | }; | ||
| 405 | 384 | ||
| 406 | unregister_framebuffer(&all->info); | 385 | static int __init bw2_init(void) |
| 407 | kfree(all); | 386 | { |
| 408 | } | 387 | if (fb_get_options("bw2fb", NULL)) |
| 388 | return -ENODEV; | ||
| 389 | |||
| 390 | return of_register_driver(&bw2_driver, &of_bus_type); | ||
| 409 | } | 391 | } |
| 410 | 392 | ||
| 411 | int __init | 393 | static void __exit bw2_exit(void) |
| 412 | bw2_setup(char *arg) | ||
| 413 | { | 394 | { |
| 414 | /* No cmdline options yet... */ | 395 | return of_unregister_driver(&bw2_driver); |
| 415 | return 0; | ||
| 416 | } | 396 | } |
| 417 | 397 | ||
| 418 | module_init(bw2_init); | ||
| 419 | 398 | ||
| 420 | #ifdef MODULE | 399 | module_init(bw2_init); |
| 421 | module_exit(bw2_exit); | 400 | module_exit(bw2_exit); |
| 422 | #endif | ||
| 423 | 401 | ||
| 424 | MODULE_DESCRIPTION("framebuffer driver for BWTWO chipsets"); | 402 | MODULE_DESCRIPTION("framebuffer driver for BWTWO chipsets"); |
| 425 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 403 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 404 | MODULE_VERSION("2.0"); | ||
| 426 | MODULE_LICENSE("GPL"); | 405 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c index 74415325b016..6faea4034e3d 100644 --- a/drivers/video/cfbcopyarea.c +++ b/drivers/video/cfbcopyarea.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | #include <linux/string.h> | 29 | #include <linux/string.h> |
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c index e5ff62e9cfb8..f00b50aab606 100644 --- a/drivers/video/cfbfillrect.c +++ b/drivers/video/cfbfillrect.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * the native cpu endians. I also need to deal with MSB position in the word. | 17 | * the native cpu endians. I also need to deal with MSB position in the word. |
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 23 | #include <linux/fb.h> | 22 | #include <linux/fb.h> |
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c index ad8a89bf8eae..51d35386a945 100644 --- a/drivers/video/cfbimgblt.c +++ b/drivers/video/cfbimgblt.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * Also need to add code to deal with cards endians that are different than | 29 | * Also need to add code to deal with cards endians that are different than |
| 30 | * the native cpu endians. I also need to deal with MSB position in the word. | 30 | * the native cpu endians. I also need to deal with MSB position in the word. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 35 | #include <linux/fb.h> | 34 | #include <linux/fb.h> |
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index 63b6c79c8a0a..7f926c619b61 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* cg14.c: CGFOURTEEN frame buffer driver | 1 | /* cg14.c: CGFOURTEEN frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 5 | * Copyright (C) 1995 Miguel de Icaza (miguel@nuclecu.unam.mx) | 5 | * Copyright (C) 1995 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 6 | * | 6 | * |
| @@ -18,8 +18,8 @@ | |||
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | 19 | ||
| 20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
| 21 | #include <asm/sbus.h> | 21 | #include <asm/prom.h> |
| 22 | #include <asm/oplib.h> | 22 | #include <asm/of_device.h> |
| 23 | #include <asm/fbio.h> | 23 | #include <asm/fbio.h> |
| 24 | 24 | ||
| 25 | #include "sbuslib.h" | 25 | #include "sbuslib.h" |
| @@ -99,73 +99,73 @@ static struct fb_ops cg14_ops = { | |||
| 99 | #define CG14_MCR_PIXMODE_32 3 | 99 | #define CG14_MCR_PIXMODE_32 3 |
| 100 | 100 | ||
| 101 | struct cg14_regs{ | 101 | struct cg14_regs{ |
| 102 | volatile u8 mcr; /* Master Control Reg */ | 102 | u8 mcr; /* Master Control Reg */ |
| 103 | volatile u8 ppr; /* Packed Pixel Reg */ | 103 | u8 ppr; /* Packed Pixel Reg */ |
| 104 | volatile u8 tms[2]; /* Test Mode Status Regs */ | 104 | u8 tms[2]; /* Test Mode Status Regs */ |
| 105 | volatile u8 msr; /* Master Status Reg */ | 105 | u8 msr; /* Master Status Reg */ |
| 106 | volatile u8 fsr; /* Fault Status Reg */ | 106 | u8 fsr; /* Fault Status Reg */ |
| 107 | volatile u8 rev; /* Revision & Impl */ | 107 | u8 rev; /* Revision & Impl */ |
| 108 | volatile u8 ccr; /* Clock Control Reg */ | 108 | u8 ccr; /* Clock Control Reg */ |
| 109 | volatile u32 tmr; /* Test Mode Read Back */ | 109 | u32 tmr; /* Test Mode Read Back */ |
| 110 | volatile u8 mod; /* Monitor Operation Data Reg */ | 110 | u8 mod; /* Monitor Operation Data Reg */ |
| 111 | volatile u8 acr; /* Aux Control */ | 111 | u8 acr; /* Aux Control */ |
| 112 | u8 xxx0[6]; | 112 | u8 xxx0[6]; |
| 113 | volatile u16 hct; /* Hor Counter */ | 113 | u16 hct; /* Hor Counter */ |
| 114 | volatile u16 vct; /* Vert Counter */ | 114 | u16 vct; /* Vert Counter */ |
| 115 | volatile u16 hbs; /* Hor Blank Start */ | 115 | u16 hbs; /* Hor Blank Start */ |
| 116 | volatile u16 hbc; /* Hor Blank Clear */ | 116 | u16 hbc; /* Hor Blank Clear */ |
| 117 | volatile u16 hss; /* Hor Sync Start */ | 117 | u16 hss; /* Hor Sync Start */ |
| 118 | volatile u16 hsc; /* Hor Sync Clear */ | 118 | u16 hsc; /* Hor Sync Clear */ |
| 119 | volatile u16 csc; /* Composite Sync Clear */ | 119 | u16 csc; /* Composite Sync Clear */ |
| 120 | volatile u16 vbs; /* Vert Blank Start */ | 120 | u16 vbs; /* Vert Blank Start */ |
| 121 | volatile u16 vbc; /* Vert Blank Clear */ | 121 | u16 vbc; /* Vert Blank Clear */ |
| 122 | volatile u16 vss; /* Vert Sync Start */ | 122 | u16 vss; /* Vert Sync Start */ |
| 123 | volatile u16 vsc; /* Vert Sync Clear */ | 123 | u16 vsc; /* Vert Sync Clear */ |
| 124 | volatile u16 xcs; | 124 | u16 xcs; |
| 125 | volatile u16 xcc; | 125 | u16 xcc; |
| 126 | volatile u16 fsa; /* Fault Status Address */ | 126 | u16 fsa; /* Fault Status Address */ |
| 127 | volatile u16 adr; /* Address Registers */ | 127 | u16 adr; /* Address Registers */ |
| 128 | u8 xxx1[0xce]; | 128 | u8 xxx1[0xce]; |
| 129 | volatile u8 pcg[0x100]; /* Pixel Clock Generator */ | 129 | u8 pcg[0x100]; /* Pixel Clock Generator */ |
| 130 | volatile u32 vbr; /* Frame Base Row */ | 130 | u32 vbr; /* Frame Base Row */ |
| 131 | volatile u32 vmcr; /* VBC Master Control */ | 131 | u32 vmcr; /* VBC Master Control */ |
| 132 | volatile u32 vcr; /* VBC refresh */ | 132 | u32 vcr; /* VBC refresh */ |
| 133 | volatile u32 vca; /* VBC Config */ | 133 | u32 vca; /* VBC Config */ |
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | #define CG14_CCR_ENABLE 0x04 | 136 | #define CG14_CCR_ENABLE 0x04 |
| 137 | #define CG14_CCR_SELECT 0x02 /* HW/Full screen */ | 137 | #define CG14_CCR_SELECT 0x02 /* HW/Full screen */ |
| 138 | 138 | ||
| 139 | struct cg14_cursor { | 139 | struct cg14_cursor { |
| 140 | volatile u32 cpl0[32]; /* Enable plane 0 */ | 140 | u32 cpl0[32]; /* Enable plane 0 */ |
| 141 | volatile u32 cpl1[32]; /* Color selection plane */ | 141 | u32 cpl1[32]; /* Color selection plane */ |
| 142 | volatile u8 ccr; /* Cursor Control Reg */ | 142 | u8 ccr; /* Cursor Control Reg */ |
| 143 | u8 xxx0[3]; | 143 | u8 xxx0[3]; |
| 144 | volatile u16 cursx; /* Cursor x,y position */ | 144 | u16 cursx; /* Cursor x,y position */ |
| 145 | volatile u16 cursy; /* Cursor x,y position */ | 145 | u16 cursy; /* Cursor x,y position */ |
| 146 | volatile u32 color0; | 146 | u32 color0; |
| 147 | volatile u32 color1; | 147 | u32 color1; |
| 148 | u32 xxx1[0x1bc]; | 148 | u32 xxx1[0x1bc]; |
| 149 | volatile u32 cpl0i[32]; /* Enable plane 0 autoinc */ | 149 | u32 cpl0i[32]; /* Enable plane 0 autoinc */ |
| 150 | volatile u32 cpl1i[32]; /* Color selection autoinc */ | 150 | u32 cpl1i[32]; /* Color selection autoinc */ |
| 151 | }; | 151 | }; |
| 152 | 152 | ||
| 153 | struct cg14_dac { | 153 | struct cg14_dac { |
| 154 | volatile u8 addr; /* Address Register */ | 154 | u8 addr; /* Address Register */ |
| 155 | u8 xxx0[255]; | 155 | u8 xxx0[255]; |
| 156 | volatile u8 glut; /* Gamma table */ | 156 | u8 glut; /* Gamma table */ |
| 157 | u8 xxx1[255]; | 157 | u8 xxx1[255]; |
| 158 | volatile u8 select; /* Register Select */ | 158 | u8 select; /* Register Select */ |
| 159 | u8 xxx2[255]; | 159 | u8 xxx2[255]; |
| 160 | volatile u8 mode; /* Mode Register */ | 160 | u8 mode; /* Mode Register */ |
| 161 | }; | 161 | }; |
| 162 | 162 | ||
| 163 | struct cg14_xlut{ | 163 | struct cg14_xlut{ |
| 164 | volatile u8 x_xlut [256]; | 164 | u8 x_xlut [256]; |
| 165 | volatile u8 x_xlutd [256]; | 165 | u8 x_xlutd [256]; |
| 166 | u8 xxx0[0x600]; | 166 | u8 xxx0[0x600]; |
| 167 | volatile u8 x_xlut_inc [256]; | 167 | u8 x_xlut_inc [256]; |
| 168 | volatile u8 x_xlutd_inc [256]; | 168 | u8 x_xlutd_inc [256]; |
| 169 | }; | 169 | }; |
| 170 | 170 | ||
| 171 | /* Color look up table (clut) */ | 171 | /* Color look up table (clut) */ |
| @@ -204,7 +204,6 @@ struct cg14_par { | |||
| 204 | 204 | ||
| 205 | int mode; | 205 | int mode; |
| 206 | int ramsize; | 206 | int ramsize; |
| 207 | struct sbus_dev *sdev; | ||
| 208 | }; | 207 | }; |
| 209 | 208 | ||
| 210 | static void __cg14_reset(struct cg14_par *par) | 209 | static void __cg14_reset(struct cg14_par *par) |
| @@ -355,14 +354,9 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) | |||
| 355 | * Initialisation | 354 | * Initialisation |
| 356 | */ | 355 | */ |
| 357 | 356 | ||
| 358 | static void cg14_init_fix(struct fb_info *info, int linebytes) | 357 | static void cg14_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) |
| 359 | { | 358 | { |
| 360 | struct cg14_par *par = (struct cg14_par *)info->par; | 359 | const char *name = dp->name; |
| 361 | const char *name; | ||
| 362 | |||
| 363 | name = "cgfourteen"; | ||
| 364 | if (par->sdev) | ||
| 365 | name = par->sdev->prom_name; | ||
| 366 | 360 | ||
| 367 | strlcpy(info->fix.id, name, sizeof(info->fix.id)); | 361 | strlcpy(info->fix.id, name, sizeof(info->fix.id)); |
| 368 | 362 | ||
| @@ -456,98 +450,81 @@ static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] __initdata = { | |||
| 456 | struct all_info { | 450 | struct all_info { |
| 457 | struct fb_info info; | 451 | struct fb_info info; |
| 458 | struct cg14_par par; | 452 | struct cg14_par par; |
| 459 | struct list_head list; | ||
| 460 | }; | 453 | }; |
| 461 | static LIST_HEAD(cg14_list); | ||
| 462 | 454 | ||
| 463 | static void cg14_init_one(struct sbus_dev *sdev, int node, int parent_node) | 455 | static void cg14_unmap_regs(struct all_info *all) |
| 464 | { | 456 | { |
| 465 | struct all_info *all; | 457 | if (all->par.regs) |
| 466 | unsigned long phys, rphys; | 458 | of_iounmap(all->par.regs, sizeof(struct cg14_regs)); |
| 467 | u32 bases[6]; | 459 | if (all->par.clut) |
| 468 | int is_8mb, linebytes, i; | 460 | of_iounmap(all->par.clut, sizeof(struct cg14_clut)); |
| 469 | 461 | if (all->par.cursor) | |
| 470 | if (!sdev) { | 462 | of_iounmap(all->par.cursor, sizeof(struct cg14_cursor)); |
| 471 | if (prom_getproperty(node, "address", | 463 | if (all->info.screen_base) |
| 472 | (char *) &bases[0], sizeof(bases)) <= 0 | 464 | of_iounmap(all->info.screen_base, all->par.fbsize); |
| 473 | || !bases[0]) { | 465 | } |
| 474 | printk(KERN_ERR "cg14: Device is not mapped.\n"); | ||
| 475 | return; | ||
| 476 | } | ||
| 477 | if (__get_iospace(bases[0]) != __get_iospace(bases[1])) { | ||
| 478 | printk(KERN_ERR "cg14: I/O spaces don't match.\n"); | ||
| 479 | return; | ||
| 480 | } | ||
| 481 | } | ||
| 482 | 466 | ||
| 483 | all = kmalloc(sizeof(*all), GFP_KERNEL); | 467 | static int __devinit cg14_init_one(struct of_device *op) |
| 484 | if (!all) { | 468 | { |
| 485 | printk(KERN_ERR "cg14: Cannot allocate memory.\n"); | 469 | struct device_node *dp = op->node; |
| 486 | return; | 470 | struct all_info *all; |
| 487 | } | 471 | int is_8mb, linebytes, i, err; |
| 488 | memset(all, 0, sizeof(*all)); | ||
| 489 | 472 | ||
| 490 | INIT_LIST_HEAD(&all->list); | 473 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 474 | if (!all) | ||
| 475 | return -ENOMEM; | ||
| 491 | 476 | ||
| 492 | spin_lock_init(&all->par.lock); | 477 | spin_lock_init(&all->par.lock); |
| 493 | 478 | ||
| 494 | sbusfb_fill_var(&all->info.var, node, 8); | 479 | sbusfb_fill_var(&all->info.var, dp->node, 8); |
| 495 | all->info.var.red.length = 8; | 480 | all->info.var.red.length = 8; |
| 496 | all->info.var.green.length = 8; | 481 | all->info.var.green.length = 8; |
| 497 | all->info.var.blue.length = 8; | 482 | all->info.var.blue.length = 8; |
| 498 | 483 | ||
| 499 | linebytes = prom_getintdefault(node, "linebytes", | 484 | linebytes = of_getintprop_default(dp, "linebytes", |
| 500 | all->info.var.xres); | 485 | all->info.var.xres); |
| 501 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); | 486 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); |
| 502 | 487 | ||
| 503 | all->par.sdev = sdev; | 488 | if (!strcmp(dp->parent->name, "sbus") || |
| 504 | if (sdev) { | 489 | !strcmp(dp->parent->name, "sbi")) { |
| 505 | rphys = sdev->reg_addrs[0].phys_addr; | 490 | all->par.physbase = op->resource[0].start; |
| 506 | all->par.physbase = phys = sdev->reg_addrs[1].phys_addr; | 491 | all->par.iospace = op->resource[0].flags & IORESOURCE_BITS; |
| 507 | all->par.iospace = sdev->reg_addrs[0].which_io; | ||
| 508 | |||
| 509 | all->par.regs = sbus_ioremap(&sdev->resource[0], 0, | ||
| 510 | sizeof(struct cg14_regs), | ||
| 511 | "cg14 regs"); | ||
| 512 | all->par.clut = sbus_ioremap(&sdev->resource[0], CG14_CLUT1, | ||
| 513 | sizeof(struct cg14_clut), | ||
| 514 | "cg14 clut"); | ||
| 515 | all->par.cursor = sbus_ioremap(&sdev->resource[0], CG14_CURSORREGS, | ||
| 516 | sizeof(struct cg14_cursor), | ||
| 517 | "cg14 cursor"); | ||
| 518 | all->info.screen_base = sbus_ioremap(&sdev->resource[1], 0, | ||
| 519 | all->par.fbsize, "cg14 ram"); | ||
| 520 | } else { | 492 | } else { |
| 521 | rphys = __get_phys(bases[0]); | 493 | all->par.physbase = op->resource[1].start; |
| 522 | all->par.physbase = phys = __get_phys(bases[1]); | 494 | all->par.iospace = op->resource[0].flags & IORESOURCE_BITS; |
| 523 | all->par.iospace = __get_iospace(bases[0]); | ||
| 524 | all->par.regs = (struct cg14_regs __iomem *)(unsigned long)bases[0]; | ||
| 525 | all->par.clut = (struct cg14_clut __iomem *)((unsigned long)bases[0] + | ||
| 526 | CG14_CLUT1); | ||
| 527 | all->par.cursor = | ||
| 528 | (struct cg14_cursor __iomem *)((unsigned long)bases[0] + | ||
| 529 | CG14_CURSORREGS); | ||
| 530 | |||
| 531 | all->info.screen_base = (char __iomem *)(unsigned long)bases[1]; | ||
| 532 | } | 495 | } |
| 533 | 496 | ||
| 534 | prom_getproperty(node, "reg", (char *) &bases[0], sizeof(bases)); | 497 | all->par.regs = of_ioremap(&op->resource[0], 0, |
| 535 | is_8mb = (bases[5] == 0x800000); | 498 | sizeof(struct cg14_regs), "cg14 regs"); |
| 499 | all->par.clut = of_ioremap(&op->resource[0], CG14_CLUT1, | ||
| 500 | sizeof(struct cg14_clut), "cg14 clut"); | ||
| 501 | all->par.cursor = of_ioremap(&op->resource[0], CG14_CURSORREGS, | ||
| 502 | sizeof(struct cg14_cursor), "cg14 cursor"); | ||
| 536 | 503 | ||
| 537 | if (sizeof(all->par.mmap_map) != sizeof(__cg14_mmap_map)) { | 504 | all->info.screen_base = of_ioremap(&op->resource[1], 0, |
| 538 | extern void __cg14_mmap_sized_wrongly(void); | 505 | all->par.fbsize, "cg14 ram"); |
| 539 | 506 | ||
| 540 | __cg14_mmap_sized_wrongly(); | 507 | if (!all->par.regs || !all->par.clut || !all->par.cursor || |
| 541 | } | 508 | !all->info.screen_base) |
| 509 | cg14_unmap_regs(all); | ||
| 510 | |||
| 511 | is_8mb = (((op->resource[1].end - op->resource[1].start) + 1) == | ||
| 512 | (8 * 1024 * 1024)); | ||
| 513 | |||
| 514 | BUILD_BUG_ON(sizeof(all->par.mmap_map) != sizeof(__cg14_mmap_map)); | ||
| 542 | 515 | ||
| 543 | memcpy(&all->par.mmap_map, &__cg14_mmap_map, sizeof(all->par.mmap_map)); | 516 | memcpy(&all->par.mmap_map, &__cg14_mmap_map, |
| 517 | sizeof(all->par.mmap_map)); | ||
| 518 | |||
| 544 | for (i = 0; i < CG14_MMAP_ENTRIES; i++) { | 519 | for (i = 0; i < CG14_MMAP_ENTRIES; i++) { |
| 545 | struct sbus_mmap_map *map = &all->par.mmap_map[i]; | 520 | struct sbus_mmap_map *map = &all->par.mmap_map[i]; |
| 546 | 521 | ||
| 547 | if (!map->size) | 522 | if (!map->size) |
| 548 | break; | 523 | break; |
| 549 | if (map->poff & 0x80000000) | 524 | if (map->poff & 0x80000000) |
| 550 | map->poff = (map->poff & 0x7fffffff) + rphys - phys; | 525 | map->poff = (map->poff & 0x7fffffff) + |
| 526 | (op->resource[0].start - | ||
| 527 | op->resource[1].start); | ||
| 551 | if (is_8mb && | 528 | if (is_8mb && |
| 552 | map->size >= 0x100000 && | 529 | map->size >= 0x100000 && |
| 553 | map->size <= 0x400000) | 530 | map->size <= 0x400000) |
| @@ -564,84 +541,87 @@ static void cg14_init_one(struct sbus_dev *sdev, int node, int parent_node) | |||
| 564 | __cg14_reset(&all->par); | 541 | __cg14_reset(&all->par); |
| 565 | 542 | ||
| 566 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 543 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
| 567 | printk(KERN_ERR "cg14: Could not allocate color map.\n"); | 544 | cg14_unmap_regs(all); |
| 568 | kfree(all); | 545 | kfree(all); |
| 569 | return; | 546 | return -ENOMEM; |
| 570 | } | 547 | } |
| 571 | fb_set_cmap(&all->info.cmap, &all->info); | 548 | fb_set_cmap(&all->info.cmap, &all->info); |
| 572 | 549 | ||
| 573 | cg14_init_fix(&all->info, linebytes); | 550 | cg14_init_fix(&all->info, linebytes, dp); |
| 574 | 551 | ||
| 575 | if (register_framebuffer(&all->info) < 0) { | 552 | err = register_framebuffer(&all->info); |
| 576 | printk(KERN_ERR "cg14: Could not register framebuffer.\n"); | 553 | if (err < 0) { |
| 577 | fb_dealloc_cmap(&all->info.cmap); | 554 | fb_dealloc_cmap(&all->info.cmap); |
| 555 | cg14_unmap_regs(all); | ||
| 578 | kfree(all); | 556 | kfree(all); |
| 579 | return; | 557 | return err; |
| 580 | } | 558 | } |
| 581 | 559 | ||
| 582 | list_add(&all->list, &cg14_list); | 560 | dev_set_drvdata(&op->dev, all); |
| 583 | 561 | ||
| 584 | printk("cg14: cgfourteen at %lx:%lx, %dMB\n", | 562 | printk("%s: cgfourteen at %lx:%lx, %dMB\n", |
| 585 | all->par.iospace, all->par.physbase, all->par.ramsize >> 20); | 563 | dp->full_name, |
| 564 | all->par.iospace, all->par.physbase, | ||
| 565 | all->par.ramsize >> 20); | ||
| 586 | 566 | ||
| 567 | return 0; | ||
| 587 | } | 568 | } |
| 588 | 569 | ||
| 589 | int __init cg14_init(void) | 570 | static int __devinit cg14_probe(struct of_device *dev, const struct of_device_id *match) |
| 590 | { | 571 | { |
| 591 | struct sbus_bus *sbus; | 572 | struct of_device *op = to_of_device(&dev->dev); |
| 592 | struct sbus_dev *sdev; | ||
| 593 | 573 | ||
| 594 | if (fb_get_options("cg14fb", NULL)) | 574 | return cg14_init_one(op); |
| 595 | return -ENODEV; | 575 | } |
| 596 | 576 | ||
| 597 | #ifdef CONFIG_SPARC32 | 577 | static int __devexit cg14_remove(struct of_device *dev) |
| 598 | { | 578 | { |
| 599 | int root, node; | 579 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 600 | 580 | ||
| 601 | root = prom_getchild(prom_root_node); | 581 | unregister_framebuffer(&all->info); |
| 602 | root = prom_searchsiblings(root, "obio"); | 582 | fb_dealloc_cmap(&all->info.cmap); |
| 603 | if (root) { | 583 | |
| 604 | node = prom_searchsiblings(prom_getchild(root), | 584 | cg14_unmap_regs(all); |
| 605 | "cgfourteen"); | 585 | |
| 606 | if (node) | 586 | kfree(all); |
| 607 | cg14_init_one(NULL, node, root); | 587 | |
| 608 | } | 588 | dev_set_drvdata(&dev->dev, NULL); |
| 609 | } | ||
| 610 | #endif | ||
| 611 | for_all_sbusdev(sdev, sbus) { | ||
| 612 | if (!strcmp(sdev->prom_name, "cgfourteen")) | ||
| 613 | cg14_init_one(sdev, sdev->prom_node, sbus->prom_node); | ||
| 614 | } | ||
| 615 | 589 | ||
| 616 | return 0; | 590 | return 0; |
| 617 | } | 591 | } |
| 618 | 592 | ||
| 619 | void __exit cg14_exit(void) | 593 | static struct of_device_id cg14_match[] = { |
| 620 | { | 594 | { |
| 621 | struct list_head *pos, *tmp; | 595 | .name = "cgfourteen", |
| 596 | }, | ||
| 597 | {}, | ||
| 598 | }; | ||
| 599 | MODULE_DEVICE_TABLE(of, cg14_match); | ||
| 622 | 600 | ||
| 623 | list_for_each_safe(pos, tmp, &cg14_list) { | 601 | static struct of_platform_driver cg14_driver = { |
| 624 | struct all_info *all = list_entry(pos, typeof(*all), list); | 602 | .name = "cg14", |
| 603 | .match_table = cg14_match, | ||
| 604 | .probe = cg14_probe, | ||
| 605 | .remove = __devexit_p(cg14_remove), | ||
| 606 | }; | ||
| 625 | 607 | ||
| 626 | unregister_framebuffer(&all->info); | 608 | int __init cg14_init(void) |
| 627 | fb_dealloc_cmap(&all->info.cmap); | 609 | { |
| 628 | kfree(all); | 610 | if (fb_get_options("cg14fb", NULL)) |
| 629 | } | 611 | return -ENODEV; |
| 612 | |||
| 613 | return of_register_driver(&cg14_driver, &of_bus_type); | ||
| 630 | } | 614 | } |
| 631 | 615 | ||
| 632 | int __init | 616 | void __exit cg14_exit(void) |
| 633 | cg14_setup(char *arg) | ||
| 634 | { | 617 | { |
| 635 | /* No cmdline options yet... */ | 618 | of_unregister_driver(&cg14_driver); |
| 636 | return 0; | ||
| 637 | } | 619 | } |
| 638 | 620 | ||
| 639 | module_init(cg14_init); | 621 | module_init(cg14_init); |
| 640 | |||
| 641 | #ifdef MODULE | ||
| 642 | module_exit(cg14_exit); | 622 | module_exit(cg14_exit); |
| 643 | #endif | ||
| 644 | 623 | ||
| 645 | MODULE_DESCRIPTION("framebuffer driver for CGfourteen chipsets"); | 624 | MODULE_DESCRIPTION("framebuffer driver for CGfourteen chipsets"); |
| 646 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 625 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 626 | MODULE_VERSION("2.0"); | ||
| 647 | MODULE_LICENSE("GPL"); | 627 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index 3de6e1b5ab2f..9c8c753ef454 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* cg3.c: CGTHREE frame buffer driver | 1 | /* cg3.c: CGTHREE frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) | 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 6 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 6 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
| @@ -19,8 +19,9 @@ | |||
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | 20 | ||
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/sbus.h> | ||
| 23 | #include <asm/oplib.h> | 22 | #include <asm/oplib.h> |
| 23 | #include <asm/prom.h> | ||
| 24 | #include <asm/of_device.h> | ||
| 24 | #include <asm/fbio.h> | 25 | #include <asm/fbio.h> |
| 25 | 26 | ||
| 26 | #include "sbuslib.h" | 27 | #include "sbuslib.h" |
| @@ -80,30 +81,30 @@ enum cg3_type { | |||
| 80 | }; | 81 | }; |
| 81 | 82 | ||
| 82 | struct bt_regs { | 83 | struct bt_regs { |
| 83 | volatile u32 addr; | 84 | u32 addr; |
| 84 | volatile u32 color_map; | 85 | u32 color_map; |
| 85 | volatile u32 control; | 86 | u32 control; |
| 86 | volatile u32 cursor; | 87 | u32 cursor; |
| 87 | }; | 88 | }; |
| 88 | 89 | ||
| 89 | struct cg3_regs { | 90 | struct cg3_regs { |
| 90 | struct bt_regs cmap; | 91 | struct bt_regs cmap; |
| 91 | volatile u8 control; | 92 | u8 control; |
| 92 | volatile u8 status; | 93 | u8 status; |
| 93 | volatile u8 cursor_start; | 94 | u8 cursor_start; |
| 94 | volatile u8 cursor_end; | 95 | u8 cursor_end; |
| 95 | volatile u8 h_blank_start; | 96 | u8 h_blank_start; |
| 96 | volatile u8 h_blank_end; | 97 | u8 h_blank_end; |
| 97 | volatile u8 h_sync_start; | 98 | u8 h_sync_start; |
| 98 | volatile u8 h_sync_end; | 99 | u8 h_sync_end; |
| 99 | volatile u8 comp_sync_end; | 100 | u8 comp_sync_end; |
| 100 | volatile u8 v_blank_start_high; | 101 | u8 v_blank_start_high; |
| 101 | volatile u8 v_blank_start_low; | 102 | u8 v_blank_start_low; |
| 102 | volatile u8 v_blank_end; | 103 | u8 v_blank_end; |
| 103 | volatile u8 v_sync_start; | 104 | u8 v_sync_start; |
| 104 | volatile u8 v_sync_end; | 105 | u8 v_sync_end; |
| 105 | volatile u8 xfer_holdoff_start; | 106 | u8 xfer_holdoff_start; |
| 106 | volatile u8 xfer_holdoff_end; | 107 | u8 xfer_holdoff_end; |
| 107 | }; | 108 | }; |
| 108 | 109 | ||
| 109 | /* Offset of interesting structures in the OBIO space */ | 110 | /* Offset of interesting structures in the OBIO space */ |
| @@ -120,9 +121,8 @@ struct cg3_par { | |||
| 120 | #define CG3_FLAG_RDI 0x00000002 | 121 | #define CG3_FLAG_RDI 0x00000002 |
| 121 | 122 | ||
| 122 | unsigned long physbase; | 123 | unsigned long physbase; |
| 124 | unsigned long which_io; | ||
| 123 | unsigned long fbsize; | 125 | unsigned long fbsize; |
| 124 | |||
| 125 | struct sbus_dev *sdev; | ||
| 126 | }; | 126 | }; |
| 127 | 127 | ||
| 128 | /** | 128 | /** |
| @@ -235,7 +235,7 @@ static int cg3_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 235 | 235 | ||
| 236 | return sbusfb_mmap_helper(cg3_mmap_map, | 236 | return sbusfb_mmap_helper(cg3_mmap_map, |
| 237 | par->physbase, par->fbsize, | 237 | par->physbase, par->fbsize, |
| 238 | par->sdev->reg_addrs[0].which_io, | 238 | par->which_io, |
| 239 | vma); | 239 | vma); |
| 240 | } | 240 | } |
| 241 | 241 | ||
| @@ -252,11 +252,9 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) | |||
| 252 | */ | 252 | */ |
| 253 | 253 | ||
| 254 | static void | 254 | static void |
| 255 | cg3_init_fix(struct fb_info *info, int linebytes) | 255 | cg3_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) |
| 256 | { | 256 | { |
| 257 | struct cg3_par *par = (struct cg3_par *)info->par; | 257 | strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); |
| 258 | |||
| 259 | strlcpy(info->fix.id, par->sdev->prom_name, sizeof(info->fix.id)); | ||
| 260 | 258 | ||
| 261 | info->fix.type = FB_TYPE_PACKED_PIXELS; | 259 | info->fix.type = FB_TYPE_PACKED_PIXELS; |
| 262 | info->fix.visual = FB_VISUAL_PSEUDOCOLOR; | 260 | info->fix.visual = FB_VISUAL_PSEUDOCOLOR; |
| @@ -267,16 +265,15 @@ cg3_init_fix(struct fb_info *info, int linebytes) | |||
| 267 | } | 265 | } |
| 268 | 266 | ||
| 269 | static void cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var, | 267 | static void cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var, |
| 270 | struct sbus_dev *sdev) | 268 | struct device_node *dp) |
| 271 | { | 269 | { |
| 272 | char buffer[40]; | 270 | char *params; |
| 273 | char *p; | 271 | char *p; |
| 274 | int ww, hh; | 272 | int ww, hh; |
| 275 | 273 | ||
| 276 | *buffer = 0; | 274 | params = of_get_property(dp, "params", NULL); |
| 277 | prom_getstring(sdev->prom_node, "params", buffer, sizeof(buffer)); | 275 | if (params) { |
| 278 | if (*buffer) { | 276 | ww = simple_strtoul(params, &p, 10); |
| 279 | ww = simple_strtoul(buffer, &p, 10); | ||
| 280 | if (ww && *p == 'x') { | 277 | if (ww && *p == 'x') { |
| 281 | hh = simple_strtoul(p + 1, &p, 10); | 278 | hh = simple_strtoul(p + 1, &p, 10); |
| 282 | if (hh && *p == '-') { | 279 | if (hh && *p == '-') { |
| @@ -348,11 +345,11 @@ static void cg3_do_default_mode(struct cg3_par *par) | |||
| 348 | sbus_writeb(p[1], regp); | 345 | sbus_writeb(p[1], regp); |
| 349 | } | 346 | } |
| 350 | for (p = cg3_dacvals; *p; p += 2) { | 347 | for (p = cg3_dacvals; *p; p += 2) { |
| 351 | volatile u8 __iomem *regp; | 348 | u8 __iomem *regp; |
| 352 | 349 | ||
| 353 | regp = (volatile u8 __iomem *)&par->regs->cmap.addr; | 350 | regp = (u8 __iomem *)&par->regs->cmap.addr; |
| 354 | sbus_writeb(p[0], regp); | 351 | sbus_writeb(p[0], regp); |
| 355 | regp = (volatile u8 __iomem *)&par->regs->cmap.control; | 352 | regp = (u8 __iomem *)&par->regs->cmap.control; |
| 356 | sbus_writeb(p[1], regp); | 353 | sbus_writeb(p[1], regp); |
| 357 | } | 354 | } |
| 358 | } | 355 | } |
| @@ -360,129 +357,137 @@ static void cg3_do_default_mode(struct cg3_par *par) | |||
| 360 | struct all_info { | 357 | struct all_info { |
| 361 | struct fb_info info; | 358 | struct fb_info info; |
| 362 | struct cg3_par par; | 359 | struct cg3_par par; |
| 363 | struct list_head list; | ||
| 364 | }; | 360 | }; |
| 365 | static LIST_HEAD(cg3_list); | ||
| 366 | 361 | ||
| 367 | static void cg3_init_one(struct sbus_dev *sdev) | 362 | static int __devinit cg3_init_one(struct of_device *op) |
| 368 | { | 363 | { |
| 364 | struct device_node *dp = op->node; | ||
| 369 | struct all_info *all; | 365 | struct all_info *all; |
| 370 | int linebytes; | 366 | int linebytes, err; |
| 371 | |||
| 372 | all = kmalloc(sizeof(*all), GFP_KERNEL); | ||
| 373 | if (!all) { | ||
| 374 | printk(KERN_ERR "cg3: Cannot allocate memory.\n"); | ||
| 375 | return; | ||
| 376 | } | ||
| 377 | memset(all, 0, sizeof(*all)); | ||
| 378 | 367 | ||
| 379 | INIT_LIST_HEAD(&all->list); | 368 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 369 | if (!all) | ||
| 370 | return -ENOMEM; | ||
| 380 | 371 | ||
| 381 | spin_lock_init(&all->par.lock); | 372 | spin_lock_init(&all->par.lock); |
| 382 | all->par.sdev = sdev; | ||
| 383 | 373 | ||
| 384 | all->par.physbase = sdev->reg_addrs[0].phys_addr; | 374 | all->par.physbase = op->resource[0].start; |
| 375 | all->par.which_io = op->resource[0].flags & IORESOURCE_BITS; | ||
| 385 | 376 | ||
| 386 | sbusfb_fill_var(&all->info.var, sdev->prom_node, 8); | 377 | sbusfb_fill_var(&all->info.var, dp->node, 8); |
| 387 | all->info.var.red.length = 8; | 378 | all->info.var.red.length = 8; |
| 388 | all->info.var.green.length = 8; | 379 | all->info.var.green.length = 8; |
| 389 | all->info.var.blue.length = 8; | 380 | all->info.var.blue.length = 8; |
| 390 | if (!strcmp(sdev->prom_name, "cgRDI")) | 381 | if (!strcmp(dp->name, "cgRDI")) |
| 391 | all->par.flags |= CG3_FLAG_RDI; | 382 | all->par.flags |= CG3_FLAG_RDI; |
| 392 | if (all->par.flags & CG3_FLAG_RDI) | 383 | if (all->par.flags & CG3_FLAG_RDI) |
| 393 | cg3_rdi_maybe_fixup_var(&all->info.var, sdev); | 384 | cg3_rdi_maybe_fixup_var(&all->info.var, dp); |
| 394 | 385 | ||
| 395 | linebytes = prom_getintdefault(sdev->prom_node, "linebytes", | 386 | linebytes = of_getintprop_default(dp, "linebytes", |
| 396 | all->info.var.xres); | 387 | all->info.var.xres); |
| 397 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); | 388 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); |
| 398 | 389 | ||
| 399 | all->par.regs = sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET, | 390 | all->par.regs = of_ioremap(&op->resource[0], CG3_REGS_OFFSET, |
| 400 | sizeof(struct cg3_regs), "cg3 regs"); | 391 | sizeof(struct cg3_regs), "cg3 regs"); |
| 401 | 392 | ||
| 402 | all->info.flags = FBINFO_DEFAULT; | 393 | all->info.flags = FBINFO_DEFAULT; |
| 403 | all->info.fbops = &cg3_ops; | 394 | all->info.fbops = &cg3_ops; |
| 404 | #ifdef CONFIG_SPARC32 | 395 | all->info.screen_base = |
| 405 | all->info.screen_base = (char __iomem *) | 396 | of_ioremap(&op->resource[0], CG3_RAM_OFFSET, |
| 406 | prom_getintdefault(sdev->prom_node, "address", 0); | 397 | all->par.fbsize, "cg3 ram"); |
| 407 | #endif | ||
| 408 | if (!all->info.screen_base) | ||
| 409 | all->info.screen_base = | ||
| 410 | sbus_ioremap(&sdev->resource[0], CG3_RAM_OFFSET, | ||
| 411 | all->par.fbsize, "cg3 ram"); | ||
| 412 | all->info.par = &all->par; | 398 | all->info.par = &all->par; |
| 413 | 399 | ||
| 414 | cg3_blank(0, &all->info); | 400 | cg3_blank(0, &all->info); |
| 415 | 401 | ||
| 416 | if (!prom_getbool(sdev->prom_node, "width")) | 402 | if (!of_find_property(dp, "width", NULL)) |
| 417 | cg3_do_default_mode(&all->par); | 403 | cg3_do_default_mode(&all->par); |
| 418 | 404 | ||
| 419 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 405 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
| 420 | printk(KERN_ERR "cg3: Could not allocate color map.\n"); | 406 | of_iounmap(all->par.regs, sizeof(struct cg3_regs)); |
| 407 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 421 | kfree(all); | 408 | kfree(all); |
| 422 | return; | 409 | return -ENOMEM; |
| 423 | } | 410 | } |
| 424 | fb_set_cmap(&all->info.cmap, &all->info); | 411 | fb_set_cmap(&all->info.cmap, &all->info); |
| 425 | 412 | ||
| 426 | cg3_init_fix(&all->info, linebytes); | 413 | cg3_init_fix(&all->info, linebytes, dp); |
| 427 | 414 | ||
| 428 | if (register_framebuffer(&all->info) < 0) { | 415 | err = register_framebuffer(&all->info); |
| 429 | printk(KERN_ERR "cg3: Could not register framebuffer.\n"); | 416 | if (err < 0) { |
| 430 | fb_dealloc_cmap(&all->info.cmap); | 417 | fb_dealloc_cmap(&all->info.cmap); |
| 418 | of_iounmap(all->par.regs, sizeof(struct cg3_regs)); | ||
| 419 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 431 | kfree(all); | 420 | kfree(all); |
| 432 | return; | 421 | return err; |
| 433 | } | 422 | } |
| 434 | 423 | ||
| 435 | list_add(&all->list, &cg3_list); | 424 | dev_set_drvdata(&op->dev, all); |
| 425 | |||
| 426 | printk("%s: cg3 at %lx:%lx\n", | ||
| 427 | dp->full_name, all->par.which_io, all->par.physbase); | ||
| 436 | 428 | ||
| 437 | printk("cg3: %s at %lx:%lx\n", | 429 | return 0; |
| 438 | sdev->prom_name, | ||
| 439 | (long) sdev->reg_addrs[0].which_io, | ||
| 440 | (long) sdev->reg_addrs[0].phys_addr); | ||
| 441 | } | 430 | } |
| 442 | 431 | ||
| 443 | int __init cg3_init(void) | 432 | static int __devinit cg3_probe(struct of_device *dev, const struct of_device_id *match) |
| 444 | { | 433 | { |
| 445 | struct sbus_bus *sbus; | 434 | struct of_device *op = to_of_device(&dev->dev); |
| 446 | struct sbus_dev *sdev; | ||
| 447 | 435 | ||
| 448 | if (fb_get_options("cg3fb", NULL)) | 436 | return cg3_init_one(op); |
| 449 | return -ENODEV; | 437 | } |
| 450 | 438 | ||
| 451 | for_all_sbusdev(sdev, sbus) { | 439 | static int __devexit cg3_remove(struct of_device *dev) |
| 452 | if (!strcmp(sdev->prom_name, "cgthree") || | 440 | { |
| 453 | !strcmp(sdev->prom_name, "cgRDI")) | 441 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 454 | cg3_init_one(sdev); | 442 | |
| 455 | } | 443 | unregister_framebuffer(&all->info); |
| 444 | fb_dealloc_cmap(&all->info.cmap); | ||
| 445 | |||
| 446 | of_iounmap(all->par.regs, sizeof(struct cg3_regs)); | ||
| 447 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 448 | |||
| 449 | kfree(all); | ||
| 450 | |||
| 451 | dev_set_drvdata(&dev->dev, NULL); | ||
| 456 | 452 | ||
| 457 | return 0; | 453 | return 0; |
| 458 | } | 454 | } |
| 459 | 455 | ||
| 460 | void __exit cg3_exit(void) | 456 | static struct of_device_id cg3_match[] = { |
| 461 | { | 457 | { |
| 462 | struct list_head *pos, *tmp; | 458 | .name = "cgthree", |
| 459 | }, | ||
| 460 | { | ||
| 461 | .name = "cgRDI", | ||
| 462 | }, | ||
| 463 | {}, | ||
| 464 | }; | ||
| 465 | MODULE_DEVICE_TABLE(of, cg3_match); | ||
| 463 | 466 | ||
| 464 | list_for_each_safe(pos, tmp, &cg3_list) { | 467 | static struct of_platform_driver cg3_driver = { |
| 465 | struct all_info *all = list_entry(pos, typeof(*all), list); | 468 | .name = "cg3", |
| 469 | .match_table = cg3_match, | ||
| 470 | .probe = cg3_probe, | ||
| 471 | .remove = __devexit_p(cg3_remove), | ||
| 472 | }; | ||
| 466 | 473 | ||
| 467 | unregister_framebuffer(&all->info); | 474 | static int __init cg3_init(void) |
| 468 | fb_dealloc_cmap(&all->info.cmap); | 475 | { |
| 469 | kfree(all); | 476 | if (fb_get_options("cg3fb", NULL)) |
| 470 | } | 477 | return -ENODEV; |
| 478 | |||
| 479 | return of_register_driver(&cg3_driver, &of_bus_type); | ||
| 471 | } | 480 | } |
| 472 | 481 | ||
| 473 | int __init | 482 | static void __exit cg3_exit(void) |
| 474 | cg3_setup(char *arg) | ||
| 475 | { | 483 | { |
| 476 | /* No cmdline options yet... */ | 484 | of_unregister_driver(&cg3_driver); |
| 477 | return 0; | ||
| 478 | } | 485 | } |
| 479 | 486 | ||
| 480 | module_init(cg3_init); | 487 | module_init(cg3_init); |
| 481 | |||
| 482 | #ifdef MODULE | ||
| 483 | module_exit(cg3_exit); | 488 | module_exit(cg3_exit); |
| 484 | #endif | ||
| 485 | 489 | ||
| 486 | MODULE_DESCRIPTION("framebuffer driver for CGthree chipsets"); | 490 | MODULE_DESCRIPTION("framebuffer driver for CGthree chipsets"); |
| 487 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 491 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 492 | MODULE_VERSION("2.0"); | ||
| 488 | MODULE_LICENSE("GPL"); | 493 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 7aab91ead681..64146be2eeb0 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* cg6.c: CGSIX (GX, GXplus, TGX) frame buffer driver | 1 | /* cg6.c: CGSIX (GX, GXplus, TGX) frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) | 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 6 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) | 6 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) |
| @@ -19,8 +19,8 @@ | |||
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | 20 | ||
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/sbus.h> | 22 | #include <asm/prom.h> |
| 23 | #include <asm/oplib.h> | 23 | #include <asm/of_device.h> |
| 24 | #include <asm/fbio.h> | 24 | #include <asm/fbio.h> |
| 25 | 25 | ||
| 26 | #include "sbuslib.h" | 26 | #include "sbuslib.h" |
| @@ -164,89 +164,89 @@ static struct fb_ops cg6_ops = { | |||
| 164 | 164 | ||
| 165 | /* The contents are unknown */ | 165 | /* The contents are unknown */ |
| 166 | struct cg6_tec { | 166 | struct cg6_tec { |
| 167 | volatile int tec_matrix; | 167 | int tec_matrix; |
| 168 | volatile int tec_clip; | 168 | int tec_clip; |
| 169 | volatile int tec_vdc; | 169 | int tec_vdc; |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | struct cg6_thc { | 172 | struct cg6_thc { |
| 173 | uint thc_pad0[512]; | 173 | u32 thc_pad0[512]; |
| 174 | volatile uint thc_hs; /* hsync timing */ | 174 | u32 thc_hs; /* hsync timing */ |
| 175 | volatile uint thc_hsdvs; | 175 | u32 thc_hsdvs; |
| 176 | volatile uint thc_hd; | 176 | u32 thc_hd; |
| 177 | volatile uint thc_vs; /* vsync timing */ | 177 | u32 thc_vs; /* vsync timing */ |
| 178 | volatile uint thc_vd; | 178 | u32 thc_vd; |
| 179 | volatile uint thc_refresh; | 179 | u32 thc_refresh; |
| 180 | volatile uint thc_misc; | 180 | u32 thc_misc; |
| 181 | uint thc_pad1[56]; | 181 | u32 thc_pad1[56]; |
| 182 | volatile uint thc_cursxy; /* cursor x,y position (16 bits each) */ | 182 | u32 thc_cursxy; /* cursor x,y position (16 bits each) */ |
| 183 | volatile uint thc_cursmask[32]; /* cursor mask bits */ | 183 | u32 thc_cursmask[32]; /* cursor mask bits */ |
| 184 | volatile uint thc_cursbits[32]; /* what to show where mask enabled */ | 184 | u32 thc_cursbits[32]; /* what to show where mask enabled */ |
| 185 | }; | 185 | }; |
| 186 | 186 | ||
| 187 | struct cg6_fbc { | 187 | struct cg6_fbc { |
| 188 | u32 xxx0[1]; | 188 | u32 xxx0[1]; |
| 189 | volatile u32 mode; | 189 | u32 mode; |
| 190 | volatile u32 clip; | 190 | u32 clip; |
| 191 | u32 xxx1[1]; | 191 | u32 xxx1[1]; |
| 192 | volatile u32 s; | 192 | u32 s; |
| 193 | volatile u32 draw; | 193 | u32 draw; |
| 194 | volatile u32 blit; | 194 | u32 blit; |
| 195 | volatile u32 font; | 195 | u32 font; |
| 196 | u32 xxx2[24]; | 196 | u32 xxx2[24]; |
| 197 | volatile u32 x0, y0, z0, color0; | 197 | u32 x0, y0, z0, color0; |
| 198 | volatile u32 x1, y1, z1, color1; | 198 | u32 x1, y1, z1, color1; |
| 199 | volatile u32 x2, y2, z2, color2; | 199 | u32 x2, y2, z2, color2; |
| 200 | volatile u32 x3, y3, z3, color3; | 200 | u32 x3, y3, z3, color3; |
| 201 | volatile u32 offx, offy; | 201 | u32 offx, offy; |
| 202 | u32 xxx3[2]; | 202 | u32 xxx3[2]; |
| 203 | volatile u32 incx, incy; | 203 | u32 incx, incy; |
| 204 | u32 xxx4[2]; | 204 | u32 xxx4[2]; |
| 205 | volatile u32 clipminx, clipminy; | 205 | u32 clipminx, clipminy; |
| 206 | u32 xxx5[2]; | 206 | u32 xxx5[2]; |
| 207 | volatile u32 clipmaxx, clipmaxy; | 207 | u32 clipmaxx, clipmaxy; |
| 208 | u32 xxx6[2]; | 208 | u32 xxx6[2]; |
| 209 | volatile u32 fg; | 209 | u32 fg; |
| 210 | volatile u32 bg; | 210 | u32 bg; |
| 211 | volatile u32 alu; | 211 | u32 alu; |
| 212 | volatile u32 pm; | 212 | u32 pm; |
| 213 | volatile u32 pixelm; | 213 | u32 pixelm; |
| 214 | u32 xxx7[2]; | 214 | u32 xxx7[2]; |
| 215 | volatile u32 patalign; | 215 | u32 patalign; |
| 216 | volatile u32 pattern[8]; | 216 | u32 pattern[8]; |
| 217 | u32 xxx8[432]; | 217 | u32 xxx8[432]; |
| 218 | volatile u32 apointx, apointy, apointz; | 218 | u32 apointx, apointy, apointz; |
| 219 | u32 xxx9[1]; | 219 | u32 xxx9[1]; |
| 220 | volatile u32 rpointx, rpointy, rpointz; | 220 | u32 rpointx, rpointy, rpointz; |
| 221 | u32 xxx10[5]; | 221 | u32 xxx10[5]; |
| 222 | volatile u32 pointr, pointg, pointb, pointa; | 222 | u32 pointr, pointg, pointb, pointa; |
| 223 | volatile u32 alinex, aliney, alinez; | 223 | u32 alinex, aliney, alinez; |
| 224 | u32 xxx11[1]; | 224 | u32 xxx11[1]; |
| 225 | volatile u32 rlinex, rliney, rlinez; | 225 | u32 rlinex, rliney, rlinez; |
| 226 | u32 xxx12[5]; | 226 | u32 xxx12[5]; |
| 227 | volatile u32 liner, lineg, lineb, linea; | 227 | u32 liner, lineg, lineb, linea; |
| 228 | volatile u32 atrix, atriy, atriz; | 228 | u32 atrix, atriy, atriz; |
| 229 | u32 xxx13[1]; | 229 | u32 xxx13[1]; |
| 230 | volatile u32 rtrix, rtriy, rtriz; | 230 | u32 rtrix, rtriy, rtriz; |
| 231 | u32 xxx14[5]; | 231 | u32 xxx14[5]; |
| 232 | volatile u32 trir, trig, trib, tria; | 232 | u32 trir, trig, trib, tria; |
| 233 | volatile u32 aquadx, aquady, aquadz; | 233 | u32 aquadx, aquady, aquadz; |
| 234 | u32 xxx15[1]; | 234 | u32 xxx15[1]; |
| 235 | volatile u32 rquadx, rquady, rquadz; | 235 | u32 rquadx, rquady, rquadz; |
| 236 | u32 xxx16[5]; | 236 | u32 xxx16[5]; |
| 237 | volatile u32 quadr, quadg, quadb, quada; | 237 | u32 quadr, quadg, quadb, quada; |
| 238 | volatile u32 arectx, arecty, arectz; | 238 | u32 arectx, arecty, arectz; |
| 239 | u32 xxx17[1]; | 239 | u32 xxx17[1]; |
| 240 | volatile u32 rrectx, rrecty, rrectz; | 240 | u32 rrectx, rrecty, rrectz; |
| 241 | u32 xxx18[5]; | 241 | u32 xxx18[5]; |
| 242 | volatile u32 rectr, rectg, rectb, recta; | 242 | u32 rectr, rectg, rectb, recta; |
| 243 | }; | 243 | }; |
| 244 | 244 | ||
| 245 | struct bt_regs { | 245 | struct bt_regs { |
| 246 | volatile u32 addr; | 246 | u32 addr; |
| 247 | volatile u32 color_map; | 247 | u32 color_map; |
| 248 | volatile u32 control; | 248 | u32 control; |
| 249 | volatile u32 cursor; | 249 | u32 cursor; |
| 250 | }; | 250 | }; |
| 251 | 251 | ||
| 252 | struct cg6_par { | 252 | struct cg6_par { |
| @@ -255,15 +255,14 @@ struct cg6_par { | |||
| 255 | struct cg6_fbc __iomem *fbc; | 255 | struct cg6_fbc __iomem *fbc; |
| 256 | struct cg6_thc __iomem *thc; | 256 | struct cg6_thc __iomem *thc; |
| 257 | struct cg6_tec __iomem *tec; | 257 | struct cg6_tec __iomem *tec; |
| 258 | volatile u32 __iomem *fhc; | 258 | u32 __iomem *fhc; |
| 259 | 259 | ||
| 260 | u32 flags; | 260 | u32 flags; |
| 261 | #define CG6_FLAG_BLANKED 0x00000001 | 261 | #define CG6_FLAG_BLANKED 0x00000001 |
| 262 | 262 | ||
| 263 | unsigned long physbase; | 263 | unsigned long physbase; |
| 264 | unsigned long which_io; | ||
| 264 | unsigned long fbsize; | 265 | unsigned long fbsize; |
| 265 | |||
| 266 | struct sbus_dev *sdev; | ||
| 267 | }; | 266 | }; |
| 268 | 267 | ||
| 269 | static int cg6_sync(struct fb_info *info) | 268 | static int cg6_sync(struct fb_info *info) |
| @@ -529,8 +528,7 @@ static int cg6_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 529 | 528 | ||
| 530 | return sbusfb_mmap_helper(cg6_mmap_map, | 529 | return sbusfb_mmap_helper(cg6_mmap_map, |
| 531 | par->physbase, par->fbsize, | 530 | par->physbase, par->fbsize, |
| 532 | par->sdev->reg_addrs[0].which_io, | 531 | par->which_io, vma); |
| 533 | vma); | ||
| 534 | } | 532 | } |
| 535 | 533 | ||
| 536 | static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) | 534 | static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) |
| @@ -658,62 +656,75 @@ static void cg6_chip_init(struct fb_info *info) | |||
| 658 | struct all_info { | 656 | struct all_info { |
| 659 | struct fb_info info; | 657 | struct fb_info info; |
| 660 | struct cg6_par par; | 658 | struct cg6_par par; |
| 661 | struct list_head list; | ||
| 662 | }; | 659 | }; |
| 663 | static LIST_HEAD(cg6_list); | ||
| 664 | 660 | ||
| 665 | static void cg6_init_one(struct sbus_dev *sdev) | 661 | static void cg6_unmap_regs(struct all_info *all) |
| 666 | { | 662 | { |
| 667 | struct all_info *all; | 663 | if (all->par.fbc) |
| 668 | int linebytes; | 664 | of_iounmap(all->par.fbc, 4096); |
| 665 | if (all->par.tec) | ||
| 666 | of_iounmap(all->par.tec, sizeof(struct cg6_tec)); | ||
| 667 | if (all->par.thc) | ||
| 668 | of_iounmap(all->par.thc, sizeof(struct cg6_thc)); | ||
| 669 | if (all->par.bt) | ||
| 670 | of_iounmap(all->par.bt, sizeof(struct bt_regs)); | ||
| 671 | if (all->par.fhc) | ||
| 672 | of_iounmap(all->par.fhc, sizeof(u32)); | ||
| 673 | |||
| 674 | if (all->info.screen_base) | ||
| 675 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 676 | } | ||
| 669 | 677 | ||
| 670 | all = kmalloc(sizeof(*all), GFP_KERNEL); | 678 | static int __devinit cg6_init_one(struct of_device *op) |
| 671 | if (!all) { | 679 | { |
| 672 | printk(KERN_ERR "cg6: Cannot allocate memory.\n"); | 680 | struct device_node *dp = op->node; |
| 673 | return; | 681 | struct all_info *all; |
| 674 | } | 682 | int linebytes, err; |
| 675 | memset(all, 0, sizeof(*all)); | ||
| 676 | 683 | ||
| 677 | INIT_LIST_HEAD(&all->list); | 684 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 685 | if (!all) | ||
| 686 | return -ENOMEM; | ||
| 678 | 687 | ||
| 679 | spin_lock_init(&all->par.lock); | 688 | spin_lock_init(&all->par.lock); |
| 680 | all->par.sdev = sdev; | ||
| 681 | 689 | ||
| 682 | all->par.physbase = sdev->reg_addrs[0].phys_addr; | 690 | all->par.physbase = op->resource[0].start; |
| 691 | all->par.which_io = op->resource[0].flags & IORESOURCE_BITS; | ||
| 683 | 692 | ||
| 684 | sbusfb_fill_var(&all->info.var, sdev->prom_node, 8); | 693 | sbusfb_fill_var(&all->info.var, dp->node, 8); |
| 685 | all->info.var.red.length = 8; | 694 | all->info.var.red.length = 8; |
| 686 | all->info.var.green.length = 8; | 695 | all->info.var.green.length = 8; |
| 687 | all->info.var.blue.length = 8; | 696 | all->info.var.blue.length = 8; |
| 688 | 697 | ||
| 689 | linebytes = prom_getintdefault(sdev->prom_node, "linebytes", | 698 | linebytes = of_getintprop_default(dp, "linebytes", |
| 690 | all->info.var.xres); | 699 | all->info.var.xres); |
| 691 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); | 700 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); |
| 692 | if (prom_getbool(sdev->prom_node, "dblbuf")) | 701 | if (of_find_property(dp, "dblbuf", NULL)) |
| 693 | all->par.fbsize *= 4; | 702 | all->par.fbsize *= 4; |
| 694 | 703 | ||
| 695 | all->par.fbc = sbus_ioremap(&sdev->resource[0], CG6_FBC_OFFSET, | 704 | all->par.fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET, |
| 696 | 4096, "cgsix fbc"); | 705 | 4096, "cgsix fbc"); |
| 697 | all->par.tec = sbus_ioremap(&sdev->resource[0], CG6_TEC_OFFSET, | 706 | all->par.tec = of_ioremap(&op->resource[0], CG6_TEC_OFFSET, |
| 698 | sizeof(struct cg6_tec), "cgsix tec"); | 707 | sizeof(struct cg6_tec), "cgsix tec"); |
| 699 | all->par.thc = sbus_ioremap(&sdev->resource[0], CG6_THC_OFFSET, | 708 | all->par.thc = of_ioremap(&op->resource[0], CG6_THC_OFFSET, |
| 700 | sizeof(struct cg6_thc), "cgsix thc"); | 709 | sizeof(struct cg6_thc), "cgsix thc"); |
| 701 | all->par.bt = sbus_ioremap(&sdev->resource[0], CG6_BROOKTREE_OFFSET, | 710 | all->par.bt = of_ioremap(&op->resource[0], CG6_BROOKTREE_OFFSET, |
| 702 | sizeof(struct bt_regs), "cgsix dac"); | 711 | sizeof(struct bt_regs), "cgsix dac"); |
| 703 | all->par.fhc = sbus_ioremap(&sdev->resource[0], CG6_FHC_OFFSET, | 712 | all->par.fhc = of_ioremap(&op->resource[0], CG6_FHC_OFFSET, |
| 704 | sizeof(u32), "cgsix fhc"); | 713 | sizeof(u32), "cgsix fhc"); |
| 705 | 714 | ||
| 706 | all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_IMAGEBLIT | | 715 | all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_IMAGEBLIT | |
| 707 | FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT; | 716 | FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT; |
| 708 | all->info.fbops = &cg6_ops; | 717 | all->info.fbops = &cg6_ops; |
| 709 | #ifdef CONFIG_SPARC32 | 718 | |
| 710 | all->info.screen_base = (char __iomem *) | 719 | all->info.screen_base = of_ioremap(&op->resource[0], CG6_RAM_OFFSET, |
| 711 | prom_getintdefault(sdev->prom_node, "address", 0); | 720 | all->par.fbsize, "cgsix ram"); |
| 712 | #endif | 721 | if (!all->par.fbc || !all->par.tec || !all->par.thc || |
| 713 | if (!all->info.screen_base) | 722 | !all->par.bt || !all->par.fhc || !all->info.screen_base) { |
| 714 | all->info.screen_base = | 723 | cg6_unmap_regs(all); |
| 715 | sbus_ioremap(&sdev->resource[0], CG6_RAM_OFFSET, | 724 | kfree(all); |
| 716 | all->par.fbsize, "cgsix ram"); | 725 | return -ENOMEM; |
| 726 | } | ||
| 727 | |||
| 717 | all->info.par = &all->par; | 728 | all->info.par = &all->par; |
| 718 | 729 | ||
| 719 | all->info.var.accel_flags = FB_ACCELF_TEXT; | 730 | all->info.var.accel_flags = FB_ACCELF_TEXT; |
| @@ -723,72 +734,90 @@ static void cg6_init_one(struct sbus_dev *sdev) | |||
| 723 | cg6_blank(0, &all->info); | 734 | cg6_blank(0, &all->info); |
| 724 | 735 | ||
| 725 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 736 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
| 726 | printk(KERN_ERR "cg6: Could not allocate color map.\n"); | 737 | cg6_unmap_regs(all); |
| 727 | kfree(all); | 738 | kfree(all); |
| 728 | return; | 739 | return -ENOMEM; |
| 729 | } | 740 | } |
| 730 | 741 | ||
| 731 | fb_set_cmap(&all->info.cmap, &all->info); | 742 | fb_set_cmap(&all->info.cmap, &all->info); |
| 732 | cg6_init_fix(&all->info, linebytes); | 743 | cg6_init_fix(&all->info, linebytes); |
| 733 | 744 | ||
| 734 | if (register_framebuffer(&all->info) < 0) { | 745 | err = register_framebuffer(&all->info); |
| 735 | printk(KERN_ERR "cg6: Could not register framebuffer.\n"); | 746 | if (err < 0) { |
| 747 | cg6_unmap_regs(all); | ||
| 736 | fb_dealloc_cmap(&all->info.cmap); | 748 | fb_dealloc_cmap(&all->info.cmap); |
| 737 | kfree(all); | 749 | kfree(all); |
| 738 | return; | 750 | return err; |
| 739 | } | 751 | } |
| 740 | 752 | ||
| 741 | list_add(&all->list, &cg6_list); | 753 | dev_set_drvdata(&op->dev, all); |
| 742 | 754 | ||
| 743 | printk("cg6: CGsix [%s] at %lx:%lx\n", | 755 | printk("%s: CGsix [%s] at %lx:%lx\n", |
| 756 | dp->full_name, | ||
| 744 | all->info.fix.id, | 757 | all->info.fix.id, |
| 745 | (long) sdev->reg_addrs[0].which_io, | 758 | all->par.which_io, all->par.physbase); |
| 746 | (long) sdev->reg_addrs[0].phys_addr); | 759 | |
| 760 | return 0; | ||
| 747 | } | 761 | } |
| 748 | 762 | ||
| 749 | int __init cg6_init(void) | 763 | static int __devinit cg6_probe(struct of_device *dev, const struct of_device_id *match) |
| 750 | { | 764 | { |
| 751 | struct sbus_bus *sbus; | 765 | struct of_device *op = to_of_device(&dev->dev); |
| 752 | struct sbus_dev *sdev; | ||
| 753 | 766 | ||
| 754 | if (fb_get_options("cg6fb", NULL)) | 767 | return cg6_init_one(op); |
| 755 | return -ENODEV; | 768 | } |
| 756 | 769 | ||
| 757 | for_all_sbusdev(sdev, sbus) { | 770 | static int __devexit cg6_remove(struct of_device *dev) |
| 758 | if (!strcmp(sdev->prom_name, "cgsix") || | 771 | { |
| 759 | !strcmp(sdev->prom_name, "cgthree+")) | 772 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 760 | cg6_init_one(sdev); | 773 | |
| 761 | } | 774 | unregister_framebuffer(&all->info); |
| 775 | fb_dealloc_cmap(&all->info.cmap); | ||
| 776 | |||
| 777 | cg6_unmap_regs(all); | ||
| 778 | |||
| 779 | kfree(all); | ||
| 780 | |||
| 781 | dev_set_drvdata(&dev->dev, NULL); | ||
| 762 | 782 | ||
| 763 | return 0; | 783 | return 0; |
| 764 | } | 784 | } |
| 765 | 785 | ||
| 766 | void __exit cg6_exit(void) | 786 | static struct of_device_id cg6_match[] = { |
| 767 | { | 787 | { |
| 768 | struct list_head *pos, *tmp; | 788 | .name = "cgsix", |
| 789 | }, | ||
| 790 | { | ||
| 791 | .name = "cgthree+", | ||
| 792 | }, | ||
| 793 | {}, | ||
| 794 | }; | ||
| 795 | MODULE_DEVICE_TABLE(of, cg6_match); | ||
| 769 | 796 | ||
| 770 | list_for_each_safe(pos, tmp, &cg6_list) { | 797 | static struct of_platform_driver cg6_driver = { |
| 771 | struct all_info *all = list_entry(pos, typeof(*all), list); | 798 | .name = "cg6", |
| 799 | .match_table = cg6_match, | ||
| 800 | .probe = cg6_probe, | ||
| 801 | .remove = __devexit_p(cg6_remove), | ||
| 802 | }; | ||
| 772 | 803 | ||
| 773 | unregister_framebuffer(&all->info); | 804 | static int __init cg6_init(void) |
| 774 | fb_dealloc_cmap(&all->info.cmap); | 805 | { |
| 775 | kfree(all); | 806 | if (fb_get_options("cg6fb", NULL)) |
| 776 | } | 807 | return -ENODEV; |
| 808 | |||
| 809 | return of_register_driver(&cg6_driver, &of_bus_type); | ||
| 777 | } | 810 | } |
| 778 | 811 | ||
| 779 | int __init | 812 | static void __exit cg6_exit(void) |
| 780 | cg6_setup(char *arg) | ||
| 781 | { | 813 | { |
| 782 | /* No cmdline options yet... */ | 814 | of_unregister_driver(&cg6_driver); |
| 783 | return 0; | ||
| 784 | } | 815 | } |
| 785 | 816 | ||
| 786 | module_init(cg6_init); | 817 | module_init(cg6_init); |
| 787 | |||
| 788 | #ifdef MODULE | ||
| 789 | module_exit(cg6_exit); | 818 | module_exit(cg6_exit); |
| 790 | #endif | ||
| 791 | 819 | ||
| 792 | MODULE_DESCRIPTION("framebuffer driver for CGsix chipsets"); | 820 | MODULE_DESCRIPTION("framebuffer driver for CGsix chipsets"); |
| 793 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 821 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 822 | MODULE_VERSION("2.0"); | ||
| 794 | MODULE_LICENSE("GPL"); | 823 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c index d76bbfac92cc..0e465c80ef24 100644 --- a/drivers/video/chipsfb.c +++ b/drivers/video/chipsfb.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * more details. | 14 | * more details. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index dda240eb7360..7355da09c721 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | #define CIRRUSFB_VERSION "2.0-pre2" | 37 | #define CIRRUSFB_VERSION "2.0-pre2" |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c index eea422eb1ab5..308850df16fe 100644 --- a/drivers/video/console/bitblit.c +++ b/drivers/video/console/bitblit.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * more details. | 10 | * more details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 16 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c index 1ecda91e5a9c..878707a04398 100644 --- a/drivers/video/console/dummycon.c +++ b/drivers/video/console/dummycon.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #define DUMMY_ROWS ORIG_VIDEO_LINES | 22 | #define DUMMY_ROWS ORIG_VIDEO_LINES |
| 23 | #elif defined(__hppa__) | 23 | #elif defined(__hppa__) |
| 24 | /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */ | 24 | /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */ |
| 25 | #include <linux/config.h> | ||
| 26 | #define DUMMY_COLUMNS CONFIG_DUMMY_CONSOLE_COLUMNS | 25 | #define DUMMY_COLUMNS CONFIG_DUMMY_CONSOLE_COLUMNS |
| 27 | #define DUMMY_ROWS CONFIG_DUMMY_CONSOLE_ROWS | 26 | #define DUMMY_ROWS CONFIG_DUMMY_CONSOLE_ROWS |
| 28 | #else | 27 | #else |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 5dc4083552d8..94e9f7069bef 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | 58 | ||
| 59 | #undef FBCONDEBUG | 59 | #undef FBCONDEBUG |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 63 | #include <linux/types.h> | 62 | #include <linux/types.h> |
| 64 | #include <linux/sched.h> | 63 | #include <linux/sched.h> |
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h index 3487a636370a..f244ad066d68 100644 --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef _VIDEO_FBCON_H | 11 | #ifndef _VIDEO_FBCON_H |
| 12 | #define _VIDEO_FBCON_H | 12 | #define _VIDEO_FBCON_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/vt_buffer.h> | 15 | #include <linux/vt_buffer.h> |
| 17 | #include <linux/vt_kern.h> | 16 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c index 990289a69b78..4481c80b8b2a 100644 --- a/drivers/video/console/fbcon_ccw.c +++ b/drivers/video/console/fbcon_ccw.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * more details. | 8 | * more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/fb.h> | 13 | #include <linux/fb.h> |
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c index d44c5fa515fb..7f92c06afea7 100644 --- a/drivers/video/console/fbcon_cw.c +++ b/drivers/video/console/fbcon_cw.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * more details. | 8 | * more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/fb.h> | 13 | #include <linux/fb.h> |
diff --git a/drivers/video/console/fbcon_rotate.c b/drivers/video/console/fbcon_rotate.c index 2dc091fbd5c9..00884e013f0f 100644 --- a/drivers/video/console/fbcon_rotate.c +++ b/drivers/video/console/fbcon_rotate.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * more details. | 8 | * more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/fb.h> | 13 | #include <linux/fb.h> |
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c index f56ed068a5bc..ab91005e64dc 100644 --- a/drivers/video/console/fbcon_ud.c +++ b/drivers/video/console/fbcon_ud.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * more details. | 8 | * more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/fb.h> | 13 | #include <linux/fb.h> |
diff --git a/drivers/video/console/font_acorn_8x8.c b/drivers/video/console/font_acorn_8x8.c index 2d2e39632e2d..40f3d4eeb198 100644 --- a/drivers/video/console/font_acorn_8x8.c +++ b/drivers/video/console/font_acorn_8x8.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | /* Acorn-like font definition, with PC graphics characters */ | 1 | /* Acorn-like font definition, with PC graphics characters */ |
| 2 | 2 | ||
| 3 | #include <linux/config.h> | ||
| 4 | #include <linux/font.h> | 3 | #include <linux/font.h> |
| 5 | 4 | ||
| 6 | static const unsigned char acorndata_8x8[] = { | 5 | static const unsigned char acorndata_8x8[] = { |
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c index 0cc1bfda76a6..c960728b7e82 100644 --- a/drivers/video/console/fonts.c +++ b/drivers/video/console/fonts.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * for more details. | 12 | * for more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/string.h> | 17 | #include <linux/string.h> |
diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c index d6e6ad537f9f..5cd5e114d1e6 100644 --- a/drivers/video/console/promcon.c +++ b/drivers/video/console/promcon.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) | 5 | * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 74ac2acaf72c..88e7038eab88 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c index 153352ca9461..d981fe4d86c6 100644 --- a/drivers/video/console/tileblit.c +++ b/drivers/video/console/tileblit.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * more details. | 8 | * more details. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/fb.h> | 13 | #include <linux/fb.h> |
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 01401cd63ac0..05735ff4e9c5 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * more details. | 33 | * more details. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 39 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c index 655301a8671c..acdd6a103dbb 100644 --- a/drivers/video/controlfb.c +++ b/drivers/video/controlfb.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * more details. | 31 | * more details. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 37 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index 55a3514157ed..2e2924957d8f 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | * (which, incidentally, is about the same saving as a 2.5in hard disk | 36 | * (which, incidentally, is about the same saving as a 2.5in hard disk |
| 37 | * entering standby mode.) | 37 | * entering standby mode.) |
| 38 | */ | 38 | */ |
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
diff --git a/drivers/video/cyber2000fb.h b/drivers/video/cyber2000fb.h index bd7e1c040781..de4fc43e51c1 100644 --- a/drivers/video/cyber2000fb.h +++ b/drivers/video/cyber2000fb.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * Integraphics Cyber2000 frame buffer device | 10 | * Integraphics Cyber2000 frame buffer device |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | /* | 13 | /* |
| 15 | * Internal CyberPro sizes and offsets. | 14 | * Internal CyberPro sizes and offsets. |
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c index 0ae0a97b0fed..94a66c2d2cf5 100644 --- a/drivers/video/cyblafb.c +++ b/drivers/video/cyblafb.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #define CYBLAFB_PIXMAPSIZE 8192 | 15 | #define CYBLAFB_PIXMAPSIZE 8192 |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 20 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index a171daab0ad0..33034f81114d 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * for more details. | 11 | * for more details. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | 15 | ||
| 17 | #include <linux/compat.h> | 16 | #include <linux/compat.h> |
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 7633e41adda1..2a0e8210d398 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* ffb.c: Creator/Elite3D frame buffer driver | 1 | /* ffb.c: Creator/Elite3D frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1997,1998,1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997,1998,1999 Jakub Jelinek (jj@ultra.linux.cz) |
| 5 | * | 5 | * |
| 6 | * Driver layout based loosely on tgafb.c, see that file for credits. | 6 | * Driver layout based loosely on tgafb.c, see that file for credits. |
| @@ -19,7 +19,8 @@ | |||
| 19 | 19 | ||
| 20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
| 21 | #include <asm/upa.h> | 21 | #include <asm/upa.h> |
| 22 | #include <asm/oplib.h> | 22 | #include <asm/prom.h> |
| 23 | #include <asm/of_device.h> | ||
| 23 | #include <asm/fbio.h> | 24 | #include <asm/fbio.h> |
| 24 | 25 | ||
| 25 | #include "sbuslib.h" | 26 | #include "sbuslib.h" |
| @@ -184,161 +185,161 @@ static struct fb_ops ffb_ops = { | |||
| 184 | 185 | ||
| 185 | struct ffb_fbc { | 186 | struct ffb_fbc { |
| 186 | /* Next vertex registers */ | 187 | /* Next vertex registers */ |
| 187 | u32 xxx1[3]; | 188 | u32 xxx1[3]; |
| 188 | volatile u32 alpha; | 189 | u32 alpha; |
| 189 | volatile u32 red; | 190 | u32 red; |
| 190 | volatile u32 green; | 191 | u32 green; |
| 191 | volatile u32 blue; | 192 | u32 blue; |
| 192 | volatile u32 depth; | 193 | u32 depth; |
| 193 | volatile u32 y; | 194 | u32 y; |
| 194 | volatile u32 x; | 195 | u32 x; |
| 195 | u32 xxx2[2]; | 196 | u32 xxx2[2]; |
| 196 | volatile u32 ryf; | 197 | u32 ryf; |
| 197 | volatile u32 rxf; | 198 | u32 rxf; |
| 198 | u32 xxx3[2]; | 199 | u32 xxx3[2]; |
| 199 | 200 | ||
| 200 | volatile u32 dmyf; | 201 | u32 dmyf; |
| 201 | volatile u32 dmxf; | 202 | u32 dmxf; |
| 202 | u32 xxx4[2]; | 203 | u32 xxx4[2]; |
| 203 | volatile u32 ebyi; | 204 | u32 ebyi; |
| 204 | volatile u32 ebxi; | 205 | u32 ebxi; |
| 205 | u32 xxx5[2]; | 206 | u32 xxx5[2]; |
| 206 | volatile u32 by; | 207 | u32 by; |
| 207 | volatile u32 bx; | 208 | u32 bx; |
| 208 | u32 dy; | 209 | u32 dy; |
| 209 | u32 dx; | 210 | u32 dx; |
| 210 | volatile u32 bh; | 211 | u32 bh; |
| 211 | volatile u32 bw; | 212 | u32 bw; |
| 212 | u32 xxx6[2]; | 213 | u32 xxx6[2]; |
| 213 | 214 | ||
| 214 | u32 xxx7[32]; | 215 | u32 xxx7[32]; |
| 215 | 216 | ||
| 216 | /* Setup unit vertex state register */ | 217 | /* Setup unit vertex state register */ |
| 217 | volatile u32 suvtx; | 218 | u32 suvtx; |
| 218 | u32 xxx8[63]; | 219 | u32 xxx8[63]; |
| 219 | 220 | ||
| 220 | /* Control registers */ | 221 | /* Control registers */ |
| 221 | volatile u32 ppc; | 222 | u32 ppc; |
| 222 | volatile u32 wid; | 223 | u32 wid; |
| 223 | volatile u32 fg; | 224 | u32 fg; |
| 224 | volatile u32 bg; | 225 | u32 bg; |
| 225 | volatile u32 consty; | 226 | u32 consty; |
| 226 | volatile u32 constz; | 227 | u32 constz; |
| 227 | volatile u32 xclip; | 228 | u32 xclip; |
| 228 | volatile u32 dcss; | 229 | u32 dcss; |
| 229 | volatile u32 vclipmin; | 230 | u32 vclipmin; |
| 230 | volatile u32 vclipmax; | 231 | u32 vclipmax; |
| 231 | volatile u32 vclipzmin; | 232 | u32 vclipzmin; |
| 232 | volatile u32 vclipzmax; | 233 | u32 vclipzmax; |
| 233 | volatile u32 dcsf; | 234 | u32 dcsf; |
| 234 | volatile u32 dcsb; | 235 | u32 dcsb; |
| 235 | volatile u32 dczf; | 236 | u32 dczf; |
| 236 | volatile u32 dczb; | 237 | u32 dczb; |
| 237 | 238 | ||
| 238 | u32 xxx9; | 239 | u32 xxx9; |
| 239 | volatile u32 blendc; | 240 | u32 blendc; |
| 240 | volatile u32 blendc1; | 241 | u32 blendc1; |
| 241 | volatile u32 blendc2; | 242 | u32 blendc2; |
| 242 | volatile u32 fbramitc; | 243 | u32 fbramitc; |
| 243 | volatile u32 fbc; | 244 | u32 fbc; |
| 244 | volatile u32 rop; | 245 | u32 rop; |
| 245 | volatile u32 cmp; | 246 | u32 cmp; |
| 246 | volatile u32 matchab; | 247 | u32 matchab; |
| 247 | volatile u32 matchc; | 248 | u32 matchc; |
| 248 | volatile u32 magnab; | 249 | u32 magnab; |
| 249 | volatile u32 magnc; | 250 | u32 magnc; |
| 250 | volatile u32 fbcfg0; | 251 | u32 fbcfg0; |
| 251 | volatile u32 fbcfg1; | 252 | u32 fbcfg1; |
| 252 | volatile u32 fbcfg2; | 253 | u32 fbcfg2; |
| 253 | volatile u32 fbcfg3; | 254 | u32 fbcfg3; |
| 254 | 255 | ||
| 255 | u32 ppcfg; | 256 | u32 ppcfg; |
| 256 | volatile u32 pick; | 257 | u32 pick; |
| 257 | volatile u32 fillmode; | 258 | u32 fillmode; |
| 258 | volatile u32 fbramwac; | 259 | u32 fbramwac; |
| 259 | volatile u32 pmask; | 260 | u32 pmask; |
| 260 | volatile u32 xpmask; | 261 | u32 xpmask; |
| 261 | volatile u32 ypmask; | 262 | u32 ypmask; |
| 262 | volatile u32 zpmask; | 263 | u32 zpmask; |
| 263 | volatile u32 clip0min; | 264 | u32 clip0min; |
| 264 | volatile u32 clip0max; | 265 | u32 clip0max; |
| 265 | volatile u32 clip1min; | 266 | u32 clip1min; |
| 266 | volatile u32 clip1max; | 267 | u32 clip1max; |
| 267 | volatile u32 clip2min; | 268 | u32 clip2min; |
| 268 | volatile u32 clip2max; | 269 | u32 clip2max; |
| 269 | volatile u32 clip3min; | 270 | u32 clip3min; |
| 270 | volatile u32 clip3max; | 271 | u32 clip3max; |
| 271 | 272 | ||
| 272 | /* New 3dRAM III support regs */ | 273 | /* New 3dRAM III support regs */ |
| 273 | volatile u32 rawblend2; | 274 | u32 rawblend2; |
| 274 | volatile u32 rawpreblend; | 275 | u32 rawpreblend; |
| 275 | volatile u32 rawstencil; | 276 | u32 rawstencil; |
| 276 | volatile u32 rawstencilctl; | 277 | u32 rawstencilctl; |
| 277 | volatile u32 threedram1; | 278 | u32 threedram1; |
| 278 | volatile u32 threedram2; | 279 | u32 threedram2; |
| 279 | volatile u32 passin; | 280 | u32 passin; |
| 280 | volatile u32 rawclrdepth; | 281 | u32 rawclrdepth; |
| 281 | volatile u32 rawpmask; | 282 | u32 rawpmask; |
| 282 | volatile u32 rawcsrc; | 283 | u32 rawcsrc; |
| 283 | volatile u32 rawmatch; | 284 | u32 rawmatch; |
| 284 | volatile u32 rawmagn; | 285 | u32 rawmagn; |
| 285 | volatile u32 rawropblend; | 286 | u32 rawropblend; |
| 286 | volatile u32 rawcmp; | 287 | u32 rawcmp; |
| 287 | volatile u32 rawwac; | 288 | u32 rawwac; |
| 288 | volatile u32 fbramid; | 289 | u32 fbramid; |
| 289 | 290 | ||
| 290 | volatile u32 drawop; | 291 | u32 drawop; |
| 291 | u32 xxx10[2]; | 292 | u32 xxx10[2]; |
| 292 | volatile u32 fontlpat; | 293 | u32 fontlpat; |
| 293 | u32 xxx11; | 294 | u32 xxx11; |
| 294 | volatile u32 fontxy; | 295 | u32 fontxy; |
| 295 | volatile u32 fontw; | 296 | u32 fontw; |
| 296 | volatile u32 fontinc; | 297 | u32 fontinc; |
| 297 | volatile u32 font; | 298 | u32 font; |
| 298 | u32 xxx12[3]; | 299 | u32 xxx12[3]; |
| 299 | volatile u32 blend2; | 300 | u32 blend2; |
| 300 | volatile u32 preblend; | 301 | u32 preblend; |
| 301 | volatile u32 stencil; | 302 | u32 stencil; |
| 302 | volatile u32 stencilctl; | 303 | u32 stencilctl; |
| 303 | 304 | ||
| 304 | u32 xxx13[4]; | 305 | u32 xxx13[4]; |
| 305 | volatile u32 dcss1; | 306 | u32 dcss1; |
| 306 | volatile u32 dcss2; | 307 | u32 dcss2; |
| 307 | volatile u32 dcss3; | 308 | u32 dcss3; |
| 308 | volatile u32 widpmask; | 309 | u32 widpmask; |
| 309 | volatile u32 dcs2; | 310 | u32 dcs2; |
| 310 | volatile u32 dcs3; | 311 | u32 dcs3; |
| 311 | volatile u32 dcs4; | 312 | u32 dcs4; |
| 312 | u32 xxx14; | 313 | u32 xxx14; |
| 313 | volatile u32 dcd2; | 314 | u32 dcd2; |
| 314 | volatile u32 dcd3; | 315 | u32 dcd3; |
| 315 | volatile u32 dcd4; | 316 | u32 dcd4; |
| 316 | u32 xxx15; | 317 | u32 xxx15; |
| 317 | 318 | ||
| 318 | volatile u32 pattern[32]; | 319 | u32 pattern[32]; |
| 319 | 320 | ||
| 320 | u32 xxx16[256]; | 321 | u32 xxx16[256]; |
| 321 | 322 | ||
| 322 | volatile u32 devid; | 323 | u32 devid; |
| 323 | u32 xxx17[63]; | 324 | u32 xxx17[63]; |
| 324 | 325 | ||
| 325 | volatile u32 ucsr; | 326 | u32 ucsr; |
| 326 | u32 xxx18[31]; | 327 | u32 xxx18[31]; |
| 327 | 328 | ||
| 328 | volatile u32 mer; | 329 | u32 mer; |
| 329 | }; | 330 | }; |
| 330 | 331 | ||
| 331 | struct ffb_dac { | 332 | struct ffb_dac { |
| 332 | volatile u32 type; | 333 | u32 type; |
| 333 | volatile u32 value; | 334 | u32 value; |
| 334 | volatile u32 type2; | 335 | u32 type2; |
| 335 | volatile u32 value2; | 336 | u32 value2; |
| 336 | }; | 337 | }; |
| 337 | 338 | ||
| 338 | struct ffb_par { | 339 | struct ffb_par { |
| 339 | spinlock_t lock; | 340 | spinlock_t lock; |
| 340 | struct ffb_fbc *fbc; | 341 | struct ffb_fbc __iomem *fbc; |
| 341 | struct ffb_dac *dac; | 342 | struct ffb_dac __iomem *dac; |
| 342 | 343 | ||
| 343 | u32 flags; | 344 | u32 flags; |
| 344 | #define FFB_FLAG_AFB 0x00000001 | 345 | #define FFB_FLAG_AFB 0x00000001 |
| @@ -353,16 +354,13 @@ struct ffb_par { | |||
| 353 | unsigned long physbase; | 354 | unsigned long physbase; |
| 354 | unsigned long fbsize; | 355 | unsigned long fbsize; |
| 355 | 356 | ||
| 356 | char name[64]; | ||
| 357 | int prom_node; | ||
| 358 | int prom_parent_node; | ||
| 359 | int dac_rev; | 357 | int dac_rev; |
| 360 | int board_type; | 358 | int board_type; |
| 361 | }; | 359 | }; |
| 362 | 360 | ||
| 363 | static void FFBFifo(struct ffb_par *par, int n) | 361 | static void FFBFifo(struct ffb_par *par, int n) |
| 364 | { | 362 | { |
| 365 | struct ffb_fbc *fbc; | 363 | struct ffb_fbc __iomem *fbc; |
| 366 | int cache = par->fifo_cache; | 364 | int cache = par->fifo_cache; |
| 367 | 365 | ||
| 368 | if (cache - n < 0) { | 366 | if (cache - n < 0) { |
| @@ -375,7 +373,7 @@ static void FFBFifo(struct ffb_par *par, int n) | |||
| 375 | 373 | ||
| 376 | static void FFBWait(struct ffb_par *par) | 374 | static void FFBWait(struct ffb_par *par) |
| 377 | { | 375 | { |
| 378 | struct ffb_fbc *fbc; | 376 | struct ffb_fbc __iomem *fbc; |
| 379 | int limit = 10000; | 377 | int limit = 10000; |
| 380 | 378 | ||
| 381 | fbc = par->fbc; | 379 | fbc = par->fbc; |
| @@ -408,8 +406,8 @@ static __inline__ void ffb_rop(struct ffb_par *par, u32 rop) | |||
| 408 | 406 | ||
| 409 | static void ffb_switch_from_graph(struct ffb_par *par) | 407 | static void ffb_switch_from_graph(struct ffb_par *par) |
| 410 | { | 408 | { |
| 411 | struct ffb_fbc *fbc = par->fbc; | 409 | struct ffb_fbc __iomem *fbc = par->fbc; |
| 412 | struct ffb_dac *dac = par->dac; | 410 | struct ffb_dac __iomem *dac = par->dac; |
| 413 | unsigned long flags; | 411 | unsigned long flags; |
| 414 | 412 | ||
| 415 | spin_lock_irqsave(&par->lock, flags); | 413 | spin_lock_irqsave(&par->lock, flags); |
| @@ -462,7 +460,7 @@ static int ffb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) | |||
| 462 | static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | 460 | static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) |
| 463 | { | 461 | { |
| 464 | struct ffb_par *par = (struct ffb_par *) info->par; | 462 | struct ffb_par *par = (struct ffb_par *) info->par; |
| 465 | struct ffb_fbc *fbc = par->fbc; | 463 | struct ffb_fbc __iomem *fbc = par->fbc; |
| 466 | unsigned long flags; | 464 | unsigned long flags; |
| 467 | u32 fg; | 465 | u32 fg; |
| 468 | 466 | ||
| @@ -505,7 +503,7 @@ static void | |||
| 505 | ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | 503 | ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area) |
| 506 | { | 504 | { |
| 507 | struct ffb_par *par = (struct ffb_par *) info->par; | 505 | struct ffb_par *par = (struct ffb_par *) info->par; |
| 508 | struct ffb_fbc *fbc = par->fbc; | 506 | struct ffb_fbc __iomem *fbc = par->fbc; |
| 509 | unsigned long flags; | 507 | unsigned long flags; |
| 510 | 508 | ||
| 511 | if (area->dx != area->sx || | 509 | if (area->dx != area->sx || |
| @@ -541,7 +539,7 @@ ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
| 541 | static void ffb_imageblit(struct fb_info *info, const struct fb_image *image) | 539 | static void ffb_imageblit(struct fb_info *info, const struct fb_image *image) |
| 542 | { | 540 | { |
| 543 | struct ffb_par *par = (struct ffb_par *) info->par; | 541 | struct ffb_par *par = (struct ffb_par *) info->par; |
| 544 | struct ffb_fbc *fbc = par->fbc; | 542 | struct ffb_fbc __iomem *fbc = par->fbc; |
| 545 | const u8 *data = image->data; | 543 | const u8 *data = image->data; |
| 546 | unsigned long flags; | 544 | unsigned long flags; |
| 547 | u32 fg, bg, xy; | 545 | u32 fg, bg, xy; |
| @@ -664,7 +662,7 @@ static int | |||
| 664 | ffb_blank(int blank, struct fb_info *info) | 662 | ffb_blank(int blank, struct fb_info *info) |
| 665 | { | 663 | { |
| 666 | struct ffb_par *par = (struct ffb_par *) info->par; | 664 | struct ffb_par *par = (struct ffb_par *) info->par; |
| 667 | struct ffb_dac *dac = par->dac; | 665 | struct ffb_dac __iomem *dac = par->dac; |
| 668 | unsigned long flags; | 666 | unsigned long flags; |
| 669 | u32 tmp; | 667 | u32 tmp; |
| 670 | 668 | ||
| @@ -883,78 +881,42 @@ ffb_init_fix(struct fb_info *info) | |||
| 883 | info->fix.accel = FB_ACCEL_SUN_CREATOR; | 881 | info->fix.accel = FB_ACCEL_SUN_CREATOR; |
| 884 | } | 882 | } |
| 885 | 883 | ||
| 886 | static int ffb_apply_upa_parent_ranges(int parent, | ||
| 887 | struct linux_prom64_registers *regs) | ||
| 888 | { | ||
| 889 | struct linux_prom64_ranges ranges[PROMREG_MAX]; | ||
| 890 | char name[128]; | ||
| 891 | int len, i; | ||
| 892 | |||
| 893 | prom_getproperty(parent, "name", name, sizeof(name)); | ||
| 894 | if (strcmp(name, "upa") != 0) | ||
| 895 | return 0; | ||
| 896 | |||
| 897 | len = prom_getproperty(parent, "ranges", (void *) ranges, sizeof(ranges)); | ||
| 898 | if (len <= 0) | ||
| 899 | return 1; | ||
| 900 | |||
| 901 | len /= sizeof(struct linux_prom64_ranges); | ||
| 902 | for (i = 0; i < len; i++) { | ||
| 903 | struct linux_prom64_ranges *rng = &ranges[i]; | ||
| 904 | u64 phys_addr = regs->phys_addr; | ||
| 905 | |||
| 906 | if (phys_addr >= rng->ot_child_base && | ||
| 907 | phys_addr < (rng->ot_child_base + rng->or_size)) { | ||
| 908 | regs->phys_addr -= rng->ot_child_base; | ||
| 909 | regs->phys_addr += rng->ot_parent_base; | ||
| 910 | return 0; | ||
| 911 | } | ||
| 912 | } | ||
| 913 | |||
| 914 | return 1; | ||
| 915 | } | ||
| 916 | |||
| 917 | struct all_info { | 884 | struct all_info { |
| 918 | struct fb_info info; | 885 | struct fb_info info; |
| 919 | struct ffb_par par; | 886 | struct ffb_par par; |
| 920 | u32 pseudo_palette[256]; | 887 | u32 pseudo_palette[256]; |
| 921 | struct list_head list; | ||
| 922 | }; | 888 | }; |
| 923 | static LIST_HEAD(ffb_list); | ||
| 924 | 889 | ||
| 925 | static void ffb_init_one(int node, int parent) | 890 | static int ffb_init_one(struct of_device *op) |
| 926 | { | 891 | { |
| 927 | struct linux_prom64_registers regs[2*PROMREG_MAX]; | 892 | struct device_node *dp = op->node; |
| 928 | struct ffb_fbc *fbc; | 893 | struct ffb_fbc __iomem *fbc; |
| 929 | struct ffb_dac *dac; | 894 | struct ffb_dac __iomem *dac; |
| 930 | struct all_info *all; | 895 | struct all_info *all; |
| 896 | int err; | ||
| 931 | 897 | ||
| 932 | if (prom_getproperty(node, "reg", (void *) regs, sizeof(regs)) <= 0) { | 898 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 933 | printk("ffb: Cannot get reg device node property.\n"); | 899 | if (!all) |
| 934 | return; | 900 | return -ENOMEM; |
| 935 | } | ||
| 936 | 901 | ||
| 937 | if (ffb_apply_upa_parent_ranges(parent, ®s[0])) { | 902 | spin_lock_init(&all->par.lock); |
| 938 | printk("ffb: Cannot apply parent ranges to regs.\n"); | 903 | all->par.fbc = of_ioremap(&op->resource[2], 0, |
| 939 | return; | 904 | sizeof(struct ffb_fbc), "ffb fbc"); |
| 905 | if (!all->par.fbc) { | ||
| 906 | kfree(all); | ||
| 907 | return -ENOMEM; | ||
| 940 | } | 908 | } |
| 941 | 909 | ||
| 942 | all = kmalloc(sizeof(*all), GFP_KERNEL); | 910 | all->par.dac = of_ioremap(&op->resource[1], 0, |
| 943 | if (!all) { | 911 | sizeof(struct ffb_dac), "ffb dac"); |
| 944 | printk(KERN_ERR "ffb: Cannot allocate memory.\n"); | 912 | if (!all->par.dac) { |
| 945 | return; | 913 | of_iounmap(all->par.fbc, sizeof(struct ffb_fbc)); |
| 914 | kfree(all); | ||
| 915 | return -ENOMEM; | ||
| 946 | } | 916 | } |
| 947 | memset(all, 0, sizeof(*all)); | ||
| 948 | |||
| 949 | INIT_LIST_HEAD(&all->list); | ||
| 950 | 917 | ||
| 951 | spin_lock_init(&all->par.lock); | ||
| 952 | all->par.fbc = (struct ffb_fbc *)(regs[0].phys_addr + FFB_FBC_REGS_POFF); | ||
| 953 | all->par.dac = (struct ffb_dac *)(regs[0].phys_addr + FFB_DAC_POFF); | ||
| 954 | all->par.rop_cache = FFB_ROP_NEW; | 918 | all->par.rop_cache = FFB_ROP_NEW; |
| 955 | all->par.physbase = regs[0].phys_addr; | 919 | all->par.physbase = op->resource[0].start; |
| 956 | all->par.prom_node = node; | ||
| 957 | all->par.prom_parent_node = parent; | ||
| 958 | 920 | ||
| 959 | /* Don't mention copyarea, so SCROLL_REDRAW is always | 921 | /* Don't mention copyarea, so SCROLL_REDRAW is always |
| 960 | * used. It is the fastest on this chip. | 922 | * used. It is the fastest on this chip. |
| @@ -968,7 +930,7 @@ static void ffb_init_one(int node, int parent) | |||
| 968 | all->info.par = &all->par; | 930 | all->info.par = &all->par; |
| 969 | all->info.pseudo_palette = all->pseudo_palette; | 931 | all->info.pseudo_palette = all->pseudo_palette; |
| 970 | 932 | ||
| 971 | sbusfb_fill_var(&all->info.var, all->par.prom_node, 32); | 933 | sbusfb_fill_var(&all->info.var, dp->node, 32); |
| 972 | all->par.fbsize = PAGE_ALIGN(all->info.var.xres * | 934 | all->par.fbsize = PAGE_ALIGN(all->info.var.xres * |
| 973 | all->info.var.yres * | 935 | all->info.var.yres * |
| 974 | 4); | 936 | 4); |
| @@ -976,14 +938,13 @@ static void ffb_init_one(int node, int parent) | |||
| 976 | 938 | ||
| 977 | all->info.var.accel_flags = FB_ACCELF_TEXT; | 939 | all->info.var.accel_flags = FB_ACCELF_TEXT; |
| 978 | 940 | ||
| 979 | prom_getstring(node, "name", all->par.name, sizeof(all->par.name)); | 941 | if (!strcmp(dp->name, "SUNW,afb")) |
| 980 | if (!strcmp(all->par.name, "SUNW,afb")) | ||
| 981 | all->par.flags |= FFB_FLAG_AFB; | 942 | all->par.flags |= FFB_FLAG_AFB; |
| 982 | 943 | ||
| 983 | all->par.board_type = prom_getintdefault(node, "board_type", 0); | 944 | all->par.board_type = of_getintprop_default(dp, "board_type", 0); |
| 984 | 945 | ||
| 985 | fbc = all->par.fbc; | 946 | fbc = all->par.fbc; |
| 986 | if((upa_readl(&fbc->ucsr) & FFB_UCSR_ALL_ERRORS) != 0) | 947 | if ((upa_readl(&fbc->ucsr) & FFB_UCSR_ALL_ERRORS) != 0) |
| 987 | upa_writel(FFB_UCSR_ALL_ERRORS, &fbc->ucsr); | 948 | upa_writel(FFB_UCSR_ALL_ERRORS, &fbc->ucsr); |
| 988 | 949 | ||
| 989 | ffb_switch_from_graph(&all->par); | 950 | ffb_switch_from_graph(&all->par); |
| @@ -1008,81 +969,88 @@ static void ffb_init_one(int node, int parent) | |||
| 1008 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 969 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
| 1009 | printk(KERN_ERR "ffb: Could not allocate color map.\n"); | 970 | printk(KERN_ERR "ffb: Could not allocate color map.\n"); |
| 1010 | kfree(all); | 971 | kfree(all); |
| 1011 | return; | 972 | return -ENOMEM; |
| 1012 | } | 973 | } |
| 1013 | 974 | ||
| 1014 | ffb_init_fix(&all->info); | 975 | ffb_init_fix(&all->info); |
| 1015 | 976 | ||
| 1016 | if (register_framebuffer(&all->info) < 0) { | 977 | err = register_framebuffer(&all->info); |
| 978 | if (err < 0) { | ||
| 1017 | printk(KERN_ERR "ffb: Could not register framebuffer.\n"); | 979 | printk(KERN_ERR "ffb: Could not register framebuffer.\n"); |
| 1018 | fb_dealloc_cmap(&all->info.cmap); | 980 | fb_dealloc_cmap(&all->info.cmap); |
| 1019 | kfree(all); | 981 | kfree(all); |
| 1020 | return; | 982 | return err; |
| 1021 | } | 983 | } |
| 1022 | 984 | ||
| 1023 | list_add(&all->list, &ffb_list); | 985 | dev_set_drvdata(&op->dev, all); |
| 1024 | 986 | ||
| 1025 | printk("ffb: %s at %016lx type %d DAC %d\n", | 987 | printk("%s: %s at %016lx, type %d, DAC revision %d\n", |
| 988 | dp->full_name, | ||
| 1026 | ((all->par.flags & FFB_FLAG_AFB) ? "AFB" : "FFB"), | 989 | ((all->par.flags & FFB_FLAG_AFB) ? "AFB" : "FFB"), |
| 1027 | regs[0].phys_addr, all->par.board_type, all->par.dac_rev); | 990 | all->par.physbase, all->par.board_type, all->par.dac_rev); |
| 991 | |||
| 992 | return 0; | ||
| 1028 | } | 993 | } |
| 1029 | 994 | ||
| 1030 | static void ffb_scan_siblings(int root) | 995 | static int __devinit ffb_probe(struct of_device *dev, const struct of_device_id *match) |
| 1031 | { | 996 | { |
| 1032 | int node, child; | 997 | struct of_device *op = to_of_device(&dev->dev); |
| 1033 | 998 | ||
| 1034 | child = prom_getchild(root); | 999 | return ffb_init_one(op); |
| 1035 | for (node = prom_searchsiblings(child, "SUNW,ffb"); node; | ||
| 1036 | node = prom_searchsiblings(prom_getsibling(node), "SUNW,ffb")) | ||
| 1037 | ffb_init_one(node, root); | ||
| 1038 | for (node = prom_searchsiblings(child, "SUNW,afb"); node; | ||
| 1039 | node = prom_searchsiblings(prom_getsibling(node), "SUNW,afb")) | ||
| 1040 | ffb_init_one(node, root); | ||
| 1041 | } | 1000 | } |
| 1042 | 1001 | ||
| 1043 | int __init ffb_init(void) | 1002 | static int __devexit ffb_remove(struct of_device *dev) |
| 1044 | { | 1003 | { |
| 1045 | int root; | 1004 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 1046 | 1005 | ||
| 1047 | if (fb_get_options("ffb", NULL)) | 1006 | unregister_framebuffer(&all->info); |
| 1048 | return -ENODEV; | 1007 | fb_dealloc_cmap(&all->info.cmap); |
| 1049 | 1008 | ||
| 1050 | ffb_scan_siblings(prom_root_node); | 1009 | of_iounmap(all->par.fbc, sizeof(struct ffb_fbc)); |
| 1010 | of_iounmap(all->par.dac, sizeof(struct ffb_dac)); | ||
| 1051 | 1011 | ||
| 1052 | root = prom_getchild(prom_root_node); | 1012 | kfree(all); |
| 1053 | for (root = prom_searchsiblings(root, "upa"); root; | 1013 | |
| 1054 | root = prom_searchsiblings(prom_getsibling(root), "upa")) | 1014 | dev_set_drvdata(&dev->dev, NULL); |
| 1055 | ffb_scan_siblings(root); | ||
| 1056 | 1015 | ||
| 1057 | return 0; | 1016 | return 0; |
| 1058 | } | 1017 | } |
| 1059 | 1018 | ||
| 1060 | void __exit ffb_exit(void) | 1019 | static struct of_device_id ffb_match[] = { |
| 1061 | { | 1020 | { |
| 1062 | struct list_head *pos, *tmp; | 1021 | .name = "SUNW,ffb", |
| 1022 | }, | ||
| 1023 | { | ||
| 1024 | .name = "SUNW,afb", | ||
| 1025 | }, | ||
| 1026 | {}, | ||
| 1027 | }; | ||
| 1028 | MODULE_DEVICE_TABLE(of, ffb_match); | ||
| 1029 | |||
| 1030 | static struct of_platform_driver ffb_driver = { | ||
| 1031 | .name = "ffb", | ||
| 1032 | .match_table = ffb_match, | ||
| 1033 | .probe = ffb_probe, | ||
| 1034 | .remove = __devexit_p(ffb_remove), | ||
| 1035 | }; | ||
| 1063 | 1036 | ||
| 1064 | list_for_each_safe(pos, tmp, &ffb_list) { | 1037 | int __init ffb_init(void) |
| 1065 | struct all_info *all = list_entry(pos, typeof(*all), list); | 1038 | { |
| 1039 | if (fb_get_options("ffb", NULL)) | ||
| 1040 | return -ENODEV; | ||
| 1066 | 1041 | ||
| 1067 | unregister_framebuffer(&all->info); | 1042 | return of_register_driver(&ffb_driver, &of_bus_type); |
| 1068 | fb_dealloc_cmap(&all->info.cmap); | ||
| 1069 | kfree(all); | ||
| 1070 | } | ||
| 1071 | } | 1043 | } |
| 1072 | 1044 | ||
| 1073 | int __init | 1045 | void __exit ffb_exit(void) |
| 1074 | ffb_setup(char *arg) | ||
| 1075 | { | 1046 | { |
| 1076 | /* No cmdline options yet... */ | 1047 | of_unregister_driver(&ffb_driver); |
| 1077 | return 0; | ||
| 1078 | } | 1048 | } |
| 1079 | 1049 | ||
| 1080 | module_init(ffb_init); | 1050 | module_init(ffb_init); |
| 1081 | |||
| 1082 | #ifdef MODULE | ||
| 1083 | module_exit(ffb_exit); | 1051 | module_exit(ffb_exit); |
| 1084 | #endif | ||
| 1085 | 1052 | ||
| 1086 | MODULE_DESCRIPTION("framebuffer driver for Creator/Elite3D chipsets"); | 1053 | MODULE_DESCRIPTION("framebuffer driver for Creator/Elite3D chipsets"); |
| 1087 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 1054 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 1055 | MODULE_VERSION("2.0"); | ||
| 1088 | MODULE_LICENSE("GPL"); | 1056 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index 5e25b9860196..bf0e60b5a3b6 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * more details. | 9 | * more details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 14 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 15 | #include <linux/dma-mapping.h> | 14 | #include <linux/dma-mapping.h> |
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index f04ca721f94c..01864767450d 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * more details. | 11 | * more details. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c index 3fe3ae1aff12..c1f7b49975dd 100644 --- a/drivers/video/i810/i810-i2c.c +++ b/drivers/video/i810/i810-i2c.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * License. See the file COPYING in the main directory of this archive for | 8 | * License. See the file COPYING in the main directory of this archive for |
| 9 | * more details. | 9 | * more details. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index a1f7d80f0ac1..fbe8a2c4b04c 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 34 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
| 35 | #include <linux/string.h> | 34 | #include <linux/string.h> |
diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c index 7b1c168c834d..cdbae173d69a 100644 --- a/drivers/video/imacfb.c +++ b/drivers/video/imacfb.c | |||
| @@ -207,10 +207,6 @@ static int __init imacfb_probe(struct platform_device *dev) | |||
| 207 | size_remap = size_total; | 207 | size_remap = size_total; |
| 208 | imacfb_fix.smem_len = size_remap; | 208 | imacfb_fix.smem_len = size_remap; |
| 209 | 209 | ||
| 210 | #ifndef __i386__ | ||
| 211 | screen_info.imacpm_seg = 0; | ||
| 212 | #endif | ||
| 213 | |||
| 214 | if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) { | 210 | if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) { |
| 215 | printk(KERN_WARNING | 211 | printk(KERN_WARNING |
| 216 | "imacfb: cannot reserve video memory at 0x%lx\n", | 212 | "imacfb: cannot reserve video memory at 0x%lx\n", |
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c index f73c642b50c2..5f393d985b11 100644 --- a/drivers/video/imsttfb.c +++ b/drivers/video/imsttfb.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * more details. | 16 | * more details. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 1718baaeed2a..0f9b2fdc28b1 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | //#define DEBUG 1 | 19 | //#define DEBUG 1 |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 0a0a8b199ecc..3f39d84015f1 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
| @@ -108,7 +108,6 @@ | |||
| 108 | * | 108 | * |
| 109 | */ | 109 | */ |
| 110 | 110 | ||
| 111 | #include <linux/config.h> | ||
| 112 | #include <linux/module.h> | 111 | #include <linux/module.h> |
| 113 | #include <linux/kernel.h> | 112 | #include <linux/kernel.h> |
| 114 | #include <linux/errno.h> | 113 | #include <linux/errno.h> |
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 7533b3dd08ac..3b78a57924f0 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | /* $DHD: intelfb/intelfbhw.c,v 1.9 2003/06/27 15:06:25 dawes Exp $ */ | 20 | /* $DHD: intelfb/intelfbhw.c,v 1.9 2003/06/27 15:06:25 dawes Exp $ */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c index 477ad297de4e..2fdbe9b2b04b 100644 --- a/drivers/video/kyro/fbdev.c +++ b/drivers/video/kyro/fbdev.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * for more details. | 9 | * for more details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/video/leo.c b/drivers/video/leo.c index a23cfdb9d826..f3a24338d9ac 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* leo.c: LEO frame buffer driver | 1 | /* leo.c: LEO frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1996-1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1996-1999 Jakub Jelinek (jj@ultra.linux.cz) |
| 5 | * Copyright (C) 1997 Michal Rehacek (Michal.Rehacek@st.mff.cuni.cz) | 5 | * Copyright (C) 1997 Michal Rehacek (Michal.Rehacek@st.mff.cuni.cz) |
| 6 | * | 6 | * |
| @@ -18,8 +18,8 @@ | |||
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | 19 | ||
| 20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
| 21 | #include <asm/sbus.h> | 21 | #include <asm/prom.h> |
| 22 | #include <asm/oplib.h> | 22 | #include <asm/of_device.h> |
| 23 | #include <asm/fbio.h> | 23 | #include <asm/fbio.h> |
| 24 | 24 | ||
| 25 | #include "sbuslib.h" | 25 | #include "sbuslib.h" |
| @@ -80,10 +80,10 @@ static struct fb_ops leo_ops = { | |||
| 80 | 80 | ||
| 81 | struct leo_cursor { | 81 | struct leo_cursor { |
| 82 | u8 xxx0[16]; | 82 | u8 xxx0[16]; |
| 83 | volatile u32 cur_type; | 83 | u32 cur_type; |
| 84 | volatile u32 cur_misc; | 84 | u32 cur_misc; |
| 85 | volatile u32 cur_cursxy; | 85 | u32 cur_cursxy; |
| 86 | volatile u32 cur_data; | 86 | u32 cur_data; |
| 87 | }; | 87 | }; |
| 88 | 88 | ||
| 89 | #define LEO_KRN_TYPE_CLUT0 0x00001000 | 89 | #define LEO_KRN_TYPE_CLUT0 0x00001000 |
| @@ -99,27 +99,27 @@ struct leo_cursor { | |||
| 99 | #define LEO_KRN_CSR_UNK2 0x00000001 | 99 | #define LEO_KRN_CSR_UNK2 0x00000001 |
| 100 | 100 | ||
| 101 | struct leo_lx_krn { | 101 | struct leo_lx_krn { |
| 102 | volatile u32 krn_type; | 102 | u32 krn_type; |
| 103 | volatile u32 krn_csr; | 103 | u32 krn_csr; |
| 104 | volatile u32 krn_value; | 104 | u32 krn_value; |
| 105 | }; | 105 | }; |
| 106 | 106 | ||
| 107 | struct leo_lc_ss0_krn { | 107 | struct leo_lc_ss0_krn { |
| 108 | volatile u32 misc; | 108 | u32 misc; |
| 109 | u8 xxx0[0x800-4]; | 109 | u8 xxx0[0x800-4]; |
| 110 | volatile u32 rev; | 110 | u32 rev; |
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | struct leo_lc_ss0_usr { | 113 | struct leo_lc_ss0_usr { |
| 114 | volatile u32 csr; | 114 | u32 csr; |
| 115 | volatile u32 addrspace; | 115 | u32 addrspace; |
| 116 | volatile u32 fontmsk; | 116 | u32 fontmsk; |
| 117 | volatile u32 fontt; | 117 | u32 fontt; |
| 118 | volatile u32 extent; | 118 | u32 extent; |
| 119 | volatile u32 src; | 119 | u32 src; |
| 120 | u32 dst; | 120 | u32 dst; |
| 121 | volatile u32 copy; | 121 | u32 copy; |
| 122 | volatile u32 fill; | 122 | u32 fill; |
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| 125 | struct leo_lc_ss1_krn { | 125 | struct leo_lc_ss1_krn { |
| @@ -132,47 +132,47 @@ struct leo_lc_ss1_usr { | |||
| 132 | 132 | ||
| 133 | struct leo_ld { | 133 | struct leo_ld { |
| 134 | u8 xxx0[0xe00]; | 134 | u8 xxx0[0xe00]; |
| 135 | volatile u32 csr; | 135 | u32 csr; |
| 136 | volatile u32 wid; | 136 | u32 wid; |
| 137 | volatile u32 wmask; | 137 | u32 wmask; |
| 138 | volatile u32 widclip; | 138 | u32 widclip; |
| 139 | volatile u32 vclipmin; | 139 | u32 vclipmin; |
| 140 | volatile u32 vclipmax; | 140 | u32 vclipmax; |
| 141 | volatile u32 pickmin; /* SS1 only */ | 141 | u32 pickmin; /* SS1 only */ |
| 142 | volatile u32 pickmax; /* SS1 only */ | 142 | u32 pickmax; /* SS1 only */ |
| 143 | volatile u32 fg; | 143 | u32 fg; |
| 144 | volatile u32 bg; | 144 | u32 bg; |
| 145 | volatile u32 src; /* Copy/Scroll (SS0 only) */ | 145 | u32 src; /* Copy/Scroll (SS0 only) */ |
| 146 | volatile u32 dst; /* Copy/Scroll/Fill (SS0 only) */ | 146 | u32 dst; /* Copy/Scroll/Fill (SS0 only) */ |
| 147 | volatile u32 extent; /* Copy/Scroll/Fill size (SS0 only) */ | 147 | u32 extent; /* Copy/Scroll/Fill size (SS0 only) */ |
| 148 | u32 xxx1[3]; | 148 | u32 xxx1[3]; |
| 149 | volatile u32 setsem; /* SS1 only */ | 149 | u32 setsem; /* SS1 only */ |
| 150 | volatile u32 clrsem; /* SS1 only */ | 150 | u32 clrsem; /* SS1 only */ |
| 151 | volatile u32 clrpick; /* SS1 only */ | 151 | u32 clrpick; /* SS1 only */ |
| 152 | volatile u32 clrdat; /* SS1 only */ | 152 | u32 clrdat; /* SS1 only */ |
| 153 | volatile u32 alpha; /* SS1 only */ | 153 | u32 alpha; /* SS1 only */ |
| 154 | u8 xxx2[0x2c]; | 154 | u8 xxx2[0x2c]; |
| 155 | volatile u32 winbg; | 155 | u32 winbg; |
| 156 | volatile u32 planemask; | 156 | u32 planemask; |
| 157 | volatile u32 rop; | 157 | u32 rop; |
| 158 | volatile u32 z; | 158 | u32 z; |
| 159 | volatile u32 dczf; /* SS1 only */ | 159 | u32 dczf; /* SS1 only */ |
| 160 | volatile u32 dczb; /* SS1 only */ | 160 | u32 dczb; /* SS1 only */ |
| 161 | volatile u32 dcs; /* SS1 only */ | 161 | u32 dcs; /* SS1 only */ |
| 162 | volatile u32 dczs; /* SS1 only */ | 162 | u32 dczs; /* SS1 only */ |
| 163 | volatile u32 pickfb; /* SS1 only */ | 163 | u32 pickfb; /* SS1 only */ |
| 164 | volatile u32 pickbb; /* SS1 only */ | 164 | u32 pickbb; /* SS1 only */ |
| 165 | volatile u32 dcfc; /* SS1 only */ | 165 | u32 dcfc; /* SS1 only */ |
| 166 | volatile u32 forcecol; /* SS1 only */ | 166 | u32 forcecol; /* SS1 only */ |
| 167 | volatile u32 door[8]; /* SS1 only */ | 167 | u32 door[8]; /* SS1 only */ |
| 168 | volatile u32 pick[5]; /* SS1 only */ | 168 | u32 pick[5]; /* SS1 only */ |
| 169 | }; | 169 | }; |
| 170 | 170 | ||
| 171 | #define LEO_SS1_MISC_ENABLE 0x00000001 | 171 | #define LEO_SS1_MISC_ENABLE 0x00000001 |
| 172 | #define LEO_SS1_MISC_STEREO 0x00000002 | 172 | #define LEO_SS1_MISC_STEREO 0x00000002 |
| 173 | struct leo_ld_ss1 { | 173 | struct leo_ld_ss1 { |
| 174 | u8 xxx0[0xef4]; | 174 | u8 xxx0[0xef4]; |
| 175 | volatile u32 ss1_misc; | 175 | u32 ss1_misc; |
| 176 | }; | 176 | }; |
| 177 | 177 | ||
| 178 | struct leo_ld_gbl { | 178 | struct leo_ld_gbl { |
| @@ -193,9 +193,8 @@ struct leo_par { | |||
| 193 | #define LEO_FLAG_BLANKED 0x00000001 | 193 | #define LEO_FLAG_BLANKED 0x00000001 |
| 194 | 194 | ||
| 195 | unsigned long physbase; | 195 | unsigned long physbase; |
| 196 | unsigned long which_io; | ||
| 196 | unsigned long fbsize; | 197 | unsigned long fbsize; |
| 197 | |||
| 198 | struct sbus_dev *sdev; | ||
| 199 | }; | 198 | }; |
| 200 | 199 | ||
| 201 | static void leo_wait(struct leo_lx_krn __iomem *lx_krn) | 200 | static void leo_wait(struct leo_lx_krn __iomem *lx_krn) |
| @@ -368,8 +367,7 @@ static int leo_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 368 | 367 | ||
| 369 | return sbusfb_mmap_helper(leo_mmap_map, | 368 | return sbusfb_mmap_helper(leo_mmap_map, |
| 370 | par->physbase, par->fbsize, | 369 | par->physbase, par->fbsize, |
| 371 | par->sdev->reg_addrs[0].which_io, | 370 | par->which_io, vma); |
| 372 | vma); | ||
| 373 | } | 371 | } |
| 374 | 372 | ||
| 375 | static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) | 373 | static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) |
| @@ -385,11 +383,9 @@ static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) | |||
| 385 | */ | 383 | */ |
| 386 | 384 | ||
| 387 | static void | 385 | static void |
| 388 | leo_init_fix(struct fb_info *info) | 386 | leo_init_fix(struct fb_info *info, struct device_node *dp) |
| 389 | { | 387 | { |
| 390 | struct leo_par *par = (struct leo_par *)info->par; | 388 | strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); |
| 391 | |||
| 392 | strlcpy(info->fix.id, par->sdev->prom_name, sizeof(info->fix.id)); | ||
| 393 | 389 | ||
| 394 | info->fix.type = FB_TYPE_PACKED_PIXELS; | 390 | info->fix.type = FB_TYPE_PACKED_PIXELS; |
| 395 | info->fix.visual = FB_VISUAL_TRUECOLOR; | 391 | info->fix.visual = FB_VISUAL_TRUECOLOR; |
| @@ -532,60 +528,74 @@ static void leo_fixup_var_rgb(struct fb_var_screeninfo *var) | |||
| 532 | struct all_info { | 528 | struct all_info { |
| 533 | struct fb_info info; | 529 | struct fb_info info; |
| 534 | struct leo_par par; | 530 | struct leo_par par; |
| 535 | struct list_head list; | ||
| 536 | }; | 531 | }; |
| 537 | static LIST_HEAD(leo_list); | ||
| 538 | 532 | ||
| 539 | static void leo_init_one(struct sbus_dev *sdev) | 533 | static void leo_unmap_regs(struct all_info *all) |
| 540 | { | 534 | { |
| 541 | struct all_info *all; | 535 | if (all->par.lc_ss0_usr) |
| 542 | int linebytes; | 536 | of_iounmap(all->par.lc_ss0_usr, 0x1000); |
| 537 | if (all->par.ld_ss0) | ||
| 538 | of_iounmap(all->par.ld_ss0, 0x1000); | ||
| 539 | if (all->par.ld_ss1) | ||
| 540 | of_iounmap(all->par.ld_ss1, 0x1000); | ||
| 541 | if (all->par.lx_krn) | ||
| 542 | of_iounmap(all->par.lx_krn, 0x1000); | ||
| 543 | if (all->par.cursor) | ||
| 544 | of_iounmap(all->par.cursor, sizeof(struct leo_cursor)); | ||
| 545 | if (all->info.screen_base) | ||
| 546 | of_iounmap(all->info.screen_base, 0x800000); | ||
| 547 | } | ||
| 543 | 548 | ||
| 544 | all = kmalloc(sizeof(*all), GFP_KERNEL); | 549 | static int __devinit leo_init_one(struct of_device *op) |
| 545 | if (!all) { | 550 | { |
| 546 | printk(KERN_ERR "leo: Cannot allocate memory.\n"); | 551 | struct device_node *dp = op->node; |
| 547 | return; | 552 | struct all_info *all; |
| 548 | } | 553 | int linebytes, err; |
| 549 | memset(all, 0, sizeof(*all)); | ||
| 550 | 554 | ||
| 551 | INIT_LIST_HEAD(&all->list); | 555 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 556 | if (!all) | ||
| 557 | return -ENOMEM; | ||
| 552 | 558 | ||
| 553 | spin_lock_init(&all->par.lock); | 559 | spin_lock_init(&all->par.lock); |
| 554 | all->par.sdev = sdev; | ||
| 555 | 560 | ||
| 556 | all->par.physbase = sdev->reg_addrs[0].phys_addr; | 561 | all->par.physbase = op->resource[0].start; |
| 562 | all->par.which_io = op->resource[0].flags & IORESOURCE_BITS; | ||
| 557 | 563 | ||
| 558 | sbusfb_fill_var(&all->info.var, sdev->prom_node, 32); | 564 | sbusfb_fill_var(&all->info.var, dp->node, 32); |
| 559 | leo_fixup_var_rgb(&all->info.var); | 565 | leo_fixup_var_rgb(&all->info.var); |
| 560 | 566 | ||
| 561 | linebytes = prom_getintdefault(sdev->prom_node, "linebytes", | 567 | linebytes = of_getintprop_default(dp, "linebytes", |
| 562 | all->info.var.xres); | 568 | all->info.var.xres); |
| 563 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); | 569 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); |
| 564 | 570 | ||
| 565 | #ifdef CONFIG_SPARC32 | ||
| 566 | all->info.screen_base = (char __iomem *) | ||
| 567 | prom_getintdefault(sdev->prom_node, "address", 0); | ||
| 568 | #endif | ||
| 569 | if (!all->info.screen_base) | ||
| 570 | all->info.screen_base = | ||
| 571 | sbus_ioremap(&sdev->resource[0], LEO_OFF_SS0, | ||
| 572 | 0x800000, "leo ram"); | ||
| 573 | |||
| 574 | all->par.lc_ss0_usr = | 571 | all->par.lc_ss0_usr = |
| 575 | sbus_ioremap(&sdev->resource[0], LEO_OFF_LC_SS0_USR, | 572 | of_ioremap(&op->resource[0], LEO_OFF_LC_SS0_USR, |
| 576 | 0x1000, "leolc ss0usr"); | 573 | 0x1000, "leolc ss0usr"); |
| 577 | all->par.ld_ss0 = | 574 | all->par.ld_ss0 = |
| 578 | sbus_ioremap(&sdev->resource[0], LEO_OFF_LD_SS0, | 575 | of_ioremap(&op->resource[0], LEO_OFF_LD_SS0, |
| 579 | 0x1000, "leold ss0"); | 576 | 0x1000, "leold ss0"); |
| 580 | all->par.ld_ss1 = | 577 | all->par.ld_ss1 = |
| 581 | sbus_ioremap(&sdev->resource[0], LEO_OFF_LD_SS1, | 578 | of_ioremap(&op->resource[0], LEO_OFF_LD_SS1, |
| 582 | 0x1000, "leold ss1"); | 579 | 0x1000, "leold ss1"); |
| 583 | all->par.lx_krn = | 580 | all->par.lx_krn = |
| 584 | sbus_ioremap(&sdev->resource[0], LEO_OFF_LX_KRN, | 581 | of_ioremap(&op->resource[0], LEO_OFF_LX_KRN, |
| 585 | 0x1000, "leolx krn"); | 582 | 0x1000, "leolx krn"); |
| 586 | all->par.cursor = | 583 | all->par.cursor = |
| 587 | sbus_ioremap(&sdev->resource[0], LEO_OFF_LX_CURSOR, | 584 | of_ioremap(&op->resource[0], LEO_OFF_LX_CURSOR, |
| 588 | sizeof(struct leo_cursor), "leolx cursor"); | 585 | sizeof(struct leo_cursor), "leolx cursor"); |
| 586 | all->info.screen_base = | ||
| 587 | of_ioremap(&op->resource[0], LEO_OFF_SS0, | ||
| 588 | 0x800000, "leo ram"); | ||
| 589 | if (!all->par.lc_ss0_usr || | ||
| 590 | !all->par.ld_ss0 || | ||
| 591 | !all->par.ld_ss1 || | ||
| 592 | !all->par.lx_krn || | ||
| 593 | !all->par.cursor || | ||
| 594 | !all->info.screen_base) { | ||
| 595 | leo_unmap_regs(all); | ||
| 596 | kfree(all); | ||
| 597 | return -ENOMEM; | ||
| 598 | } | ||
| 589 | 599 | ||
| 590 | all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; | 600 | all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; |
| 591 | all->info.fbops = &leo_ops; | 601 | all->info.fbops = &leo_ops; |
| @@ -597,69 +607,85 @@ static void leo_init_one(struct sbus_dev *sdev) | |||
| 597 | leo_blank(0, &all->info); | 607 | leo_blank(0, &all->info); |
| 598 | 608 | ||
| 599 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 609 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
| 600 | printk(KERN_ERR "leo: Could not allocate color map.\n"); | 610 | leo_unmap_regs(all); |
| 601 | kfree(all); | 611 | kfree(all); |
| 602 | return; | 612 | return -ENOMEM;; |
| 603 | } | 613 | } |
| 604 | 614 | ||
| 605 | leo_init_fix(&all->info); | 615 | leo_init_fix(&all->info, dp); |
| 606 | 616 | ||
| 607 | if (register_framebuffer(&all->info) < 0) { | 617 | err = register_framebuffer(&all->info); |
| 608 | printk(KERN_ERR "leo: Could not register framebuffer.\n"); | 618 | if (err < 0) { |
| 609 | fb_dealloc_cmap(&all->info.cmap); | 619 | fb_dealloc_cmap(&all->info.cmap); |
| 620 | leo_unmap_regs(all); | ||
| 610 | kfree(all); | 621 | kfree(all); |
| 611 | return; | 622 | return err; |
| 612 | } | 623 | } |
| 613 | 624 | ||
| 614 | list_add(&all->list, &leo_list); | 625 | dev_set_drvdata(&op->dev, all); |
| 626 | |||
| 627 | printk("%s: leo at %lx:%lx\n", | ||
| 628 | dp->full_name, | ||
| 629 | all->par.which_io, all->par.physbase); | ||
| 615 | 630 | ||
| 616 | printk("leo: %s at %lx:%lx\n", | 631 | return 0; |
| 617 | sdev->prom_name, | ||
| 618 | (long) sdev->reg_addrs[0].which_io, | ||
| 619 | (long) sdev->reg_addrs[0].phys_addr); | ||
| 620 | } | 632 | } |
| 621 | 633 | ||
| 622 | int __init leo_init(void) | 634 | static int __devinit leo_probe(struct of_device *dev, const struct of_device_id *match) |
| 623 | { | 635 | { |
| 624 | struct sbus_bus *sbus; | 636 | struct of_device *op = to_of_device(&dev->dev); |
| 625 | struct sbus_dev *sdev; | ||
| 626 | 637 | ||
| 627 | if (fb_get_options("leofb", NULL)) | 638 | return leo_init_one(op); |
| 628 | return -ENODEV; | 639 | } |
| 629 | 640 | ||
| 630 | for_all_sbusdev(sdev, sbus) { | 641 | static int __devexit leo_remove(struct of_device *dev) |
| 631 | if (!strcmp(sdev->prom_name, "leo")) | 642 | { |
| 632 | leo_init_one(sdev); | 643 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 633 | } | 644 | |
| 645 | unregister_framebuffer(&all->info); | ||
| 646 | fb_dealloc_cmap(&all->info.cmap); | ||
| 647 | |||
| 648 | leo_unmap_regs(all); | ||
| 649 | |||
| 650 | kfree(all); | ||
| 651 | |||
| 652 | dev_set_drvdata(&dev->dev, NULL); | ||
| 634 | 653 | ||
| 635 | return 0; | 654 | return 0; |
| 636 | } | 655 | } |
| 637 | 656 | ||
| 638 | void __exit leo_exit(void) | 657 | static struct of_device_id leo_match[] = { |
| 639 | { | 658 | { |
| 640 | struct list_head *pos, *tmp; | 659 | .name = "leo", |
| 660 | }, | ||
| 661 | {}, | ||
| 662 | }; | ||
| 663 | MODULE_DEVICE_TABLE(of, leo_match); | ||
| 664 | |||
| 665 | static struct of_platform_driver leo_driver = { | ||
| 666 | .name = "leo", | ||
| 667 | .match_table = leo_match, | ||
| 668 | .probe = leo_probe, | ||
| 669 | .remove = __devexit_p(leo_remove), | ||
| 670 | }; | ||
| 641 | 671 | ||
| 642 | list_for_each_safe(pos, tmp, &leo_list) { | 672 | static int __init leo_init(void) |
| 643 | struct all_info *all = list_entry(pos, typeof(*all), list); | 673 | { |
| 674 | if (fb_get_options("leofb", NULL)) | ||
| 675 | return -ENODEV; | ||
| 644 | 676 | ||
| 645 | unregister_framebuffer(&all->info); | 677 | return of_register_driver(&leo_driver, &of_bus_type); |
| 646 | fb_dealloc_cmap(&all->info.cmap); | ||
| 647 | kfree(all); | ||
| 648 | } | ||
| 649 | } | 678 | } |
| 650 | 679 | ||
| 651 | int __init | 680 | static void __exit leo_exit(void) |
| 652 | leo_setup(char *arg) | ||
| 653 | { | 681 | { |
| 654 | /* No cmdline options yet... */ | 682 | of_unregister_driver(&leo_driver); |
| 655 | return 0; | ||
| 656 | } | 683 | } |
| 657 | 684 | ||
| 658 | module_init(leo_init); | 685 | module_init(leo_init); |
| 659 | #ifdef MODULE | ||
| 660 | module_exit(leo_exit); | 686 | module_exit(leo_exit); |
| 661 | #endif | ||
| 662 | 687 | ||
| 663 | MODULE_DESCRIPTION("framebuffer driver for LEO chipsets"); | 688 | MODULE_DESCRIPTION("framebuffer driver for LEO chipsets"); |
| 664 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 689 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 690 | MODULE_VERSION("2.0"); | ||
| 665 | MODULE_LICENSE("GPL"); | 691 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 788fa812c871..80c03618eb53 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Copyright (C) 2003 Geert Uytterhoeven <geert@linux-m68k.org> | 9 | * Copyright (C) 2003 Geert Uytterhoeven <geert@linux-m68k.org> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/linux_logo.h> | 12 | #include <linux/linux_logo.h> |
| 14 | #include <linux/stddef.h> | 13 | #include <linux/stddef.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c index d21321ca7c39..ab2149531a04 100644 --- a/drivers/video/macmodes.c +++ b/drivers/video/macmodes.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * more details. | 15 | * more details. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c index a456e67a5b00..c4b570b4a4df 100644 --- a/drivers/video/matrox/matroxfb_DAC1064.c +++ b/drivers/video/matrox/matroxfb_DAC1064.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #include "matroxfb_DAC1064.h" | 16 | #include "matroxfb_DAC1064.h" |
| 18 | #include "matroxfb_misc.h" | 17 | #include "matroxfb_misc.h" |
diff --git a/drivers/video/matrox/matroxfb_DAC1064.h b/drivers/video/matrox/matroxfb_DAC1064.h index 56513a5d220b..df39c3193735 100644 --- a/drivers/video/matrox/matroxfb_DAC1064.h +++ b/drivers/video/matrox/matroxfb_DAC1064.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __MATROXFB_DAC1064_H__ | 1 | #ifndef __MATROXFB_DAC1064_H__ |
| 2 | #define __MATROXFB_DAC1064_H__ | 2 | #define __MATROXFB_DAC1064_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include "matroxfb_base.h" | 5 | #include "matroxfb_base.h" |
| 7 | 6 | ||
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c index 23ebad0a12d8..a5690a5f29d5 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.c +++ b/drivers/video/matrox/matroxfb_Ti3026.c | |||
| @@ -78,7 +78,6 @@ | |||
| 78 | * | 78 | * |
| 79 | */ | 79 | */ |
| 80 | 80 | ||
| 81 | #include <linux/config.h> | ||
| 82 | 81 | ||
| 83 | #include "matroxfb_Ti3026.h" | 82 | #include "matroxfb_Ti3026.h" |
| 84 | #include "matroxfb_misc.h" | 83 | #include "matroxfb_misc.h" |
diff --git a/drivers/video/matrox/matroxfb_Ti3026.h b/drivers/video/matrox/matroxfb_Ti3026.h index 536e5f69de9f..27872aaa0a17 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.h +++ b/drivers/video/matrox/matroxfb_Ti3026.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __MATROXFB_TI3026_H__ | 1 | #ifndef __MATROXFB_TI3026_H__ |
| 2 | #define __MATROXFB_TI3026_H__ | 2 | #define __MATROXFB_TI3026_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include "matroxfb_base.h" | 5 | #include "matroxfb_base.h" |
| 7 | 6 | ||
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index f4ddd3431f17..8b5bf7972ee3 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
| @@ -99,7 +99,6 @@ | |||
| 99 | * | 99 | * |
| 100 | */ | 100 | */ |
| 101 | 101 | ||
| 102 | #include <linux/config.h> | ||
| 103 | #include <linux/version.h> | 102 | #include <linux/version.h> |
| 104 | 103 | ||
| 105 | #define __OLD_VIDIOC_ | 104 | #define __OLD_VIDIOC_ |
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h index b71737178d0d..b95779b57c06 100644 --- a/drivers/video/matrox/matroxfb_base.h +++ b/drivers/video/matrox/matroxfb_base.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | /* Guard accelerator accesses with spin_lock_irqsave... */ | 25 | /* Guard accelerator accesses with spin_lock_irqsave... */ |
| 26 | #undef MATROXFB_USE_SPINLOCKS | 26 | #undef MATROXFB_USE_SPINLOCKS |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c index 263d801ef78f..18886b629cb1 100644 --- a/drivers/video/matrox/matroxfb_misc.c +++ b/drivers/video/matrox/matroxfb_misc.c | |||
| @@ -84,7 +84,6 @@ | |||
| 84 | * | 84 | * |
| 85 | */ | 85 | */ |
| 86 | 86 | ||
| 87 | #include <linux/config.h> | ||
| 88 | 87 | ||
| 89 | #include "matroxfb_misc.h" | 88 | #include "matroxfb_misc.h" |
| 90 | #include <linux/interrupt.h> | 89 | #include <linux/interrupt.h> |
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c index 2f156b724d1c..773855a311e8 100644 --- a/drivers/video/neofb.c +++ b/drivers/video/neofb.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | * | 54 | * |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/module.h> | 57 | #include <linux/module.h> |
| 59 | #include <linux/kernel.h> | 58 | #include <linux/kernel.h> |
| 60 | #include <linux/errno.h> | 59 | #include <linux/errno.h> |
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c index 1edb1c432b75..19eef3a09023 100644 --- a/drivers/video/nvidia/nv_i2c.c +++ b/drivers/video/nvidia/nv_i2c.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * for more details. | 10 | * for more details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c index 7a03d040b1a3..8209106e26ee 100644 --- a/drivers/video/nvidia/nv_of.c +++ b/drivers/video/nvidia/nv_of.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * for more details. | 10 | * for more details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index 7b5cffb27851..b02d6033cc0c 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index ad1434e3f227..bfeb11bd4712 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * more details. | 12 | * more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 0d1957505359..56ac51d6a7f3 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* p9100.c: P9100 frame buffer driver | 1 | /* p9100.c: P9100 frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright 1999 Derrick J Brashear (shadow@dementia.org) | 4 | * Copyright 1999 Derrick J Brashear (shadow@dementia.org) |
| 5 | * | 5 | * |
| 6 | * Driver layout based loosely on tgafb.c, see that file for credits. | 6 | * Driver layout based loosely on tgafb.c, see that file for credits. |
| @@ -17,8 +17,8 @@ | |||
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | 18 | ||
| 19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 20 | #include <asm/sbus.h> | 20 | #include <asm/prom.h> |
| 21 | #include <asm/oplib.h> | 21 | #include <asm/of_device.h> |
| 22 | #include <asm/fbio.h> | 22 | #include <asm/fbio.h> |
| 23 | 23 | ||
| 24 | #include "sbuslib.h" | 24 | #include "sbuslib.h" |
| @@ -72,60 +72,60 @@ static struct fb_ops p9100_ops = { | |||
| 72 | 72 | ||
| 73 | struct p9100_regs { | 73 | struct p9100_regs { |
| 74 | /* Registers for the system control */ | 74 | /* Registers for the system control */ |
| 75 | volatile u32 sys_base; | 75 | u32 sys_base; |
| 76 | volatile u32 sys_config; | 76 | u32 sys_config; |
| 77 | volatile u32 sys_intr; | 77 | u32 sys_intr; |
| 78 | volatile u32 sys_int_ena; | 78 | u32 sys_int_ena; |
| 79 | volatile u32 sys_alt_rd; | 79 | u32 sys_alt_rd; |
| 80 | volatile u32 sys_alt_wr; | 80 | u32 sys_alt_wr; |
| 81 | volatile u32 sys_xxx[58]; | 81 | u32 sys_xxx[58]; |
| 82 | 82 | ||
| 83 | /* Registers for the video control */ | 83 | /* Registers for the video control */ |
| 84 | volatile u32 vid_base; | 84 | u32 vid_base; |
| 85 | volatile u32 vid_hcnt; | 85 | u32 vid_hcnt; |
| 86 | volatile u32 vid_htotal; | 86 | u32 vid_htotal; |
| 87 | volatile u32 vid_hsync_rise; | 87 | u32 vid_hsync_rise; |
| 88 | volatile u32 vid_hblank_rise; | 88 | u32 vid_hblank_rise; |
| 89 | volatile u32 vid_hblank_fall; | 89 | u32 vid_hblank_fall; |
| 90 | volatile u32 vid_hcnt_preload; | 90 | u32 vid_hcnt_preload; |
| 91 | volatile u32 vid_vcnt; | 91 | u32 vid_vcnt; |
| 92 | volatile u32 vid_vlen; | 92 | u32 vid_vlen; |
| 93 | volatile u32 vid_vsync_rise; | 93 | u32 vid_vsync_rise; |
| 94 | volatile u32 vid_vblank_rise; | 94 | u32 vid_vblank_rise; |
| 95 | volatile u32 vid_vblank_fall; | 95 | u32 vid_vblank_fall; |
| 96 | volatile u32 vid_vcnt_preload; | 96 | u32 vid_vcnt_preload; |
| 97 | volatile u32 vid_screenpaint_addr; | 97 | u32 vid_screenpaint_addr; |
| 98 | volatile u32 vid_screenpaint_timectl1; | 98 | u32 vid_screenpaint_timectl1; |
| 99 | volatile u32 vid_screenpaint_qsfcnt; | 99 | u32 vid_screenpaint_qsfcnt; |
| 100 | volatile u32 vid_screenpaint_timectl2; | 100 | u32 vid_screenpaint_timectl2; |
| 101 | volatile u32 vid_xxx[15]; | 101 | u32 vid_xxx[15]; |
| 102 | 102 | ||
| 103 | /* Registers for the video control */ | 103 | /* Registers for the video control */ |
| 104 | volatile u32 vram_base; | 104 | u32 vram_base; |
| 105 | volatile u32 vram_memcfg; | 105 | u32 vram_memcfg; |
| 106 | volatile u32 vram_refresh_pd; | 106 | u32 vram_refresh_pd; |
| 107 | volatile u32 vram_refresh_cnt; | 107 | u32 vram_refresh_cnt; |
| 108 | volatile u32 vram_raslo_max; | 108 | u32 vram_raslo_max; |
| 109 | volatile u32 vram_raslo_cur; | 109 | u32 vram_raslo_cur; |
| 110 | volatile u32 pwrup_cfg; | 110 | u32 pwrup_cfg; |
| 111 | volatile u32 vram_xxx[25]; | 111 | u32 vram_xxx[25]; |
| 112 | 112 | ||
| 113 | /* Registers for IBM RGB528 Palette */ | 113 | /* Registers for IBM RGB528 Palette */ |
| 114 | volatile u32 ramdac_cmap_wridx; | 114 | u32 ramdac_cmap_wridx; |
| 115 | volatile u32 ramdac_palette_data; | 115 | u32 ramdac_palette_data; |
| 116 | volatile u32 ramdac_pixel_mask; | 116 | u32 ramdac_pixel_mask; |
| 117 | volatile u32 ramdac_palette_rdaddr; | 117 | u32 ramdac_palette_rdaddr; |
| 118 | volatile u32 ramdac_idx_lo; | 118 | u32 ramdac_idx_lo; |
| 119 | volatile u32 ramdac_idx_hi; | 119 | u32 ramdac_idx_hi; |
| 120 | volatile u32 ramdac_idx_data; | 120 | u32 ramdac_idx_data; |
| 121 | volatile u32 ramdac_idx_ctl; | 121 | u32 ramdac_idx_ctl; |
| 122 | volatile u32 ramdac_xxx[1784]; | 122 | u32 ramdac_xxx[1784]; |
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| 125 | struct p9100_cmd_parameng { | 125 | struct p9100_cmd_parameng { |
| 126 | volatile u32 parameng_status; | 126 | u32 parameng_status; |
| 127 | volatile u32 parameng_bltcmd; | 127 | u32 parameng_bltcmd; |
| 128 | volatile u32 parameng_quadcmd; | 128 | u32 parameng_quadcmd; |
| 129 | }; | 129 | }; |
| 130 | 130 | ||
| 131 | struct p9100_par { | 131 | struct p9100_par { |
| @@ -136,9 +136,8 @@ struct p9100_par { | |||
| 136 | #define P9100_FLAG_BLANKED 0x00000001 | 136 | #define P9100_FLAG_BLANKED 0x00000001 |
| 137 | 137 | ||
| 138 | unsigned long physbase; | 138 | unsigned long physbase; |
| 139 | unsigned long which_io; | ||
| 139 | unsigned long fbsize; | 140 | unsigned long fbsize; |
| 140 | |||
| 141 | struct sbus_dev *sdev; | ||
| 142 | }; | 141 | }; |
| 143 | 142 | ||
| 144 | /** | 143 | /** |
| @@ -227,8 +226,7 @@ static int p9100_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 227 | 226 | ||
| 228 | return sbusfb_mmap_helper(p9100_mmap_map, | 227 | return sbusfb_mmap_helper(p9100_mmap_map, |
| 229 | par->physbase, par->fbsize, | 228 | par->physbase, par->fbsize, |
| 230 | par->sdev->reg_addrs[0].which_io, | 229 | par->which_io, vma); |
| 231 | vma); | ||
| 232 | } | 230 | } |
| 233 | 231 | ||
| 234 | static int p9100_ioctl(struct fb_info *info, unsigned int cmd, | 232 | static int p9100_ioctl(struct fb_info *info, unsigned int cmd, |
| @@ -245,12 +243,9 @@ static int p9100_ioctl(struct fb_info *info, unsigned int cmd, | |||
| 245 | * Initialisation | 243 | * Initialisation |
| 246 | */ | 244 | */ |
| 247 | 245 | ||
| 248 | static void | 246 | static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) |
| 249 | p9100_init_fix(struct fb_info *info, int linebytes) | ||
| 250 | { | 247 | { |
| 251 | struct p9100_par *par = (struct p9100_par *)info->par; | 248 | strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); |
| 252 | |||
| 253 | strlcpy(info->fix.id, par->sdev->prom_name, sizeof(info->fix.id)); | ||
| 254 | 249 | ||
| 255 | info->fix.type = FB_TYPE_PACKED_PIXELS; | 250 | info->fix.type = FB_TYPE_PACKED_PIXELS; |
| 256 | info->fix.visual = FB_VISUAL_PSEUDOCOLOR; | 251 | info->fix.visual = FB_VISUAL_PSEUDOCOLOR; |
| @@ -263,121 +258,137 @@ p9100_init_fix(struct fb_info *info, int linebytes) | |||
| 263 | struct all_info { | 258 | struct all_info { |
| 264 | struct fb_info info; | 259 | struct fb_info info; |
| 265 | struct p9100_par par; | 260 | struct p9100_par par; |
| 266 | struct list_head list; | ||
| 267 | }; | 261 | }; |
| 268 | static LIST_HEAD(p9100_list); | ||
| 269 | 262 | ||
| 270 | static void p9100_init_one(struct sbus_dev *sdev) | 263 | static int __devinit p9100_init_one(struct of_device *op) |
| 271 | { | 264 | { |
| 265 | struct device_node *dp = op->node; | ||
| 272 | struct all_info *all; | 266 | struct all_info *all; |
| 273 | int linebytes; | 267 | int linebytes, err; |
| 274 | |||
| 275 | all = kmalloc(sizeof(*all), GFP_KERNEL); | ||
| 276 | if (!all) { | ||
| 277 | printk(KERN_ERR "p9100: Cannot allocate memory.\n"); | ||
| 278 | return; | ||
| 279 | } | ||
| 280 | memset(all, 0, sizeof(*all)); | ||
| 281 | 268 | ||
| 282 | INIT_LIST_HEAD(&all->list); | 269 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 270 | if (!all) | ||
| 271 | return -ENOMEM; | ||
| 283 | 272 | ||
| 284 | spin_lock_init(&all->par.lock); | 273 | spin_lock_init(&all->par.lock); |
| 285 | all->par.sdev = sdev; | ||
| 286 | 274 | ||
| 287 | /* This is the framebuffer and the only resource apps can mmap. */ | 275 | /* This is the framebuffer and the only resource apps can mmap. */ |
| 288 | all->par.physbase = sdev->reg_addrs[2].phys_addr; | 276 | all->par.physbase = op->resource[2].start; |
| 277 | all->par.which_io = op->resource[2].flags & IORESOURCE_BITS; | ||
| 289 | 278 | ||
| 290 | sbusfb_fill_var(&all->info.var, sdev->prom_node, 8); | 279 | sbusfb_fill_var(&all->info.var, dp->node, 8); |
| 291 | all->info.var.red.length = 8; | 280 | all->info.var.red.length = 8; |
| 292 | all->info.var.green.length = 8; | 281 | all->info.var.green.length = 8; |
| 293 | all->info.var.blue.length = 8; | 282 | all->info.var.blue.length = 8; |
| 294 | 283 | ||
| 295 | linebytes = prom_getintdefault(sdev->prom_node, "linebytes", | 284 | linebytes = of_getintprop_default(dp, "linebytes", |
| 296 | all->info.var.xres); | 285 | all->info.var.xres); |
| 297 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); | 286 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); |
| 298 | 287 | ||
| 299 | all->par.regs = sbus_ioremap(&sdev->resource[0], 0, | 288 | all->par.regs = of_ioremap(&op->resource[0], 0, |
| 300 | sizeof(struct p9100_regs), "p9100 regs"); | 289 | sizeof(struct p9100_regs), "p9100 regs"); |
| 290 | if (!all->par.regs) { | ||
| 291 | kfree(all); | ||
| 292 | return -ENOMEM; | ||
| 293 | } | ||
| 301 | 294 | ||
| 302 | all->info.flags = FBINFO_DEFAULT; | 295 | all->info.flags = FBINFO_DEFAULT; |
| 303 | all->info.fbops = &p9100_ops; | 296 | all->info.fbops = &p9100_ops; |
| 304 | #ifdef CONFIG_SPARC32 | 297 | all->info.screen_base = of_ioremap(&op->resource[2], 0, |
| 305 | all->info.screen_base = (char __iomem *) | 298 | all->par.fbsize, "p9100 ram"); |
| 306 | prom_getintdefault(sdev->prom_node, "address", 0); | 299 | if (!all->info.screen_base) { |
| 307 | #endif | 300 | of_iounmap(all->par.regs, sizeof(struct p9100_regs)); |
| 308 | if (!all->info.screen_base) | 301 | kfree(all); |
| 309 | all->info.screen_base = sbus_ioremap(&sdev->resource[2], 0, | 302 | return -ENOMEM; |
| 310 | all->par.fbsize, "p9100 ram"); | 303 | } |
| 311 | all->info.par = &all->par; | 304 | all->info.par = &all->par; |
| 312 | 305 | ||
| 313 | p9100_blank(0, &all->info); | 306 | p9100_blank(0, &all->info); |
| 314 | 307 | ||
| 315 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 308 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
| 316 | printk(KERN_ERR "p9100: Could not allocate color map.\n"); | 309 | of_iounmap(all->par.regs, sizeof(struct p9100_regs)); |
| 310 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 317 | kfree(all); | 311 | kfree(all); |
| 318 | return; | 312 | return -ENOMEM; |
| 319 | } | 313 | } |
| 320 | 314 | ||
| 321 | p9100_init_fix(&all->info, linebytes); | 315 | p9100_init_fix(&all->info, linebytes, dp); |
| 322 | 316 | ||
| 323 | if (register_framebuffer(&all->info) < 0) { | 317 | err = register_framebuffer(&all->info); |
| 324 | printk(KERN_ERR "p9100: Could not register framebuffer.\n"); | 318 | if (err < 0) { |
| 325 | fb_dealloc_cmap(&all->info.cmap); | 319 | fb_dealloc_cmap(&all->info.cmap); |
| 320 | of_iounmap(all->par.regs, sizeof(struct p9100_regs)); | ||
| 321 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 326 | kfree(all); | 322 | kfree(all); |
| 327 | return; | 323 | return err; |
| 328 | } | 324 | } |
| 329 | fb_set_cmap(&all->info.cmap, &all->info); | 325 | fb_set_cmap(&all->info.cmap, &all->info); |
| 330 | 326 | ||
| 331 | list_add(&all->list, &p9100_list); | 327 | dev_set_drvdata(&op->dev, all); |
| 328 | |||
| 329 | printk("%s: p9100 at %lx:%lx\n", | ||
| 330 | dp->full_name, | ||
| 331 | all->par.which_io, all->par.physbase); | ||
| 332 | 332 | ||
| 333 | printk("p9100: %s at %lx:%lx\n", | 333 | return 0; |
| 334 | sdev->prom_name, | ||
| 335 | (long) sdev->reg_addrs[0].which_io, | ||
| 336 | (long) sdev->reg_addrs[0].phys_addr); | ||
| 337 | } | 334 | } |
| 338 | 335 | ||
| 339 | int __init p9100_init(void) | 336 | static int __devinit p9100_probe(struct of_device *dev, const struct of_device_id *match) |
| 340 | { | 337 | { |
| 341 | struct sbus_bus *sbus; | 338 | struct of_device *op = to_of_device(&dev->dev); |
| 342 | struct sbus_dev *sdev; | ||
| 343 | 339 | ||
| 344 | if (fb_get_options("p9100fb", NULL)) | 340 | return p9100_init_one(op); |
| 345 | return -ENODEV; | 341 | } |
| 346 | 342 | ||
| 347 | for_all_sbusdev(sdev, sbus) { | 343 | static int __devexit p9100_remove(struct of_device *dev) |
| 348 | if (!strcmp(sdev->prom_name, "p9100")) | 344 | { |
| 349 | p9100_init_one(sdev); | 345 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 350 | } | 346 | |
| 347 | unregister_framebuffer(&all->info); | ||
| 348 | fb_dealloc_cmap(&all->info.cmap); | ||
| 349 | |||
| 350 | of_iounmap(all->par.regs, sizeof(struct p9100_regs)); | ||
| 351 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 352 | |||
| 353 | kfree(all); | ||
| 354 | |||
| 355 | dev_set_drvdata(&dev->dev, NULL); | ||
| 351 | 356 | ||
| 352 | return 0; | 357 | return 0; |
| 353 | } | 358 | } |
| 354 | 359 | ||
| 355 | void __exit p9100_exit(void) | 360 | static struct of_device_id p9100_match[] = { |
| 356 | { | 361 | { |
| 357 | struct list_head *pos, *tmp; | 362 | .name = "p9100", |
| 363 | }, | ||
| 364 | {}, | ||
| 365 | }; | ||
| 366 | MODULE_DEVICE_TABLE(of, p9100_match); | ||
| 358 | 367 | ||
| 359 | list_for_each_safe(pos, tmp, &p9100_list) { | 368 | static struct of_platform_driver p9100_driver = { |
| 360 | struct all_info *all = list_entry(pos, typeof(*all), list); | 369 | .name = "p9100", |
| 370 | .match_table = p9100_match, | ||
| 371 | .probe = p9100_probe, | ||
| 372 | .remove = __devexit_p(p9100_remove), | ||
| 373 | }; | ||
| 361 | 374 | ||
| 362 | unregister_framebuffer(&all->info); | 375 | static int __init p9100_init(void) |
| 363 | fb_dealloc_cmap(&all->info.cmap); | 376 | { |
| 364 | kfree(all); | 377 | if (fb_get_options("p9100fb", NULL)) |
| 365 | } | 378 | return -ENODEV; |
| 379 | |||
| 380 | return of_register_driver(&p9100_driver, &of_bus_type); | ||
| 366 | } | 381 | } |
| 367 | 382 | ||
| 368 | int __init | 383 | static void __exit p9100_exit(void) |
| 369 | p9100_setup(char *arg) | ||
| 370 | { | 384 | { |
| 371 | /* No cmdline options yet... */ | 385 | of_unregister_driver(&p9100_driver); |
| 372 | return 0; | ||
| 373 | } | 386 | } |
| 374 | 387 | ||
| 375 | module_init(p9100_init); | 388 | module_init(p9100_init); |
| 376 | |||
| 377 | #ifdef MODULE | ||
| 378 | module_exit(p9100_exit); | 389 | module_exit(p9100_exit); |
| 379 | #endif | ||
| 380 | 390 | ||
| 381 | MODULE_DESCRIPTION("framebuffer driver for P9100 chipsets"); | 391 | MODULE_DESCRIPTION("framebuffer driver for P9100 chipsets"); |
| 382 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 392 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 393 | MODULE_VERSION("2.0"); | ||
| 383 | MODULE_LICENSE("GPL"); | 394 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c index 335e37465559..450e802e0aa8 100644 --- a/drivers/video/platinumfb.c +++ b/drivers/video/platinumfb.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * more details. | 17 | * more details. |
| 18 | */ | 18 | */ |
| 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/errno.h> | 22 | #include <linux/errno.h> |
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 4e963930b50a..49a203e1591c 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/moduleparam.h> | 31 | #include <linux/moduleparam.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c index 52c18a35fb41..0e0f977b05ee 100644 --- a/drivers/video/pm3fb.c +++ b/drivers/video/pm3fb.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | * Wed Feb 21 14:47:06 CET 2001, v 1.0.0: First working version | 52 | * Wed Feb 21 14:47:06 CET 2001, v 1.0.0: First working version |
| 53 | */ | 53 | */ |
| 54 | 54 | ||
| 55 | #include <linux/config.h> | ||
| 56 | #include <linux/module.h> | 55 | #include <linux/module.h> |
| 57 | #include <linux/kernel.h> | 56 | #include <linux/kernel.h> |
| 58 | #include <linux/errno.h> | 57 | #include <linux/errno.h> |
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c index ec4bacf9dd2e..4a1e0e856920 100644 --- a/drivers/video/pvr2fb.c +++ b/drivers/video/pvr2fb.c | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | #include <linux/tty.h> | 56 | #include <linux/tty.h> |
| 57 | #include <linux/slab.h> | 57 | #include <linux/slab.h> |
| 58 | #include <linux/delay.h> | 58 | #include <linux/delay.h> |
| 59 | #include <linux/config.h> | ||
| 60 | #include <linux/interrupt.h> | 59 | #include <linux/interrupt.h> |
| 61 | #include <linux/fb.h> | 60 | #include <linux/fb.h> |
| 62 | #include <linux/init.h> | 61 | #include <linux/init.h> |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 809fc5eefc15..54663a9baf43 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/moduleparam.h> | 26 | #include <linux/moduleparam.h> |
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 12af58c5cf1f..2788655e6e7d 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * doublescan modes are broken | 29 | * doublescan modes are broken |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c index 8b1967fc116a..9751c37c0bfd 100644 --- a/drivers/video/riva/rivafb-i2c.c +++ b/drivers/video/riva/rivafb-i2c.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * for more details. | 12 | * for more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h index 440ff445689b..7fa13fc9c413 100644 --- a/drivers/video/riva/rivafb.h +++ b/drivers/video/riva/rivafb.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __RIVAFB_H | 1 | #ifndef __RIVAFB_H |
| 2 | #define __RIVAFB_H | 2 | #define __RIVAFB_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/fb.h> | 4 | #include <linux/fb.h> |
| 6 | #include <video/vga.h> | 5 | #include <video/vga.h> |
| 7 | #include <linux/i2c.h> | 6 | #include <linux/i2c.h> |
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index feec47bdd479..a5333c190789 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * more details. | 28 | * more details. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 34 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index d9831fd42341..553fd84af44f 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
| @@ -160,7 +160,6 @@ | |||
| 160 | * - Add patch 681/1 and clean up stork definitions. | 160 | * - Add patch 681/1 and clean up stork definitions. |
| 161 | */ | 161 | */ |
| 162 | 162 | ||
| 163 | #include <linux/config.h> | ||
| 164 | #include <linux/module.h> | 163 | #include <linux/module.h> |
| 165 | #include <linux/kernel.h> | 164 | #include <linux/kernel.h> |
| 166 | #include <linux/sched.h> | 165 | #include <linux/sched.h> |
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c index 21debed863ac..e83befd16d63 100644 --- a/drivers/video/savage/savagefb-i2c.c +++ b/drivers/video/savage/savagefb-i2c.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * for more details. | 10 | * for more details. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index 78883cf66a4d..4729af477fbf 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | * | 41 | * |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <linux/config.h> | ||
| 45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| 46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
| 47 | #include <linux/errno.h> | 46 | #include <linux/errno.h> |
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c index c0cc5e3ba7b5..ebb6756aea08 100644 --- a/drivers/video/sgivwfb.c +++ b/drivers/video/sgivwfb.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * more details. | 9 | * more details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h index 634c0a9d219b..7ecab87cef02 100644 --- a/drivers/video/sis/init.h +++ b/drivers/video/sis/init.h | |||
| @@ -73,7 +73,6 @@ | |||
| 73 | #ifdef SIS_CP | 73 | #ifdef SIS_CP |
| 74 | #undef SIS_CP | 74 | #undef SIS_CP |
| 75 | #endif | 75 | #endif |
| 76 | #include <linux/config.h> | ||
| 77 | #include <linux/version.h> | 76 | #include <linux/version.h> |
| 78 | #include <linux/types.h> | 77 | #include <linux/types.h> |
| 79 | #include <asm/io.h> | 78 | #include <asm/io.h> |
diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c index c3e070a6effd..f13faddc6181 100644 --- a/drivers/video/sis/init301.c +++ b/drivers/video/sis/init301.c | |||
| @@ -8043,8 +8043,8 @@ SiS_SetCHTVReg(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short | |||
| 8043 | SiS_SetCH700x(SiS_Pr,0x01,0x28); | 8043 | SiS_SetCH700x(SiS_Pr,0x01,0x28); |
| 8044 | 8044 | ||
| 8045 | /* Set video bandwidth | 8045 | /* Set video bandwidth |
| 8046 | High bandwith Luma composite video filter(S0=1) | 8046 | High bandwidth Luma composite video filter(S0=1) |
| 8047 | low bandwith Luma S-video filter (S2-1=00) | 8047 | low bandwidth Luma S-video filter (S2-1=00) |
| 8048 | disable peak filter in S-video channel (S3=0) | 8048 | disable peak filter in S-video channel (S3=0) |
| 8049 | high bandwidth Chroma Filter (S5-4=11) | 8049 | high bandwidth Chroma Filter (S5-4=11) |
| 8050 | =00110001=0x31 | 8050 | =00110001=0x31 |
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h index f475b21a85cf..bc321dc57e92 100644 --- a/drivers/video/sis/init301.h +++ b/drivers/video/sis/init301.h | |||
| @@ -67,7 +67,6 @@ | |||
| 67 | #ifdef SIS_CP | 67 | #ifdef SIS_CP |
| 68 | #undef SIS_CP | 68 | #undef SIS_CP |
| 69 | #endif | 69 | #endif |
| 70 | #include <linux/config.h> | ||
| 71 | #include <linux/version.h> | 70 | #include <linux/version.h> |
| 72 | #include <linux/types.h> | 71 | #include <linux/types.h> |
| 73 | #include <asm/io.h> | 72 | #include <asm/io.h> |
diff --git a/drivers/video/sis/initextlfb.c b/drivers/video/sis/initextlfb.c index cc856d90903c..09f5d758b6c0 100644 --- a/drivers/video/sis/initextlfb.c +++ b/drivers/video/sis/initextlfb.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include "vgatypes.h" | 30 | #include "vgatypes.h" |
| 31 | #include "vstruct.h" | 31 | #include "vstruct.h" |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/version.h> | 33 | #include <linux/version.h> |
| 35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 36 | #include <linux/fb.h> | 35 | #include <linux/fb.h> |
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h index 841ca3190cd4..f59568020eb2 100644 --- a/drivers/video/sis/osdef.h +++ b/drivers/video/sis/osdef.h | |||
| @@ -90,7 +90,6 @@ | |||
| 90 | /**********************************************************************/ | 90 | /**********************************************************************/ |
| 91 | 91 | ||
| 92 | #ifdef SIS_LINUX_KERNEL | 92 | #ifdef SIS_LINUX_KERNEL |
| 93 | #include <linux/config.h> | ||
| 94 | #include <linux/version.h> | 93 | #include <linux/version.h> |
| 95 | 94 | ||
| 96 | #ifdef CONFIG_FB_SIS_300 | 95 | #ifdef CONFIG_FB_SIS_300 |
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h index 0b6e625d7331..a259446ca7fe 100644 --- a/drivers/video/sis/sis.h +++ b/drivers/video/sis/sis.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef _SIS_H_ | 24 | #ifndef _SIS_H_ |
| 25 | #define _SIS_H_ | 25 | #define _SIS_H_ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/version.h> | 27 | #include <linux/version.h> |
| 29 | 28 | ||
| 30 | #include "osdef.h" | 29 | #include "osdef.h" |
diff --git a/drivers/video/sis/sis_accel.c b/drivers/video/sis/sis_accel.c index bab933e6c6a6..3b7ce032e2ed 100644 --- a/drivers/video/sis/sis_accel.c +++ b/drivers/video/sis/sis_accel.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * for more information and updates) | 28 | * for more information and updates) |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/version.h> | 31 | #include <linux/version.h> |
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index c63c0e721b82..b848ca7db7f9 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/version.h> | 36 | #include <linux/version.h> |
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) | 38 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) |
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index c44de90ca12e..dad54e73147b 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | * Includes | 82 | * Includes |
| 83 | */ | 83 | */ |
| 84 | 84 | ||
| 85 | #include <linux/config.h> | ||
| 86 | #include <linux/string.h> | 85 | #include <linux/string.h> |
| 87 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
| 88 | #include <linux/module.h> | 87 | #include <linux/module.h> |
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c index 4a292aae6eb2..3e16e2d9d55d 100644 --- a/drivers/video/stifb.c +++ b/drivers/video/stifb.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | #undef DEBUG_STIFB_REGS /* debug sti register accesses */ | 54 | #undef DEBUG_STIFB_REGS /* debug sti register accesses */ |
| 55 | 55 | ||
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/module.h> | 57 | #include <linux/module.h> |
| 59 | #include <linux/kernel.h> | 58 | #include <linux/kernel.h> |
| 60 | #include <linux/errno.h> | 59 | #include <linux/errno.h> |
diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c index 9b36b9df535f..e046e20f02b9 100644 --- a/drivers/video/sun3fb.c +++ b/drivers/video/sun3fb.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * more details. | 25 | * more details. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index 95b918229d9b..6990ab11cd06 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* tcx.c: TCX frame buffer driver | 1 | /* tcx.c: TCX frame buffer driver |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) |
| 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) | 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 6 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) | 6 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) |
| @@ -19,8 +19,8 @@ | |||
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | 20 | ||
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/sbus.h> | 22 | #include <asm/prom.h> |
| 23 | #include <asm/oplib.h> | 23 | #include <asm/of_device.h> |
| 24 | #include <asm/fbio.h> | 24 | #include <asm/fbio.h> |
| 25 | 25 | ||
| 26 | #include "sbuslib.h" | 26 | #include "sbuslib.h" |
| @@ -77,32 +77,32 @@ static struct fb_ops tcx_ops = { | |||
| 77 | 77 | ||
| 78 | /* The contents are unknown */ | 78 | /* The contents are unknown */ |
| 79 | struct tcx_tec { | 79 | struct tcx_tec { |
| 80 | volatile u32 tec_matrix; | 80 | u32 tec_matrix; |
| 81 | volatile u32 tec_clip; | 81 | u32 tec_clip; |
| 82 | volatile u32 tec_vdc; | 82 | u32 tec_vdc; |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | struct tcx_thc { | 85 | struct tcx_thc { |
| 86 | volatile u32 thc_rev; | 86 | u32 thc_rev; |
| 87 | u32 thc_pad0[511]; | 87 | u32 thc_pad0[511]; |
| 88 | volatile u32 thc_hs; /* hsync timing */ | 88 | u32 thc_hs; /* hsync timing */ |
| 89 | volatile u32 thc_hsdvs; | 89 | u32 thc_hsdvs; |
| 90 | volatile u32 thc_hd; | 90 | u32 thc_hd; |
| 91 | volatile u32 thc_vs; /* vsync timing */ | 91 | u32 thc_vs; /* vsync timing */ |
| 92 | volatile u32 thc_vd; | 92 | u32 thc_vd; |
| 93 | volatile u32 thc_refresh; | 93 | u32 thc_refresh; |
| 94 | volatile u32 thc_misc; | 94 | u32 thc_misc; |
| 95 | u32 thc_pad1[56]; | 95 | u32 thc_pad1[56]; |
| 96 | volatile u32 thc_cursxy; /* cursor x,y position (16 bits each) */ | 96 | u32 thc_cursxy; /* cursor x,y position (16 bits each) */ |
| 97 | volatile u32 thc_cursmask[32]; /* cursor mask bits */ | 97 | u32 thc_cursmask[32]; /* cursor mask bits */ |
| 98 | volatile u32 thc_cursbits[32]; /* what to show where mask enabled */ | 98 | u32 thc_cursbits[32]; /* what to show where mask enabled */ |
| 99 | }; | 99 | }; |
| 100 | 100 | ||
| 101 | struct bt_regs { | 101 | struct bt_regs { |
| 102 | volatile u32 addr; | 102 | u32 addr; |
| 103 | volatile u32 color_map; | 103 | u32 color_map; |
| 104 | volatile u32 control; | 104 | u32 control; |
| 105 | volatile u32 cursor; | 105 | u32 cursor; |
| 106 | }; | 106 | }; |
| 107 | 107 | ||
| 108 | #define TCX_MMAP_ENTRIES 14 | 108 | #define TCX_MMAP_ENTRIES 14 |
| @@ -112,24 +112,23 @@ struct tcx_par { | |||
| 112 | struct bt_regs __iomem *bt; | 112 | struct bt_regs __iomem *bt; |
| 113 | struct tcx_thc __iomem *thc; | 113 | struct tcx_thc __iomem *thc; |
| 114 | struct tcx_tec __iomem *tec; | 114 | struct tcx_tec __iomem *tec; |
| 115 | volatile u32 __iomem *cplane; | 115 | u32 __iomem *cplane; |
| 116 | 116 | ||
| 117 | u32 flags; | 117 | u32 flags; |
| 118 | #define TCX_FLAG_BLANKED 0x00000001 | 118 | #define TCX_FLAG_BLANKED 0x00000001 |
| 119 | 119 | ||
| 120 | unsigned long physbase; | 120 | unsigned long physbase; |
| 121 | unsigned long which_io; | ||
| 121 | unsigned long fbsize; | 122 | unsigned long fbsize; |
| 122 | 123 | ||
| 123 | struct sbus_mmap_map mmap_map[TCX_MMAP_ENTRIES]; | 124 | struct sbus_mmap_map mmap_map[TCX_MMAP_ENTRIES]; |
| 124 | int lowdepth; | 125 | int lowdepth; |
| 125 | |||
| 126 | struct sbus_dev *sdev; | ||
| 127 | }; | 126 | }; |
| 128 | 127 | ||
| 129 | /* Reset control plane so that WID is 8-bit plane. */ | 128 | /* Reset control plane so that WID is 8-bit plane. */ |
| 130 | static void __tcx_set_control_plane (struct tcx_par *par) | 129 | static void __tcx_set_control_plane (struct tcx_par *par) |
| 131 | { | 130 | { |
| 132 | volatile u32 __iomem *p, *pend; | 131 | u32 __iomem *p, *pend; |
| 133 | 132 | ||
| 134 | if (par->lowdepth) | 133 | if (par->lowdepth) |
| 135 | return; | 134 | return; |
| @@ -307,8 +306,7 @@ static int tcx_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 307 | 306 | ||
| 308 | return sbusfb_mmap_helper(par->mmap_map, | 307 | return sbusfb_mmap_helper(par->mmap_map, |
| 309 | par->physbase, par->fbsize, | 308 | par->physbase, par->fbsize, |
| 310 | par->sdev->reg_addrs[0].which_io, | 309 | par->which_io, vma); |
| 311 | vma); | ||
| 312 | } | 310 | } |
| 313 | 311 | ||
| 314 | static int tcx_ioctl(struct fb_info *info, unsigned int cmd, | 312 | static int tcx_ioctl(struct fb_info *info, unsigned int cmd, |
| @@ -350,48 +348,71 @@ tcx_init_fix(struct fb_info *info, int linebytes) | |||
| 350 | struct all_info { | 348 | struct all_info { |
| 351 | struct fb_info info; | 349 | struct fb_info info; |
| 352 | struct tcx_par par; | 350 | struct tcx_par par; |
| 353 | struct list_head list; | ||
| 354 | }; | 351 | }; |
| 355 | static LIST_HEAD(tcx_list); | ||
| 356 | 352 | ||
| 357 | static void tcx_init_one(struct sbus_dev *sdev) | 353 | static void tcx_unmap_regs(struct all_info *all) |
| 358 | { | 354 | { |
| 359 | struct all_info *all; | 355 | if (all->par.tec) |
| 360 | int linebytes, i; | 356 | of_iounmap(all->par.tec, sizeof(struct tcx_tec)); |
| 357 | if (all->par.thc) | ||
| 358 | of_iounmap(all->par.thc, sizeof(struct tcx_thc)); | ||
| 359 | if (all->par.bt) | ||
| 360 | of_iounmap(all->par.bt, sizeof(struct bt_regs)); | ||
| 361 | if (all->par.cplane) | ||
| 362 | of_iounmap(all->par.cplane, all->par.fbsize * sizeof(u32)); | ||
| 363 | if (all->info.screen_base) | ||
| 364 | of_iounmap(all->info.screen_base, all->par.fbsize); | ||
| 365 | } | ||
| 361 | 366 | ||
| 362 | all = kmalloc(sizeof(*all), GFP_KERNEL); | 367 | static int __devinit tcx_init_one(struct of_device *op) |
| 363 | if (!all) { | 368 | { |
| 364 | printk(KERN_ERR "tcx: Cannot allocate memory.\n"); | 369 | struct device_node *dp = op->node; |
| 365 | return; | 370 | struct all_info *all; |
| 366 | } | 371 | int linebytes, i, err; |
| 367 | memset(all, 0, sizeof(*all)); | ||
| 368 | 372 | ||
| 369 | INIT_LIST_HEAD(&all->list); | 373 | all = kzalloc(sizeof(*all), GFP_KERNEL); |
| 374 | if (!all) | ||
| 375 | return -ENOMEM; | ||
| 370 | 376 | ||
| 371 | spin_lock_init(&all->par.lock); | 377 | spin_lock_init(&all->par.lock); |
| 372 | all->par.sdev = sdev; | ||
| 373 | 378 | ||
| 374 | all->par.lowdepth = prom_getbool(sdev->prom_node, "tcx-8-bit"); | 379 | all->par.lowdepth = |
| 380 | (of_find_property(dp, "tcx-8-bit", NULL) != NULL); | ||
| 375 | 381 | ||
| 376 | sbusfb_fill_var(&all->info.var, sdev->prom_node, 8); | 382 | sbusfb_fill_var(&all->info.var, dp->node, 8); |
| 377 | all->info.var.red.length = 8; | 383 | all->info.var.red.length = 8; |
| 378 | all->info.var.green.length = 8; | 384 | all->info.var.green.length = 8; |
| 379 | all->info.var.blue.length = 8; | 385 | all->info.var.blue.length = 8; |
| 380 | 386 | ||
| 381 | linebytes = prom_getintdefault(sdev->prom_node, "linebytes", | 387 | linebytes = of_getintprop_default(dp, "linebytes", |
| 382 | all->info.var.xres); | 388 | all->info.var.xres); |
| 383 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); | 389 | all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres); |
| 384 | 390 | ||
| 385 | all->par.tec = sbus_ioremap(&sdev->resource[7], 0, | 391 | all->par.tec = of_ioremap(&op->resource[7], 0, |
| 386 | sizeof(struct tcx_tec), "tcx tec"); | 392 | sizeof(struct tcx_tec), "tcx tec"); |
| 387 | all->par.thc = sbus_ioremap(&sdev->resource[9], 0, | 393 | all->par.thc = of_ioremap(&op->resource[9], 0, |
| 388 | sizeof(struct tcx_thc), "tcx thc"); | 394 | sizeof(struct tcx_thc), "tcx thc"); |
| 389 | all->par.bt = sbus_ioremap(&sdev->resource[8], 0, | 395 | all->par.bt = of_ioremap(&op->resource[8], 0, |
| 390 | sizeof(struct bt_regs), "tcx dac"); | 396 | sizeof(struct bt_regs), "tcx dac"); |
| 397 | all->info.screen_base = of_ioremap(&op->resource[0], 0, | ||
| 398 | all->par.fbsize, "tcx ram"); | ||
| 399 | if (!all->par.tec || !all->par.thc || | ||
| 400 | !all->par.bt || !all->info.screen_base) { | ||
| 401 | tcx_unmap_regs(all); | ||
| 402 | kfree(all); | ||
| 403 | return -ENOMEM; | ||
| 404 | } | ||
| 405 | |||
| 391 | memcpy(&all->par.mmap_map, &__tcx_mmap_map, sizeof(all->par.mmap_map)); | 406 | memcpy(&all->par.mmap_map, &__tcx_mmap_map, sizeof(all->par.mmap_map)); |
| 392 | if (!all->par.lowdepth) { | 407 | if (!all->par.lowdepth) { |
| 393 | all->par.cplane = sbus_ioremap(&sdev->resource[4], 0, | 408 | all->par.cplane = of_ioremap(&op->resource[4], 0, |
| 394 | all->par.fbsize * sizeof(u32), "tcx cplane"); | 409 | all->par.fbsize * sizeof(u32), |
| 410 | "tcx cplane"); | ||
| 411 | if (!all->par.cplane) { | ||
| 412 | tcx_unmap_regs(all); | ||
| 413 | kfree(all); | ||
| 414 | return -ENOMEM; | ||
| 415 | } | ||
| 395 | } else { | 416 | } else { |
| 396 | all->par.mmap_map[1].size = SBUS_MMAP_EMPTY; | 417 | all->par.mmap_map[1].size = SBUS_MMAP_EMPTY; |
| 397 | all->par.mmap_map[4].size = SBUS_MMAP_EMPTY; | 418 | all->par.mmap_map[4].size = SBUS_MMAP_EMPTY; |
| @@ -400,6 +421,8 @@ static void tcx_init_one(struct sbus_dev *sdev) | |||
| 400 | } | 421 | } |
| 401 | 422 | ||
| 402 | all->par.physbase = 0; | 423 | all->par.physbase = 0; |
| 424 | all->par.which_io = op->resource[0].flags & IORESOURCE_BITS; | ||
| 425 | |||
| 403 | for (i = 0; i < TCX_MMAP_ENTRIES; i++) { | 426 | for (i = 0; i < TCX_MMAP_ENTRIES; i++) { |
| 404 | int j; | 427 | int j; |
| 405 | 428 | ||
| @@ -416,18 +439,11 @@ static void tcx_init_one(struct sbus_dev *sdev) | |||
| 416 | j = i; | 439 | j = i; |
| 417 | break; | 440 | break; |
| 418 | }; | 441 | }; |
| 419 | all->par.mmap_map[i].poff = sdev->reg_addrs[j].phys_addr; | 442 | all->par.mmap_map[i].poff = op->resource[j].start; |
| 420 | } | 443 | } |
| 421 | 444 | ||
| 422 | all->info.flags = FBINFO_DEFAULT; | 445 | all->info.flags = FBINFO_DEFAULT; |
| 423 | all->info.fbops = &tcx_ops; | 446 | all->info.fbops = &tcx_ops; |
| 424 | #ifdef CONFIG_SPARC32 | ||
| 425 | all->info.screen_base = (char __iomem *) | ||
| 426 | prom_getintdefault(sdev->prom_node, "address", 0); | ||
| 427 | #endif | ||
| 428 | if (!all->info.screen_base) | ||
| 429 | all->info.screen_base = sbus_ioremap(&sdev->resource[0], 0, | ||
| 430 | all->par.fbsize, "tcx ram"); | ||
| 431 | all->info.par = &all->par; | 447 | all->info.par = &all->par; |
| 432 | 448 | ||
| 433 | /* Initialize brooktree DAC. */ | 449 | /* Initialize brooktree DAC. */ |
| @@ -445,72 +461,88 @@ static void tcx_init_one(struct sbus_dev *sdev) | |||
| 445 | tcx_blank(FB_BLANK_UNBLANK, &all->info); | 461 | tcx_blank(FB_BLANK_UNBLANK, &all->info); |
| 446 | 462 | ||
| 447 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 463 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
| 448 | printk(KERN_ERR "tcx: Could not allocate color map.\n"); | 464 | tcx_unmap_regs(all); |
| 449 | kfree(all); | 465 | kfree(all); |
| 450 | return; | 466 | return -ENOMEM; |
| 451 | } | 467 | } |
| 452 | 468 | ||
| 453 | fb_set_cmap(&all->info.cmap, &all->info); | 469 | fb_set_cmap(&all->info.cmap, &all->info); |
| 454 | tcx_init_fix(&all->info, linebytes); | 470 | tcx_init_fix(&all->info, linebytes); |
| 455 | 471 | ||
| 456 | if (register_framebuffer(&all->info) < 0) { | 472 | err = register_framebuffer(&all->info); |
| 457 | printk(KERN_ERR "tcx: Could not register framebuffer.\n"); | 473 | if (err < 0) { |
| 458 | fb_dealloc_cmap(&all->info.cmap); | 474 | fb_dealloc_cmap(&all->info.cmap); |
| 475 | tcx_unmap_regs(all); | ||
| 459 | kfree(all); | 476 | kfree(all); |
| 460 | return; | 477 | return err; |
| 461 | } | 478 | } |
| 462 | 479 | ||
| 463 | list_add(&all->list, &tcx_list); | 480 | dev_set_drvdata(&op->dev, all); |
| 464 | 481 | ||
| 465 | printk("tcx: %s at %lx:%lx, %s\n", | 482 | printk("%s: TCX at %lx:%lx, %s\n", |
| 466 | sdev->prom_name, | 483 | dp->full_name, |
| 467 | (long) sdev->reg_addrs[0].which_io, | 484 | all->par.which_io, |
| 468 | (long) sdev->reg_addrs[0].phys_addr, | 485 | op->resource[0].start, |
| 469 | all->par.lowdepth ? "8-bit only" : "24-bit depth"); | 486 | all->par.lowdepth ? "8-bit only" : "24-bit depth"); |
| 487 | |||
| 488 | return 0; | ||
| 470 | } | 489 | } |
| 471 | 490 | ||
| 472 | int __init tcx_init(void) | 491 | static int __devinit tcx_probe(struct of_device *dev, const struct of_device_id *match) |
| 473 | { | 492 | { |
| 474 | struct sbus_bus *sbus; | 493 | struct of_device *op = to_of_device(&dev->dev); |
| 475 | struct sbus_dev *sdev; | ||
| 476 | 494 | ||
| 477 | if (fb_get_options("tcxfb", NULL)) | 495 | return tcx_init_one(op); |
| 478 | return -ENODEV; | 496 | } |
| 479 | 497 | ||
| 480 | for_all_sbusdev(sdev, sbus) { | 498 | static int __devexit tcx_remove(struct of_device *dev) |
| 481 | if (!strcmp(sdev->prom_name, "SUNW,tcx")) | 499 | { |
| 482 | tcx_init_one(sdev); | 500 | struct all_info *all = dev_get_drvdata(&dev->dev); |
| 483 | } | 501 | |
| 502 | unregister_framebuffer(&all->info); | ||
| 503 | fb_dealloc_cmap(&all->info.cmap); | ||
| 504 | |||
| 505 | tcx_unmap_regs(all); | ||
| 506 | |||
| 507 | kfree(all); | ||
| 508 | |||
| 509 | dev_set_drvdata(&dev->dev, NULL); | ||
| 484 | 510 | ||
| 485 | return 0; | 511 | return 0; |
| 486 | } | 512 | } |
| 487 | 513 | ||
| 488 | void __exit tcx_exit(void) | 514 | static struct of_device_id tcx_match[] = { |
| 489 | { | 515 | { |
| 490 | struct list_head *pos, *tmp; | 516 | .name = "SUNW,tcx", |
| 517 | }, | ||
| 518 | {}, | ||
| 519 | }; | ||
| 520 | MODULE_DEVICE_TABLE(of, tcx_match); | ||
| 491 | 521 | ||
| 492 | list_for_each_safe(pos, tmp, &tcx_list) { | 522 | static struct of_platform_driver tcx_driver = { |
| 493 | struct all_info *all = list_entry(pos, typeof(*all), list); | 523 | .name = "tcx", |
| 524 | .match_table = tcx_match, | ||
| 525 | .probe = tcx_probe, | ||
| 526 | .remove = __devexit_p(tcx_remove), | ||
| 527 | }; | ||
| 494 | 528 | ||
| 495 | unregister_framebuffer(&all->info); | 529 | int __init tcx_init(void) |
| 496 | fb_dealloc_cmap(&all->info.cmap); | 530 | { |
| 497 | kfree(all); | 531 | if (fb_get_options("tcxfb", NULL)) |
| 498 | } | 532 | return -ENODEV; |
| 533 | |||
| 534 | return of_register_driver(&tcx_driver, &of_bus_type); | ||
| 499 | } | 535 | } |
| 500 | 536 | ||
| 501 | int __init | 537 | void __exit tcx_exit(void) |
| 502 | tcx_setup(char *arg) | ||
| 503 | { | 538 | { |
| 504 | /* No cmdline options yet... */ | 539 | of_unregister_driver(&tcx_driver); |
| 505 | return 0; | ||
| 506 | } | 540 | } |
| 507 | 541 | ||
| 508 | module_init(tcx_init); | 542 | module_init(tcx_init); |
| 509 | |||
| 510 | #ifdef MODULE | ||
| 511 | module_exit(tcx_exit); | 543 | module_exit(tcx_exit); |
| 512 | #endif | ||
| 513 | 544 | ||
| 514 | MODULE_DESCRIPTION("framebuffer driver for TCX chipsets"); | 545 | MODULE_DESCRIPTION("framebuffer driver for TCX chipsets"); |
| 515 | MODULE_AUTHOR("David S. Miller <davem@redhat.com>"); | 546 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 547 | MODULE_VERSION("2.0"); | ||
| 516 | MODULE_LICENSE("GPL"); | 548 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 5e5328d682db..239b1496874b 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | * | 58 | * |
| 59 | */ | 59 | */ |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 63 | #include <linux/kernel.h> | 62 | #include <linux/kernel.h> |
| 64 | #include <linux/errno.h> | 63 | #include <linux/errno.h> |
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c index 41f8c2d93892..14175cdb9c9c 100644 --- a/drivers/video/tridentfb.c +++ b/drivers/video/tridentfb.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * TGUI acceleration | 15 | * TGUI acceleration |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 2bdeb4baa952..1d76c035050e 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | * more details. | 39 | * more details. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 44 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| 45 | #include <linux/errno.h> | 44 | #include <linux/errno.h> |
diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c index 15179ec62339..d94efafc77b5 100644 --- a/drivers/video/vgastate.c +++ b/drivers/video/vgastate.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * archive for more details. | 13 | * archive for more details. |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 19 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
diff --git a/drivers/zorro/names.c b/drivers/zorro/names.c index 0dd532d3a5d6..e8517c3d8e82 100644 --- a/drivers/zorro/names.c +++ b/drivers/zorro/names.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * David Mosberger-Tang, Martin Mares | 9 | * David Mosberger-Tang, Martin Mares |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
diff --git a/fs/9p/conv.c b/fs/9p/conv.c index a767e05b60bf..1e898144eb7c 100644 --- a/fs/9p/conv.c +++ b/fs/9p/conv.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
diff --git a/fs/9p/error.c b/fs/9p/error.c index 981fe8ecd780..ae91555c1558 100644 --- a/fs/9p/error.c +++ b/fs/9p/error.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | 31 | ||
| 33 | #include <linux/list.h> | 32 | #include <linux/list.h> |
diff --git a/fs/9p/fcall.c b/fs/9p/fcall.c index 6f2617820a4e..8556097fcda8 100644 --- a/fs/9p/fcall.c +++ b/fs/9p/fcall.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
diff --git a/fs/9p/fcprint.c b/fs/9p/fcprint.c index 583e827baebd..34b96114a28d 100644 --- a/fs/9p/fcprint.c +++ b/fs/9p/fcprint.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Boston, MA 02111-1301 USA | 21 | * Boston, MA 02111-1301 USA |
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/fs.h> | 26 | #include <linux/fs.h> |
diff --git a/fs/9p/fid.c b/fs/9p/fid.c index b7608af07ce8..70492ccb4385 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
diff --git a/fs/9p/mux.c b/fs/9p/mux.c index 8d45ed668837..90a79c784549 100644 --- a/fs/9p/mux.c +++ b/fs/9p/mux.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
diff --git a/fs/9p/trans_fd.c b/fs/9p/trans_fd.c index 94e0a7fd9fc2..34d43355beb7 100644 --- a/fs/9p/trans_fd.c +++ b/fs/9p/trans_fd.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/in.h> | 28 | #include <linux/in.h> |
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/net.h> | 30 | #include <linux/net.h> |
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index d37416eb5791..22f7ccd58d38 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index d4f0aa3c87f2..9dfd259a70b4 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 32 | #include <linux/smp_lock.h> | 32 | #include <linux/smp_lock.h> |
| 33 | #include <linux/inet.h> | 33 | #include <linux/inet.h> |
| 34 | #include <linux/version.h> | ||
| 35 | #include <linux/pagemap.h> | 34 | #include <linux/pagemap.h> |
| 36 | #include <linux/idr.h> | 35 | #include <linux/idr.h> |
| 37 | 36 | ||
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 1a8e46084f0e..c3c47eda7574 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 32 | #include <linux/smp_lock.h> | 32 | #include <linux/smp_lock.h> |
| 33 | #include <linux/inet.h> | 33 | #include <linux/inet.h> |
| 34 | #include <linux/version.h> | ||
| 35 | #include <linux/list.h> | 34 | #include <linux/list.h> |
| 36 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 37 | #include <linux/idr.h> | 36 | #include <linux/idr.h> |
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 8b15bb22caca..63320d4e15d2 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 31 | #include <linux/fs.h> | 30 | #include <linux/fs.h> |
diff --git a/fs/Kconfig b/fs/Kconfig index 6dc8cfd6d80c..53f5c6d61121 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -326,7 +326,7 @@ source "fs/xfs/Kconfig" | |||
| 326 | 326 | ||
| 327 | config OCFS2_FS | 327 | config OCFS2_FS |
| 328 | tristate "OCFS2 file system support (EXPERIMENTAL)" | 328 | tristate "OCFS2 file system support (EXPERIMENTAL)" |
| 329 | depends on NET && EXPERIMENTAL | 329 | depends on NET && SYSFS && EXPERIMENTAL |
| 330 | select CONFIGFS_FS | 330 | select CONFIGFS_FS |
| 331 | select JBD | 331 | select JBD |
| 332 | select CRC32 | 332 | select CRC32 |
| @@ -356,6 +356,16 @@ config OCFS2_FS | |||
| 356 | - POSIX ACLs | 356 | - POSIX ACLs |
| 357 | - readpages / writepages (not user visible) | 357 | - readpages / writepages (not user visible) |
| 358 | 358 | ||
| 359 | config OCFS2_DEBUG_MASKLOG | ||
| 360 | bool "OCFS2 logging support" | ||
| 361 | depends on OCFS2_FS | ||
| 362 | default y | ||
| 363 | help | ||
| 364 | The ocfs2 filesystem has an extensive logging system. The system | ||
| 365 | allows selection of events to log via files in /sys/o2cb/logmask/. | ||
| 366 | This option will enlarge your kernel, but it allows debugging of | ||
| 367 | ocfs2 filesystem issues. | ||
| 368 | |||
| 359 | config MINIX_FS | 369 | config MINIX_FS |
| 360 | tristate "Minix fs support" | 370 | tristate "Minix fs support" |
| 361 | help | 371 | help |
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index 7b075fc397da..d3c7905b2ddc 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * Common directory handling for ADFS | 10 | * Common directory handling for ADFS |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 14 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 15 | #include <linux/adfs_fs.h> | 14 | #include <linux/adfs_fs.h> |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index a83e889a97cd..fcaeead9696b 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -325,7 +325,7 @@ befs_read_inode(struct inode *inode) | |||
| 325 | if (!bh) { | 325 | if (!bh) { |
| 326 | befs_error(sb, "unable to read inode block - " | 326 | befs_error(sb, "unable to read inode block - " |
| 327 | "inode = %lu", inode->i_ino); | 327 | "inode = %lu", inode->i_ino); |
| 328 | goto unaquire_none; | 328 | goto unacquire_none; |
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | raw_inode = (befs_inode *) bh->b_data; | 331 | raw_inode = (befs_inode *) bh->b_data; |
| @@ -334,7 +334,7 @@ befs_read_inode(struct inode *inode) | |||
| 334 | 334 | ||
| 335 | if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { | 335 | if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { |
| 336 | befs_error(sb, "Bad inode: %lu", inode->i_ino); | 336 | befs_error(sb, "Bad inode: %lu", inode->i_ino); |
| 337 | goto unaquire_bh; | 337 | goto unacquire_bh; |
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); | 340 | inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); |
| @@ -402,17 +402,17 @@ befs_read_inode(struct inode *inode) | |||
| 402 | befs_error(sb, "Inode %lu is not a regular file, " | 402 | befs_error(sb, "Inode %lu is not a regular file, " |
| 403 | "directory or symlink. THAT IS WRONG! BeFS has no " | 403 | "directory or symlink. THAT IS WRONG! BeFS has no " |
| 404 | "on disk special files", inode->i_ino); | 404 | "on disk special files", inode->i_ino); |
| 405 | goto unaquire_bh; | 405 | goto unacquire_bh; |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | brelse(bh); | 408 | brelse(bh); |
| 409 | befs_debug(sb, "<--- befs_read_inode()"); | 409 | befs_debug(sb, "<--- befs_read_inode()"); |
| 410 | return; | 410 | return; |
| 411 | 411 | ||
| 412 | unaquire_bh: | 412 | unacquire_bh: |
| 413 | brelse(bh); | 413 | brelse(bh); |
| 414 | 414 | ||
| 415 | unaquire_none: | 415 | unacquire_none: |
| 416 | make_bad_inode(inode); | 416 | make_bad_inode(inode); |
| 417 | befs_debug(sb, "<--- befs_read_inode() - Bad inode"); | 417 | befs_debug(sb, "<--- befs_read_inode() - Bad inode"); |
| 418 | return; | 418 | return; |
| @@ -761,14 +761,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 761 | printk(KERN_ERR | 761 | printk(KERN_ERR |
| 762 | "BeFS(%s): Unable to allocate memory for private " | 762 | "BeFS(%s): Unable to allocate memory for private " |
| 763 | "portion of superblock. Bailing.\n", sb->s_id); | 763 | "portion of superblock. Bailing.\n", sb->s_id); |
| 764 | goto unaquire_none; | 764 | goto unacquire_none; |
| 765 | } | 765 | } |
| 766 | befs_sb = BEFS_SB(sb); | 766 | befs_sb = BEFS_SB(sb); |
| 767 | memset(befs_sb, 0, sizeof(befs_sb_info)); | 767 | memset(befs_sb, 0, sizeof(befs_sb_info)); |
| 768 | 768 | ||
| 769 | if (!parse_options((char *) data, &befs_sb->mount_opts)) { | 769 | if (!parse_options((char *) data, &befs_sb->mount_opts)) { |
| 770 | befs_error(sb, "cannot parse mount options"); | 770 | befs_error(sb, "cannot parse mount options"); |
| 771 | goto unaquire_priv_sbp; | 771 | goto unacquire_priv_sbp; |
| 772 | } | 772 | } |
| 773 | 773 | ||
| 774 | befs_debug(sb, "---> befs_fill_super()"); | 774 | befs_debug(sb, "---> befs_fill_super()"); |
| @@ -794,7 +794,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 794 | 794 | ||
| 795 | if (!(bh = sb_bread(sb, sb_block))) { | 795 | if (!(bh = sb_bread(sb, sb_block))) { |
| 796 | befs_error(sb, "unable to read superblock"); | 796 | befs_error(sb, "unable to read superblock"); |
| 797 | goto unaquire_priv_sbp; | 797 | goto unacquire_priv_sbp; |
| 798 | } | 798 | } |
| 799 | 799 | ||
| 800 | /* account for offset of super block on x86 */ | 800 | /* account for offset of super block on x86 */ |
| @@ -809,20 +809,20 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 809 | } | 809 | } |
| 810 | 810 | ||
| 811 | if (befs_load_sb(sb, disk_sb) != BEFS_OK) | 811 | if (befs_load_sb(sb, disk_sb) != BEFS_OK) |
| 812 | goto unaquire_bh; | 812 | goto unacquire_bh; |
| 813 | 813 | ||
| 814 | befs_dump_super_block(sb, disk_sb); | 814 | befs_dump_super_block(sb, disk_sb); |
| 815 | 815 | ||
| 816 | brelse(bh); | 816 | brelse(bh); |
| 817 | 817 | ||
| 818 | if (befs_check_sb(sb) != BEFS_OK) | 818 | if (befs_check_sb(sb) != BEFS_OK) |
| 819 | goto unaquire_priv_sbp; | 819 | goto unacquire_priv_sbp; |
| 820 | 820 | ||
| 821 | if( befs_sb->num_blocks > ~((sector_t)0) ) { | 821 | if( befs_sb->num_blocks > ~((sector_t)0) ) { |
| 822 | befs_error(sb, "blocks count: %Lu " | 822 | befs_error(sb, "blocks count: %Lu " |
| 823 | "is larger than the host can use", | 823 | "is larger than the host can use", |
| 824 | befs_sb->num_blocks); | 824 | befs_sb->num_blocks); |
| 825 | goto unaquire_priv_sbp; | 825 | goto unacquire_priv_sbp; |
| 826 | } | 826 | } |
| 827 | 827 | ||
| 828 | /* | 828 | /* |
| @@ -838,7 +838,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 838 | if (!sb->s_root) { | 838 | if (!sb->s_root) { |
| 839 | iput(root); | 839 | iput(root); |
| 840 | befs_error(sb, "get root inode failed"); | 840 | befs_error(sb, "get root inode failed"); |
| 841 | goto unaquire_priv_sbp; | 841 | goto unacquire_priv_sbp; |
| 842 | } | 842 | } |
| 843 | 843 | ||
| 844 | /* load nls library */ | 844 | /* load nls library */ |
| @@ -860,13 +860,13 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 860 | 860 | ||
| 861 | return 0; | 861 | return 0; |
| 862 | /*****************/ | 862 | /*****************/ |
| 863 | unaquire_bh: | 863 | unacquire_bh: |
| 864 | brelse(bh); | 864 | brelse(bh); |
| 865 | 865 | ||
| 866 | unaquire_priv_sbp: | 866 | unacquire_priv_sbp: |
| 867 | kfree(sb->s_fs_info); | 867 | kfree(sb->s_fs_info); |
| 868 | 868 | ||
| 869 | unaquire_none: | 869 | unacquire_none: |
| 870 | sb->s_fs_info = NULL; | 870 | sb->s_fs_info = NULL; |
| 871 | return -EINVAL; | 871 | return -EINVAL; |
| 872 | } | 872 | } |
| @@ -925,18 +925,18 @@ init_befs_fs(void) | |||
| 925 | 925 | ||
| 926 | err = befs_init_inodecache(); | 926 | err = befs_init_inodecache(); |
| 927 | if (err) | 927 | if (err) |
| 928 | goto unaquire_none; | 928 | goto unacquire_none; |
| 929 | 929 | ||
| 930 | err = register_filesystem(&befs_fs_type); | 930 | err = register_filesystem(&befs_fs_type); |
| 931 | if (err) | 931 | if (err) |
| 932 | goto unaquire_inodecache; | 932 | goto unacquire_inodecache; |
| 933 | 933 | ||
| 934 | return 0; | 934 | return 0; |
| 935 | 935 | ||
| 936 | unaquire_inodecache: | 936 | unacquire_inodecache: |
| 937 | befs_destroy_inodecache(); | 937 | befs_destroy_inodecache(); |
| 938 | 938 | ||
| 939 | unaquire_none: | 939 | unacquire_none: |
| 940 | return err; | 940 | return err; |
| 941 | } | 941 | } |
| 942 | 942 | ||
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index c94d52eafd1b..a62fd4018a20 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c index 00a91dc25d16..32b5d625ce9c 100644 --- a/fs/binfmt_som.c +++ b/fs/binfmt_som.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 33 | #include <asm/pgtable.h> | 33 | #include <asm/pgtable.h> |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | 35 | ||
| 37 | #include <linux/elf.h> | 36 | #include <linux/elf.h> |
| 38 | 37 | ||
diff --git a/fs/block_dev.c b/fs/block_dev.c index 909cb0595b4e..9633a490dab0 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE | 5 | * Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/fcntl.h> | 10 | #include <linux/fcntl.h> |
diff --git a/fs/buffer.c b/fs/buffer.c index e9994722f4a3..3660dcb97591 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * async buffer flushing, 1999 Andrea Arcangeli <andrea@suse.de> | 18 | * async buffer flushing, 1999 Andrea Arcangeli <andrea@suse.de> |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/syscalls.h> | 22 | #include <linux/syscalls.h> |
| 24 | #include <linux/fs.h> | 23 | #include <linux/fs.h> |
| @@ -852,7 +851,7 @@ int __set_page_dirty_buffers(struct page *page) | |||
| 852 | write_lock_irq(&mapping->tree_lock); | 851 | write_lock_irq(&mapping->tree_lock); |
| 853 | if (page->mapping) { /* Race with truncate? */ | 852 | if (page->mapping) { /* Race with truncate? */ |
| 854 | if (mapping_cap_account_dirty(mapping)) | 853 | if (mapping_cap_account_dirty(mapping)) |
| 855 | inc_page_state(nr_dirty); | 854 | __inc_zone_page_state(page, NR_FILE_DIRTY); |
| 856 | radix_tree_tag_set(&mapping->page_tree, | 855 | radix_tree_tag_set(&mapping->page_tree, |
| 857 | page_index(page), | 856 | page_index(page), |
| 858 | PAGECACHE_TAG_DIRTY); | 857 | PAGECACHE_TAG_DIRTY); |
diff --git a/fs/char_dev.c b/fs/char_dev.c index 97986635b641..a4cbc6706ef0 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
| 10 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 031cdf293256..2e75883b7f54 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 5861eb42e626..944d2b9e092d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -324,7 +324,7 @@ out: | |||
| 324 | return rc; | 324 | return rc; |
| 325 | } | 325 | } |
| 326 | 326 | ||
| 327 | /* Try to reaquire byte range locks that were released when session */ | 327 | /* Try to reacquire byte range locks that were released when session */ |
| 328 | /* to server was lost */ | 328 | /* to server was lost */ |
| 329 | static int cifs_relock_file(struct cifsFileInfo *cifsFile) | 329 | static int cifs_relock_file(struct cifsFileInfo *cifsFile) |
| 330 | { | 330 | { |
diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c index f0b10757288f..1c82e9a7d7c8 100644 --- a/fs/coda/sysctl.c +++ b/fs/coda/sysctl.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/time.h> | 14 | #include <linux/time.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/sysctl.h> | 16 | #include <linux/sysctl.h> |
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index d8d50a70c58d..4063a9396977 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * ioctls. | 10 | * ioctls. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/compat.h> | 14 | #include <linux/compat.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 207f8006fd6c..df025453dd97 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c | |||
| @@ -211,7 +211,7 @@ static void remove_dir(struct dentry * d) | |||
| 211 | struct configfs_dirent * sd; | 211 | struct configfs_dirent * sd; |
| 212 | 212 | ||
| 213 | sd = d->d_fsdata; | 213 | sd = d->d_fsdata; |
| 214 | list_del_init(&sd->s_sibling); | 214 | list_del_init(&sd->s_sibling); |
| 215 | configfs_put(sd); | 215 | configfs_put(sd); |
| 216 | if (d->d_inode) | 216 | if (d->d_inode) |
| 217 | simple_rmdir(parent->d_inode,d); | 217 | simple_rmdir(parent->d_inode,d); |
| @@ -330,7 +330,7 @@ static int configfs_detach_prep(struct dentry *dentry) | |||
| 330 | 330 | ||
| 331 | ret = configfs_detach_prep(sd->s_dentry); | 331 | ret = configfs_detach_prep(sd->s_dentry); |
| 332 | if (!ret) | 332 | if (!ret) |
| 333 | continue; | 333 | continue; |
| 334 | } else | 334 | } else |
| 335 | ret = -ENOTEMPTY; | 335 | ret = -ENOTEMPTY; |
| 336 | 336 | ||
| @@ -931,7 +931,7 @@ int configfs_rename_dir(struct config_item * item, const char *new_name) | |||
| 931 | 931 | ||
| 932 | new_dentry = lookup_one_len(new_name, parent, strlen(new_name)); | 932 | new_dentry = lookup_one_len(new_name, parent, strlen(new_name)); |
| 933 | if (!IS_ERR(new_dentry)) { | 933 | if (!IS_ERR(new_dentry)) { |
| 934 | if (!new_dentry->d_inode) { | 934 | if (!new_dentry->d_inode) { |
| 935 | error = config_item_set_name(item, "%s", new_name); | 935 | error = config_item_set_name(item, "%s", new_name); |
| 936 | if (!error) { | 936 | if (!error) { |
| 937 | d_add(new_dentry, NULL); | 937 | d_add(new_dentry, NULL); |
diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c index e5512e295cf2..fb65e0800a86 100644 --- a/fs/configfs/symlink.c +++ b/fs/configfs/symlink.c | |||
| @@ -66,7 +66,7 @@ static void fill_item_path(struct config_item * item, char * buffer, int length) | |||
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | static int create_link(struct config_item *parent_item, | 68 | static int create_link(struct config_item *parent_item, |
| 69 | struct config_item *item, | 69 | struct config_item *item, |
| 70 | struct dentry *dentry) | 70 | struct dentry *dentry) |
| 71 | { | 71 | { |
| 72 | struct configfs_dirent *target_sd = item->ci_dentry->d_fsdata; | 72 | struct configfs_dirent *target_sd = item->ci_dentry->d_fsdata; |
diff --git a/fs/dcache.c b/fs/dcache.c index 48b44a714b35..c6e3535be192 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * the dcache entry is deleted or garbage collected. | 14 | * the dcache entry is deleted or garbage collected. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/syscalls.h> | 17 | #include <linux/syscalls.h> |
| 19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/fs/dcookies.c b/fs/dcookies.c index 8749339bf4f6..0c4b0674854b 100644 --- a/fs/dcookies.c +++ b/fs/dcookies.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * to the pair and can be looked up from userspace. | 12 | * to the pair and can be looked up from userspace. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/syscalls.h> | 15 | #include <linux/syscalls.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index 66a505422e5c..39640fd03458 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 19 | #include <linux/pagemap.h> | 18 | #include <linux/pagemap.h> |
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 6fa1e04f8415..e8ae3042b806 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | /* uncomment to get debug messages from the debug filesystem, ah the irony. */ | 16 | /* uncomment to get debug messages from the debug filesystem, ah the irony. */ |
| 17 | /* #define DEBUG */ | 17 | /* #define DEBUG */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
| 22 | #include <linux/mount.h> | 21 | #include <linux/mount.h> |
| @@ -22,7 +22,6 @@ | |||
| 22 | * formats. | 22 | * formats. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 27 | #include <linux/file.h> | 26 | #include <linux/file.h> |
| 28 | #include <linux/mman.h> | 27 | #include <linux/mman.h> |
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index 433a213a8bd9..d4870432ecfc 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 11 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include "ext2.h" | 14 | #include "ext2.h" |
| 16 | #include <linux/quotaops.h> | 15 | #include <linux/quotaops.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index 308c252568c6..de85c61c58c5 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 12 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/quotaops.h> | 15 | #include <linux/quotaops.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 18 | #include <linux/backing-dev.h> | 17 | #include <linux/backing-dev.h> |
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index d4233b2e6436..9f43879d6d68 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 16 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h index 67cfeb66e897..bf8175b2ced9 100644 --- a/fs/ext2/xattr.h +++ b/fs/ext2/xattr.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> | 6 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/xattr.h> | 10 | #include <linux/xattr.h> |
| 12 | 11 | ||
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index 96172e89ddc3..a504a40d6d29 100644 --- a/fs/ext3/balloc.c +++ b/fs/ext3/balloc.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 11 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/time.h> | 14 | #include <linux/time.h> |
| 16 | #include <linux/capability.h> | 15 | #include <linux/capability.h> |
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c index dfd811895d8f..5e1337fd878a 100644 --- a/fs/ext3/resize.c +++ b/fs/ext3/resize.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * This could probably be made into a module, because it is not often in use. | 8 | * This could probably be made into a module, because it is not often in use. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #define EXT3FS_DEBUG | 12 | #define EXT3FS_DEBUG |
| 14 | 13 | ||
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index b7483360a2db..f2dd71336612 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 16 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
diff --git a/fs/ext3/xattr.h b/fs/ext3/xattr.h index 2ceae38f3d49..6b1ae1c6182c 100644 --- a/fs/ext3/xattr.h +++ b/fs/ext3/xattr.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> | 6 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/xattr.h> | 9 | #include <linux/xattr.h> |
| 11 | 10 | ||
| 12 | /* Magic value in attribute blocks */ | 11 | /* Magic value in attribute blocks */ |
diff --git a/fs/file_table.c b/fs/file_table.c index 506d5307108d..0131ba06e1ee 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 5 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/string.h> | 8 | #include <linux/string.h> |
| 10 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 11 | #include <linux/file.h> | 10 | #include <linux/file.h> |
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 031b27a4bc9a..892643dc9af1 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
| @@ -464,8 +464,8 @@ void sync_inodes_sb(struct super_block *sb, int wait) | |||
| 464 | .range_start = 0, | 464 | .range_start = 0, |
| 465 | .range_end = LLONG_MAX, | 465 | .range_end = LLONG_MAX, |
| 466 | }; | 466 | }; |
| 467 | unsigned long nr_dirty = read_page_state(nr_dirty); | 467 | unsigned long nr_dirty = global_page_state(NR_FILE_DIRTY); |
| 468 | unsigned long nr_unstable = read_page_state(nr_unstable); | 468 | unsigned long nr_unstable = global_page_state(NR_UNSTABLE_NFS); |
| 469 | 469 | ||
| 470 | wbc.nr_to_write = nr_dirty + nr_unstable + | 470 | wbc.nr_to_write = nr_dirty + nr_unstable + |
| 471 | (inodes_stat.nr_inodes - inodes_stat.nr_unused) + | 471 | (inodes_stat.nr_inodes - inodes_stat.nr_unused) + |
diff --git a/fs/hfs/super.c b/fs/hfs/super.c index d9227bf14e86..34937ee83ab1 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Based on the minix file system code, (C) 1991, 1992 by Linus Torvalds | 12 | * Based on the minix file system code, (C) 1991, 1992 by Linus Torvalds |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/blkdev.h> | 16 | #include <linux/blkdev.h> |
| 18 | #include <linux/mount.h> | 17 | #include <linux/mount.h> |
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 0a92fa2336a2..d279d5924f28 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/pagemap.h> | 12 | #include <linux/pagemap.h> |
diff --git a/fs/inode.c b/fs/inode.c index f42961eb983b..0bf9f0444a96 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * (C) 1997 Linus Torvalds | 4 | * (C) 1997 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/fs.h> | 7 | #include <linux/fs.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/dcache.h> | 9 | #include <linux/dcache.h> |
| @@ -452,15 +451,14 @@ static void prune_icache(int nr_to_scan) | |||
| 452 | nr_pruned++; | 451 | nr_pruned++; |
| 453 | } | 452 | } |
| 454 | inodes_stat.nr_unused -= nr_pruned; | 453 | inodes_stat.nr_unused -= nr_pruned; |
| 454 | if (current_is_kswapd()) | ||
| 455 | __count_vm_events(KSWAPD_INODESTEAL, reap); | ||
| 456 | else | ||
| 457 | __count_vm_events(PGINODESTEAL, reap); | ||
| 455 | spin_unlock(&inode_lock); | 458 | spin_unlock(&inode_lock); |
| 456 | 459 | ||
| 457 | dispose_list(&freeable); | 460 | dispose_list(&freeable); |
| 458 | mutex_unlock(&iprune_mutex); | 461 | mutex_unlock(&iprune_mutex); |
| 459 | |||
| 460 | if (current_is_kswapd()) | ||
| 461 | mod_page_state(kswapd_inodesteal, reap); | ||
| 462 | else | ||
| 463 | mod_page_state(pginodesteal, reap); | ||
| 464 | } | 462 | } |
| 465 | 463 | ||
| 466 | /* | 464 | /* |
diff --git a/fs/ioctl.c b/fs/ioctl.c index f8aeec3ca10c..4b7660b09ac0 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/syscalls.h> | 7 | #include <linux/syscalls.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/smp_lock.h> | 9 | #include <linux/smp_lock.h> |
diff --git a/fs/ioprio.c b/fs/ioprio.c index 7fa76ed53c10..93aa5715f224 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c | |||
| @@ -125,11 +125,24 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio) | |||
| 125 | return ret; | 125 | return ret; |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | static int get_task_ioprio(struct task_struct *p) | ||
| 129 | { | ||
| 130 | int ret; | ||
| 131 | |||
| 132 | ret = security_task_getioprio(p); | ||
| 133 | if (ret) | ||
| 134 | goto out; | ||
| 135 | ret = p->ioprio; | ||
| 136 | out: | ||
| 137 | return ret; | ||
| 138 | } | ||
| 139 | |||
| 128 | asmlinkage long sys_ioprio_get(int which, int who) | 140 | asmlinkage long sys_ioprio_get(int which, int who) |
| 129 | { | 141 | { |
| 130 | struct task_struct *g, *p; | 142 | struct task_struct *g, *p; |
| 131 | struct user_struct *user; | 143 | struct user_struct *user; |
| 132 | int ret = -ESRCH; | 144 | int ret = -ESRCH; |
| 145 | int tmpio; | ||
| 133 | 146 | ||
| 134 | read_lock_irq(&tasklist_lock); | 147 | read_lock_irq(&tasklist_lock); |
| 135 | switch (which) { | 148 | switch (which) { |
| @@ -139,16 +152,19 @@ asmlinkage long sys_ioprio_get(int which, int who) | |||
| 139 | else | 152 | else |
| 140 | p = find_task_by_pid(who); | 153 | p = find_task_by_pid(who); |
| 141 | if (p) | 154 | if (p) |
| 142 | ret = p->ioprio; | 155 | ret = get_task_ioprio(p); |
| 143 | break; | 156 | break; |
| 144 | case IOPRIO_WHO_PGRP: | 157 | case IOPRIO_WHO_PGRP: |
| 145 | if (!who) | 158 | if (!who) |
| 146 | who = process_group(current); | 159 | who = process_group(current); |
| 147 | do_each_task_pid(who, PIDTYPE_PGID, p) { | 160 | do_each_task_pid(who, PIDTYPE_PGID, p) { |
| 161 | tmpio = get_task_ioprio(p); | ||
| 162 | if (tmpio < 0) | ||
| 163 | continue; | ||
| 148 | if (ret == -ESRCH) | 164 | if (ret == -ESRCH) |
| 149 | ret = p->ioprio; | 165 | ret = tmpio; |
| 150 | else | 166 | else |
| 151 | ret = ioprio_best(ret, p->ioprio); | 167 | ret = ioprio_best(ret, tmpio); |
| 152 | } while_each_task_pid(who, PIDTYPE_PGID, p); | 168 | } while_each_task_pid(who, PIDTYPE_PGID, p); |
| 153 | break; | 169 | break; |
| 154 | case IOPRIO_WHO_USER: | 170 | case IOPRIO_WHO_USER: |
| @@ -163,10 +179,13 @@ asmlinkage long sys_ioprio_get(int which, int who) | |||
| 163 | do_each_thread(g, p) { | 179 | do_each_thread(g, p) { |
| 164 | if (p->uid != user->uid) | 180 | if (p->uid != user->uid) |
| 165 | continue; | 181 | continue; |
| 182 | tmpio = get_task_ioprio(p); | ||
| 183 | if (tmpio < 0) | ||
| 184 | continue; | ||
| 166 | if (ret == -ESRCH) | 185 | if (ret == -ESRCH) |
| 167 | ret = p->ioprio; | 186 | ret = tmpio; |
| 168 | else | 187 | else |
| 169 | ret = ioprio_best(ret, p->ioprio); | 188 | ret = ioprio_best(ret, tmpio); |
| 170 | } while_each_thread(g, p); | 189 | } while_each_thread(g, p); |
| 171 | 190 | ||
| 172 | if (who) | 191 | if (who) |
diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c index 3a39158cca96..731816332b12 100644 --- a/fs/isofs/compress.c +++ b/fs/isofs/compress.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Transparent decompression of files on an iso9660 filesystem | 16 | * Transparent decompression of files on an iso9660 filesystem |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | 21 | ||
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 5440ea292c69..27e276987fd2 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | * isofs directory handling functions | 11 | * isofs directory handling functions |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
| 15 | #include "isofs.h" | 14 | #include "isofs.h" |
| 16 | 15 | ||
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index bb11c7fb4019..14391361c886 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 2004 Paul Serice - NFS Export Operations | 11 | * 2004 Paul Serice - NFS Export Operations |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | 16 | ||
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c index 5371a403130a..9000f1effedf 100644 --- a/fs/jffs/intrep.c +++ b/fs/jffs/intrep.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | * | 55 | * |
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | #include <linux/config.h> | ||
| 59 | #include <linux/types.h> | 58 | #include <linux/types.h> |
| 60 | #include <linux/slab.h> | 59 | #include <linux/slab.h> |
| 61 | #include <linux/jffs.h> | 60 | #include <linux/jffs.h> |
diff --git a/fs/jffs/jffs_fm.h b/fs/jffs/jffs_fm.h index c794d923df2a..9ee6ad29eff5 100644 --- a/fs/jffs/jffs_fm.h +++ b/fs/jffs/jffs_fm.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #ifndef __LINUX_JFFS_FM_H__ | 20 | #ifndef __LINUX_JFFS_FM_H__ |
| 21 | #define __LINUX_JFFS_FM_H__ | 21 | #define __LINUX_JFFS_FM_H__ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 25 | #include <linux/jffs.h> | 24 | #include <linux/jffs.h> |
| 26 | #include <linux/mtd/mtd.h> | 25 | #include <linux/mtd/mtd.h> |
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c index 5c63e0cdcf4c..3681d0728ac7 100644 --- a/fs/jffs2/compr_zlib.c +++ b/fs/jffs2/compr_zlib.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #error "The userspace support got too messy and was removed. Update your mkfs.jffs2" | 15 | #error "The userspace support got too messy and was removed. Update your mkfs.jffs2" |
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h index 5fa494a792b2..3daf3bca0376 100644 --- a/fs/jffs2/debug.h +++ b/fs/jffs2/debug.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef _JFFS2_DEBUG_H_ | 13 | #ifndef _JFFS2_DEBUG_H_ |
| 14 | #define _JFFS2_DEBUG_H_ | 14 | #define _JFFS2_DEBUG_H_ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #ifndef CONFIG_JFFS2_FS_DEBUG | 17 | #ifndef CONFIG_JFFS2_FS_DEBUG |
| 19 | #define CONFIG_JFFS2_FS_DEBUG 0 | 18 | #define CONFIG_JFFS2_FS_DEBUG 0 |
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 97caa77d60cf..4780f82825d6 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/capability.h> | 14 | #include <linux/capability.h> |
| 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/fs.h> | 17 | #include <linux/fs.h> |
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h index b16c60bbcf6e..f752baa8d399 100644 --- a/fs/jffs2/nodelist.h +++ b/fs/jffs2/nodelist.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef __JFFS2_NODELIST_H__ | 14 | #ifndef __JFFS2_NODELIST_H__ |
| 15 | #define __JFFS2_NODELIST_H__ | 15 | #define __JFFS2_NODELIST_H__ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/jffs2.h> | 19 | #include <linux/jffs2.h> |
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 2378a662c256..68e3953419b4 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index ac3d66948e8c..10c46231ce15 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c | |||
| @@ -842,7 +842,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp, | |||
| 842 | TXN_UNLOCK(); | 842 | TXN_UNLOCK(); |
| 843 | release_metapage(mp); | 843 | release_metapage(mp); |
| 844 | TXN_LOCK(); | 844 | TXN_LOCK(); |
| 845 | xtid = tlck->tid; /* reaquire after dropping TXN_LOCK */ | 845 | xtid = tlck->tid; /* reacquire after dropping TXN_LOCK */ |
| 846 | 846 | ||
| 847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", | 847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", |
| 848 | tid, xtid, lid); | 848 | tid, xtid, lid); |
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 73d2aba084c6..4f6cfebc82db 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/parser.h> | 22 | #include <linux/parser.h> |
| 24 | #include <linux/completion.h> | 23 | #include <linux/completion.h> |
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 4db62098d3f4..5980c45998cc 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index fd56c8872f34..9a991b52c647 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 12 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/sysctl.h> | 17 | #include <linux/sysctl.h> |
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 3ef739120dff..baf5ae513481 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | 20 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index d210cf304e92..dbb66a3b5cd9 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | 7 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/time.h> | 11 | #include <linux/time.h> |
| 13 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index a570e5c8a930..2a4df9b3779a 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
| 12 | #include <linux/time.h> | 11 | #include <linux/time.h> |
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index f22a3764461a..033ea4ac2c30 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 12 | #include <linux/utsname.h> | 11 | #include <linux/utsname.h> |
diff --git a/fs/namespace.c b/fs/namespace.c index b3ed212ea416..fa7ed6a9fc2d 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Heavily rewritten. | 8 | * Heavily rewritten. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/syscalls.h> | 11 | #include <linux/syscalls.h> |
| 13 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 14 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index f0860c602d8b..b4ee89250e95 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #include <linux/time.h> | 14 | #include <linux/time.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 6c51c1198464..1ddf77b0b825 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | 13 | ||
| 15 | #include <asm/system.h> | 14 | #include <asm/system.h> |
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index eb3813ad136f..42039fe0653c 100644 --- a/fs/ncpfs/ioctl.c +++ b/fs/ncpfs/ioctl.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | 10 | ||
| 12 | #include <asm/uaccess.h> | 11 | #include <asm/uaccess.h> |
| 13 | #include <linux/capability.h> | 12 | #include <linux/capability.h> |
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c index 52d60c3d8996..e7d5a3097fe6 100644 --- a/fs/ncpfs/mmap.c +++ b/fs/ncpfs/mmap.c | |||
| @@ -93,7 +93,7 @@ static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area, | |||
| 93 | */ | 93 | */ |
| 94 | if (type) | 94 | if (type) |
| 95 | *type = VM_FAULT_MAJOR; | 95 | *type = VM_FAULT_MAJOR; |
| 96 | inc_page_state(pgmajfault); | 96 | count_vm_event(PGMAJFAULT); |
| 97 | return page; | 97 | return page; |
| 98 | } | 98 | } |
| 99 | 99 | ||
diff --git a/fs/ncpfs/ncplib_kernel.c b/fs/ncpfs/ncplib_kernel.c index d9ebf6439f59..551e0bac7aac 100644 --- a/fs/ncpfs/ncplib_kernel.c +++ b/fs/ncpfs/ncplib_kernel.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | 13 | ||
| 15 | #include "ncplib_kernel.h" | 14 | #include "ncplib_kernel.h" |
| 16 | 15 | ||
diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h index 799e5c2bec55..2441d1ab57dc 100644 --- a/fs/ncpfs/ncplib_kernel.h +++ b/fs/ncpfs/ncplib_kernel.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _NCPLIB_H | 12 | #ifndef _NCPLIB_H |
| 13 | #define _NCPLIB_H | 13 | #define _NCPLIB_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/fs/ncpfs/ncpsign_kernel.c b/fs/ncpfs/ncpsign_kernel.c index a6ec90cd8894..749a18d33599 100644 --- a/fs/ncpfs/ncpsign_kernel.c +++ b/fs/ncpfs/ncpsign_kernel.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #ifdef CONFIG_NCPFS_PACKET_SIGNING | 9 | #ifdef CONFIG_NCPFS_PACKET_SIGNING |
| 11 | 10 | ||
diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c index 8783eb7ec641..11c2b252ebed 100644 --- a/fs/ncpfs/sock.c +++ b/fs/ncpfs/sock.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <linux/time.h> | 12 | #include <linux/time.h> |
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c index f76b1392a012..ca92c2406635 100644 --- a/fs/ncpfs/symlink.c +++ b/fs/ncpfs/symlink.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | 23 | ||
| 25 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
| 26 | 25 | ||
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index d53f8c6a9ecb..fe0a6b8ac149 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * NFSv4 callback handling | 6 | * NFSv4 callback handling |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/completion.h> | 9 | #include <linux/completion.h> |
| 11 | #include <linux/ip.h> | 10 | #include <linux/ip.h> |
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 462cfceb50c5..7719483ecdfc 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * NFSv4 callback procedures | 6 | * NFSv4 callback procedures |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/nfs4.h> | 8 | #include <linux/nfs4.h> |
| 10 | #include <linux/nfs_fs.h> | 9 | #include <linux/nfs_fs.h> |
| 11 | #include "nfs4_fs.h" | 10 | #include "nfs4_fs.h" |
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index c92991328d9a..29f932192054 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * | 5 | * |
| 6 | * NFSv4 callback encode/decode procedures | 6 | * NFSv4 callback encode/decode procedures |
| 7 | */ | 7 | */ |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/sunrpc/svc.h> | 9 | #include <linux/sunrpc/svc.h> |
| 11 | #include <linux/nfs4.h> | 10 | #include <linux/nfs4.h> |
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index d3be923d4e43..9540a316c05e 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * NFS file delegation management | 6 | * NFS file delegation management |
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/completion.h> | 9 | #include <linux/completion.h> |
| 11 | #include <linux/kthread.h> | 10 | #include <linux/kthread.h> |
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 8ca9707be6c9..4cdd1b499e35 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * | 38 | * |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 43 | #include <linux/sched.h> | 42 | #include <linux/sched.h> |
| 44 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index c5b916605fb0..d349fb2245da 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | 18 | ||
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 96e5b82c153b..090a36b07a22 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * subsequent patch. | 38 | * subsequent patch. |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
| 43 | #include <linux/smp_lock.h> | 42 | #include <linux/smp_lock.h> |
| 44 | #include <linux/nfs_fs.h> | 43 | #include <linux/nfs_fs.h> |
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index d89f6fb3b3a3..36e902a88ca1 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 14 | #include <linux/file.h> | 13 | #include <linux/file.h> |
| 15 | #include <linux/sunrpc/clnt.h> | 14 | #include <linux/sunrpc/clnt.h> |
| @@ -315,6 +314,7 @@ nfs_scan_lock_dirty(struct nfs_inode *nfsi, struct list_head *dst, | |||
| 315 | req->wb_index, NFS_PAGE_TAG_DIRTY); | 314 | req->wb_index, NFS_PAGE_TAG_DIRTY); |
| 316 | nfs_list_remove_request(req); | 315 | nfs_list_remove_request(req); |
| 317 | nfs_list_add_request(req, dst); | 316 | nfs_list_add_request(req, dst); |
| 317 | dec_zone_page_state(req->wb_page, NR_FILE_DIRTY); | ||
| 318 | res++; | 318 | res++; |
| 319 | } | 319 | } |
| 320 | } | 320 | } |
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 32cf3773af0c..52bf634260a1 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * within the RPC code when root squashing is suspected. | 15 | * within the RPC code when root squashing is suspected. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/time.h> | 18 | #include <linux/time.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index db61e51bb154..2fe3403c2409 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Sysctl interface to NFS parameters | 4 | * Sysctl interface to NFS parameters |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 8 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
| 9 | #include <linux/ctype.h> | 8 | #include <linux/ctype.h> |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 8fccb9cb173b..bca5734ca9fb 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * Copyright (C) 1996, 1997, Olaf Kirch <okir@monad.swb.de> | 46 | * Copyright (C) 1996, 1997, Olaf Kirch <okir@monad.swb.de> |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| 51 | #include <linux/slab.h> | 50 | #include <linux/slab.h> |
| 52 | #include <linux/mm.h> | 51 | #include <linux/mm.h> |
| @@ -497,7 +496,7 @@ nfs_mark_request_dirty(struct nfs_page *req) | |||
| 497 | nfs_list_add_request(req, &nfsi->dirty); | 496 | nfs_list_add_request(req, &nfsi->dirty); |
| 498 | nfsi->ndirty++; | 497 | nfsi->ndirty++; |
| 499 | spin_unlock(&nfsi->req_lock); | 498 | spin_unlock(&nfsi->req_lock); |
| 500 | inc_page_state(nr_dirty); | 499 | inc_zone_page_state(req->wb_page, NR_FILE_DIRTY); |
| 501 | mark_inode_dirty(inode); | 500 | mark_inode_dirty(inode); |
| 502 | } | 501 | } |
| 503 | 502 | ||
| @@ -525,7 +524,7 @@ nfs_mark_request_commit(struct nfs_page *req) | |||
| 525 | nfs_list_add_request(req, &nfsi->commit); | 524 | nfs_list_add_request(req, &nfsi->commit); |
| 526 | nfsi->ncommit++; | 525 | nfsi->ncommit++; |
| 527 | spin_unlock(&nfsi->req_lock); | 526 | spin_unlock(&nfsi->req_lock); |
| 528 | inc_page_state(nr_unstable); | 527 | inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); |
| 529 | mark_inode_dirty(inode); | 528 | mark_inode_dirty(inode); |
| 530 | } | 529 | } |
| 531 | #endif | 530 | #endif |
| @@ -609,7 +608,6 @@ nfs_scan_dirty(struct inode *inode, struct list_head *dst, unsigned long idx_sta | |||
| 609 | if (nfsi->ndirty != 0) { | 608 | if (nfsi->ndirty != 0) { |
| 610 | res = nfs_scan_lock_dirty(nfsi, dst, idx_start, npages); | 609 | res = nfs_scan_lock_dirty(nfsi, dst, idx_start, npages); |
| 611 | nfsi->ndirty -= res; | 610 | nfsi->ndirty -= res; |
| 612 | sub_page_state(nr_dirty,res); | ||
| 613 | if ((nfsi->ndirty == 0) != list_empty(&nfsi->dirty)) | 611 | if ((nfsi->ndirty == 0) != list_empty(&nfsi->dirty)) |
| 614 | printk(KERN_ERR "NFS: desynchronized value of nfs_i.ndirty.\n"); | 612 | printk(KERN_ERR "NFS: desynchronized value of nfs_i.ndirty.\n"); |
| 615 | } | 613 | } |
| @@ -1394,7 +1392,6 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata) | |||
| 1394 | { | 1392 | { |
| 1395 | struct nfs_write_data *data = calldata; | 1393 | struct nfs_write_data *data = calldata; |
| 1396 | struct nfs_page *req; | 1394 | struct nfs_page *req; |
| 1397 | int res = 0; | ||
| 1398 | 1395 | ||
| 1399 | dprintk("NFS: %4d nfs_commit_done (status %d)\n", | 1396 | dprintk("NFS: %4d nfs_commit_done (status %d)\n", |
| 1400 | task->tk_pid, task->tk_status); | 1397 | task->tk_pid, task->tk_status); |
| @@ -1406,6 +1403,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata) | |||
| 1406 | while (!list_empty(&data->pages)) { | 1403 | while (!list_empty(&data->pages)) { |
| 1407 | req = nfs_list_entry(data->pages.next); | 1404 | req = nfs_list_entry(data->pages.next); |
| 1408 | nfs_list_remove_request(req); | 1405 | nfs_list_remove_request(req); |
| 1406 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | ||
| 1409 | 1407 | ||
| 1410 | dprintk("NFS: commit (%s/%Ld %d@%Ld)", | 1408 | dprintk("NFS: commit (%s/%Ld %d@%Ld)", |
| 1411 | req->wb_context->dentry->d_inode->i_sb->s_id, | 1409 | req->wb_context->dentry->d_inode->i_sb->s_id, |
| @@ -1432,9 +1430,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata) | |||
| 1432 | nfs_mark_request_dirty(req); | 1430 | nfs_mark_request_dirty(req); |
| 1433 | next: | 1431 | next: |
| 1434 | nfs_clear_page_writeback(req); | 1432 | nfs_clear_page_writeback(req); |
| 1435 | res++; | ||
| 1436 | } | 1433 | } |
| 1437 | sub_page_state(nr_unstable,res); | ||
| 1438 | } | 1434 | } |
| 1439 | 1435 | ||
| 1440 | static const struct rpc_call_ops nfs_commit_ops = { | 1436 | static const struct rpc_call_ops nfs_commit_ops = { |
diff --git a/fs/nfsctl.c b/fs/nfsctl.c index a5a18d4aca40..c043136a82ca 100644 --- a/fs/nfsctl.c +++ b/fs/nfsctl.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * This should eventually move to userland. | 4 | * This should eventually move to userland. |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 9 | #include <linux/file.h> | 8 | #include <linux/file.h> |
| 10 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 3eec30000f3f..01bc68c628ad 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c | |||
| @@ -126,7 +126,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) | |||
| 126 | if (*ep) | 126 | if (*ep) |
| 127 | goto out; | 127 | goto out; |
| 128 | dprintk("found fsidtype %d\n", fsidtype); | 128 | dprintk("found fsidtype %d\n", fsidtype); |
| 129 | if (fsidtype > 2) | 129 | if (key_len(fsidtype)==0) /* invalid type */ |
| 130 | goto out; | 130 | goto out; |
| 131 | if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0) | 131 | if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0) |
| 132 | goto out; | 132 | goto out; |
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index dbaf3f93f328..54b37b1d2e3a 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 33 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/list.h> | 37 | #include <linux/list.h> |
| 39 | #include <linux/inet.h> | 38 | #include <linux/inet.h> |
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c index 4b6aa60dfceb..bea6b9478114 100644 --- a/fs/nfsd/nfs4idmap.c +++ b/fs/nfsd/nfs4idmap.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | 39 | ||
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7c7d01672d35..9daa0b9feb8d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -1237,8 +1237,15 @@ find_file(struct inode *ino) | |||
| 1237 | return NULL; | 1237 | return NULL; |
| 1238 | } | 1238 | } |
| 1239 | 1239 | ||
| 1240 | #define TEST_ACCESS(x) ((x > 0 || x < 4)?1:0) | 1240 | static int access_valid(u32 x) |
| 1241 | #define TEST_DENY(x) ((x >= 0 || x < 5)?1:0) | 1241 | { |
| 1242 | return (x > 0 && x < 4); | ||
| 1243 | } | ||
| 1244 | |||
| 1245 | static int deny_valid(u32 x) | ||
| 1246 | { | ||
| 1247 | return (x >= 0 && x < 5); | ||
| 1248 | } | ||
| 1242 | 1249 | ||
| 1243 | static void | 1250 | static void |
| 1244 | set_access(unsigned int *access, unsigned long bmap) { | 1251 | set_access(unsigned int *access, unsigned long bmap) { |
| @@ -1745,7 +1752,8 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf | |||
| 1745 | int status; | 1752 | int status; |
| 1746 | 1753 | ||
| 1747 | status = nfserr_inval; | 1754 | status = nfserr_inval; |
| 1748 | if (!TEST_ACCESS(open->op_share_access) || !TEST_DENY(open->op_share_deny)) | 1755 | if (!access_valid(open->op_share_access) |
| 1756 | || !deny_valid(open->op_share_deny)) | ||
| 1749 | goto out; | 1757 | goto out; |
| 1750 | /* | 1758 | /* |
| 1751 | * Lookup file; if found, lookup stateid and check open request, | 1759 | * Lookup file; if found, lookup stateid and check open request, |
| @@ -1782,10 +1790,10 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf | |||
| 1782 | } else { | 1790 | } else { |
| 1783 | /* Stateid was not found, this is a new OPEN */ | 1791 | /* Stateid was not found, this is a new OPEN */ |
| 1784 | int flags = 0; | 1792 | int flags = 0; |
| 1793 | if (open->op_share_access & NFS4_SHARE_ACCESS_READ) | ||
| 1794 | flags |= MAY_READ; | ||
| 1785 | if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) | 1795 | if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) |
| 1786 | flags = MAY_WRITE; | 1796 | flags |= MAY_WRITE; |
| 1787 | else | ||
| 1788 | flags = MAY_READ; | ||
| 1789 | status = nfs4_new_open(rqstp, &stp, dp, current_fh, flags); | 1797 | status = nfs4_new_open(rqstp, &stp, dp, current_fh, flags); |
| 1790 | if (status) | 1798 | if (status) |
| 1791 | goto out; | 1799 | goto out; |
| @@ -2070,16 +2078,12 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl | |||
| 2070 | if (!stateid->si_fileid) { /* delegation stateid */ | 2078 | if (!stateid->si_fileid) { /* delegation stateid */ |
| 2071 | if(!(dp = find_delegation_stateid(ino, stateid))) { | 2079 | if(!(dp = find_delegation_stateid(ino, stateid))) { |
| 2072 | dprintk("NFSD: delegation stateid not found\n"); | 2080 | dprintk("NFSD: delegation stateid not found\n"); |
| 2073 | if (nfs4_in_grace()) | ||
| 2074 | status = nfserr_grace; | ||
| 2075 | goto out; | 2081 | goto out; |
| 2076 | } | 2082 | } |
| 2077 | stidp = &dp->dl_stateid; | 2083 | stidp = &dp->dl_stateid; |
| 2078 | } else { /* open or lock stateid */ | 2084 | } else { /* open or lock stateid */ |
| 2079 | if (!(stp = find_stateid(stateid, flags))) { | 2085 | if (!(stp = find_stateid(stateid, flags))) { |
| 2080 | dprintk("NFSD: open or lock stateid not found\n"); | 2086 | dprintk("NFSD: open or lock stateid not found\n"); |
| 2081 | if (nfs4_in_grace()) | ||
| 2082 | status = nfserr_grace; | ||
| 2083 | goto out; | 2087 | goto out; |
| 2084 | } | 2088 | } |
| 2085 | if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) | 2089 | if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) |
| @@ -2252,8 +2256,9 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs | |||
| 2252 | (int)current_fh->fh_dentry->d_name.len, | 2256 | (int)current_fh->fh_dentry->d_name.len, |
| 2253 | current_fh->fh_dentry->d_name.name); | 2257 | current_fh->fh_dentry->d_name.name); |
| 2254 | 2258 | ||
| 2255 | if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0))) | 2259 | status = fh_verify(rqstp, current_fh, S_IFREG, 0); |
| 2256 | goto out; | 2260 | if (status) |
| 2261 | return status; | ||
| 2257 | 2262 | ||
| 2258 | nfs4_lock_state(); | 2263 | nfs4_lock_state(); |
| 2259 | 2264 | ||
| @@ -2320,7 +2325,8 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct n | |||
| 2320 | (int)current_fh->fh_dentry->d_name.len, | 2325 | (int)current_fh->fh_dentry->d_name.len, |
| 2321 | current_fh->fh_dentry->d_name.name); | 2326 | current_fh->fh_dentry->d_name.name); |
| 2322 | 2327 | ||
| 2323 | if (!TEST_ACCESS(od->od_share_access) || !TEST_DENY(od->od_share_deny)) | 2328 | if (!access_valid(od->od_share_access) |
| 2329 | || !deny_valid(od->od_share_deny)) | ||
| 2324 | return nfserr_inval; | 2330 | return nfserr_inval; |
| 2325 | 2331 | ||
| 2326 | nfs4_lock_state(); | 2332 | nfs4_lock_state(); |
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index a1810e6a93e5..7046ac9cf97f 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | 10 | ||
| 12 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 3f2ec2e6d06c..ecc439d2565f 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
| @@ -187,13 +187,6 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) | |||
| 187 | goto out; | 187 | goto out; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | /* Set user creds for this exportpoint */ | ||
| 191 | error = nfsd_setuser(rqstp, exp); | ||
| 192 | if (error) { | ||
| 193 | error = nfserrno(error); | ||
| 194 | goto out; | ||
| 195 | } | ||
| 196 | |||
| 197 | /* | 190 | /* |
| 198 | * Look up the dentry using the NFS file handle. | 191 | * Look up the dentry using the NFS file handle. |
| 199 | */ | 192 | */ |
| @@ -251,6 +244,14 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) | |||
| 251 | } | 244 | } |
| 252 | cache_get(&exp->h); | 245 | cache_get(&exp->h); |
| 253 | 246 | ||
| 247 | /* Set user creds for this exportpoint; necessary even in the "just | ||
| 248 | * checking" case because this may be a filehandle that was created by | ||
| 249 | * fh_compose, and that is about to be used in another nfsv4 compound | ||
| 250 | * operation */ | ||
| 251 | error = nfserrno(nfsd_setuser(rqstp, exp)); | ||
| 252 | if (error) | ||
| 253 | goto out; | ||
| 254 | |||
| 254 | error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type); | 255 | error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type); |
| 255 | if (error) | 256 | if (error) |
| 256 | goto out; | 257 | goto out; |
| @@ -312,8 +313,8 @@ int | |||
| 312 | fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, struct svc_fh *ref_fh) | 313 | fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, struct svc_fh *ref_fh) |
| 313 | { | 314 | { |
| 314 | /* ref_fh is a reference file handle. | 315 | /* ref_fh is a reference file handle. |
| 315 | * if it is non-null, then we should compose a filehandle which is | 316 | * if it is non-null and for the same filesystem, then we should compose |
| 316 | * of the same version, where possible. | 317 | * a filehandle which is of the same version, where possible. |
| 317 | * Currently, that means that if ref_fh->fh_handle.fh_version == 0xca | 318 | * Currently, that means that if ref_fh->fh_handle.fh_version == 0xca |
| 318 | * Then create a 32byte filehandle using nfs_fhbase_old | 319 | * Then create a 32byte filehandle using nfs_fhbase_old |
| 319 | * | 320 | * |
| @@ -332,7 +333,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, st | |||
| 332 | parent->d_name.name, dentry->d_name.name, | 333 | parent->d_name.name, dentry->d_name.name, |
| 333 | (inode ? inode->i_ino : 0)); | 334 | (inode ? inode->i_ino : 0)); |
| 334 | 335 | ||
| 335 | if (ref_fh) { | 336 | if (ref_fh && ref_fh->fh_export == exp) { |
| 336 | ref_fh_version = ref_fh->fh_handle.fh_version; | 337 | ref_fh_version = ref_fh->fh_handle.fh_version; |
| 337 | if (ref_fh_version == 0xca) | 338 | if (ref_fh_version == 0xca) |
| 338 | ref_fh_fsid_type = 0; | 339 | ref_fh_fsid_type = 0; |
| @@ -461,7 +462,7 @@ fh_update(struct svc_fh *fhp) | |||
| 461 | } else { | 462 | } else { |
| 462 | int size; | 463 | int size; |
| 463 | if (fhp->fh_handle.fh_fileid_type != 0) | 464 | if (fhp->fh_handle.fh_fileid_type != 0) |
| 464 | goto out_uptodate; | 465 | goto out; |
| 465 | datap = fhp->fh_handle.fh_auth+ | 466 | datap = fhp->fh_handle.fh_auth+ |
| 466 | fhp->fh_handle.fh_size/4 -1; | 467 | fhp->fh_handle.fh_size/4 -1; |
| 467 | size = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4; | 468 | size = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4; |
| @@ -481,10 +482,6 @@ out_negative: | |||
| 481 | printk(KERN_ERR "fh_update: %s/%s still negative!\n", | 482 | printk(KERN_ERR "fh_update: %s/%s still negative!\n", |
| 482 | dentry->d_parent->d_name.name, dentry->d_name.name); | 483 | dentry->d_parent->d_name.name, dentry->d_name.name); |
| 483 | goto out; | 484 | goto out; |
| 484 | out_uptodate: | ||
| 485 | printk(KERN_ERR "fh_update: %s/%s already up-to-date!\n", | ||
| 486 | dentry->d_parent->d_name.name, dentry->d_name.name); | ||
| 487 | goto out; | ||
| 488 | } | 485 | } |
| 489 | 486 | ||
| 490 | /* | 487 | /* |
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 3790727e5dfd..ec1decf29bab 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> | 8 | * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | 12 | ||
| 14 | #include <linux/time.h> | 13 | #include <linux/time.h> |
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 245eaa1fb59b..c9e3b5a8fe07 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Zerocpy NFS support (C) 2002 Hirokazu Takahashi <taka@valinux.co.jp> | 16 | * Zerocpy NFS support (C) 2002 Hirokazu Takahashi <taka@valinux.co.jp> |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/string.h> | 19 | #include <linux/string.h> |
| 21 | #include <linux/time.h> | 20 | #include <linux/time.h> |
| 22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| @@ -673,7 +672,10 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
| 673 | goto out_nfserr; | 672 | goto out_nfserr; |
| 674 | 673 | ||
| 675 | if (access & MAY_WRITE) { | 674 | if (access & MAY_WRITE) { |
| 676 | flags = O_WRONLY|O_LARGEFILE; | 675 | if (access & MAY_READ) |
| 676 | flags = O_RDWR|O_LARGEFILE; | ||
| 677 | else | ||
| 678 | flags = O_WRONLY|O_LARGEFILE; | ||
| 677 | 679 | ||
| 678 | DQUOT_INIT(inode); | 680 | DQUOT_INIT(inode); |
| 679 | } | 681 | } |
| @@ -834,7 +836,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 834 | if (ra && ra->p_set) | 836 | if (ra && ra->p_set) |
| 835 | file->f_ra = ra->p_ra; | 837 | file->f_ra = ra->p_ra; |
| 836 | 838 | ||
| 837 | if (file->f_op->sendfile) { | 839 | if (file->f_op->sendfile && rqstp->rq_sendfile_ok) { |
| 838 | svc_pushback_unused_pages(rqstp); | 840 | svc_pushback_unused_pages(rqstp); |
| 839 | err = file->f_op->sendfile(file, &offset, *count, | 841 | err = file->f_op->sendfile(file, &offset, *count, |
| 840 | nfsd_read_actor, rqstp); | 842 | nfsd_read_actor, rqstp); |
| @@ -1517,14 +1519,15 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, | |||
| 1517 | err = nfserrno(err); | 1519 | err = nfserrno(err); |
| 1518 | } | 1520 | } |
| 1519 | 1521 | ||
| 1520 | fh_unlock(ffhp); | ||
| 1521 | dput(dnew); | 1522 | dput(dnew); |
| 1523 | out_unlock: | ||
| 1524 | fh_unlock(ffhp); | ||
| 1522 | out: | 1525 | out: |
| 1523 | return err; | 1526 | return err; |
| 1524 | 1527 | ||
| 1525 | out_nfserr: | 1528 | out_nfserr: |
| 1526 | err = nfserrno(err); | 1529 | err = nfserrno(err); |
| 1527 | goto out; | 1530 | goto out_unlock; |
| 1528 | } | 1531 | } |
| 1529 | 1532 | ||
| 1530 | /* | 1533 | /* |
| @@ -1553,7 +1556,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, | |||
| 1553 | tdir = tdentry->d_inode; | 1556 | tdir = tdentry->d_inode; |
| 1554 | 1557 | ||
| 1555 | err = (rqstp->rq_vers == 2) ? nfserr_acces : nfserr_xdev; | 1558 | err = (rqstp->rq_vers == 2) ? nfserr_acces : nfserr_xdev; |
| 1556 | if (fdir->i_sb != tdir->i_sb) | 1559 | if (ffhp->fh_export != tfhp->fh_export) |
| 1557 | goto out; | 1560 | goto out; |
| 1558 | 1561 | ||
| 1559 | err = nfserr_perm; | 1562 | err = nfserr_perm; |
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index a912debcd20b..9de6b495f112 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/nls.h> | 13 | #include <linux/nls.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
diff --git a/fs/ntfs/sysctl.h b/fs/ntfs/sysctl.h index c8064cae8f17..beda5bf96405 100644 --- a/fs/ntfs/sysctl.h +++ b/fs/ntfs/sysctl.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef _LINUX_NTFS_SYSCTL_H | 24 | #ifndef _LINUX_NTFS_SYSCTL_H |
| 25 | #define _LINUX_NTFS_SYSCTL_H | 25 | #define _LINUX_NTFS_SYSCTL_H |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | 27 | ||
| 29 | #if defined(DEBUG) && defined(CONFIG_SYSCTL) | 28 | #if defined(DEBUG) && defined(CONFIG_SYSCTL) |
| 30 | 29 | ||
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index cca71317b6d6..f1d1c342ce01 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
| @@ -558,16 +558,9 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, | |||
| 558 | u64 vbo_max; /* file offset, max_blocks from iblock */ | 558 | u64 vbo_max; /* file offset, max_blocks from iblock */ |
| 559 | u64 p_blkno; | 559 | u64 p_blkno; |
| 560 | int contig_blocks; | 560 | int contig_blocks; |
| 561 | unsigned char blocksize_bits; | 561 | unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits; |
| 562 | unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits; | 562 | unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits; |
| 563 | 563 | ||
| 564 | if (!inode || !bh_result) { | ||
| 565 | mlog(ML_ERROR, "inode or bh_result is null\n"); | ||
| 566 | return -EIO; | ||
| 567 | } | ||
| 568 | |||
| 569 | blocksize_bits = inode->i_sb->s_blocksize_bits; | ||
| 570 | |||
| 571 | /* This function won't even be called if the request isn't all | 564 | /* This function won't even be called if the request isn't all |
| 572 | * nicely aligned and of the right size, so there's no need | 565 | * nicely aligned and of the right size, so there's no need |
| 573 | * for us to check any of that. */ | 566 | * for us to check any of that. */ |
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 1d26cfcd9f84..504595d6cf65 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
| @@ -517,6 +517,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg, | |||
| 517 | hb_block->hb_seq = cpu_to_le64(cputime); | 517 | hb_block->hb_seq = cpu_to_le64(cputime); |
| 518 | hb_block->hb_node = node_num; | 518 | hb_block->hb_node = node_num; |
| 519 | hb_block->hb_generation = cpu_to_le64(generation); | 519 | hb_block->hb_generation = cpu_to_le64(generation); |
| 520 | hb_block->hb_dead_ms = cpu_to_le32(o2hb_dead_threshold * O2HB_REGION_TIMEOUT_MS); | ||
| 520 | 521 | ||
| 521 | /* This step must always happen last! */ | 522 | /* This step must always happen last! */ |
| 522 | hb_block->hb_cksum = cpu_to_le32(o2hb_compute_block_crc_le(reg, | 523 | hb_block->hb_cksum = cpu_to_le32(o2hb_compute_block_crc_le(reg, |
| @@ -645,6 +646,8 @@ static int o2hb_check_slot(struct o2hb_region *reg, | |||
| 645 | struct o2nm_node *node; | 646 | struct o2nm_node *node; |
| 646 | struct o2hb_disk_heartbeat_block *hb_block = reg->hr_tmp_block; | 647 | struct o2hb_disk_heartbeat_block *hb_block = reg->hr_tmp_block; |
| 647 | u64 cputime; | 648 | u64 cputime; |
| 649 | unsigned int dead_ms = o2hb_dead_threshold * O2HB_REGION_TIMEOUT_MS; | ||
| 650 | unsigned int slot_dead_ms; | ||
| 648 | 651 | ||
| 649 | memcpy(hb_block, slot->ds_raw_block, reg->hr_block_bytes); | 652 | memcpy(hb_block, slot->ds_raw_block, reg->hr_block_bytes); |
| 650 | 653 | ||
| @@ -733,6 +736,23 @@ fire_callbacks: | |||
| 733 | &o2hb_live_slots[slot->ds_node_num]); | 736 | &o2hb_live_slots[slot->ds_node_num]); |
| 734 | 737 | ||
| 735 | slot->ds_equal_samples = 0; | 738 | slot->ds_equal_samples = 0; |
| 739 | |||
| 740 | /* We want to be sure that all nodes agree on the | ||
| 741 | * number of milliseconds before a node will be | ||
| 742 | * considered dead. The self-fencing timeout is | ||
| 743 | * computed from this value, and a discrepancy might | ||
| 744 | * result in heartbeat calling a node dead when it | ||
| 745 | * hasn't self-fenced yet. */ | ||
| 746 | slot_dead_ms = le32_to_cpu(hb_block->hb_dead_ms); | ||
| 747 | if (slot_dead_ms && slot_dead_ms != dead_ms) { | ||
| 748 | /* TODO: Perhaps we can fail the region here. */ | ||
| 749 | mlog(ML_ERROR, "Node %d on device %s has a dead count " | ||
| 750 | "of %u ms, but our count is %u ms.\n" | ||
| 751 | "Please double check your configuration values " | ||
| 752 | "for 'O2CB_HEARTBEAT_THRESHOLD'\n", | ||
| 753 | slot->ds_node_num, reg->hr_dev_name, slot_dead_ms, | ||
| 754 | dead_ms); | ||
| 755 | } | ||
| 736 | goto out; | 756 | goto out; |
| 737 | } | 757 | } |
| 738 | 758 | ||
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h index 73edad782537..a42628ba9ddf 100644 --- a/fs/ocfs2/cluster/masklog.h +++ b/fs/ocfs2/cluster/masklog.h | |||
| @@ -123,6 +123,17 @@ | |||
| 123 | #define MLOG_MASK_PREFIX 0 | 123 | #define MLOG_MASK_PREFIX 0 |
| 124 | #endif | 124 | #endif |
| 125 | 125 | ||
| 126 | /* | ||
| 127 | * When logging is disabled, force the bit test to 0 for anything other | ||
| 128 | * than errors and notices, allowing gcc to remove the code completely. | ||
| 129 | * When enabled, allow all masks. | ||
| 130 | */ | ||
| 131 | #if defined(CONFIG_OCFS2_DEBUG_MASKLOG) | ||
| 132 | #define ML_ALLOWED_BITS ~0 | ||
| 133 | #else | ||
| 134 | #define ML_ALLOWED_BITS (ML_ERROR|ML_NOTICE) | ||
| 135 | #endif | ||
| 136 | |||
| 126 | #define MLOG_MAX_BITS 64 | 137 | #define MLOG_MAX_BITS 64 |
| 127 | 138 | ||
| 128 | struct mlog_bits { | 139 | struct mlog_bits { |
| @@ -187,7 +198,8 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; | |||
| 187 | 198 | ||
| 188 | #define mlog(mask, fmt, args...) do { \ | 199 | #define mlog(mask, fmt, args...) do { \ |
| 189 | u64 __m = MLOG_MASK_PREFIX | (mask); \ | 200 | u64 __m = MLOG_MASK_PREFIX | (mask); \ |
| 190 | if (__mlog_test_u64(__m, mlog_and_bits) && \ | 201 | if ((__m & ML_ALLOWED_BITS) && \ |
| 202 | __mlog_test_u64(__m, mlog_and_bits) && \ | ||
| 191 | !__mlog_test_u64(__m, mlog_not_bits)) { \ | 203 | !__mlog_test_u64(__m, mlog_not_bits)) { \ |
| 192 | if (__m & ML_ERROR) \ | 204 | if (__m & ML_ERROR) \ |
| 193 | __mlog_printk(KERN_ERR, "ERROR: "fmt , ##args); \ | 205 | __mlog_printk(KERN_ERR, "ERROR: "fmt , ##args); \ |
| @@ -204,6 +216,7 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; | |||
| 204 | mlog(ML_ERROR, "status = %lld\n", (long long)_st); \ | 216 | mlog(ML_ERROR, "status = %lld\n", (long long)_st); \ |
| 205 | } while (0) | 217 | } while (0) |
| 206 | 218 | ||
| 219 | #if defined(CONFIG_OCFS2_DEBUG_MASKLOG) | ||
| 207 | #define mlog_entry(fmt, args...) do { \ | 220 | #define mlog_entry(fmt, args...) do { \ |
| 208 | mlog(ML_ENTRY, "ENTRY:" fmt , ##args); \ | 221 | mlog(ML_ENTRY, "ENTRY:" fmt , ##args); \ |
| 209 | } while (0) | 222 | } while (0) |
| @@ -247,6 +260,13 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; | |||
| 247 | #define mlog_exit_void() do { \ | 260 | #define mlog_exit_void() do { \ |
| 248 | mlog(ML_EXIT, "EXIT\n"); \ | 261 | mlog(ML_EXIT, "EXIT\n"); \ |
| 249 | } while (0) | 262 | } while (0) |
| 263 | #else | ||
| 264 | #define mlog_entry(...) do { } while (0) | ||
| 265 | #define mlog_entry_void(...) do { } while (0) | ||
| 266 | #define mlog_exit(...) do { } while (0) | ||
| 267 | #define mlog_exit_ptr(...) do { } while (0) | ||
| 268 | #define mlog_exit_void(...) do { } while (0) | ||
| 269 | #endif /* defined(CONFIG_OCFS2_DEBUG_MASKLOG) */ | ||
| 250 | 270 | ||
| 251 | #define mlog_bug_on_msg(cond, fmt, args...) do { \ | 271 | #define mlog_bug_on_msg(cond, fmt, args...) do { \ |
| 252 | if (cond) { \ | 272 | if (cond) { \ |
diff --git a/fs/ocfs2/cluster/ocfs2_heartbeat.h b/fs/ocfs2/cluster/ocfs2_heartbeat.h index 94096069cb43..3f4151da9709 100644 --- a/fs/ocfs2/cluster/ocfs2_heartbeat.h +++ b/fs/ocfs2/cluster/ocfs2_heartbeat.h | |||
| @@ -32,6 +32,7 @@ struct o2hb_disk_heartbeat_block { | |||
| 32 | __u8 hb_pad1[3]; | 32 | __u8 hb_pad1[3]; |
| 33 | __le32 hb_cksum; | 33 | __le32 hb_cksum; |
| 34 | __le64 hb_generation; | 34 | __le64 hb_generation; |
| 35 | __le32 hb_dead_ms; | ||
| 35 | }; | 36 | }; |
| 36 | 37 | ||
| 37 | #endif /* _OCFS2_HEARTBEAT_H */ | 38 | #endif /* _OCFS2_HEARTBEAT_H */ |
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 1591eb37a723..b650efa8c8be 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
| @@ -396,8 +396,8 @@ static void o2net_set_nn_state(struct o2net_node *nn, | |||
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | if (was_valid && !valid) { | 398 | if (was_valid && !valid) { |
| 399 | mlog(ML_NOTICE, "no longer connected to " SC_NODEF_FMT "\n", | 399 | printk(KERN_INFO "o2net: no longer connected to " |
| 400 | SC_NODEF_ARGS(old_sc)); | 400 | SC_NODEF_FMT "\n", SC_NODEF_ARGS(old_sc)); |
| 401 | o2net_complete_nodes_nsw(nn); | 401 | o2net_complete_nodes_nsw(nn); |
| 402 | } | 402 | } |
| 403 | 403 | ||
| @@ -409,10 +409,10 @@ static void o2net_set_nn_state(struct o2net_node *nn, | |||
| 409 | * the only way to start connecting again is to down | 409 | * the only way to start connecting again is to down |
| 410 | * heartbeat and bring it back up. */ | 410 | * heartbeat and bring it back up. */ |
| 411 | cancel_delayed_work(&nn->nn_connect_expired); | 411 | cancel_delayed_work(&nn->nn_connect_expired); |
| 412 | mlog(ML_NOTICE, "%s " SC_NODEF_FMT "\n", | 412 | printk(KERN_INFO "o2net: %s " SC_NODEF_FMT "\n", |
| 413 | o2nm_this_node() > sc->sc_node->nd_num ? | 413 | o2nm_this_node() > sc->sc_node->nd_num ? |
| 414 | "connected to" : "accepted connection from", | 414 | "connected to" : "accepted connection from", |
| 415 | SC_NODEF_ARGS(sc)); | 415 | SC_NODEF_ARGS(sc)); |
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | /* trigger the connecting worker func as long as we're not valid, | 418 | /* trigger the connecting worker func as long as we're not valid, |
| @@ -1280,7 +1280,7 @@ static void o2net_idle_timer(unsigned long data) | |||
| 1280 | 1280 | ||
| 1281 | do_gettimeofday(&now); | 1281 | do_gettimeofday(&now); |
| 1282 | 1282 | ||
| 1283 | mlog(ML_NOTICE, "connection to " SC_NODEF_FMT " has been idle for 10 " | 1283 | printk(KERN_INFO "o2net: connection to " SC_NODEF_FMT " has been idle for 10 " |
| 1284 | "seconds, shutting it down.\n", SC_NODEF_ARGS(sc)); | 1284 | "seconds, shutting it down.\n", SC_NODEF_ARGS(sc)); |
| 1285 | mlog(ML_NOTICE, "here are some times that might help debug the " | 1285 | mlog(ML_NOTICE, "here are some times that might help debug the " |
| 1286 | "situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv " | 1286 | "situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv " |
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index ae47f450792f..3d494d1a5f36 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c | |||
| @@ -213,11 +213,9 @@ int ocfs2_find_files_on_disk(const char *name, | |||
| 213 | struct ocfs2_dir_entry **dirent) | 213 | struct ocfs2_dir_entry **dirent) |
| 214 | { | 214 | { |
| 215 | int status = -ENOENT; | 215 | int status = -ENOENT; |
| 216 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | ||
| 217 | 216 | ||
| 218 | mlog_entry("(osb=%p, parent=%llu, name='%.*s', blkno=%p, inode=%p)\n", | 217 | mlog_entry("(name=%.*s, blkno=%p, inode=%p, dirent_bh=%p, dirent=%p)\n", |
| 219 | osb, (unsigned long long)OCFS2_I(inode)->ip_blkno, | 218 | namelen, name, blkno, inode, dirent_bh, dirent); |
| 220 | namelen, name, blkno, inode); | ||
| 221 | 219 | ||
| 222 | *dirent_bh = ocfs2_find_entry(name, namelen, inode, dirent); | 220 | *dirent_bh = ocfs2_find_entry(name, namelen, inode, dirent); |
| 223 | if (!*dirent_bh || !*dirent) { | 221 | if (!*dirent_bh || !*dirent) { |
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index 9bdc9cf65991..14530ee7e11d 100644 --- a/fs/ocfs2/dlm/dlmcommon.h +++ b/fs/ocfs2/dlm/dlmcommon.h | |||
| @@ -822,8 +822,6 @@ int dlm_begin_reco_handler(struct o2net_msg *msg, u32 len, void *data); | |||
| 822 | int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data); | 822 | int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data); |
| 823 | int dlm_do_master_requery(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, | 823 | int dlm_do_master_requery(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, |
| 824 | u8 nodenum, u8 *real_master); | 824 | u8 nodenum, u8 *real_master); |
| 825 | int dlm_lockres_master_requery(struct dlm_ctxt *dlm, | ||
| 826 | struct dlm_lock_resource *res, u8 *real_master); | ||
| 827 | 825 | ||
| 828 | 826 | ||
| 829 | int dlm_dispatch_assert_master(struct dlm_ctxt *dlm, | 827 | int dlm_dispatch_assert_master(struct dlm_ctxt *dlm, |
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index b8c23f7ba67e..8d1065f8b3bd 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c | |||
| @@ -408,12 +408,13 @@ static void __dlm_print_nodes(struct dlm_ctxt *dlm) | |||
| 408 | 408 | ||
| 409 | assert_spin_locked(&dlm->spinlock); | 409 | assert_spin_locked(&dlm->spinlock); |
| 410 | 410 | ||
| 411 | mlog(ML_NOTICE, "Nodes in my domain (\"%s\"):\n", dlm->name); | 411 | printk(KERN_INFO "ocfs2_dlm: Nodes in domain (\"%s\"): ", dlm->name); |
| 412 | 412 | ||
| 413 | while ((node = find_next_bit(dlm->domain_map, O2NM_MAX_NODES, | 413 | while ((node = find_next_bit(dlm->domain_map, O2NM_MAX_NODES, |
| 414 | node + 1)) < O2NM_MAX_NODES) { | 414 | node + 1)) < O2NM_MAX_NODES) { |
| 415 | mlog(ML_NOTICE, " node %d\n", node); | 415 | printk("%d ", node); |
| 416 | } | 416 | } |
| 417 | printk("\n"); | ||
| 417 | } | 418 | } |
| 418 | 419 | ||
| 419 | static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data) | 420 | static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data) |
| @@ -429,7 +430,7 @@ static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data) | |||
| 429 | 430 | ||
| 430 | node = exit_msg->node_idx; | 431 | node = exit_msg->node_idx; |
| 431 | 432 | ||
| 432 | mlog(0, "Node %u leaves domain %s\n", node, dlm->name); | 433 | printk(KERN_INFO "ocfs2_dlm: Node %u leaves domain %s\n", node, dlm->name); |
| 433 | 434 | ||
| 434 | spin_lock(&dlm->spinlock); | 435 | spin_lock(&dlm->spinlock); |
| 435 | clear_bit(node, dlm->domain_map); | 436 | clear_bit(node, dlm->domain_map); |
| @@ -678,6 +679,8 @@ static int dlm_assert_joined_handler(struct o2net_msg *msg, u32 len, void *data) | |||
| 678 | set_bit(assert->node_idx, dlm->domain_map); | 679 | set_bit(assert->node_idx, dlm->domain_map); |
| 679 | __dlm_set_joining_node(dlm, DLM_LOCK_RES_OWNER_UNKNOWN); | 680 | __dlm_set_joining_node(dlm, DLM_LOCK_RES_OWNER_UNKNOWN); |
| 680 | 681 | ||
| 682 | printk(KERN_INFO "ocfs2_dlm: Node %u joins domain %s\n", | ||
| 683 | assert->node_idx, dlm->name); | ||
| 681 | __dlm_print_nodes(dlm); | 684 | __dlm_print_nodes(dlm); |
| 682 | 685 | ||
| 683 | /* notify anything attached to the heartbeat events */ | 686 | /* notify anything attached to the heartbeat events */ |
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index 29b2845f370d..594745fab0b5 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
| @@ -95,6 +95,9 @@ static void dlm_reco_unlock_ast(void *astdata, enum dlm_status st); | |||
| 95 | static void dlm_request_all_locks_worker(struct dlm_work_item *item, | 95 | static void dlm_request_all_locks_worker(struct dlm_work_item *item, |
| 96 | void *data); | 96 | void *data); |
| 97 | static void dlm_mig_lockres_worker(struct dlm_work_item *item, void *data); | 97 | static void dlm_mig_lockres_worker(struct dlm_work_item *item, void *data); |
| 98 | static int dlm_lockres_master_requery(struct dlm_ctxt *dlm, | ||
| 99 | struct dlm_lock_resource *res, | ||
| 100 | u8 *real_master); | ||
| 98 | 101 | ||
| 99 | static u64 dlm_get_next_mig_cookie(void); | 102 | static u64 dlm_get_next_mig_cookie(void); |
| 100 | 103 | ||
| @@ -1484,8 +1487,9 @@ leave: | |||
| 1484 | 1487 | ||
| 1485 | 1488 | ||
| 1486 | 1489 | ||
| 1487 | int dlm_lockres_master_requery(struct dlm_ctxt *dlm, | 1490 | static int dlm_lockres_master_requery(struct dlm_ctxt *dlm, |
| 1488 | struct dlm_lock_resource *res, u8 *real_master) | 1491 | struct dlm_lock_resource *res, |
| 1492 | u8 *real_master) | ||
| 1489 | { | 1493 | { |
| 1490 | struct dlm_node_iter iter; | 1494 | struct dlm_node_iter iter; |
| 1491 | int nodenum; | 1495 | int nodenum; |
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 4acd37286bdd..762eb1fbb34d 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
| @@ -2071,8 +2071,7 @@ int ocfs2_dlm_init(struct ocfs2_super *osb) | |||
| 2071 | } | 2071 | } |
| 2072 | 2072 | ||
| 2073 | /* launch vote thread */ | 2073 | /* launch vote thread */ |
| 2074 | osb->vote_task = kthread_run(ocfs2_vote_thread, osb, "ocfs2vote-%d", | 2074 | osb->vote_task = kthread_run(ocfs2_vote_thread, osb, "ocfs2vote"); |
| 2075 | osb->osb_id); | ||
| 2076 | if (IS_ERR(osb->vote_task)) { | 2075 | if (IS_ERR(osb->vote_task)) { |
| 2077 | status = PTR_ERR(osb->vote_task); | 2076 | status = PTR_ERR(osb->vote_task); |
| 2078 | osb->vote_task = NULL; | 2077 | osb->vote_task = NULL; |
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 1a5c69071df6..fcd4475d1f89 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c | |||
| @@ -298,7 +298,7 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode, | |||
| 298 | 298 | ||
| 299 | ret = ocfs2_extent_map_insert(inode, rec, | 299 | ret = ocfs2_extent_map_insert(inode, rec, |
| 300 | le16_to_cpu(el->l_tree_depth)); | 300 | le16_to_cpu(el->l_tree_depth)); |
| 301 | if (ret) { | 301 | if (ret && (ret != -EEXIST)) { |
| 302 | mlog_errno(ret); | 302 | mlog_errno(ret); |
| 303 | goto out_free; | 303 | goto out_free; |
| 304 | } | 304 | } |
| @@ -427,6 +427,11 @@ static int ocfs2_extent_map_insert_entry(struct ocfs2_extent_map *em, | |||
| 427 | /* | 427 | /* |
| 428 | * Simple rule: on any return code other than -EAGAIN, anything left | 428 | * Simple rule: on any return code other than -EAGAIN, anything left |
| 429 | * in the insert_context will be freed. | 429 | * in the insert_context will be freed. |
| 430 | * | ||
| 431 | * Simple rule #2: A return code of -EEXIST from this function or | ||
| 432 | * its calls to ocfs2_extent_map_insert_entry() signifies that another | ||
| 433 | * thread beat us to the insert. It is not an actual error, but it | ||
| 434 | * tells the caller we have no more work to do. | ||
| 430 | */ | 435 | */ |
| 431 | static int ocfs2_extent_map_try_insert(struct inode *inode, | 436 | static int ocfs2_extent_map_try_insert(struct inode *inode, |
| 432 | struct ocfs2_extent_rec *rec, | 437 | struct ocfs2_extent_rec *rec, |
| @@ -448,22 +453,32 @@ static int ocfs2_extent_map_try_insert(struct inode *inode, | |||
| 448 | goto out_unlock; | 453 | goto out_unlock; |
| 449 | } | 454 | } |
| 450 | 455 | ||
| 456 | /* Since insert_entry failed, the map MUST have old_ent */ | ||
| 451 | old_ent = ocfs2_extent_map_lookup(em, le32_to_cpu(rec->e_cpos), | 457 | old_ent = ocfs2_extent_map_lookup(em, le32_to_cpu(rec->e_cpos), |
| 452 | le32_to_cpu(rec->e_clusters), NULL, | 458 | le32_to_cpu(rec->e_clusters), |
| 453 | NULL); | 459 | NULL, NULL); |
| 454 | 460 | ||
| 455 | BUG_ON(!old_ent); | 461 | BUG_ON(!old_ent); |
| 456 | 462 | ||
| 457 | ret = -EEXIST; | 463 | if (old_ent->e_tree_depth < tree_depth) { |
| 458 | if (old_ent->e_tree_depth < tree_depth) | 464 | /* Another thread beat us to the lower tree_depth */ |
| 465 | ret = -EEXIST; | ||
| 459 | goto out_unlock; | 466 | goto out_unlock; |
| 467 | } | ||
| 460 | 468 | ||
| 461 | if (old_ent->e_tree_depth == tree_depth) { | 469 | if (old_ent->e_tree_depth == tree_depth) { |
| 470 | /* | ||
| 471 | * Another thread beat us to this tree_depth. | ||
| 472 | * Let's make sure we agree with that thread (the | ||
| 473 | * extent_rec should be identical). | ||
| 474 | */ | ||
| 462 | if (!memcmp(rec, &old_ent->e_rec, | 475 | if (!memcmp(rec, &old_ent->e_rec, |
| 463 | sizeof(struct ocfs2_extent_rec))) | 476 | sizeof(struct ocfs2_extent_rec))) |
| 464 | ret = 0; | 477 | ret = 0; |
| 478 | else | ||
| 479 | /* FIXME: Should this be ESRCH/EBADR??? */ | ||
| 480 | ret = -EEXIST; | ||
| 465 | 481 | ||
| 466 | /* FIXME: Should this be ESRCH/EBADR??? */ | ||
| 467 | goto out_unlock; | 482 | goto out_unlock; |
| 468 | } | 483 | } |
| 469 | 484 | ||
| @@ -599,7 +614,7 @@ static int ocfs2_extent_map_insert(struct inode *inode, | |||
| 599 | tree_depth, &ctxt); | 614 | tree_depth, &ctxt); |
| 600 | } while (ret == -EAGAIN); | 615 | } while (ret == -EAGAIN); |
| 601 | 616 | ||
| 602 | if (ret < 0) | 617 | if ((ret < 0) && (ret != -EEXIST)) |
| 603 | mlog_errno(ret); | 618 | mlog_errno(ret); |
| 604 | 619 | ||
| 605 | if (ctxt.left_ent) | 620 | if (ctxt.left_ent) |
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 910a601b2e98..f92bf1dd379a 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
| @@ -784,8 +784,7 @@ int ocfs2_journal_load(struct ocfs2_journal *journal) | |||
| 784 | } | 784 | } |
| 785 | 785 | ||
| 786 | /* Launch the commit thread */ | 786 | /* Launch the commit thread */ |
| 787 | osb->commit_task = kthread_run(ocfs2_commit_thread, osb, "ocfs2cmt-%d", | 787 | osb->commit_task = kthread_run(ocfs2_commit_thread, osb, "ocfs2cmt"); |
| 788 | osb->osb_id); | ||
| 789 | if (IS_ERR(osb->commit_task)) { | 788 | if (IS_ERR(osb->commit_task)) { |
| 790 | status = PTR_ERR(osb->commit_task); | 789 | status = PTR_ERR(osb->commit_task); |
| 791 | osb->commit_task = NULL; | 790 | osb->commit_task = NULL; |
| @@ -1118,7 +1117,7 @@ void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num) | |||
| 1118 | goto out; | 1117 | goto out; |
| 1119 | 1118 | ||
| 1120 | osb->recovery_thread_task = kthread_run(__ocfs2_recovery_thread, osb, | 1119 | osb->recovery_thread_task = kthread_run(__ocfs2_recovery_thread, osb, |
| 1121 | "ocfs2rec-%d", osb->osb_id); | 1120 | "ocfs2rec"); |
| 1122 | if (IS_ERR(osb->recovery_thread_task)) { | 1121 | if (IS_ERR(osb->recovery_thread_task)) { |
| 1123 | mlog_errno((int)PTR_ERR(osb->recovery_thread_task)); | 1122 | mlog_errno((int)PTR_ERR(osb->recovery_thread_task)); |
| 1124 | osb->recovery_thread_task = NULL; | 1123 | osb->recovery_thread_task = NULL; |
diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c index 843cf9ddefe8..83934e33e5b0 100644 --- a/fs/ocfs2/mmap.c +++ b/fs/ocfs2/mmap.c | |||
| @@ -46,12 +46,12 @@ static struct page *ocfs2_nopage(struct vm_area_struct * area, | |||
| 46 | unsigned long address, | 46 | unsigned long address, |
| 47 | int *type) | 47 | int *type) |
| 48 | { | 48 | { |
| 49 | struct inode *inode = area->vm_file->f_dentry->d_inode; | ||
| 50 | struct page *page = NOPAGE_SIGBUS; | 49 | struct page *page = NOPAGE_SIGBUS; |
| 51 | sigset_t blocked, oldset; | 50 | sigset_t blocked, oldset; |
| 52 | int ret; | 51 | int ret; |
| 53 | 52 | ||
| 54 | mlog_entry("(inode %lu, address %lu)\n", inode->i_ino, address); | 53 | mlog_entry("(area=%p, address=%lu, type=%p)\n", area, address, |
| 54 | type); | ||
| 55 | 55 | ||
| 56 | /* The best way to deal with signals in this path is | 56 | /* The best way to deal with signals in this path is |
| 57 | * to block them upfront, rather than allowing the | 57 | * to block them upfront, rather than allowing the |
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index da1093039c01..cd4a6f253d13 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
| @@ -184,7 +184,6 @@ struct ocfs2_journal; | |||
| 184 | struct ocfs2_journal_handle; | 184 | struct ocfs2_journal_handle; |
| 185 | struct ocfs2_super | 185 | struct ocfs2_super |
| 186 | { | 186 | { |
| 187 | u32 osb_id; /* id used by the proc interface */ | ||
| 188 | struct task_struct *commit_task; | 187 | struct task_struct *commit_task; |
| 189 | struct super_block *sb; | 188 | struct super_block *sb; |
| 190 | struct inode *root_inode; | 189 | struct inode *root_inode; |
| @@ -222,13 +221,11 @@ struct ocfs2_super | |||
| 222 | unsigned long s_mount_opt; | 221 | unsigned long s_mount_opt; |
| 223 | 222 | ||
| 224 | u16 max_slots; | 223 | u16 max_slots; |
| 225 | u16 num_nodes; | ||
| 226 | s16 node_num; | 224 | s16 node_num; |
| 227 | s16 slot_num; | 225 | s16 slot_num; |
| 228 | int s_sectsize_bits; | 226 | int s_sectsize_bits; |
| 229 | int s_clustersize; | 227 | int s_clustersize; |
| 230 | int s_clustersize_bits; | 228 | int s_clustersize_bits; |
| 231 | struct proc_dir_entry *proc_sub_dir; /* points to /proc/fs/ocfs2/<maj_min> */ | ||
| 232 | 229 | ||
| 233 | atomic_t vol_state; | 230 | atomic_t vol_state; |
| 234 | struct mutex recovery_lock; | 231 | struct mutex recovery_lock; |
| @@ -294,7 +291,6 @@ struct ocfs2_super | |||
| 294 | }; | 291 | }; |
| 295 | 292 | ||
| 296 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) | 293 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) |
| 297 | #define OCFS2_MAX_OSB_ID 65536 | ||
| 298 | 294 | ||
| 299 | static inline int ocfs2_should_order_data(struct inode *inode) | 295 | static inline int ocfs2_should_order_data(struct inode *inode) |
| 300 | { | 296 | { |
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c index 871627961d6d..aa6f5aadedc4 100644 --- a/fs/ocfs2/slot_map.c +++ b/fs/ocfs2/slot_map.c | |||
| @@ -264,7 +264,7 @@ int ocfs2_find_slot(struct ocfs2_super *osb) | |||
| 264 | osb->slot_num = slot; | 264 | osb->slot_num = slot; |
| 265 | spin_unlock(&si->si_lock); | 265 | spin_unlock(&si->si_lock); |
| 266 | 266 | ||
| 267 | mlog(ML_NOTICE, "taking node slot %d\n", osb->slot_num); | 267 | mlog(0, "taking node slot %d\n", osb->slot_num); |
| 268 | 268 | ||
| 269 | status = ocfs2_update_disk_slots(osb, si); | 269 | status = ocfs2_update_disk_slots(osb, si); |
| 270 | if (status < 0) | 270 | if (status < 0) |
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index cdf73393f094..382706a67ffd 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
| @@ -68,13 +68,6 @@ | |||
| 68 | 68 | ||
| 69 | #include "buffer_head_io.h" | 69 | #include "buffer_head_io.h" |
| 70 | 70 | ||
| 71 | /* | ||
| 72 | * Globals | ||
| 73 | */ | ||
| 74 | static spinlock_t ocfs2_globals_lock = SPIN_LOCK_UNLOCKED; | ||
| 75 | |||
| 76 | static u32 osb_id; /* Keeps track of next available OSB Id */ | ||
| 77 | |||
| 78 | static kmem_cache_t *ocfs2_inode_cachep = NULL; | 71 | static kmem_cache_t *ocfs2_inode_cachep = NULL; |
| 79 | 72 | ||
| 80 | kmem_cache_t *ocfs2_lock_cache = NULL; | 73 | kmem_cache_t *ocfs2_lock_cache = NULL; |
| @@ -642,10 +635,9 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) | |||
| 642 | 635 | ||
| 643 | ocfs2_complete_mount_recovery(osb); | 636 | ocfs2_complete_mount_recovery(osb); |
| 644 | 637 | ||
| 645 | printk("ocfs2: Mounting device (%u,%u) on (node %d, slot %d) with %s " | 638 | printk(KERN_INFO "ocfs2: Mounting device (%s) on (node %d, slot %d) " |
| 646 | "data mode.\n", | 639 | "with %s data mode.\n", |
| 647 | MAJOR(sb->s_dev), MINOR(sb->s_dev), osb->node_num, | 640 | osb->dev_str, osb->node_num, osb->slot_num, |
| 648 | osb->slot_num, | ||
| 649 | osb->s_mount_opt & OCFS2_MOUNT_DATA_WRITEBACK ? "writeback" : | 641 | osb->s_mount_opt & OCFS2_MOUNT_DATA_WRITEBACK ? "writeback" : |
| 650 | "ordered"); | 642 | "ordered"); |
| 651 | 643 | ||
| @@ -800,10 +792,6 @@ static int __init ocfs2_init(void) | |||
| 800 | goto leave; | 792 | goto leave; |
| 801 | } | 793 | } |
| 802 | 794 | ||
| 803 | spin_lock(&ocfs2_globals_lock); | ||
| 804 | osb_id = 0; | ||
| 805 | spin_unlock(&ocfs2_globals_lock); | ||
| 806 | |||
| 807 | ocfs2_debugfs_root = debugfs_create_dir("ocfs2", NULL); | 795 | ocfs2_debugfs_root = debugfs_create_dir("ocfs2", NULL); |
| 808 | if (!ocfs2_debugfs_root) { | 796 | if (!ocfs2_debugfs_root) { |
| 809 | status = -EFAULT; | 797 | status = -EFAULT; |
| @@ -1020,7 +1008,7 @@ static int ocfs2_fill_local_node_info(struct ocfs2_super *osb) | |||
| 1020 | goto bail; | 1008 | goto bail; |
| 1021 | } | 1009 | } |
| 1022 | 1010 | ||
| 1023 | mlog(ML_NOTICE, "I am node %d\n", osb->node_num); | 1011 | mlog(0, "I am node %d\n", osb->node_num); |
| 1024 | 1012 | ||
| 1025 | status = 0; | 1013 | status = 0; |
| 1026 | bail: | 1014 | bail: |
| @@ -1191,8 +1179,8 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err) | |||
| 1191 | 1179 | ||
| 1192 | atomic_set(&osb->vol_state, VOLUME_DISMOUNTED); | 1180 | atomic_set(&osb->vol_state, VOLUME_DISMOUNTED); |
| 1193 | 1181 | ||
| 1194 | printk("ocfs2: Unmounting device (%u,%u) on (node %d)\n", | 1182 | printk(KERN_INFO "ocfs2: Unmounting device (%s) on (node %d)\n", |
| 1195 | MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev), osb->node_num); | 1183 | osb->dev_str, osb->node_num); |
| 1196 | 1184 | ||
| 1197 | ocfs2_delete_osb(osb); | 1185 | ocfs2_delete_osb(osb); |
| 1198 | kfree(osb); | 1186 | kfree(osb); |
| @@ -1212,8 +1200,6 @@ static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uu | |||
| 1212 | if (osb->uuid_str == NULL) | 1200 | if (osb->uuid_str == NULL) |
| 1213 | return -ENOMEM; | 1201 | return -ENOMEM; |
| 1214 | 1202 | ||
| 1215 | memcpy(osb->uuid, uuid, OCFS2_VOL_UUID_LEN); | ||
| 1216 | |||
| 1217 | for (i = 0, ptr = osb->uuid_str; i < OCFS2_VOL_UUID_LEN; i++) { | 1203 | for (i = 0, ptr = osb->uuid_str; i < OCFS2_VOL_UUID_LEN; i++) { |
| 1218 | /* print with null */ | 1204 | /* print with null */ |
| 1219 | ret = snprintf(ptr, 3, "%02X", uuid[i]); | 1205 | ret = snprintf(ptr, 3, "%02X", uuid[i]); |
| @@ -1311,13 +1297,6 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
| 1311 | goto bail; | 1297 | goto bail; |
| 1312 | } | 1298 | } |
| 1313 | 1299 | ||
| 1314 | osb->uuid = kmalloc(OCFS2_VOL_UUID_LEN, GFP_KERNEL); | ||
| 1315 | if (!osb->uuid) { | ||
| 1316 | mlog(ML_ERROR, "unable to alloc uuid\n"); | ||
| 1317 | status = -ENOMEM; | ||
| 1318 | goto bail; | ||
| 1319 | } | ||
| 1320 | |||
| 1321 | di = (struct ocfs2_dinode *)bh->b_data; | 1300 | di = (struct ocfs2_dinode *)bh->b_data; |
| 1322 | 1301 | ||
| 1323 | osb->max_slots = le16_to_cpu(di->id2.i_super.s_max_slots); | 1302 | osb->max_slots = le16_to_cpu(di->id2.i_super.s_max_slots); |
| @@ -1327,7 +1306,7 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
| 1327 | status = -EINVAL; | 1306 | status = -EINVAL; |
| 1328 | goto bail; | 1307 | goto bail; |
| 1329 | } | 1308 | } |
| 1330 | mlog(ML_NOTICE, "max_slots for this device: %u\n", osb->max_slots); | 1309 | mlog(0, "max_slots for this device: %u\n", osb->max_slots); |
| 1331 | 1310 | ||
| 1332 | init_waitqueue_head(&osb->osb_wipe_event); | 1311 | init_waitqueue_head(&osb->osb_wipe_event); |
| 1333 | osb->osb_orphan_wipes = kcalloc(osb->max_slots, | 1312 | osb->osb_orphan_wipes = kcalloc(osb->max_slots, |
| @@ -1418,7 +1397,7 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
| 1418 | goto bail; | 1397 | goto bail; |
| 1419 | } | 1398 | } |
| 1420 | 1399 | ||
| 1421 | memcpy(&uuid_net_key, &osb->uuid[i], sizeof(osb->net_key)); | 1400 | memcpy(&uuid_net_key, di->id2.i_super.s_uuid, sizeof(uuid_net_key)); |
| 1422 | osb->net_key = le32_to_cpu(uuid_net_key); | 1401 | osb->net_key = le32_to_cpu(uuid_net_key); |
| 1423 | 1402 | ||
| 1424 | strncpy(osb->vol_label, di->id2.i_super.s_label, 63); | 1403 | strncpy(osb->vol_label, di->id2.i_super.s_label, 63); |
| @@ -1484,18 +1463,6 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
| 1484 | goto bail; | 1463 | goto bail; |
| 1485 | } | 1464 | } |
| 1486 | 1465 | ||
| 1487 | /* Link this osb onto the global linked list of all osb structures. */ | ||
| 1488 | /* The Global Link List is mainted for the whole driver . */ | ||
| 1489 | spin_lock(&ocfs2_globals_lock); | ||
| 1490 | osb->osb_id = osb_id; | ||
| 1491 | if (osb_id < OCFS2_MAX_OSB_ID) | ||
| 1492 | osb_id++; | ||
| 1493 | else { | ||
| 1494 | mlog(ML_ERROR, "Too many volumes mounted\n"); | ||
| 1495 | status = -ENOMEM; | ||
| 1496 | } | ||
| 1497 | spin_unlock(&ocfs2_globals_lock); | ||
| 1498 | |||
| 1499 | bail: | 1466 | bail: |
| 1500 | mlog_exit(status); | 1467 | mlog_exit(status); |
| 1501 | return status; | 1468 | return status; |
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c index 0c8a1294ec96..c0f68aa6c175 100644 --- a/fs/ocfs2/symlink.c +++ b/fs/ocfs2/symlink.c | |||
| @@ -154,7 +154,7 @@ static void *ocfs2_follow_link(struct dentry *dentry, | |||
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | status = vfs_follow_link(nd, link); | 156 | status = vfs_follow_link(nd, link); |
| 157 | if (status) | 157 | if (status && status != -ENOENT) |
| 158 | mlog_errno(status); | 158 | mlog_errno(status); |
| 159 | bail: | 159 | bail: |
| 160 | if (page) { | 160 | if (page) { |
diff --git a/fs/partitions/acorn.c b/fs/partitions/acorn.c index c05085710fce..1bc9f372c7d4 100644 --- a/fs/partitions/acorn.c +++ b/fs/partitions/acorn.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * every single manufacturer of SCSI and IDE cards created their own | 12 | * every single manufacturer of SCSI and IDE cards created their own |
| 13 | * method. | 13 | * method. |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/buffer_head.h> | 15 | #include <linux/buffer_head.h> |
| 17 | #include <linux/adfs_fs.h> | 16 | #include <linux/adfs_fs.h> |
| 18 | 17 | ||
diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c index 0f5b017aebad..63730282ad81 100644 --- a/fs/partitions/efi.c +++ b/fs/partitions/efi.c | |||
| @@ -91,7 +91,6 @@ | |||
| 91 | * - Code works, detects all the partitions. | 91 | * - Code works, detects all the partitions. |
| 92 | * | 92 | * |
| 93 | ************************************************************/ | 93 | ************************************************************/ |
| 94 | #include <linux/config.h> | ||
| 95 | #include <linux/crc32.h> | 94 | #include <linux/crc32.h> |
| 96 | #include "check.h" | 95 | #include "check.h" |
| 97 | #include "efi.h" | 96 | #include "efi.h" |
diff --git a/fs/partitions/efi.h b/fs/partitions/efi.h index c44fb0561448..2cc89d0475bf 100644 --- a/fs/partitions/efi.h +++ b/fs/partitions/efi.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #define FS_PART_EFI_H_INCLUDED | 26 | #define FS_PART_EFI_H_INCLUDED |
| 27 | 27 | ||
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
| 31 | #include <linux/genhd.h> | 30 | #include <linux/genhd.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/fs/partitions/ibm.c b/fs/partitions/ibm.c index 830c55d86ab1..d352a7381fed 100644 --- a/fs/partitions/ibm.c +++ b/fs/partitions/ibm.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 | 6 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/buffer_head.h> | 9 | #include <linux/buffer_head.h> |
| 11 | #include <linux/hdreg.h> | 10 | #include <linux/hdreg.h> |
| 12 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c index 813292f21210..c0871002d00d 100644 --- a/fs/partitions/mac.c +++ b/fs/partitions/mac.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Re-organised Feb 1998 Russell King | 6 | * Re-organised Feb 1998 Russell King |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/ctype.h> | 9 | #include <linux/ctype.h> |
| 11 | #include "check.h" | 10 | #include "check.h" |
| 12 | #include "mac.h" | 11 | #include "mac.h" |
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 9935d254186e..8f12587c3129 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Re-organised Feb 1998 Russell King | 19 | * Re-organised Feb 1998 Russell King |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | #include "check.h" | 23 | #include "check.h" |
| 25 | #include "msdos.h" | 24 | #include "msdos.h" |
diff --git a/fs/proc/array.c b/fs/proc/array.c index 7a76ad570230..7495d3e20775 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | * : base.c too. | 52 | * : base.c too. |
| 53 | */ | 53 | */ |
| 54 | 54 | ||
| 55 | #include <linux/config.h> | ||
| 56 | #include <linux/types.h> | 55 | #include <linux/types.h> |
| 57 | #include <linux/errno.h> | 56 | #include <linux/errno.h> |
| 58 | #include <linux/time.h> | 57 | #include <linux/time.h> |
diff --git a/fs/proc/base.c b/fs/proc/base.c index 6ba7785319de..243a94af0427 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | 49 | ||
| 50 | #include <asm/uaccess.h> | 50 | #include <asm/uaccess.h> |
| 51 | 51 | ||
| 52 | #include <linux/config.h> | ||
| 53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| 54 | #include <linux/time.h> | 53 | #include <linux/time.h> |
| 55 | #include <linux/proc_fs.h> | 54 | #include <linux/proc_fs.h> |
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 17f6e8fa1397..036d14d83627 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Safe accesses to vmalloc/direct-mapped discontiguous areas, Kanoj Sarcar <kanoj@sgi.com> | 9 | * Safe accesses to vmalloc/direct-mapped discontiguous areas, Kanoj Sarcar <kanoj@sgi.com> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 14 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
| 15 | #include <linux/user.h> | 14 | #include <linux/user.h> |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 5c10ea157425..9f2cfc30f9cf 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/mman.h> | 26 | #include <linux/mman.h> |
| 27 | #include <linux/proc_fs.h> | 27 | #include <linux/proc_fs.h> |
| 28 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
| 31 | #include <linux/mmzone.h> | 30 | #include <linux/mmzone.h> |
| 32 | #include <linux/pagemap.h> | 31 | #include <linux/pagemap.h> |
| @@ -120,7 +119,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 120 | { | 119 | { |
| 121 | struct sysinfo i; | 120 | struct sysinfo i; |
| 122 | int len; | 121 | int len; |
| 123 | struct page_state ps; | ||
| 124 | unsigned long inactive; | 122 | unsigned long inactive; |
| 125 | unsigned long active; | 123 | unsigned long active; |
| 126 | unsigned long free; | 124 | unsigned long free; |
| @@ -129,7 +127,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 129 | struct vmalloc_info vmi; | 127 | struct vmalloc_info vmi; |
| 130 | long cached; | 128 | long cached; |
| 131 | 129 | ||
| 132 | get_page_state(&ps); | ||
| 133 | get_zone_counts(&active, &inactive, &free); | 130 | get_zone_counts(&active, &inactive, &free); |
| 134 | 131 | ||
| 135 | /* | 132 | /* |
| @@ -142,7 +139,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 142 | allowed = ((totalram_pages - hugetlb_total_pages()) | 139 | allowed = ((totalram_pages - hugetlb_total_pages()) |
| 143 | * sysctl_overcommit_ratio / 100) + total_swap_pages; | 140 | * sysctl_overcommit_ratio / 100) + total_swap_pages; |
| 144 | 141 | ||
| 145 | cached = get_page_cache_size() - total_swapcache_pages - i.bufferram; | 142 | cached = global_page_state(NR_FILE_PAGES) - |
| 143 | total_swapcache_pages - i.bufferram; | ||
| 146 | if (cached < 0) | 144 | if (cached < 0) |
| 147 | cached = 0; | 145 | cached = 0; |
| 148 | 146 | ||
| @@ -167,11 +165,14 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 167 | "SwapFree: %8lu kB\n" | 165 | "SwapFree: %8lu kB\n" |
| 168 | "Dirty: %8lu kB\n" | 166 | "Dirty: %8lu kB\n" |
| 169 | "Writeback: %8lu kB\n" | 167 | "Writeback: %8lu kB\n" |
| 168 | "AnonPages: %8lu kB\n" | ||
| 170 | "Mapped: %8lu kB\n" | 169 | "Mapped: %8lu kB\n" |
| 171 | "Slab: %8lu kB\n" | 170 | "Slab: %8lu kB\n" |
| 171 | "PageTables: %8lu kB\n" | ||
| 172 | "NFS Unstable: %8lu kB\n" | ||
| 173 | "Bounce: %8lu kB\n" | ||
| 172 | "CommitLimit: %8lu kB\n" | 174 | "CommitLimit: %8lu kB\n" |
| 173 | "Committed_AS: %8lu kB\n" | 175 | "Committed_AS: %8lu kB\n" |
| 174 | "PageTables: %8lu kB\n" | ||
| 175 | "VmallocTotal: %8lu kB\n" | 176 | "VmallocTotal: %8lu kB\n" |
| 176 | "VmallocUsed: %8lu kB\n" | 177 | "VmallocUsed: %8lu kB\n" |
| 177 | "VmallocChunk: %8lu kB\n", | 178 | "VmallocChunk: %8lu kB\n", |
| @@ -188,13 +189,16 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 188 | K(i.freeram-i.freehigh), | 189 | K(i.freeram-i.freehigh), |
| 189 | K(i.totalswap), | 190 | K(i.totalswap), |
| 190 | K(i.freeswap), | 191 | K(i.freeswap), |
| 191 | K(ps.nr_dirty), | 192 | K(global_page_state(NR_FILE_DIRTY)), |
| 192 | K(ps.nr_writeback), | 193 | K(global_page_state(NR_WRITEBACK)), |
| 193 | K(ps.nr_mapped), | 194 | K(global_page_state(NR_ANON_PAGES)), |
| 194 | K(ps.nr_slab), | 195 | K(global_page_state(NR_FILE_MAPPED)), |
| 196 | K(global_page_state(NR_SLAB)), | ||
| 197 | K(global_page_state(NR_PAGETABLE)), | ||
| 198 | K(global_page_state(NR_UNSTABLE_NFS)), | ||
| 199 | K(global_page_state(NR_BOUNCE)), | ||
| 195 | K(allowed), | 200 | K(allowed), |
| 196 | K(committed), | 201 | K(committed), |
| 197 | K(ps.nr_page_table_pages), | ||
| 198 | (unsigned long)VMALLOC_TOTAL >> 10, | 202 | (unsigned long)VMALLOC_TOTAL >> 10, |
| 199 | vmi.used >> 10, | 203 | vmi.used >> 10, |
| 200 | vmi.largest_chunk >> 10 | 204 | vmi.largest_chunk >> 10 |
diff --git a/fs/proc/root.c b/fs/proc/root.c index 9995356ce73e..8901c65caca8 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/time.h> | 12 | #include <linux/time.h> |
| 13 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
| 14 | #include <linux/stat.h> | 14 | #include <linux/stat.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/bitops.h> | 17 | #include <linux/bitops.h> |
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 20d4b2237fce..d96050728c43 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 12 | #include <linux/proc_fs.h> | 11 | #include <linux/proc_fs.h> |
| 13 | #include <linux/user.h> | 12 | #include <linux/user.h> |
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c index 46efbf52cbec..8425cf6e9624 100644 --- a/fs/qnx4/bitmap.c +++ b/fs/qnx4/bitmap.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 28-06-1998 by Frank Denis : qnx4_free_inode (to be fixed) . | 13 | * 28-06-1998 by Frank Denis : qnx4_free_inode (to be fixed) . |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/time.h> | 16 | #include <linux/time.h> |
| 18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 19 | #include <linux/qnx4_fs.h> | 18 | #include <linux/qnx4_fs.h> |
diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index 9031948fefd0..0d7103fa0df5 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 20-06-1998 by Frank Denis : Linux 2.1.99+ & dcache support. | 11 | * 20-06-1998 by Frank Denis : Linux 2.1.99+ & dcache support. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
diff --git a/fs/qnx4/fsync.c b/fs/qnx4/fsync.c index df5bc75d5414..aa3b19544bee 100644 --- a/fs/qnx4/fsync.c +++ b/fs/qnx4/fsync.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 24-03-1998 by Richard Frowijn : first release. | 10 | * 24-03-1998 by Richard Frowijn : first release. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/time.h> | 14 | #include <linux/time.h> |
| 16 | #include <linux/stat.h> | 15 | #include <linux/stat.h> |
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 8bc182a88748..5a903491e697 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 30-06-1998 by Frank Denis : first step to write inodes. | 12 | * 30-06-1998 by Frank Denis : first step to write inodes. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/string.h> | 17 | #include <linux/string.h> |
diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c index 4af4951d7f54..c3d83f67154a 100644 --- a/fs/qnx4/namei.c +++ b/fs/qnx4/namei.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 04-07-1998 by Frank Denis : first step for rmdir/unlink. | 12 | * 04-07-1998 by Frank Denis : first step for rmdir/unlink. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/time.h> | 15 | #include <linux/time.h> |
| 17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
| 18 | #include <linux/qnx4_fs.h> | 17 | #include <linux/qnx4_fs.h> |
diff --git a/fs/qnx4/truncate.c b/fs/qnx4/truncate.c index 86563ec01b39..6437c1c3d1dd 100644 --- a/fs/qnx4/truncate.c +++ b/fs/qnx4/truncate.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 30-06-1998 by Frank DENIS : ugly filler. | 10 | * 30-06-1998 by Frank DENIS : ugly filler. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c index 909f71e9a30f..4a7dbdee1b6d 100644 --- a/fs/reiserfs/bitmap.c +++ b/fs/reiserfs/bitmap.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | */ | 3 | */ |
| 4 | /* Reiserfs block (de)allocator, bitmap-based. */ | 4 | /* Reiserfs block (de)allocator, bitmap-based. */ |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/time.h> | 6 | #include <linux/time.h> |
| 8 | #include <linux/reiserfs_fs.h> | 7 | #include <linux/reiserfs_fs.h> |
| 9 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index 973c819f8033..9aabcc0ccd2d 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README | 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 7 | #include <linux/errno.h> | 6 | #include <linux/errno.h> |
| 8 | #include <linux/fs.h> | 7 | #include <linux/fs.h> |
diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c index b2264ba3cc56..fba304e64de8 100644 --- a/fs/reiserfs/do_balan.c +++ b/fs/reiserfs/do_balan.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | ** | 15 | ** |
| 16 | **/ | 16 | **/ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
| 20 | #include <linux/time.h> | 19 | #include <linux/time.h> |
| 21 | #include <linux/reiserfs_fs.h> | 20 | #include <linux/reiserfs_fs.h> |
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index 5600d3d60cf7..6d0e554daa9d 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | ** | 34 | ** |
| 35 | **/ | 35 | **/ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/time.h> | 37 | #include <linux/time.h> |
| 39 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 40 | #include <linux/reiserfs_fs.h> | 39 | #include <linux/reiserfs_fs.h> |
diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c index 6c5a726fd34b..de391a82b999 100644 --- a/fs/reiserfs/ibalance.c +++ b/fs/reiserfs/ibalance.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README | 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/uaccess.h> | 5 | #include <asm/uaccess.h> |
| 7 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 8 | #include <linux/time.h> | 7 | #include <linux/time.h> |
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index a24858a632fa..12dfdcfbee3d 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README | 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/time.h> | 5 | #include <linux/time.h> |
| 7 | #include <linux/fs.h> | 6 | #include <linux/fs.h> |
| 8 | #include <linux/reiserfs_fs.h> | 7 | #include <linux/reiserfs_fs.h> |
| @@ -2933,6 +2932,11 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 2933 | } | 2932 | } |
| 2934 | if (error) | 2933 | if (error) |
| 2935 | goto out; | 2934 | goto out; |
| 2935 | /* | ||
| 2936 | * file size is changed, ctime and mtime are | ||
| 2937 | * to be updated | ||
| 2938 | */ | ||
| 2939 | attr->ia_valid |= (ATTR_MTIME | ATTR_CTIME); | ||
| 2936 | } | 2940 | } |
| 2937 | } | 2941 | } |
| 2938 | 2942 | ||
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 49d1a53dbef0..9b3672d69367 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | ** from within kupdate, it will ignore the immediate flag | 34 | ** from within kupdate, it will ignore the immediate flag |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
| 39 | #include <asm/system.h> | 38 | #include <asm/system.h> |
| 40 | 39 | ||
diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c index 2533c1f64aba..281f8061ac58 100644 --- a/fs/reiserfs/lbalance.c +++ b/fs/reiserfs/lbalance.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README | 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/uaccess.h> | 5 | #include <asm/uaccess.h> |
| 7 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 8 | #include <linux/time.h> | 7 | #include <linux/time.h> |
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index 284f7852de8b..c61710e49c62 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * NO WARRANTY | 11 | * NO WARRANTY |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/time.h> | 14 | #include <linux/time.h> |
| 16 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
| 17 | #include <linux/reiserfs_fs.h> | 16 | #include <linux/reiserfs_fs.h> |
diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c index f62590aa9c95..65feba4deb69 100644 --- a/fs/reiserfs/objectid.c +++ b/fs/reiserfs/objectid.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README | 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 7 | #include <linux/random.h> | 6 | #include <linux/random.h> |
| 8 | #include <linux/time.h> | 7 | #include <linux/time.h> |
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c index 27bd3a1df2ad..bc808a91eeaa 100644 --- a/fs/reiserfs/prints.c +++ b/fs/reiserfs/prints.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README | 2 | * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/time.h> | 5 | #include <linux/time.h> |
| 7 | #include <linux/fs.h> | 6 | #include <linux/fs.h> |
| 8 | #include <linux/reiserfs_fs.h> | 7 | #include <linux/reiserfs_fs.h> |
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c index 731688e1cfe3..5d8a8cfebc70 100644 --- a/fs/reiserfs/procfs.c +++ b/fs/reiserfs/procfs.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | /* $Id: procfs.c,v 1.1.8.2 2001/07/15 17:08:42 god Exp $ */ | 11 | /* $Id: procfs.c,v 1.1.8.2 2001/07/15 17:08:42 god Exp $ */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/time.h> | 14 | #include <linux/time.h> |
| 16 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index d2b25e1ba6e9..8b9b13127136 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | * reiserfs_insert_item | 49 | * reiserfs_insert_item |
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <linux/config.h> | ||
| 53 | #include <linux/time.h> | 52 | #include <linux/time.h> |
| 54 | #include <linux/string.h> | 53 | #include <linux/string.h> |
| 55 | #include <linux/pagemap.h> | 54 | #include <linux/pagemap.h> |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 00f1321e9209..28eb3c886034 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * NO WARRANTY | 11 | * NO WARRANTY |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/vmalloc.h> | 15 | #include <linux/vmalloc.h> |
| 17 | #include <linux/time.h> | 16 | #include <linux/time.h> |
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index 196e971c03c9..36f108fc1cf5 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Copyright 1999 Hans Reiser, see reiserfs/README for licensing and copyright details | 2 | * Copyright 1999 Hans Reiser, see reiserfs/README for licensing and copyright details |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/time.h> | 5 | #include <linux/time.h> |
| 7 | #include <linux/pagemap.h> | 6 | #include <linux/pagemap.h> |
| 8 | #include <linux/buffer_head.h> | 7 | #include <linux/buffer_head.h> |
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 506ff87c1d4b..a1ed657c3c84 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Please add a note about your changes to smbfs in the ChangeLog file. | 7 | * Please add a note about your changes to smbfs in the ChangeLog file. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/time.h> | 11 | #include <linux/time.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c index 24577e2c489b..e67540441288 100644 --- a/fs/smbfs/smbiod.c +++ b/fs/smbfs/smbiod.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 2001, Urban Widmark | 5 | * Copyright (C) 2001, Urban Widmark |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | 8 | ||
| 10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
diff --git a/fs/super.c b/fs/super.c index 8a669f6f3f52..9b780c42d845 100644 --- a/fs/super.c +++ b/fs/super.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000 | 20 | * Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000 |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/fs/udf/super.c b/fs/udf/super.c index 44fe2cb0bbb2..4df822c881b6 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | 40 | ||
| 41 | #include "udfdecl.h" | 41 | #include "udfdecl.h" |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/blkdev.h> | 43 | #include <linux/blkdev.h> |
| 45 | #include <linux/slab.h> | 44 | #include <linux/slab.h> |
| 46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 2f992387cc9e..1033b7cf2939 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include "osta_udf.h" | 6 | #include "osta_udf.h" |
| 7 | 7 | ||
| 8 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/udf_fs_i.h> | 10 | #include <linux/udf_fs_i.h> |
| 12 | #include <linux/udf_fs_sb.h> | 11 | #include <linux/udf_fs_sb.h> |
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index 95b878e5c7a0..b01804baa120 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c | |||
| @@ -217,48 +217,6 @@ failed: | |||
| 217 | return; | 217 | return; |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | static struct page *ufs_get_locked_page(struct address_space *mapping, | ||
| 221 | unsigned long index) | ||
| 222 | { | ||
| 223 | struct page *page; | ||
| 224 | |||
| 225 | try_again: | ||
| 226 | page = find_lock_page(mapping, index); | ||
| 227 | if (!page) { | ||
| 228 | page = read_cache_page(mapping, index, | ||
| 229 | (filler_t*)mapping->a_ops->readpage, | ||
| 230 | NULL); | ||
| 231 | if (IS_ERR(page)) { | ||
| 232 | printk(KERN_ERR "ufs_change_blocknr: " | ||
| 233 | "read_cache_page error: ino %lu, index: %lu\n", | ||
| 234 | mapping->host->i_ino, index); | ||
| 235 | goto out; | ||
| 236 | } | ||
| 237 | |||
| 238 | lock_page(page); | ||
| 239 | |||
| 240 | if (!PageUptodate(page) || PageError(page)) { | ||
| 241 | unlock_page(page); | ||
| 242 | page_cache_release(page); | ||
| 243 | |||
| 244 | printk(KERN_ERR "ufs_change_blocknr: " | ||
| 245 | "can not read page: ino %lu, index: %lu\n", | ||
| 246 | mapping->host->i_ino, index); | ||
| 247 | |||
| 248 | page = ERR_PTR(-EIO); | ||
| 249 | goto out; | ||
| 250 | } | ||
| 251 | } | ||
| 252 | |||
| 253 | if (unlikely(!page->mapping || !page_has_buffers(page))) { | ||
| 254 | unlock_page(page); | ||
| 255 | page_cache_release(page); | ||
| 256 | goto try_again;/*we really need these buffers*/ | ||
| 257 | } | ||
| 258 | out: | ||
| 259 | return page; | ||
| 260 | } | ||
| 261 | |||
| 262 | /* | 220 | /* |
| 263 | * Modify inode page cache in such way: | 221 | * Modify inode page cache in such way: |
| 264 | * have - blocks with b_blocknr equal to oldb...oldb+count-1 | 222 | * have - blocks with b_blocknr equal to oldb...oldb+count-1 |
| @@ -311,10 +269,8 @@ static void ufs_change_blocknr(struct inode *inode, unsigned int baseblk, | |||
| 311 | 269 | ||
| 312 | set_page_dirty(page); | 270 | set_page_dirty(page); |
| 313 | 271 | ||
| 314 | if (likely(cur_index != index)) { | 272 | if (likely(cur_index != index)) |
| 315 | unlock_page(page); | 273 | ufs_put_locked_page(page); |
| 316 | page_cache_release(page); | ||
| 317 | } | ||
| 318 | } | 274 | } |
| 319 | UFSD("EXIT\n"); | 275 | UFSD("EXIT\n"); |
| 320 | } | 276 | } |
diff --git a/fs/ufs/file.c b/fs/ufs/file.c index 0e5001512a9d..a9c6e5f04fae 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c | |||
| @@ -60,7 +60,3 @@ const struct file_operations ufs_file_operations = { | |||
| 60 | .fsync = ufs_sync_file, | 60 | .fsync = ufs_sync_file, |
| 61 | .sendfile = generic_file_sendfile, | 61 | .sendfile = generic_file_sendfile, |
| 62 | }; | 62 | }; |
| 63 | |||
| 64 | struct inode_operations ufs_file_inode_operations = { | ||
| 65 | .truncate = ufs_truncate, | ||
| 66 | }; | ||
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 488b5ff48afb..e7c8615beb65 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c | |||
| @@ -843,14 +843,17 @@ int ufs_sync_inode (struct inode *inode) | |||
| 843 | 843 | ||
| 844 | void ufs_delete_inode (struct inode * inode) | 844 | void ufs_delete_inode (struct inode * inode) |
| 845 | { | 845 | { |
| 846 | loff_t old_i_size; | ||
| 847 | |||
| 846 | truncate_inode_pages(&inode->i_data, 0); | 848 | truncate_inode_pages(&inode->i_data, 0); |
| 847 | /*UFS_I(inode)->i_dtime = CURRENT_TIME;*/ | 849 | /*UFS_I(inode)->i_dtime = CURRENT_TIME;*/ |
| 848 | lock_kernel(); | 850 | lock_kernel(); |
| 849 | mark_inode_dirty(inode); | 851 | mark_inode_dirty(inode); |
| 850 | ufs_update_inode(inode, IS_SYNC(inode)); | 852 | ufs_update_inode(inode, IS_SYNC(inode)); |
| 853 | old_i_size = inode->i_size; | ||
| 851 | inode->i_size = 0; | 854 | inode->i_size = 0; |
| 852 | if (inode->i_blocks) | 855 | if (inode->i_blocks && ufs_truncate(inode, old_i_size)) |
| 853 | ufs_truncate (inode); | 856 | ufs_warning(inode->i_sb, __FUNCTION__, "ufs_truncate failed\n"); |
| 854 | ufs_free_inode (inode); | 857 | ufs_free_inode (inode); |
| 855 | unlock_kernel(); | 858 | unlock_kernel(); |
| 856 | } | 859 | } |
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 74ef5e9bedff..19a99726e58d 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | 66 | ||
| 67 | #include <linux/config.h> | ||
| 68 | #include <linux/module.h> | 67 | #include <linux/module.h> |
| 69 | #include <linux/bitops.h> | 68 | #include <linux/bitops.h> |
| 70 | 69 | ||
diff --git a/fs/ufs/truncate.c b/fs/ufs/truncate.c index 3c3b301f8701..c9b55872079b 100644 --- a/fs/ufs/truncate.c +++ b/fs/ufs/truncate.c | |||
| @@ -369,24 +369,97 @@ static int ufs_trunc_tindirect (struct inode * inode) | |||
| 369 | UFSD("EXIT\n"); | 369 | UFSD("EXIT\n"); |
| 370 | return retry; | 370 | return retry; |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | void ufs_truncate (struct inode * inode) | 373 | static int ufs_alloc_lastblock(struct inode *inode) |
| 374 | { | 374 | { |
| 375 | int err = 0; | ||
| 376 | struct address_space *mapping = inode->i_mapping; | ||
| 377 | struct ufs_sb_private_info *uspi = UFS_SB(inode->i_sb)->s_uspi; | ||
| 375 | struct ufs_inode_info *ufsi = UFS_I(inode); | 378 | struct ufs_inode_info *ufsi = UFS_I(inode); |
| 376 | struct super_block * sb; | 379 | unsigned lastfrag, i, end; |
| 377 | struct ufs_sb_private_info * uspi; | 380 | struct page *lastpage; |
| 378 | int retry; | 381 | struct buffer_head *bh; |
| 382 | |||
| 383 | lastfrag = (i_size_read(inode) + uspi->s_fsize - 1) >> uspi->s_fshift; | ||
| 384 | |||
| 385 | if (!lastfrag) { | ||
| 386 | ufsi->i_lastfrag = 0; | ||
| 387 | goto out; | ||
| 388 | } | ||
| 389 | lastfrag--; | ||
| 390 | |||
| 391 | lastpage = ufs_get_locked_page(mapping, lastfrag >> | ||
| 392 | (PAGE_CACHE_SHIFT - inode->i_blkbits)); | ||
| 393 | if (IS_ERR(lastpage)) { | ||
| 394 | err = -EIO; | ||
| 395 | goto out; | ||
| 396 | } | ||
| 397 | |||
| 398 | end = lastfrag & ((1 << (PAGE_CACHE_SHIFT - inode->i_blkbits)) - 1); | ||
| 399 | bh = page_buffers(lastpage); | ||
| 400 | for (i = 0; i < end; ++i) | ||
| 401 | bh = bh->b_this_page; | ||
| 402 | |||
| 403 | if (!buffer_mapped(bh)) { | ||
| 404 | err = ufs_getfrag_block(inode, lastfrag, bh, 1); | ||
| 405 | |||
| 406 | if (unlikely(err)) | ||
| 407 | goto out_unlock; | ||
| 408 | |||
| 409 | if (buffer_new(bh)) { | ||
| 410 | clear_buffer_new(bh); | ||
| 411 | unmap_underlying_metadata(bh->b_bdev, | ||
| 412 | bh->b_blocknr); | ||
| 413 | /* | ||
| 414 | * we do not zeroize fragment, because of | ||
| 415 | * if it maped to hole, it already contains zeroes | ||
| 416 | */ | ||
| 417 | set_buffer_uptodate(bh); | ||
| 418 | mark_buffer_dirty(bh); | ||
| 419 | set_page_dirty(lastpage); | ||
| 420 | } | ||
| 421 | } | ||
| 422 | out_unlock: | ||
| 423 | ufs_put_locked_page(lastpage); | ||
| 424 | out: | ||
| 425 | return err; | ||
| 426 | } | ||
| 427 | |||
| 428 | int ufs_truncate(struct inode *inode, loff_t old_i_size) | ||
| 429 | { | ||
| 430 | struct ufs_inode_info *ufsi = UFS_I(inode); | ||
| 431 | struct super_block *sb = inode->i_sb; | ||
| 432 | struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; | ||
| 433 | int retry, err = 0; | ||
| 379 | 434 | ||
| 380 | UFSD("ENTER\n"); | 435 | UFSD("ENTER\n"); |
| 381 | sb = inode->i_sb; | ||
| 382 | uspi = UFS_SB(sb)->s_uspi; | ||
| 383 | 436 | ||
| 384 | if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))) | 437 | if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || |
| 385 | return; | 438 | S_ISLNK(inode->i_mode))) |
| 439 | return -EINVAL; | ||
| 386 | if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) | 440 | if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) |
| 387 | return; | 441 | return -EPERM; |
| 442 | |||
| 443 | if (inode->i_size > old_i_size) { | ||
| 444 | /* | ||
| 445 | * if we expand file we should care about | ||
| 446 | * allocation of block for last byte first of all | ||
| 447 | */ | ||
| 448 | err = ufs_alloc_lastblock(inode); | ||
| 449 | |||
| 450 | if (err) { | ||
| 451 | i_size_write(inode, old_i_size); | ||
| 452 | goto out; | ||
| 453 | } | ||
| 454 | /* | ||
| 455 | * go away, because of we expand file, and we do not | ||
| 456 | * need free blocks, and zeroizes page | ||
| 457 | */ | ||
| 458 | lock_kernel(); | ||
| 459 | goto almost_end; | ||
| 460 | } | ||
| 388 | 461 | ||
| 389 | block_truncate_page(inode->i_mapping, inode->i_size, ufs_getfrag_block); | 462 | block_truncate_page(inode->i_mapping, inode->i_size, ufs_getfrag_block); |
| 390 | 463 | ||
| 391 | lock_kernel(); | 464 | lock_kernel(); |
| 392 | while (1) { | 465 | while (1) { |
| @@ -404,9 +477,58 @@ void ufs_truncate (struct inode * inode) | |||
| 404 | yield(); | 477 | yield(); |
| 405 | } | 478 | } |
| 406 | 479 | ||
| 480 | if (inode->i_size < old_i_size) { | ||
| 481 | /* | ||
| 482 | * now we should have enough space | ||
| 483 | * to allocate block for last byte | ||
| 484 | */ | ||
| 485 | err = ufs_alloc_lastblock(inode); | ||
| 486 | if (err) | ||
| 487 | /* | ||
| 488 | * looks like all the same - we have no space, | ||
| 489 | * but we truncate file already | ||
| 490 | */ | ||
| 491 | inode->i_size = (ufsi->i_lastfrag - 1) * uspi->s_fsize; | ||
| 492 | } | ||
| 493 | almost_end: | ||
| 407 | inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC; | 494 | inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC; |
| 408 | ufsi->i_lastfrag = DIRECT_FRAGMENT; | ||
| 409 | unlock_kernel(); | 495 | unlock_kernel(); |
| 410 | mark_inode_dirty(inode); | 496 | mark_inode_dirty(inode); |
| 411 | UFSD("EXIT\n"); | 497 | out: |
| 498 | UFSD("EXIT: err %d\n", err); | ||
| 499 | return err; | ||
| 412 | } | 500 | } |
| 501 | |||
| 502 | |||
| 503 | /* | ||
| 504 | * We don't define our `inode->i_op->truncate', and call it here, | ||
| 505 | * because of: | ||
| 506 | * - there is no way to know old size | ||
| 507 | * - there is no way inform user about error, if it happens in `truncate' | ||
| 508 | */ | ||
| 509 | static int ufs_setattr(struct dentry *dentry, struct iattr *attr) | ||
| 510 | { | ||
| 511 | struct inode *inode = dentry->d_inode; | ||
| 512 | unsigned int ia_valid = attr->ia_valid; | ||
| 513 | int error; | ||
| 514 | |||
| 515 | error = inode_change_ok(inode, attr); | ||
| 516 | if (error) | ||
| 517 | return error; | ||
| 518 | |||
| 519 | if (ia_valid & ATTR_SIZE && | ||
| 520 | attr->ia_size != i_size_read(inode)) { | ||
| 521 | loff_t old_i_size = inode->i_size; | ||
| 522 | error = vmtruncate(inode, attr->ia_size); | ||
| 523 | if (error) | ||
| 524 | return error; | ||
| 525 | error = ufs_truncate(inode, old_i_size); | ||
| 526 | if (error) | ||
| 527 | return error; | ||
| 528 | } | ||
| 529 | return inode_setattr(inode, attr); | ||
| 530 | } | ||
| 531 | |||
| 532 | struct inode_operations ufs_file_inode_operations = { | ||
| 533 | .setattr = ufs_setattr, | ||
| 534 | }; | ||
diff --git a/fs/ufs/util.c b/fs/ufs/util.c index a2f13f45708b..337cf2c46d10 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c | |||
| @@ -233,3 +233,57 @@ ufs_set_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi, dev_t dev | |||
| 233 | else | 233 | else |
| 234 | ufsi->i_u1.i_data[0] = fs32; | 234 | ufsi->i_u1.i_data[0] = fs32; |
| 235 | } | 235 | } |
| 236 | |||
| 237 | /** | ||
| 238 | * ufs_get_locked_page() - locate, pin and lock a pagecache page, if not exist | ||
| 239 | * read it from disk. | ||
| 240 | * @mapping: the address_space to search | ||
| 241 | * @index: the page index | ||
| 242 | * | ||
| 243 | * Locates the desired pagecache page, if not exist we'll read it, | ||
| 244 | * locks it, increments its reference | ||
| 245 | * count and returns its address. | ||
| 246 | * | ||
| 247 | */ | ||
| 248 | |||
| 249 | struct page *ufs_get_locked_page(struct address_space *mapping, | ||
| 250 | pgoff_t index) | ||
| 251 | { | ||
| 252 | struct page *page; | ||
| 253 | |||
| 254 | try_again: | ||
| 255 | page = find_lock_page(mapping, index); | ||
| 256 | if (!page) { | ||
| 257 | page = read_cache_page(mapping, index, | ||
| 258 | (filler_t*)mapping->a_ops->readpage, | ||
| 259 | NULL); | ||
| 260 | if (IS_ERR(page)) { | ||
| 261 | printk(KERN_ERR "ufs_change_blocknr: " | ||
| 262 | "read_cache_page error: ino %lu, index: %lu\n", | ||
| 263 | mapping->host->i_ino, index); | ||
| 264 | goto out; | ||
| 265 | } | ||
| 266 | |||
| 267 | lock_page(page); | ||
| 268 | |||
| 269 | if (!PageUptodate(page) || PageError(page)) { | ||
| 270 | unlock_page(page); | ||
| 271 | page_cache_release(page); | ||
| 272 | |||
| 273 | printk(KERN_ERR "ufs_change_blocknr: " | ||
| 274 | "can not read page: ino %lu, index: %lu\n", | ||
| 275 | mapping->host->i_ino, index); | ||
| 276 | |||
| 277 | page = ERR_PTR(-EIO); | ||
| 278 | goto out; | ||
| 279 | } | ||
| 280 | } | ||
| 281 | |||
| 282 | if (unlikely(!page->mapping || !page_has_buffers(page))) { | ||
| 283 | unlock_page(page); | ||
| 284 | page_cache_release(page); | ||
| 285 | goto try_again;/*we really need these buffers*/ | ||
| 286 | } | ||
| 287 | out: | ||
| 288 | return page; | ||
| 289 | } | ||
diff --git a/fs/ufs/util.h b/fs/ufs/util.h index 406981fff5e7..28fce6c239b5 100644 --- a/fs/ufs/util.h +++ b/fs/ufs/util.h | |||
| @@ -251,6 +251,14 @@ extern void _ubh_ubhcpymem_(struct ufs_sb_private_info *, unsigned char *, struc | |||
| 251 | #define ubh_memcpyubh(ubh,mem,size) _ubh_memcpyubh_(uspi,ubh,mem,size) | 251 | #define ubh_memcpyubh(ubh,mem,size) _ubh_memcpyubh_(uspi,ubh,mem,size) |
| 252 | extern void _ubh_memcpyubh_(struct ufs_sb_private_info *, struct ufs_buffer_head *, unsigned char *, unsigned); | 252 | extern void _ubh_memcpyubh_(struct ufs_sb_private_info *, struct ufs_buffer_head *, unsigned char *, unsigned); |
| 253 | 253 | ||
| 254 | /* This functions works with cache pages*/ | ||
| 255 | extern struct page *ufs_get_locked_page(struct address_space *mapping, | ||
| 256 | pgoff_t index); | ||
| 257 | static inline void ufs_put_locked_page(struct page *page) | ||
| 258 | { | ||
| 259 | unlock_page(page); | ||
| 260 | page_cache_release(page); | ||
| 261 | } | ||
| 254 | 262 | ||
| 255 | 263 | ||
| 256 | /* | 264 | /* |
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h index 4dd6592d5a4c..ceda3a2859d2 100644 --- a/fs/xfs/linux-2.6/xfs_buf.h +++ b/fs/xfs/linux-2.6/xfs_buf.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __XFS_BUF_H__ | 18 | #ifndef __XFS_BUF_H__ |
| 19 | #define __XFS_BUF_H__ | 19 | #define __XFS_BUF_H__ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/list.h> | 21 | #include <linux/list.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index 601f01c92f7f..270db0f3861d 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * along with this program; if not, write the Free Software Foundation, | 15 | * along with this program; if not, write the Free Software Foundation, |
| 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/compat.h> | 18 | #include <linux/compat.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/ioctl.h> | 20 | #include <linux/ioctl.h> |
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index 028eb17ec2ed..8c021dc57d1f 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #define __XFS_LINUX__ | 19 | #define __XFS_LINUX__ |
| 20 | 20 | ||
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <linux/config.h> | ||
| 23 | 22 | ||
| 24 | /* | 23 | /* |
| 25 | * Some types are conditional depending on the target system. | 24 | * Some types are conditional depending on the target system. |
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h index 4bb38068f40d..f1ac6109556e 100644 --- a/include/acpi/acmacros.h +++ b/include/acpi/acmacros.h | |||
| @@ -726,7 +726,7 @@ | |||
| 726 | 726 | ||
| 727 | #define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__) | 727 | #define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__) |
| 728 | #define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__) | 728 | #define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__) |
| 729 | #define ACPI_FREE(a) acpi_os_free(a) | 729 | #define ACPI_FREE(a) kfree(a) |
| 730 | #define ACPI_MEM_TRACKING(a) | 730 | #define ACPI_MEM_TRACKING(a) |
| 731 | 731 | ||
| 732 | #else | 732 | #else |
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 89bc4a16c2e8..0cd63bce0ae4 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
| @@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle); | |||
| 143 | */ | 143 | */ |
| 144 | void *acpi_os_allocate(acpi_size size); | 144 | void *acpi_os_allocate(acpi_size size); |
| 145 | 145 | ||
| 146 | void acpi_os_free(void *memory); | ||
| 147 | |||
| 148 | acpi_status | 146 | acpi_status |
| 149 | acpi_os_map_memory(acpi_physical_address physical_address, | 147 | acpi_os_map_memory(acpi_physical_address physical_address, |
| 150 | acpi_size size, void __iomem ** logical_address); | 148 | acpi_size size, void __iomem ** logical_address); |
diff --git a/include/asm-alpha/socket.h b/include/asm-alpha/socket.h index b5193229132a..d22ab97ea72e 100644 --- a/include/asm-alpha/socket.h +++ b/include/asm-alpha/socket.h | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #define SCM_TIMESTAMP SO_TIMESTAMP | 51 | #define SCM_TIMESTAMP SO_TIMESTAMP |
| 52 | 52 | ||
| 53 | #define SO_PEERSEC 30 | 53 | #define SO_PEERSEC 30 |
| 54 | #define SO_PASSSEC 34 | ||
| 54 | 55 | ||
| 55 | /* Security levels - as per NRL IPv6 - don't actually do anything */ | 56 | /* Security levels - as per NRL IPv6 - don't actually do anything */ |
| 56 | #define SO_SECURITY_AUTHENTICATION 19 | 57 | #define SO_SECURITY_AUTHENTICATION 19 |
diff --git a/include/asm-arm/arch-at91rm9200/board.h b/include/asm-arm/arch-at91rm9200/board.h index 1fdd70b23809..c1ca9a4658ec 100644 --- a/include/asm-arm/arch-at91rm9200/board.h +++ b/include/asm-arm/arch-at91rm9200/board.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | /* | 21 | /* |
| 22 | * These are data structures found in platform_device.dev.platform_data, | 22 | * These are data structures found in platform_device.dev.platform_data, |
| 23 | * and describing board-specfic data needed by drivers. For example, | 23 | * and describing board-specific data needed by drivers. For example, |
| 24 | * which pin is used for a given GPIO role. | 24 | * which pin is used for a given GPIO role. |
| 25 | * | 25 | * |
| 26 | * In 2.6, drivers should strongly avoid board-specific knowledge so | 26 | * In 2.6, drivers should strongly avoid board-specific knowledge so |
diff --git a/include/asm-arm/arch-ixp4xx/io.h b/include/asm-arm/arch-ixp4xx/io.h index b59520e56fc7..0d517267fb63 100644 --- a/include/asm-arm/arch-ixp4xx/io.h +++ b/include/asm-arm/arch-ixp4xx/io.h | |||
| @@ -38,7 +38,7 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data); | |||
| 38 | * 2) If > 64MB of memory space is required, the IXP4xx can be configured | 38 | * 2) If > 64MB of memory space is required, the IXP4xx can be configured |
| 39 | * to use indirect registers to access PCI (as we do below for I/O | 39 | * to use indirect registers to access PCI (as we do below for I/O |
| 40 | * transactions). This allows for up to 128MB (0x48000000 to 0x4fffffff) | 40 | * transactions). This allows for up to 128MB (0x48000000 to 0x4fffffff) |
| 41 | * of memory on the bus. The disadvantadge of this is that every | 41 | * of memory on the bus. The disadvantage of this is that every |
| 42 | * PCI access requires three local register accesses plus a spinlock, | 42 | * PCI access requires three local register accesses plus a spinlock, |
| 43 | * but in some cases the performance hit is acceptable. In addition, | 43 | * but in some cases the performance hit is acceptable. In addition, |
| 44 | * you cannot mmap() PCI devices in this case. | 44 | * you cannot mmap() PCI devices in this case. |
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h index 7fb02138f585..0e36fd5d87df 100644 --- a/include/asm-arm/bug.h +++ b/include/asm-arm/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-arm/socket.h b/include/asm-arm/socket.h index 3c51da6438c9..19f7df702b06 100644 --- a/include/asm-arm/socket.h +++ b/include/asm-arm/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h index c46b5c84275f..8a7554f03984 100644 --- a/include/asm-arm/thread_info.h +++ b/include/asm-arm/thread_info.h | |||
| @@ -116,7 +116,7 @@ extern void iwmmxt_task_release(struct thread_info *); | |||
| 116 | 116 | ||
| 117 | /* | 117 | /* |
| 118 | * We use bit 30 of the preempt_count to indicate that kernel | 118 | * We use bit 30 of the preempt_count to indicate that kernel |
| 119 | * preemption is occuring. See include/asm-arm/hardirq.h. | 119 | * preemption is occurring. See include/asm-arm/hardirq.h. |
| 120 | */ | 120 | */ |
| 121 | #define PREEMPT_ACTIVE 0x40000000 | 121 | #define PREEMPT_ACTIVE 0x40000000 |
| 122 | 122 | ||
diff --git a/include/asm-arm26/socket.h b/include/asm-arm26/socket.h index 3c51da6438c9..19f7df702b06 100644 --- a/include/asm-arm26/socket.h +++ b/include/asm-arm26/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-cris/arch-v32/arbiter.h b/include/asm-cris/arch-v32/arbiter.h index dba3c285cacd..081a911d7af1 100644 --- a/include/asm-cris/arch-v32/arbiter.h +++ b/include/asm-cris/arch-v32/arbiter.h | |||
| @@ -20,8 +20,8 @@ enum | |||
| 20 | arbiter_all_accesses = 0xff | 20 | arbiter_all_accesses = 0xff |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | int crisv32_arbiter_allocate_bandwith(int client, int region, | 23 | int crisv32_arbiter_allocate_bandwidth(int client, int region, |
| 24 | unsigned long bandwidth); | 24 | unsigned long bandwidth); |
| 25 | int crisv32_arbiter_watch(unsigned long start, unsigned long size, | 25 | int crisv32_arbiter_watch(unsigned long start, unsigned long size, |
| 26 | unsigned long clients, unsigned long accesses, | 26 | unsigned long clients, unsigned long accesses, |
| 27 | watch_callback* cb); | 27 | watch_callback* cb); |
diff --git a/include/asm-cris/socket.h b/include/asm-cris/socket.h index 8b1da3e58c55..01cfdf1d6d33 100644 --- a/include/asm-cris/socket.h +++ b/include/asm-cris/socket.h | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #define SO_ACCEPTCONN 30 | 50 | #define SO_ACCEPTCONN 30 |
| 51 | 51 | ||
| 52 | #define SO_PEERSEC 31 | 52 | #define SO_PEERSEC 31 |
| 53 | #define SO_PASSSEC 34 | ||
| 53 | 54 | ||
| 54 | #endif /* _ASM_SOCKET_H */ | 55 | #endif /* _ASM_SOCKET_H */ |
| 55 | 56 | ||
diff --git a/include/asm-frv/socket.h b/include/asm-frv/socket.h index 7177f8b9817c..31db18fc871f 100644 --- a/include/asm-frv/socket.h +++ b/include/asm-frv/socket.h | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
| 53 | 54 | ||
diff --git a/include/asm-generic/audit_change_attr.h b/include/asm-generic/audit_change_attr.h new file mode 100644 index 000000000000..cb05bf69745a --- /dev/null +++ b/include/asm-generic/audit_change_attr.h | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | __NR_chmod, | ||
| 2 | __NR_fchmod, | ||
| 3 | __NR_chown, | ||
| 4 | __NR_fchown, | ||
| 5 | __NR_lchown, | ||
| 6 | __NR_setxattr, | ||
| 7 | __NR_lsetxattr, | ||
| 8 | __NR_fsetxattr, | ||
| 9 | __NR_removexattr, | ||
| 10 | __NR_lremovexattr, | ||
| 11 | __NR_fremovexattr, | ||
| 12 | __NR_fchownat, | ||
| 13 | __NR_fchmodat, | ||
| 14 | #ifdef __NR_chown32 | ||
| 15 | __NR_chown32, | ||
| 16 | __NR_fchown32, | ||
| 17 | __NR_lchown32, | ||
| 18 | #endif | ||
diff --git a/include/asm-generic/audit_dir_write.h b/include/asm-generic/audit_dir_write.h new file mode 100644 index 000000000000..161a7a58fbab --- /dev/null +++ b/include/asm-generic/audit_dir_write.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | __NR_rename, | ||
| 2 | __NR_mkdir, | ||
| 3 | __NR_rmdir, | ||
| 4 | __NR_creat, | ||
| 5 | __NR_link, | ||
| 6 | __NR_unlink, | ||
| 7 | __NR_symlink, | ||
| 8 | __NR_mknod, | ||
| 9 | __NR_mkdirat, | ||
| 10 | __NR_mknodat, | ||
| 11 | __NR_unlinkat, | ||
| 12 | __NR_renameat, | ||
| 13 | __NR_linkat, | ||
| 14 | __NR_symlinkat, | ||
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 0b49f9e070f1..962cad7cfbbd 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h | |||
| @@ -14,5 +14,6 @@ extern char _end[]; | |||
| 14 | extern char __per_cpu_start[], __per_cpu_end[]; | 14 | extern char __per_cpu_start[], __per_cpu_end[]; |
| 15 | extern char __kprobes_text_start[], __kprobes_text_end[]; | 15 | extern char __kprobes_text_start[], __kprobes_text_end[]; |
| 16 | extern char __initdata_begin[], __initdata_end[]; | 16 | extern char __initdata_begin[], __initdata_end[]; |
| 17 | extern char __start_rodata[], __end_rodata[]; | ||
| 17 | 18 | ||
| 18 | #endif /* _ASM_GENERIC_SECTIONS_H_ */ | 19 | #endif /* _ASM_GENERIC_SECTIONS_H_ */ |
diff --git a/include/asm-h8300/socket.h b/include/asm-h8300/socket.h index d98cf85bafc1..ebc830fee0d0 100644 --- a/include/asm-h8300/socket.h +++ b/include/asm-h8300/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h index c61bd1a17f37..96adbabec740 100644 --- a/include/asm-i386/alternative.h +++ b/include/asm-i386/alternative.h | |||
| @@ -19,11 +19,19 @@ struct alt_instr { | |||
| 19 | extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); | 19 | extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); |
| 20 | 20 | ||
| 21 | struct module; | 21 | struct module; |
| 22 | #ifdef CONFIG_SMP | ||
| 22 | extern void alternatives_smp_module_add(struct module *mod, char *name, | 23 | extern void alternatives_smp_module_add(struct module *mod, char *name, |
| 23 | void *locks, void *locks_end, | 24 | void *locks, void *locks_end, |
| 24 | void *text, void *text_end); | 25 | void *text, void *text_end); |
| 25 | extern void alternatives_smp_module_del(struct module *mod); | 26 | extern void alternatives_smp_module_del(struct module *mod); |
| 26 | extern void alternatives_smp_switch(int smp); | 27 | extern void alternatives_smp_switch(int smp); |
| 28 | #else | ||
| 29 | static inline void alternatives_smp_module_add(struct module *mod, char *name, | ||
| 30 | void *locks, void *locks_end, | ||
| 31 | void *text, void *text_end) {} | ||
| 32 | static inline void alternatives_smp_module_del(struct module *mod) {} | ||
| 33 | static inline void alternatives_smp_switch(int smp) {} | ||
| 34 | #endif | ||
| 27 | 35 | ||
| 28 | #endif | 36 | #endif |
| 29 | 37 | ||
diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h index 802ae76195b7..5755d57c4e95 100644 --- a/include/asm-i386/socket.h +++ b/include/asm-i386/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-ia64/sn/tioca_provider.h b/include/asm-ia64/sn/tioca_provider.h index ab7fe2463468..65cdd73c2a57 100644 --- a/include/asm-ia64/sn/tioca_provider.h +++ b/include/asm-ia64/sn/tioca_provider.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #define PV908234 (1 << 1) | 27 | #define PV908234 (1 << 1) |
| 28 | /* CA:AGPDMA write request data mismatch with ABC1CL merge */ | 28 | /* CA:AGPDMA write request data mismatch with ABC1CL merge */ |
| 29 | #define PV895469 (1 << 1) | 29 | #define PV895469 (1 << 1) |
| 30 | /* TIO:CA TLB invalidate of written GART entries possibly not occuring in CA*/ | 30 | /* TIO:CA TLB invalidate of written GART entries possibly not occurring in CA*/ |
| 31 | #define PV910244 (1 << 1) | 31 | #define PV910244 (1 << 1) |
| 32 | 32 | ||
| 33 | struct tioca_dmamap{ | 33 | struct tioca_dmamap{ |
diff --git a/include/asm-ia64/socket.h b/include/asm-ia64/socket.h index a255006fb7b5..d638ef3d50c3 100644 --- a/include/asm-ia64/socket.h +++ b/include/asm-ia64/socket.h | |||
| @@ -57,5 +57,6 @@ | |||
| 57 | #define SO_ACCEPTCONN 30 | 57 | #define SO_ACCEPTCONN 30 |
| 58 | 58 | ||
| 59 | #define SO_PEERSEC 31 | 59 | #define SO_PEERSEC 31 |
| 60 | #define SO_PASSSEC 34 | ||
| 60 | 61 | ||
| 61 | #endif /* _ASM_IA64_SOCKET_H */ | 62 | #endif /* _ASM_IA64_SOCKET_H */ |
diff --git a/include/asm-m32r/socket.h b/include/asm-m32r/socket.h index 8b6680f223c0..acdf748fcdc8 100644 --- a/include/asm-m32r/socket.h +++ b/include/asm-m32r/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_M32R_SOCKET_H */ | 53 | #endif /* _ASM_M32R_SOCKET_H */ |
diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h index f578ca4b776a..a5966ec005ae 100644 --- a/include/asm-m68k/socket.h +++ b/include/asm-m68k/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h index 0bb31e5aaca6..36ebe4e186a7 100644 --- a/include/asm-mips/socket.h +++ b/include/asm-mips/socket.h | |||
| @@ -69,6 +69,7 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */ | |||
| 69 | #define SO_PEERSEC 30 | 69 | #define SO_PEERSEC 30 |
| 70 | #define SO_SNDBUFFORCE 31 | 70 | #define SO_SNDBUFFORCE 31 |
| 71 | #define SO_RCVBUFFORCE 33 | 71 | #define SO_RCVBUFFORCE 33 |
| 72 | #define SO_PASSSEC 34 | ||
| 72 | 73 | ||
| 73 | #ifdef __KERNEL__ | 74 | #ifdef __KERNEL__ |
| 74 | 75 | ||
diff --git a/include/asm-parisc/socket.h b/include/asm-parisc/socket.h index 1bf54dc53c10..ce2eae1708b5 100644 --- a/include/asm-parisc/socket.h +++ b/include/asm-parisc/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 0x401c | 48 | #define SO_ACCEPTCONN 0x401c |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 0x401d | 50 | #define SO_PEERSEC 0x401d |
| 51 | #define SO_PASSSEC 0x401e | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-powerpc/of_device.h b/include/asm-powerpc/of_device.h index 6249a7c39639..c5c0b0b3cd52 100644 --- a/include/asm-powerpc/of_device.h +++ b/include/asm-powerpc/of_device.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | /* | 9 | /* |
| 10 | * The of_platform_bus_type is a bus type used by drivers that do not | 10 | * The of_platform_bus_type is a bus type used by drivers that do not |
| 11 | * attach to a macio or similar bus but still use OF probing | 11 | * attach to a macio or similar bus but still use OF probing |
| 12 | * mecanism | 12 | * mechanism |
| 13 | */ | 13 | */ |
| 14 | extern struct bus_type of_platform_bus_type; | 14 | extern struct bus_type of_platform_bus_type; |
| 15 | 15 | ||
diff --git a/include/asm-powerpc/pmac_pfunc.h b/include/asm-powerpc/pmac_pfunc.h index cef61304ffc2..1330d6a58c57 100644 --- a/include/asm-powerpc/pmac_pfunc.h +++ b/include/asm-powerpc/pmac_pfunc.h | |||
| @@ -205,7 +205,7 @@ extern void pmf_do_irq(struct pmf_function *func); | |||
| 205 | * | 205 | * |
| 206 | * The args array contains as many arguments as is required by the function, | 206 | * The args array contains as many arguments as is required by the function, |
| 207 | * this is dependent on the function you are calling, unfortunately Apple | 207 | * this is dependent on the function you are calling, unfortunately Apple |
| 208 | * mecanism provides no way to encode that so you have to get it right at | 208 | * mechanism provides no way to encode that so you have to get it right at |
| 209 | * the call site. Some functions require no args, in which case, you can | 209 | * the call site. Some functions require no args, in which case, you can |
| 210 | * pass NULL. | 210 | * pass NULL. |
| 211 | * | 211 | * |
diff --git a/include/asm-powerpc/socket.h b/include/asm-powerpc/socket.h index e4b8177d4acc..c8b1da50e72d 100644 --- a/include/asm-powerpc/socket.h +++ b/include/asm-powerpc/socket.h | |||
| @@ -55,5 +55,6 @@ | |||
| 55 | #define SO_ACCEPTCONN 30 | 55 | #define SO_ACCEPTCONN 30 |
| 56 | 56 | ||
| 57 | #define SO_PEERSEC 31 | 57 | #define SO_PEERSEC 31 |
| 58 | #define SO_PASSSEC 34 | ||
| 58 | 59 | ||
| 59 | #endif /* _ASM_POWERPC_SOCKET_H */ | 60 | #endif /* _ASM_POWERPC_SOCKET_H */ |
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index 0b19af82507f..fe95c8258cf9 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h | |||
| @@ -170,7 +170,7 @@ extern __inline__ int get_order(unsigned long size) | |||
| 170 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 170 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
| 171 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 171 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 172 | 172 | ||
| 173 | /* We do define AT_SYSINFO_EHDR but don't use the gate mecanism */ | 173 | /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */ |
| 174 | #define __HAVE_ARCH_GATE_AREA 1 | 174 | #define __HAVE_ARCH_GATE_AREA 1 |
| 175 | 175 | ||
| 176 | #include <asm-generic/memory_model.h> | 176 | #include <asm-generic/memory_model.h> |
diff --git a/include/asm-s390/pgtable.h b/include/asm-s390/pgtable.h index 859b5e969826..24312387fa24 100644 --- a/include/asm-s390/pgtable.h +++ b/include/asm-s390/pgtable.h | |||
| @@ -657,13 +657,6 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot) | |||
| 657 | __pte; \ | 657 | __pte; \ |
| 658 | }) | 658 | }) |
| 659 | 659 | ||
| 660 | #define SetPageUptodate(_page) \ | ||
| 661 | do { \ | ||
| 662 | struct page *__page = (_page); \ | ||
| 663 | if (!test_and_set_bit(PG_uptodate, &__page->flags)) \ | ||
| 664 | page_test_and_clear_dirty(_page); \ | ||
| 665 | } while (0) | ||
| 666 | |||
| 667 | #ifdef __s390x__ | 660 | #ifdef __s390x__ |
| 668 | 661 | ||
| 669 | #define pfn_pmd(pfn, pgprot) \ | 662 | #define pfn_pmd(pfn, pgprot) \ |
diff --git a/include/asm-s390/socket.h b/include/asm-s390/socket.h index 15a5298c8744..1778a49a74c5 100644 --- a/include/asm-s390/socket.h +++ b/include/asm-s390/socket.h | |||
| @@ -56,5 +56,6 @@ | |||
| 56 | #define SO_ACCEPTCONN 30 | 56 | #define SO_ACCEPTCONN 30 |
| 57 | 57 | ||
| 58 | #define SO_PEERSEC 31 | 58 | #define SO_PEERSEC 31 |
| 59 | #define SO_PASSSEC 34 | ||
| 59 | 60 | ||
| 60 | #endif /* _ASM_SOCKET_H */ | 61 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-sh/socket.h b/include/asm-sh/socket.h index 553904ff9336..ca70362eb563 100644 --- a/include/asm-sh/socket.h +++ b/include/asm-sh/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* __ASM_SH_SOCKET_H */ | 53 | #endif /* __ASM_SH_SOCKET_H */ |
diff --git a/include/asm-sparc/of_device.h b/include/asm-sparc/of_device.h index 4816d102f918..80ea31f6e17f 100644 --- a/include/asm-sparc/of_device.h +++ b/include/asm-sparc/of_device.h | |||
| @@ -4,10 +4,12 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/device.h> | 5 | #include <linux/device.h> |
| 6 | #include <linux/mod_devicetable.h> | 6 | #include <linux/mod_devicetable.h> |
| 7 | #include <asm/openprom.h> | ||
| 7 | #include <asm/prom.h> | 8 | #include <asm/prom.h> |
| 8 | 9 | ||
| 9 | extern struct bus_type ebus_bus_type; | 10 | extern struct bus_type ebus_bus_type; |
| 10 | extern struct bus_type sbus_bus_type; | 11 | extern struct bus_type sbus_bus_type; |
| 12 | extern struct bus_type of_bus_type; | ||
| 11 | 13 | ||
| 12 | /* | 14 | /* |
| 13 | * The of_device is a kind of "base class" that is a superset of | 15 | * The of_device is a kind of "base class" that is a superset of |
| @@ -16,11 +18,25 @@ extern struct bus_type sbus_bus_type; | |||
| 16 | */ | 18 | */ |
| 17 | struct of_device | 19 | struct of_device |
| 18 | { | 20 | { |
| 19 | struct device_node *node; /* OF device node */ | 21 | struct device_node *node; |
| 20 | struct device dev; /* Generic device interface */ | 22 | struct device dev; |
| 23 | struct resource resource[PROMREG_MAX]; | ||
| 24 | unsigned int irqs[PROMINTR_MAX]; | ||
| 25 | int num_irqs; | ||
| 26 | |||
| 27 | void *sysdata; | ||
| 28 | |||
| 29 | int slot; | ||
| 30 | int portid; | ||
| 31 | int clock_freq; | ||
| 21 | }; | 32 | }; |
| 22 | #define to_of_device(d) container_of(d, struct of_device, dev) | 33 | #define to_of_device(d) container_of(d, struct of_device, dev) |
| 23 | 34 | ||
| 35 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); | ||
| 36 | extern void of_iounmap(void __iomem *base, unsigned long size); | ||
| 37 | |||
| 38 | extern struct of_device *of_find_device_by_node(struct device_node *); | ||
| 39 | |||
| 24 | extern const struct of_device_id *of_match_device( | 40 | extern const struct of_device_id *of_match_device( |
| 25 | const struct of_device_id *matches, const struct of_device *dev); | 41 | const struct of_device_id *matches, const struct of_device *dev); |
| 26 | 42 | ||
diff --git a/include/asm-sparc/prom.h b/include/asm-sparc/prom.h index f9cf44c07164..86c13dccea3d 100644 --- a/include/asm-sparc/prom.h +++ b/include/asm-sparc/prom.h | |||
| @@ -25,11 +25,6 @@ | |||
| 25 | typedef u32 phandle; | 25 | typedef u32 phandle; |
| 26 | typedef u32 ihandle; | 26 | typedef u32 ihandle; |
| 27 | 27 | ||
| 28 | struct interrupt_info { | ||
| 29 | int line; | ||
| 30 | int sense; /* +ve/-ve logic, edge or level, etc. */ | ||
| 31 | }; | ||
| 32 | |||
| 33 | struct property { | 28 | struct property { |
| 34 | char *name; | 29 | char *name; |
| 35 | int length; | 30 | int length; |
| @@ -43,9 +38,6 @@ struct device_node { | |||
| 43 | char *name; | 38 | char *name; |
| 44 | char *type; | 39 | char *type; |
| 45 | phandle node; | 40 | phandle node; |
| 46 | phandle linux_phandle; | ||
| 47 | int n_intrs; | ||
| 48 | struct interrupt_info *intrs; | ||
| 49 | char *path_component_name; | 41 | char *path_component_name; |
| 50 | char *full_name; | 42 | char *full_name; |
| 51 | 43 | ||
| @@ -69,6 +61,8 @@ struct device_node { | |||
| 69 | #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) | 61 | #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) |
| 70 | #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) | 62 | #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) |
| 71 | 63 | ||
| 64 | #define OF_BAD_ADDR ((u64)-1) | ||
| 65 | |||
| 72 | static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de) | 66 | static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de) |
| 73 | { | 67 | { |
| 74 | dn->pde = de; | 68 | dn->pde = de; |
| @@ -101,6 +95,8 @@ extern int of_set_property(struct device_node *node, const char *name, void *val | |||
| 101 | extern int of_getintprop_default(struct device_node *np, | 95 | extern int of_getintprop_default(struct device_node *np, |
| 102 | const char *name, | 96 | const char *name, |
| 103 | int def); | 97 | int def); |
| 98 | extern int of_n_addr_cells(struct device_node *np); | ||
| 99 | extern int of_n_size_cells(struct device_node *np); | ||
| 104 | 100 | ||
| 105 | extern void prom_build_devicetree(void); | 101 | extern void prom_build_devicetree(void); |
| 106 | 102 | ||
diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h index 4e0ce3a35ea9..f6c4e5baf3f7 100644 --- a/include/asm-sparc/socket.h +++ b/include/asm-sparc/socket.h | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #define SCM_TIMESTAMP SO_TIMESTAMP | 48 | #define SCM_TIMESTAMP SO_TIMESTAMP |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 0x001e | 50 | #define SO_PEERSEC 0x001e |
| 51 | #define SO_PASSSEC 0x001f | ||
| 51 | 52 | ||
| 52 | /* Security levels - as per NRL IPv6 - don't actually do anything */ | 53 | /* Security levels - as per NRL IPv6 - don't actually do anything */ |
| 53 | #define SO_SECURITY_AUTHENTICATION 0x5001 | 54 | #define SO_SECURITY_AUTHENTICATION 0x5001 |
diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h index 024088ef9d27..a62c7b997d66 100644 --- a/include/asm-sparc64/of_device.h +++ b/include/asm-sparc64/of_device.h | |||
| @@ -4,11 +4,13 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/device.h> | 5 | #include <linux/device.h> |
| 6 | #include <linux/mod_devicetable.h> | 6 | #include <linux/mod_devicetable.h> |
| 7 | #include <asm/openprom.h> | ||
| 7 | #include <asm/prom.h> | 8 | #include <asm/prom.h> |
| 8 | 9 | ||
| 9 | extern struct bus_type isa_bus_type; | 10 | extern struct bus_type isa_bus_type; |
| 10 | extern struct bus_type ebus_bus_type; | 11 | extern struct bus_type ebus_bus_type; |
| 11 | extern struct bus_type sbus_bus_type; | 12 | extern struct bus_type sbus_bus_type; |
| 13 | extern struct bus_type of_bus_type; | ||
| 12 | 14 | ||
| 13 | /* | 15 | /* |
| 14 | * The of_device is a kind of "base class" that is a superset of | 16 | * The of_device is a kind of "base class" that is a superset of |
| @@ -17,11 +19,25 @@ extern struct bus_type sbus_bus_type; | |||
| 17 | */ | 19 | */ |
| 18 | struct of_device | 20 | struct of_device |
| 19 | { | 21 | { |
| 20 | struct device_node *node; /* OF device node */ | 22 | struct device_node *node; |
| 21 | struct device dev; /* Generic device interface */ | 23 | struct device dev; |
| 24 | struct resource resource[PROMREG_MAX]; | ||
| 25 | unsigned int irqs[PROMINTR_MAX]; | ||
| 26 | int num_irqs; | ||
| 27 | |||
| 28 | void *sysdata; | ||
| 29 | |||
| 30 | int slot; | ||
| 31 | int portid; | ||
| 32 | int clock_freq; | ||
| 22 | }; | 33 | }; |
| 23 | #define to_of_device(d) container_of(d, struct of_device, dev) | 34 | #define to_of_device(d) container_of(d, struct of_device, dev) |
| 24 | 35 | ||
| 36 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); | ||
| 37 | extern void of_iounmap(void __iomem *base, unsigned long size); | ||
| 38 | |||
| 39 | extern struct of_device *of_find_device_by_node(struct device_node *); | ||
| 40 | |||
| 25 | extern const struct of_device_id *of_match_device( | 41 | extern const struct of_device_id *of_match_device( |
| 26 | const struct of_device_id *matches, const struct of_device *dev); | 42 | const struct of_device_id *matches, const struct of_device *dev); |
| 27 | 43 | ||
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h index cebe80b1da6c..dcfa7629358c 100644 --- a/include/asm-sparc64/pbm.h +++ b/include/asm-sparc64/pbm.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <asm/page.h> | 16 | #include <asm/page.h> |
| 17 | #include <asm/oplib.h> | 17 | #include <asm/oplib.h> |
| 18 | #include <asm/prom.h> | 18 | #include <asm/prom.h> |
| 19 | #include <asm/of_device.h> | ||
| 19 | #include <asm/iommu.h> | 20 | #include <asm/iommu.h> |
| 20 | 21 | ||
| 21 | /* The abstraction used here is that there are PCI controllers, | 22 | /* The abstraction used here is that there are PCI controllers, |
| @@ -209,7 +210,6 @@ struct pci_controller_info { | |||
| 209 | 210 | ||
| 210 | /* Operations which are controller specific. */ | 211 | /* Operations which are controller specific. */ |
| 211 | void (*scan_bus)(struct pci_controller_info *); | 212 | void (*scan_bus)(struct pci_controller_info *); |
| 212 | unsigned int (*irq_build)(struct pci_pbm_info *, struct pci_dev *, unsigned int); | ||
| 213 | void (*base_address_update)(struct pci_dev *, int); | 213 | void (*base_address_update)(struct pci_dev *, int); |
| 214 | void (*resource_adjust)(struct pci_dev *, struct resource *, struct resource *); | 214 | void (*resource_adjust)(struct pci_dev *, struct resource *, struct resource *); |
| 215 | 215 | ||
| @@ -217,8 +217,6 @@ struct pci_controller_info { | |||
| 217 | struct pci_ops *pci_ops; | 217 | struct pci_ops *pci_ops; |
| 218 | unsigned int pci_first_busno; | 218 | unsigned int pci_first_busno; |
| 219 | unsigned int pci_last_busno; | 219 | unsigned int pci_last_busno; |
| 220 | |||
| 221 | void *starfire_cookie; | ||
| 222 | }; | 220 | }; |
| 223 | 221 | ||
| 224 | /* PCI devices which are not bridges have this placed in their pci_dev | 222 | /* PCI devices which are not bridges have this placed in their pci_dev |
| @@ -228,6 +226,7 @@ struct pci_controller_info { | |||
| 228 | struct pcidev_cookie { | 226 | struct pcidev_cookie { |
| 229 | struct pci_pbm_info *pbm; | 227 | struct pci_pbm_info *pbm; |
| 230 | struct device_node *prom_node; | 228 | struct device_node *prom_node; |
| 229 | struct of_device *op; | ||
| 231 | struct linux_prom_pci_registers prom_regs[PROMREG_MAX]; | 230 | struct linux_prom_pci_registers prom_regs[PROMREG_MAX]; |
| 232 | int num_prom_regs; | 231 | int num_prom_regs; |
| 233 | struct linux_prom_pci_registers prom_assignments[PROMREG_MAX]; | 232 | struct linux_prom_pci_registers prom_assignments[PROMREG_MAX]; |
diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h index 265614d497c4..99671ed6625d 100644 --- a/include/asm-sparc64/prom.h +++ b/include/asm-sparc64/prom.h | |||
| @@ -25,11 +25,6 @@ | |||
| 25 | typedef u32 phandle; | 25 | typedef u32 phandle; |
| 26 | typedef u32 ihandle; | 26 | typedef u32 ihandle; |
| 27 | 27 | ||
| 28 | struct interrupt_info { | ||
| 29 | int line; | ||
| 30 | int sense; /* +ve/-ve logic, edge or level, etc. */ | ||
| 31 | }; | ||
| 32 | |||
| 33 | struct property { | 28 | struct property { |
| 34 | char *name; | 29 | char *name; |
| 35 | int length; | 30 | int length; |
| @@ -39,13 +34,11 @@ struct property { | |||
| 39 | unsigned int unique_id; | 34 | unsigned int unique_id; |
| 40 | }; | 35 | }; |
| 41 | 36 | ||
| 37 | struct of_irq_controller; | ||
| 42 | struct device_node { | 38 | struct device_node { |
| 43 | char *name; | 39 | char *name; |
| 44 | char *type; | 40 | char *type; |
| 45 | phandle node; | 41 | phandle node; |
| 46 | phandle linux_phandle; | ||
| 47 | int n_intrs; | ||
| 48 | struct interrupt_info *intrs; | ||
| 49 | char *path_component_name; | 42 | char *path_component_name; |
| 50 | char *full_name; | 43 | char *full_name; |
| 51 | 44 | ||
| @@ -61,6 +54,13 @@ struct device_node { | |||
| 61 | unsigned long _flags; | 54 | unsigned long _flags; |
| 62 | void *data; | 55 | void *data; |
| 63 | unsigned int unique_id; | 56 | unsigned int unique_id; |
| 57 | |||
| 58 | struct of_irq_controller *irq_trans; | ||
| 59 | }; | ||
| 60 | |||
| 61 | struct of_irq_controller { | ||
| 62 | unsigned int (*irq_build)(struct device_node *, unsigned int, void *); | ||
| 63 | void *data; | ||
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | /* flag descriptions */ | 66 | /* flag descriptions */ |
| @@ -69,6 +69,8 @@ struct device_node { | |||
| 69 | #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) | 69 | #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) |
| 70 | #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) | 70 | #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) |
| 71 | 71 | ||
| 72 | #define OF_BAD_ADDR ((u64)-1) | ||
| 73 | |||
| 72 | static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de) | 74 | static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de) |
| 73 | { | 75 | { |
| 74 | dn->pde = de; | 76 | dn->pde = de; |
| @@ -101,6 +103,8 @@ extern int of_set_property(struct device_node *node, const char *name, void *val | |||
| 101 | extern int of_getintprop_default(struct device_node *np, | 103 | extern int of_getintprop_default(struct device_node *np, |
| 102 | const char *name, | 104 | const char *name, |
| 103 | int def); | 105 | int def); |
| 106 | extern int of_n_addr_cells(struct device_node *np); | ||
| 107 | extern int of_n_size_cells(struct device_node *np); | ||
| 104 | 108 | ||
| 105 | extern void prom_build_devicetree(void); | 109 | extern void prom_build_devicetree(void); |
| 106 | 110 | ||
diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h index 56ee985e4605..7efd49d31bb8 100644 --- a/include/asm-sparc64/sbus.h +++ b/include/asm-sparc64/sbus.h | |||
| @@ -80,7 +80,6 @@ struct sbus_bus { | |||
| 80 | int num_sbus_ranges; | 80 | int num_sbus_ranges; |
| 81 | 81 | ||
| 82 | int portid; | 82 | int portid; |
| 83 | void *starfire_cookie; | ||
| 84 | }; | 83 | }; |
| 85 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) | 84 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) |
| 86 | 85 | ||
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h index 59987dad3359..754d46a50af3 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #define SCM_TIMESTAMP SO_TIMESTAMP | 48 | #define SCM_TIMESTAMP SO_TIMESTAMP |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 0x001e | 50 | #define SO_PEERSEC 0x001e |
| 51 | #define SO_PASSSEC 0x001f | ||
| 51 | 52 | ||
| 52 | /* Security levels - as per NRL IPv6 - don't actually do anything */ | 53 | /* Security levels - as per NRL IPv6 - don't actually do anything */ |
| 53 | #define SO_SECURITY_AUTHENTICATION 0x5001 | 54 | #define SO_SECURITY_AUTHENTICATION 0x5001 |
diff --git a/include/asm-sparc64/starfire.h b/include/asm-sparc64/starfire.h index b606cb2b32a8..48b50b5e35b0 100644 --- a/include/asm-sparc64/starfire.h +++ b/include/asm-sparc64/starfire.h | |||
| @@ -14,7 +14,7 @@ extern int this_is_starfire; | |||
| 14 | extern void check_if_starfire(void); | 14 | extern void check_if_starfire(void); |
| 15 | extern void starfire_cpu_setup(void); | 15 | extern void starfire_cpu_setup(void); |
| 16 | extern int starfire_hard_smp_processor_id(void); | 16 | extern int starfire_hard_smp_processor_id(void); |
| 17 | extern void *starfire_hookup(int); | 17 | extern void starfire_hookup(int); |
| 18 | extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid); | 18 | extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid); |
| 19 | 19 | ||
| 20 | #endif | 20 | #endif |
diff --git a/include/asm-sparc64/vdev.h b/include/asm-sparc64/vdev.h deleted file mode 100644 index 25637c57675d..000000000000 --- a/include/asm-sparc64/vdev.h +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | /* vdev.h: SUN4V virtual device interfaces and defines. | ||
| 2 | * | ||
| 3 | * Copyright (C) 2006 David S. Miller <davem@davemloft.net> | ||
| 4 | */ | ||
| 5 | |||
| 6 | #ifndef _SPARC64_VDEV_H | ||
| 7 | #define _SPARC64_VDEV_H | ||
| 8 | |||
| 9 | #include <linux/types.h> | ||
| 10 | #include <asm/prom.h> | ||
| 11 | |||
| 12 | extern u32 sun4v_vdev_devhandle; | ||
| 13 | extern struct device_node *sun4v_vdev_root; | ||
| 14 | |||
| 15 | extern unsigned int sun4v_vdev_device_interrupt(struct device_node *dev_node); | ||
| 16 | |||
| 17 | #endif /* !(_SPARC64_VDEV_H) */ | ||
diff --git a/include/asm-um/io.h b/include/asm-um/io.h index 1934d9340e2c..44e8b8c772ae 100644 --- a/include/asm-um/io.h +++ b/include/asm-um/io.h | |||
| @@ -45,8 +45,13 @@ static inline void writel(unsigned int b, volatile void __iomem *addr) | |||
| 45 | { | 45 | { |
| 46 | *(volatile unsigned int __force *) addr = b; | 46 | *(volatile unsigned int __force *) addr = b; |
| 47 | } | 47 | } |
| 48 | static inline void writeq(unsigned int b, volatile void __iomem *addr) | ||
| 49 | { | ||
| 50 | *(volatile unsigned long long __force *) addr = b; | ||
| 51 | } | ||
| 48 | #define __raw_writeb writeb | 52 | #define __raw_writeb writeb |
| 49 | #define __raw_writew writew | 53 | #define __raw_writew writew |
| 50 | #define __raw_writel writel | 54 | #define __raw_writel writel |
| 55 | #define __raw_writeq writeq | ||
| 51 | 56 | ||
| 52 | #endif | 57 | #endif |
diff --git a/include/asm-um/kmap_types.h b/include/asm-um/kmap_types.h index 0b22ad776e76..6c03acdb4405 100644 --- a/include/asm-um/kmap_types.h +++ b/include/asm-um/kmap_types.h | |||
| @@ -6,6 +6,24 @@ | |||
| 6 | #ifndef __UM_KMAP_TYPES_H | 6 | #ifndef __UM_KMAP_TYPES_H |
| 7 | #define __UM_KMAP_TYPES_H | 7 | #define __UM_KMAP_TYPES_H |
| 8 | 8 | ||
| 9 | #include "asm/arch/kmap_types.h" | 9 | /* No more #include "asm/arch/kmap_types.h" ! */ |
| 10 | |||
| 11 | enum km_type { | ||
| 12 | KM_BOUNCE_READ, | ||
| 13 | KM_SKB_SUNRPC_DATA, | ||
| 14 | KM_SKB_DATA_SOFTIRQ, | ||
| 15 | KM_USER0, | ||
| 16 | KM_USER1, | ||
| 17 | KM_UML_USERCOPY, /* UML specific, for copy_*_user - used in do_op_one_page */ | ||
| 18 | KM_BIO_SRC_IRQ, | ||
| 19 | KM_BIO_DST_IRQ, | ||
| 20 | KM_PTE0, | ||
| 21 | KM_PTE1, | ||
| 22 | KM_IRQ0, | ||
| 23 | KM_IRQ1, | ||
| 24 | KM_SOFTIRQ0, | ||
| 25 | KM_SOFTIRQ1, | ||
| 26 | KM_TYPE_NR | ||
| 27 | }; | ||
| 10 | 28 | ||
| 11 | #endif | 29 | #endif |
diff --git a/include/asm-v850/socket.h b/include/asm-v850/socket.h index 0240d366a0a4..0dfe55ac2ef2 100644 --- a/include/asm-v850/socket.h +++ b/include/asm-v850/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* __V850_SOCKET_H__ */ | 53 | #endif /* __V850_SOCKET_H__ */ |
diff --git a/include/asm-x86_64/alternative.h b/include/asm-x86_64/alternative.h index 387c8f66af7d..aa67bfd1b3ce 100644 --- a/include/asm-x86_64/alternative.h +++ b/include/asm-x86_64/alternative.h | |||
| @@ -17,11 +17,20 @@ struct alt_instr { | |||
| 17 | extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); | 17 | extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); |
| 18 | 18 | ||
| 19 | struct module; | 19 | struct module; |
| 20 | |||
| 21 | #ifdef CONFIG_SMP | ||
| 20 | extern void alternatives_smp_module_add(struct module *mod, char *name, | 22 | extern void alternatives_smp_module_add(struct module *mod, char *name, |
| 21 | void *locks, void *locks_end, | 23 | void *locks, void *locks_end, |
| 22 | void *text, void *text_end); | 24 | void *text, void *text_end); |
| 23 | extern void alternatives_smp_module_del(struct module *mod); | 25 | extern void alternatives_smp_module_del(struct module *mod); |
| 24 | extern void alternatives_smp_switch(int smp); | 26 | extern void alternatives_smp_switch(int smp); |
| 27 | #else | ||
| 28 | static inline void alternatives_smp_module_add(struct module *mod, char *name, | ||
| 29 | void *locks, void *locks_end, | ||
| 30 | void *text, void *text_end) {} | ||
| 31 | static inline void alternatives_smp_module_del(struct module *mod) {} | ||
| 32 | static inline void alternatives_smp_switch(int smp) {} | ||
| 33 | #endif | ||
| 25 | 34 | ||
| 26 | #endif | 35 | #endif |
| 27 | 36 | ||
diff --git a/include/asm-x86_64/socket.h b/include/asm-x86_64/socket.h index f2cdbeae5d5b..b46702607933 100644 --- a/include/asm-x86_64/socket.h +++ b/include/asm-x86_64/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |
diff --git a/include/asm-xtensa/socket.h b/include/asm-xtensa/socket.h index 00f83f3a6d72..971d231be60e 100644 --- a/include/asm-xtensa/socket.h +++ b/include/asm-xtensa/socket.h | |||
| @@ -59,5 +59,6 @@ | |||
| 59 | 59 | ||
| 60 | #define SO_ACCEPTCONN 30 | 60 | #define SO_ACCEPTCONN 30 |
| 61 | #define SO_PEERSEC 31 | 61 | #define SO_PEERSEC 31 |
| 62 | #define SO_PASSSEC 34 | ||
| 62 | 63 | ||
| 63 | #endif /* _XTENSA_SOCKET_H */ | 64 | #endif /* _XTENSA_SOCKET_H */ |
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 1eb238affb12..41788a31c438 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #define LINUX_ATMDEV_H | 7 | #define LINUX_ATMDEV_H |
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | #include <linux/device.h> | ||
| 10 | #include <linux/atmapi.h> | 11 | #include <linux/atmapi.h> |
| 11 | #include <linux/atm.h> | 12 | #include <linux/atm.h> |
| 12 | #include <linux/atmioc.h> | 13 | #include <linux/atmioc.h> |
| @@ -358,6 +359,7 @@ struct atm_dev { | |||
| 358 | struct proc_dir_entry *proc_entry; /* proc entry */ | 359 | struct proc_dir_entry *proc_entry; /* proc entry */ |
| 359 | char *proc_name; /* proc entry name */ | 360 | char *proc_name; /* proc entry name */ |
| 360 | #endif | 361 | #endif |
| 362 | struct class_device class_dev; /* sysfs class device */ | ||
| 361 | struct list_head dev_list; /* linkage */ | 363 | struct list_head dev_list; /* linkage */ |
| 362 | }; | 364 | }; |
| 363 | 365 | ||
| @@ -459,7 +461,7 @@ static inline void atm_dev_put(struct atm_dev *dev) | |||
| 459 | BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags)); | 461 | BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags)); |
| 460 | if (dev->ops->dev_close) | 462 | if (dev->ops->dev_close) |
| 461 | dev->ops->dev_close(dev); | 463 | dev->ops->dev_close(dev); |
| 462 | kfree(dev); | 464 | class_device_put(&dev->class_dev); |
| 463 | } | 465 | } |
| 464 | } | 466 | } |
| 465 | 467 | ||
diff --git a/include/linux/audit.h b/include/linux/audit.h index e051ff9c5b50..b27d7debc5a1 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -122,10 +122,17 @@ | |||
| 122 | /* Rule structure sizes -- if these change, different AUDIT_ADD and | 122 | /* Rule structure sizes -- if these change, different AUDIT_ADD and |
| 123 | * AUDIT_LIST commands must be implemented. */ | 123 | * AUDIT_LIST commands must be implemented. */ |
| 124 | #define AUDIT_MAX_FIELDS 64 | 124 | #define AUDIT_MAX_FIELDS 64 |
| 125 | #define AUDIT_MAX_KEY_LEN 32 | ||
| 125 | #define AUDIT_BITMASK_SIZE 64 | 126 | #define AUDIT_BITMASK_SIZE 64 |
| 126 | #define AUDIT_WORD(nr) ((__u32)((nr)/32)) | 127 | #define AUDIT_WORD(nr) ((__u32)((nr)/32)) |
| 127 | #define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32)) | 128 | #define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32)) |
| 128 | 129 | ||
| 130 | #define AUDIT_SYSCALL_CLASSES 16 | ||
| 131 | #define AUDIT_CLASS_DIR_WRITE 0 | ||
| 132 | #define AUDIT_CLASS_DIR_WRITE_32 1 | ||
| 133 | #define AUDIT_CLASS_CHATTR 2 | ||
| 134 | #define AUDIT_CLASS_CHATTR_32 3 | ||
| 135 | |||
| 129 | /* This bitmask is used to validate user input. It represents all bits that | 136 | /* This bitmask is used to validate user input. It represents all bits that |
| 130 | * are currently used in an audit field constant understood by the kernel. | 137 | * are currently used in an audit field constant understood by the kernel. |
| 131 | * If you are adding a new #define AUDIT_<whatever>, please ensure that | 138 | * If you are adding a new #define AUDIT_<whatever>, please ensure that |
| @@ -150,12 +157,17 @@ | |||
| 150 | #define AUDIT_PERS 10 | 157 | #define AUDIT_PERS 10 |
| 151 | #define AUDIT_ARCH 11 | 158 | #define AUDIT_ARCH 11 |
| 152 | #define AUDIT_MSGTYPE 12 | 159 | #define AUDIT_MSGTYPE 12 |
| 153 | #define AUDIT_SE_USER 13 /* security label user */ | 160 | #define AUDIT_SUBJ_USER 13 /* security label user */ |
| 154 | #define AUDIT_SE_ROLE 14 /* security label role */ | 161 | #define AUDIT_SUBJ_ROLE 14 /* security label role */ |
| 155 | #define AUDIT_SE_TYPE 15 /* security label type */ | 162 | #define AUDIT_SUBJ_TYPE 15 /* security label type */ |
| 156 | #define AUDIT_SE_SEN 16 /* security label sensitivity label */ | 163 | #define AUDIT_SUBJ_SEN 16 /* security label sensitivity label */ |
| 157 | #define AUDIT_SE_CLR 17 /* security label clearance label */ | 164 | #define AUDIT_SUBJ_CLR 17 /* security label clearance label */ |
| 158 | #define AUDIT_PPID 18 | 165 | #define AUDIT_PPID 18 |
| 166 | #define AUDIT_OBJ_USER 19 | ||
| 167 | #define AUDIT_OBJ_ROLE 20 | ||
| 168 | #define AUDIT_OBJ_TYPE 21 | ||
| 169 | #define AUDIT_OBJ_LEV_LOW 22 | ||
| 170 | #define AUDIT_OBJ_LEV_HIGH 23 | ||
| 159 | 171 | ||
| 160 | /* These are ONLY useful when checking | 172 | /* These are ONLY useful when checking |
| 161 | * at syscall exit time (AUDIT_AT_EXIT). */ | 173 | * at syscall exit time (AUDIT_AT_EXIT). */ |
| @@ -171,6 +183,8 @@ | |||
| 171 | #define AUDIT_ARG2 (AUDIT_ARG0+2) | 183 | #define AUDIT_ARG2 (AUDIT_ARG0+2) |
| 172 | #define AUDIT_ARG3 (AUDIT_ARG0+3) | 184 | #define AUDIT_ARG3 (AUDIT_ARG0+3) |
| 173 | 185 | ||
| 186 | #define AUDIT_FILTERKEY 210 | ||
| 187 | |||
| 174 | #define AUDIT_NEGATE 0x80000000 | 188 | #define AUDIT_NEGATE 0x80000000 |
| 175 | 189 | ||
| 176 | /* These are the supported operators. | 190 | /* These are the supported operators. |
| @@ -299,6 +313,7 @@ struct mqstat; | |||
| 299 | #define AUDITSC_SUCCESS 1 | 313 | #define AUDITSC_SUCCESS 1 |
| 300 | #define AUDITSC_FAILURE 2 | 314 | #define AUDITSC_FAILURE 2 |
| 301 | #define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS ) | 315 | #define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS ) |
| 316 | extern int __init audit_register_class(int class, unsigned *list); | ||
| 302 | #ifdef CONFIG_AUDITSYSCALL | 317 | #ifdef CONFIG_AUDITSYSCALL |
| 303 | /* These are defined in auditsc.c */ | 318 | /* These are defined in auditsc.c */ |
| 304 | /* Public API */ | 319 | /* Public API */ |
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index a3caf6866bae..44a11f1ccaf2 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h | |||
| @@ -87,9 +87,9 @@ int cpu_down(unsigned int cpu); | |||
| 87 | #define lock_cpu_hotplug() do { } while (0) | 87 | #define lock_cpu_hotplug() do { } while (0) |
| 88 | #define unlock_cpu_hotplug() do { } while (0) | 88 | #define unlock_cpu_hotplug() do { } while (0) |
| 89 | #define lock_cpu_hotplug_interruptible() 0 | 89 | #define lock_cpu_hotplug_interruptible() 0 |
| 90 | #define hotcpu_notifier(fn, pri) | 90 | #define hotcpu_notifier(fn, pri) do { } while (0) |
| 91 | #define register_hotcpu_notifier(nb) | 91 | #define register_hotcpu_notifier(nb) do { } while (0) |
| 92 | #define unregister_hotcpu_notifier(nb) | 92 | #define unregister_hotcpu_notifier(nb) do { } while (0) |
| 93 | 93 | ||
| 94 | /* CPUs don't go offline once they're online w/o CONFIG_HOTPLUG_CPU */ | 94 | /* CPUs don't go offline once they're online w/o CONFIG_HOTPLUG_CPU */ |
| 95 | static inline int cpu_is_offline(int cpu) { return 0; } | 95 | static inline int cpu_is_offline(int cpu) { return 0; } |
diff --git a/include/linux/dqblk_xfs.h b/include/linux/dqblk_xfs.h index 2fda1b2aabd9..527504c11c5e 100644 --- a/include/linux/dqblk_xfs.h +++ b/include/linux/dqblk_xfs.h | |||
| @@ -125,14 +125,14 @@ typedef struct fs_disk_quota { | |||
| 125 | 125 | ||
| 126 | /* | 126 | /* |
| 127 | * fs_quota_stat is the struct returned in Q_XGETQSTAT for a given file system. | 127 | * fs_quota_stat is the struct returned in Q_XGETQSTAT for a given file system. |
| 128 | * Provides a centralized way to get meta infomation about the quota subsystem. | 128 | * Provides a centralized way to get meta information about the quota subsystem. |
| 129 | * eg. space taken up for user and group quotas, number of dquots currently | 129 | * eg. space taken up for user and group quotas, number of dquots currently |
| 130 | * incore. | 130 | * incore. |
| 131 | */ | 131 | */ |
| 132 | #define FS_QSTAT_VERSION 1 /* fs_quota_stat.qs_version */ | 132 | #define FS_QSTAT_VERSION 1 /* fs_quota_stat.qs_version */ |
| 133 | 133 | ||
| 134 | /* | 134 | /* |
| 135 | * Some basic infomation about 'quota files'. | 135 | * Some basic information about 'quota files'. |
| 136 | */ | 136 | */ |
| 137 | typedef struct fs_qfilestat { | 137 | typedef struct fs_qfilestat { |
| 138 | __u64 qfs_ino; /* inode number */ | 138 | __u64 qfs_ino; /* inode number */ |
diff --git a/include/linux/err.h b/include/linux/err.h index ff71d2af5da3..cd3b367f7445 100644 --- a/include/linux/err.h +++ b/include/linux/err.h | |||
| @@ -13,7 +13,9 @@ | |||
| 13 | * This should be a per-architecture thing, to allow different | 13 | * This should be a per-architecture thing, to allow different |
| 14 | * error and pointer decisions. | 14 | * error and pointer decisions. |
| 15 | */ | 15 | */ |
| 16 | #define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L) | 16 | #define MAX_ERRNO 4095 |
| 17 | |||
| 18 | #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO) | ||
| 17 | 19 | ||
| 18 | static inline void *ERR_PTR(long error) | 20 | static inline void *ERR_PTR(long error) |
| 19 | { | 21 | { |
diff --git a/include/linux/fb.h b/include/linux/fb.h index b45928f5c63f..ffefeeeeca93 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -557,7 +557,7 @@ struct fb_pixmap { | |||
| 557 | * Frame buffer operations | 557 | * Frame buffer operations |
| 558 | * | 558 | * |
| 559 | * LOCKING NOTE: those functions must _ALL_ be called with the console | 559 | * LOCKING NOTE: those functions must _ALL_ be called with the console |
| 560 | * semaphore held, this is the only suitable locking mecanism we have | 560 | * semaphore held, this is the only suitable locking mechanism we have |
| 561 | * in 2.6. Some may be called at interrupt time at this point though. | 561 | * in 2.6. Some may be called at interrupt time at this point though. |
| 562 | */ | 562 | */ |
| 563 | 563 | ||
diff --git a/include/linux/mm.h b/include/linux/mm.h index c41a1299b8cf..75179529e399 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -36,7 +36,6 @@ extern int sysctl_legacy_va_layout; | |||
| 36 | #include <asm/page.h> | 36 | #include <asm/page.h> |
| 37 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
| 38 | #include <asm/processor.h> | 38 | #include <asm/processor.h> |
| 39 | #include <asm/atomic.h> | ||
| 40 | 39 | ||
| 41 | #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) | 40 | #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) |
| 42 | 41 | ||
| @@ -515,6 +514,11 @@ static inline void set_page_links(struct page *page, unsigned long zone, | |||
| 515 | set_page_section(page, pfn_to_section_nr(pfn)); | 514 | set_page_section(page, pfn_to_section_nr(pfn)); |
| 516 | } | 515 | } |
| 517 | 516 | ||
| 517 | /* | ||
| 518 | * Some inline functions in vmstat.h depend on page_zone() | ||
| 519 | */ | ||
| 520 | #include <linux/vmstat.h> | ||
| 521 | |||
| 518 | #ifndef CONFIG_DISCONTIGMEM | 522 | #ifndef CONFIG_DISCONTIGMEM |
| 519 | /* The array of struct pages - for discontigmem use pgdat->lmem_map */ | 523 | /* The array of struct pages - for discontigmem use pgdat->lmem_map */ |
| 520 | extern struct page *mem_map; | 524 | extern struct page *mem_map; |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index d6120fa69116..27e748eb72b0 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
| @@ -46,6 +46,27 @@ struct zone_padding { | |||
| 46 | #define ZONE_PADDING(name) | 46 | #define ZONE_PADDING(name) |
| 47 | #endif | 47 | #endif |
| 48 | 48 | ||
| 49 | enum zone_stat_item { | ||
| 50 | NR_ANON_PAGES, /* Mapped anonymous pages */ | ||
| 51 | NR_FILE_MAPPED, /* pagecache pages mapped into pagetables. | ||
| 52 | only modified from process context */ | ||
| 53 | NR_FILE_PAGES, | ||
| 54 | NR_SLAB, /* Pages used by slab allocator */ | ||
| 55 | NR_PAGETABLE, /* used for pagetables */ | ||
| 56 | NR_FILE_DIRTY, | ||
| 57 | NR_WRITEBACK, | ||
| 58 | NR_UNSTABLE_NFS, /* NFS unstable pages */ | ||
| 59 | NR_BOUNCE, | ||
| 60 | #ifdef CONFIG_NUMA | ||
| 61 | NUMA_HIT, /* allocated in intended node */ | ||
| 62 | NUMA_MISS, /* allocated in non intended node */ | ||
| 63 | NUMA_FOREIGN, /* was intended here, hit elsewhere */ | ||
| 64 | NUMA_INTERLEAVE_HIT, /* interleaver preferred this zone */ | ||
| 65 | NUMA_LOCAL, /* allocation from local node */ | ||
| 66 | NUMA_OTHER, /* allocation from other node */ | ||
| 67 | #endif | ||
| 68 | NR_VM_ZONE_STAT_ITEMS }; | ||
| 69 | |||
| 49 | struct per_cpu_pages { | 70 | struct per_cpu_pages { |
| 50 | int count; /* number of pages in the list */ | 71 | int count; /* number of pages in the list */ |
| 51 | int high; /* high watermark, emptying needed */ | 72 | int high; /* high watermark, emptying needed */ |
| @@ -55,13 +76,8 @@ struct per_cpu_pages { | |||
| 55 | 76 | ||
| 56 | struct per_cpu_pageset { | 77 | struct per_cpu_pageset { |
| 57 | struct per_cpu_pages pcp[2]; /* 0: hot. 1: cold */ | 78 | struct per_cpu_pages pcp[2]; /* 0: hot. 1: cold */ |
| 58 | #ifdef CONFIG_NUMA | 79 | #ifdef CONFIG_SMP |
| 59 | unsigned long numa_hit; /* allocated in intended node */ | 80 | s8 vm_stat_diff[NR_VM_ZONE_STAT_ITEMS]; |
| 60 | unsigned long numa_miss; /* allocated in non intended node */ | ||
| 61 | unsigned long numa_foreign; /* was intended here, hit elsewhere */ | ||
| 62 | unsigned long interleave_hit; /* interleaver prefered this zone */ | ||
| 63 | unsigned long local_node; /* allocation from local node */ | ||
| 64 | unsigned long other_node; /* allocation from other node */ | ||
| 65 | #endif | 81 | #endif |
| 66 | } ____cacheline_aligned_in_smp; | 82 | } ____cacheline_aligned_in_smp; |
| 67 | 83 | ||
| @@ -165,12 +181,8 @@ struct zone { | |||
| 165 | /* A count of how many reclaimers are scanning this zone */ | 181 | /* A count of how many reclaimers are scanning this zone */ |
| 166 | atomic_t reclaim_in_progress; | 182 | atomic_t reclaim_in_progress; |
| 167 | 183 | ||
| 168 | /* | 184 | /* Zone statistics */ |
| 169 | * timestamp (in jiffies) of the last zone reclaim that did not | 185 | atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]; |
| 170 | * result in freeing of pages. This is used to avoid repeated scans | ||
| 171 | * if all memory in the zone is in use. | ||
| 172 | */ | ||
| 173 | unsigned long last_unsuccessful_zone_reclaim; | ||
| 174 | 186 | ||
| 175 | /* | 187 | /* |
| 176 | * prev_priority holds the scanning priority for this zone. It is | 188 | * prev_priority holds the scanning priority for this zone. It is |
diff --git a/include/linux/net.h b/include/linux/net.h index 385e68f5bd93..b20c53c74413 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -61,6 +61,7 @@ typedef enum { | |||
| 61 | #define SOCK_ASYNC_WAITDATA 1 | 61 | #define SOCK_ASYNC_WAITDATA 1 |
| 62 | #define SOCK_NOSPACE 2 | 62 | #define SOCK_NOSPACE 2 |
| 63 | #define SOCK_PASSCRED 3 | 63 | #define SOCK_PASSCRED 3 |
| 64 | #define SOCK_PASSSEC 4 | ||
| 64 | 65 | ||
| 65 | #ifndef ARCH_HAS_SOCKET_TYPES | 66 | #ifndef ARCH_HAS_SOCKET_TYPES |
| 66 | /** | 67 | /** |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 03cd7551a7a1..85f99f60deea 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -313,8 +313,12 @@ struct net_device | |||
| 313 | 313 | ||
| 314 | /* Segmentation offload features */ | 314 | /* Segmentation offload features */ |
| 315 | #define NETIF_F_GSO_SHIFT 16 | 315 | #define NETIF_F_GSO_SHIFT 16 |
| 316 | #define NETIF_F_GSO_MASK 0xffff0000 | ||
| 316 | #define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT) | 317 | #define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT) |
| 317 | #define NETIF_F_UFO (SKB_GSO_UDPV4 << NETIF_F_GSO_SHIFT) | 318 | #define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT) |
| 319 | #define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT) | ||
| 320 | #define NETIF_F_TSO_ECN (SKB_GSO_TCP_ECN << NETIF_F_GSO_SHIFT) | ||
| 321 | #define NETIF_F_TSO6 (SKB_GSO_TCPV6 << NETIF_F_GSO_SHIFT) | ||
| 318 | 322 | ||
| 319 | #define NETIF_F_GEN_CSUM (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM) | 323 | #define NETIF_F_GEN_CSUM (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM) |
| 320 | #define NETIF_F_ALL_CSUM (NETIF_F_IP_CSUM | NETIF_F_GEN_CSUM) | 324 | #define NETIF_F_ALL_CSUM (NETIF_F_IP_CSUM | NETIF_F_GEN_CSUM) |
| @@ -543,7 +547,8 @@ struct packet_type { | |||
| 543 | struct net_device *, | 547 | struct net_device *, |
| 544 | struct packet_type *, | 548 | struct packet_type *, |
| 545 | struct net_device *); | 549 | struct net_device *); |
| 546 | struct sk_buff *(*gso_segment)(struct sk_buff *skb, int sg); | 550 | struct sk_buff *(*gso_segment)(struct sk_buff *skb, |
| 551 | int features); | ||
| 547 | void *af_packet_priv; | 552 | void *af_packet_priv; |
| 548 | struct list_head list; | 553 | struct list_head list; |
| 549 | }; | 554 | }; |
| @@ -968,7 +973,7 @@ extern int netdev_max_backlog; | |||
| 968 | extern int weight_p; | 973 | extern int weight_p; |
| 969 | extern int netdev_set_master(struct net_device *dev, struct net_device *master); | 974 | extern int netdev_set_master(struct net_device *dev, struct net_device *master); |
| 970 | extern int skb_checksum_help(struct sk_buff *skb, int inward); | 975 | extern int skb_checksum_help(struct sk_buff *skb, int inward); |
| 971 | extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int sg); | 976 | extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features); |
| 972 | #ifdef CONFIG_BUG | 977 | #ifdef CONFIG_BUG |
| 973 | extern void netdev_rx_csum_fault(struct net_device *dev); | 978 | extern void netdev_rx_csum_fault(struct net_device *dev); |
| 974 | #else | 979 | #else |
| @@ -988,11 +993,21 @@ extern void dev_seq_stop(struct seq_file *seq, void *v); | |||
| 988 | 993 | ||
| 989 | extern void linkwatch_run_queue(void); | 994 | extern void linkwatch_run_queue(void); |
| 990 | 995 | ||
| 996 | static inline int net_gso_ok(int features, int gso_type) | ||
| 997 | { | ||
| 998 | int feature = gso_type << NETIF_F_GSO_SHIFT; | ||
| 999 | return (features & feature) == feature; | ||
| 1000 | } | ||
| 1001 | |||
| 1002 | static inline int skb_gso_ok(struct sk_buff *skb, int features) | ||
| 1003 | { | ||
| 1004 | return net_gso_ok(features, skb_shinfo(skb)->gso_size ? | ||
| 1005 | skb_shinfo(skb)->gso_type : 0); | ||
| 1006 | } | ||
| 1007 | |||
| 991 | static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) | 1008 | static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) |
| 992 | { | 1009 | { |
| 993 | int feature = skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT; | 1010 | return !skb_gso_ok(skb, dev->features); |
| 994 | return skb_shinfo(skb)->gso_size && | ||
| 995 | (dev->features & feature) != feature; | ||
| 996 | } | 1011 | } |
| 997 | 1012 | ||
| 998 | #endif /* __KERNEL__ */ | 1013 | #endif /* __KERNEL__ */ |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index d90b1bb37563..55ea853d57bc 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
| @@ -9,7 +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> | 12 | #include <linux/in.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | #include <linux/pagemap.h> | 14 | #include <linux/pagemap.h> |
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 0c076d58c676..5748642e9f36 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h | |||
| @@ -5,12 +5,8 @@ | |||
| 5 | #ifndef PAGE_FLAGS_H | 5 | #ifndef PAGE_FLAGS_H |
| 6 | #define PAGE_FLAGS_H | 6 | #define PAGE_FLAGS_H |
| 7 | 7 | ||
| 8 | #include <linux/percpu.h> | ||
| 9 | #include <linux/cache.h> | ||
| 10 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 11 | 9 | ||
| 12 | #include <asm/pgtable.h> | ||
| 13 | |||
| 14 | /* | 10 | /* |
| 15 | * Various page->flags bits: | 11 | * Various page->flags bits: |
| 16 | * | 12 | * |
| @@ -103,134 +99,6 @@ | |||
| 103 | #endif | 99 | #endif |
| 104 | 100 | ||
| 105 | /* | 101 | /* |
| 106 | * Global page accounting. One instance per CPU. Only unsigned longs are | ||
| 107 | * allowed. | ||
| 108 | * | ||
| 109 | * - Fields can be modified with xxx_page_state and xxx_page_state_zone at | ||
| 110 | * any time safely (which protects the instance from modification by | ||
| 111 | * interrupt. | ||
| 112 | * - The __xxx_page_state variants can be used safely when interrupts are | ||
| 113 | * disabled. | ||
| 114 | * - The __xxx_page_state variants can be used if the field is only | ||
| 115 | * modified from process context and protected from preemption, or only | ||
| 116 | * modified from interrupt context. In this case, the field should be | ||
| 117 | * commented here. | ||
| 118 | */ | ||
| 119 | struct page_state { | ||
| 120 | unsigned long nr_dirty; /* Dirty writeable pages */ | ||
| 121 | unsigned long nr_writeback; /* Pages under writeback */ | ||
| 122 | unsigned long nr_unstable; /* NFS unstable pages */ | ||
| 123 | unsigned long nr_page_table_pages;/* Pages used for pagetables */ | ||
| 124 | unsigned long nr_mapped; /* mapped into pagetables. | ||
| 125 | * only modified from process context */ | ||
| 126 | unsigned long nr_slab; /* In slab */ | ||
| 127 | #define GET_PAGE_STATE_LAST nr_slab | ||
| 128 | |||
| 129 | /* | ||
| 130 | * The below are zeroed by get_page_state(). Use get_full_page_state() | ||
| 131 | * to add up all these. | ||
| 132 | */ | ||
| 133 | unsigned long pgpgin; /* Disk reads */ | ||
| 134 | unsigned long pgpgout; /* Disk writes */ | ||
| 135 | unsigned long pswpin; /* swap reads */ | ||
| 136 | unsigned long pswpout; /* swap writes */ | ||
| 137 | |||
| 138 | unsigned long pgalloc_high; /* page allocations */ | ||
| 139 | unsigned long pgalloc_normal; | ||
| 140 | unsigned long pgalloc_dma32; | ||
| 141 | unsigned long pgalloc_dma; | ||
| 142 | |||
| 143 | unsigned long pgfree; /* page freeings */ | ||
| 144 | unsigned long pgactivate; /* pages moved inactive->active */ | ||
| 145 | unsigned long pgdeactivate; /* pages moved active->inactive */ | ||
| 146 | |||
| 147 | unsigned long pgfault; /* faults (major+minor) */ | ||
| 148 | unsigned long pgmajfault; /* faults (major only) */ | ||
| 149 | |||
| 150 | unsigned long pgrefill_high; /* inspected in refill_inactive_zone */ | ||
| 151 | unsigned long pgrefill_normal; | ||
| 152 | unsigned long pgrefill_dma32; | ||
| 153 | unsigned long pgrefill_dma; | ||
| 154 | |||
| 155 | unsigned long pgsteal_high; /* total highmem pages reclaimed */ | ||
| 156 | unsigned long pgsteal_normal; | ||
| 157 | unsigned long pgsteal_dma32; | ||
| 158 | unsigned long pgsteal_dma; | ||
| 159 | |||
| 160 | unsigned long pgscan_kswapd_high;/* total highmem pages scanned */ | ||
| 161 | unsigned long pgscan_kswapd_normal; | ||
| 162 | unsigned long pgscan_kswapd_dma32; | ||
| 163 | unsigned long pgscan_kswapd_dma; | ||
| 164 | |||
| 165 | unsigned long pgscan_direct_high;/* total highmem pages scanned */ | ||
| 166 | unsigned long pgscan_direct_normal; | ||
| 167 | unsigned long pgscan_direct_dma32; | ||
| 168 | unsigned long pgscan_direct_dma; | ||
| 169 | |||
| 170 | unsigned long pginodesteal; /* pages reclaimed via inode freeing */ | ||
| 171 | unsigned long slabs_scanned; /* slab objects scanned */ | ||
| 172 | unsigned long kswapd_steal; /* pages reclaimed by kswapd */ | ||
| 173 | unsigned long kswapd_inodesteal;/* reclaimed via kswapd inode freeing */ | ||
| 174 | unsigned long pageoutrun; /* kswapd's calls to page reclaim */ | ||
| 175 | unsigned long allocstall; /* direct reclaim calls */ | ||
| 176 | |||
| 177 | unsigned long pgrotated; /* pages rotated to tail of the LRU */ | ||
| 178 | unsigned long nr_bounce; /* pages for bounce buffers */ | ||
| 179 | }; | ||
| 180 | |||
| 181 | extern void get_page_state(struct page_state *ret); | ||
| 182 | extern void get_page_state_node(struct page_state *ret, int node); | ||
| 183 | extern void get_full_page_state(struct page_state *ret); | ||
| 184 | extern unsigned long read_page_state_offset(unsigned long offset); | ||
| 185 | extern void mod_page_state_offset(unsigned long offset, unsigned long delta); | ||
| 186 | extern void __mod_page_state_offset(unsigned long offset, unsigned long delta); | ||
| 187 | |||
| 188 | #define read_page_state(member) \ | ||
| 189 | read_page_state_offset(offsetof(struct page_state, member)) | ||
| 190 | |||
| 191 | #define mod_page_state(member, delta) \ | ||
| 192 | mod_page_state_offset(offsetof(struct page_state, member), (delta)) | ||
| 193 | |||
| 194 | #define __mod_page_state(member, delta) \ | ||
| 195 | __mod_page_state_offset(offsetof(struct page_state, member), (delta)) | ||
| 196 | |||
| 197 | #define inc_page_state(member) mod_page_state(member, 1UL) | ||
| 198 | #define dec_page_state(member) mod_page_state(member, 0UL - 1) | ||
| 199 | #define add_page_state(member,delta) mod_page_state(member, (delta)) | ||
| 200 | #define sub_page_state(member,delta) mod_page_state(member, 0UL - (delta)) | ||
| 201 | |||
| 202 | #define __inc_page_state(member) __mod_page_state(member, 1UL) | ||
| 203 | #define __dec_page_state(member) __mod_page_state(member, 0UL - 1) | ||
| 204 | #define __add_page_state(member,delta) __mod_page_state(member, (delta)) | ||
| 205 | #define __sub_page_state(member,delta) __mod_page_state(member, 0UL - (delta)) | ||
| 206 | |||
| 207 | #define page_state(member) (*__page_state(offsetof(struct page_state, member))) | ||
| 208 | |||
| 209 | #define state_zone_offset(zone, member) \ | ||
| 210 | ({ \ | ||
| 211 | unsigned offset; \ | ||
| 212 | if (is_highmem(zone)) \ | ||
| 213 | offset = offsetof(struct page_state, member##_high); \ | ||
| 214 | else if (is_normal(zone)) \ | ||
| 215 | offset = offsetof(struct page_state, member##_normal); \ | ||
| 216 | else if (is_dma32(zone)) \ | ||
| 217 | offset = offsetof(struct page_state, member##_dma32); \ | ||
| 218 | else \ | ||
| 219 | offset = offsetof(struct page_state, member##_dma); \ | ||
| 220 | offset; \ | ||
| 221 | }) | ||
| 222 | |||
| 223 | #define __mod_page_state_zone(zone, member, delta) \ | ||
| 224 | do { \ | ||
| 225 | __mod_page_state_offset(state_zone_offset(zone, member), (delta)); \ | ||
| 226 | } while (0) | ||
| 227 | |||
| 228 | #define mod_page_state_zone(zone, member, delta) \ | ||
| 229 | do { \ | ||
| 230 | mod_page_state_offset(state_zone_offset(zone, member), (delta)); \ | ||
| 231 | } while (0) | ||
| 232 | |||
| 233 | /* | ||
| 234 | * Manipulation of page state flags | 102 | * Manipulation of page state flags |
| 235 | */ | 103 | */ |
| 236 | #define PageLocked(page) \ | 104 | #define PageLocked(page) \ |
| @@ -254,7 +122,14 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta); | |||
| 254 | #define TestClearPageReferenced(page) test_and_clear_bit(PG_referenced, &(page)->flags) | 122 | #define TestClearPageReferenced(page) test_and_clear_bit(PG_referenced, &(page)->flags) |
| 255 | 123 | ||
| 256 | #define PageUptodate(page) test_bit(PG_uptodate, &(page)->flags) | 124 | #define PageUptodate(page) test_bit(PG_uptodate, &(page)->flags) |
| 257 | #ifndef SetPageUptodate | 125 | #ifdef CONFIG_S390 |
| 126 | #define SetPageUptodate(_page) \ | ||
| 127 | do { \ | ||
| 128 | struct page *__page = (_page); \ | ||
| 129 | if (!test_and_set_bit(PG_uptodate, &__page->flags)) \ | ||
| 130 | page_test_and_clear_dirty(_page); \ | ||
| 131 | } while (0) | ||
| 132 | #else | ||
| 258 | #define SetPageUptodate(page) set_bit(PG_uptodate, &(page)->flags) | 133 | #define SetPageUptodate(page) set_bit(PG_uptodate, &(page)->flags) |
| 259 | #endif | 134 | #endif |
| 260 | #define ClearPageUptodate(page) clear_bit(PG_uptodate, &(page)->flags) | 135 | #define ClearPageUptodate(page) clear_bit(PG_uptodate, &(page)->flags) |
| @@ -306,7 +181,7 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta); | |||
| 306 | do { \ | 181 | do { \ |
| 307 | if (!test_and_set_bit(PG_writeback, \ | 182 | if (!test_and_set_bit(PG_writeback, \ |
| 308 | &(page)->flags)) \ | 183 | &(page)->flags)) \ |
| 309 | inc_page_state(nr_writeback); \ | 184 | inc_zone_page_state(page, NR_WRITEBACK); \ |
| 310 | } while (0) | 185 | } while (0) |
| 311 | #define TestSetPageWriteback(page) \ | 186 | #define TestSetPageWriteback(page) \ |
| 312 | ({ \ | 187 | ({ \ |
| @@ -314,14 +189,14 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta); | |||
| 314 | ret = test_and_set_bit(PG_writeback, \ | 189 | ret = test_and_set_bit(PG_writeback, \ |
| 315 | &(page)->flags); \ | 190 | &(page)->flags); \ |
| 316 | if (!ret) \ | 191 | if (!ret) \ |
| 317 | inc_page_state(nr_writeback); \ | 192 | inc_zone_page_state(page, NR_WRITEBACK); \ |
| 318 | ret; \ | 193 | ret; \ |
| 319 | }) | 194 | }) |
| 320 | #define ClearPageWriteback(page) \ | 195 | #define ClearPageWriteback(page) \ |
| 321 | do { \ | 196 | do { \ |
| 322 | if (test_and_clear_bit(PG_writeback, \ | 197 | if (test_and_clear_bit(PG_writeback, \ |
| 323 | &(page)->flags)) \ | 198 | &(page)->flags)) \ |
| 324 | dec_page_state(nr_writeback); \ | 199 | dec_zone_page_state(page, NR_WRITEBACK); \ |
| 325 | } while (0) | 200 | } while (0) |
| 326 | #define TestClearPageWriteback(page) \ | 201 | #define TestClearPageWriteback(page) \ |
| 327 | ({ \ | 202 | ({ \ |
| @@ -329,7 +204,7 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta); | |||
| 329 | ret = test_and_clear_bit(PG_writeback, \ | 204 | ret = test_and_clear_bit(PG_writeback, \ |
| 330 | &(page)->flags); \ | 205 | &(page)->flags); \ |
| 331 | if (ret) \ | 206 | if (ret) \ |
| 332 | dec_page_state(nr_writeback); \ | 207 | dec_zone_page_state(page, NR_WRITEBACK); \ |
| 333 | ret; \ | 208 | ret; \ |
| 334 | }) | 209 | }) |
| 335 | 210 | ||
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 1245df7141aa..0a2f5d27f60e 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h | |||
| @@ -113,51 +113,6 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, | |||
| 113 | extern void remove_from_page_cache(struct page *page); | 113 | extern void remove_from_page_cache(struct page *page); |
| 114 | extern void __remove_from_page_cache(struct page *page); | 114 | extern void __remove_from_page_cache(struct page *page); |
| 115 | 115 | ||
| 116 | extern atomic_t nr_pagecache; | ||
| 117 | |||
| 118 | #ifdef CONFIG_SMP | ||
| 119 | |||
| 120 | #define PAGECACHE_ACCT_THRESHOLD max(16, NR_CPUS * 2) | ||
| 121 | DECLARE_PER_CPU(long, nr_pagecache_local); | ||
| 122 | |||
| 123 | /* | ||
| 124 | * pagecache_acct implements approximate accounting for pagecache. | ||
| 125 | * vm_enough_memory() do not need high accuracy. Writers will keep | ||
| 126 | * an offset in their per-cpu arena and will spill that into the | ||
| 127 | * global count whenever the absolute value of the local count | ||
| 128 | * exceeds the counter's threshold. | ||
| 129 | * | ||
| 130 | * MUST be protected from preemption. | ||
| 131 | * current protection is mapping->page_lock. | ||
| 132 | */ | ||
| 133 | static inline void pagecache_acct(int count) | ||
| 134 | { | ||
| 135 | long *local; | ||
| 136 | |||
| 137 | local = &__get_cpu_var(nr_pagecache_local); | ||
| 138 | *local += count; | ||
| 139 | if (*local > PAGECACHE_ACCT_THRESHOLD || *local < -PAGECACHE_ACCT_THRESHOLD) { | ||
| 140 | atomic_add(*local, &nr_pagecache); | ||
| 141 | *local = 0; | ||
| 142 | } | ||
| 143 | } | ||
| 144 | |||
| 145 | #else | ||
| 146 | |||
| 147 | static inline void pagecache_acct(int count) | ||
| 148 | { | ||
| 149 | atomic_add(count, &nr_pagecache); | ||
| 150 | } | ||
| 151 | #endif | ||
| 152 | |||
| 153 | static inline unsigned long get_page_cache_size(void) | ||
| 154 | { | ||
| 155 | int ret = atomic_read(&nr_pagecache); | ||
| 156 | if (unlikely(ret < 0)) | ||
| 157 | ret = 0; | ||
| 158 | return ret; | ||
| 159 | } | ||
| 160 | |||
| 161 | /* | 116 | /* |
| 162 | * Return byte-offset into filesystem object for page. | 117 | * Return byte-offset into filesystem object for page. |
| 163 | */ | 118 | */ |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9ae6b1a75366..b093479a531d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -729,6 +729,7 @@ | |||
| 729 | #define PCI_DEVICE_ID_TI_4450 0x8011 | 729 | #define PCI_DEVICE_ID_TI_4450 0x8011 |
| 730 | #define PCI_DEVICE_ID_TI_XX21_XX11 0x8031 | 730 | #define PCI_DEVICE_ID_TI_XX21_XX11 0x8031 |
| 731 | #define PCI_DEVICE_ID_TI_X515 0x8036 | 731 | #define PCI_DEVICE_ID_TI_X515 0x8036 |
| 732 | #define PCI_DEVICE_ID_TI_XX12 0x8039 | ||
| 732 | #define PCI_DEVICE_ID_TI_1130 0xac12 | 733 | #define PCI_DEVICE_ID_TI_1130 0xac12 |
| 733 | #define PCI_DEVICE_ID_TI_1031 0xac13 | 734 | #define PCI_DEVICE_ID_TI_1031 0xac13 |
| 734 | #define PCI_DEVICE_ID_TI_1131 0xac15 | 735 | #define PCI_DEVICE_ID_TI_1131 0xac15 |
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 48dfe00070c7..b4ca73d65891 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
| @@ -163,14 +163,22 @@ extern int rcu_needs_cpu(int cpu); | |||
| 163 | * | 163 | * |
| 164 | * It is illegal to block while in an RCU read-side critical section. | 164 | * It is illegal to block while in an RCU read-side critical section. |
| 165 | */ | 165 | */ |
| 166 | #define rcu_read_lock() preempt_disable() | 166 | #define rcu_read_lock() \ |
| 167 | do { \ | ||
| 168 | preempt_disable(); \ | ||
| 169 | __acquire(RCU); \ | ||
| 170 | } while(0) | ||
| 167 | 171 | ||
| 168 | /** | 172 | /** |
| 169 | * rcu_read_unlock - marks the end of an RCU read-side critical section. | 173 | * rcu_read_unlock - marks the end of an RCU read-side critical section. |
| 170 | * | 174 | * |
| 171 | * See rcu_read_lock() for more information. | 175 | * See rcu_read_lock() for more information. |
| 172 | */ | 176 | */ |
| 173 | #define rcu_read_unlock() preempt_enable() | 177 | #define rcu_read_unlock() \ |
| 178 | do { \ | ||
| 179 | __release(RCU); \ | ||
| 180 | preempt_enable(); \ | ||
| 181 | } while(0) | ||
| 174 | 182 | ||
| 175 | /* | 183 | /* |
| 176 | * So where is rcu_write_lock()? It does not exist, as there is no | 184 | * So where is rcu_write_lock()? It does not exist, as there is no |
| @@ -193,14 +201,22 @@ extern int rcu_needs_cpu(int cpu); | |||
| 193 | * can use just rcu_read_lock(). | 201 | * can use just rcu_read_lock(). |
| 194 | * | 202 | * |
| 195 | */ | 203 | */ |
| 196 | #define rcu_read_lock_bh() local_bh_disable() | 204 | #define rcu_read_lock_bh() \ |
| 205 | do { \ | ||
| 206 | local_bh_disable(); \ | ||
| 207 | __acquire(RCU_BH); \ | ||
| 208 | } while(0) | ||
| 197 | 209 | ||
| 198 | /* | 210 | /* |
| 199 | * rcu_read_unlock_bh - marks the end of a softirq-only RCU critical section | 211 | * rcu_read_unlock_bh - marks the end of a softirq-only RCU critical section |
| 200 | * | 212 | * |
| 201 | * See rcu_read_lock_bh() for more information. | 213 | * See rcu_read_lock_bh() for more information. |
| 202 | */ | 214 | */ |
| 203 | #define rcu_read_unlock_bh() local_bh_enable() | 215 | #define rcu_read_unlock_bh() \ |
| 216 | do { \ | ||
| 217 | __release(RCU_BH); \ | ||
| 218 | local_bh_enable(); \ | ||
| 219 | } while(0) | ||
| 204 | 220 | ||
| 205 | /** | 221 | /** |
| 206 | * rcu_dereference - fetch an RCU-protected pointer in an | 222 | * rcu_dereference - fetch an RCU-protected pointer in an |
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 36e2bf4b4315..5371e4e74595 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
| @@ -34,8 +34,8 @@ struct rtc_time { | |||
| 34 | * alarm API. | 34 | * alarm API. |
| 35 | */ | 35 | */ |
| 36 | struct rtc_wkalrm { | 36 | struct rtc_wkalrm { |
| 37 | unsigned char enabled; /* 0 = alarm disable, 1 = alarm disabled */ | 37 | unsigned char enabled; /* 0 = alarm disabled, 1 = alarm enabled */ |
| 38 | unsigned char pending; /* 0 = alarm pending, 1 = alarm not pending */ | 38 | unsigned char pending; /* 0 = alarm not pending, 1 = alarm pending */ |
| 39 | struct rtc_time time; /* time the alarm is set to */ | 39 | struct rtc_time time; /* time the alarm is set to */ |
| 40 | }; | 40 | }; |
| 41 | 41 | ||
diff --git a/include/linux/sched.h b/include/linux/sched.h index 821f0481ebe1..aaf723308ed4 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1153,7 +1153,7 @@ extern int force_sig_info(int, struct siginfo *, struct task_struct *); | |||
| 1153 | extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp); | 1153 | extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp); |
| 1154 | extern int kill_pg_info(int, struct siginfo *, pid_t); | 1154 | extern int kill_pg_info(int, struct siginfo *, pid_t); |
| 1155 | extern int kill_proc_info(int, struct siginfo *, pid_t); | 1155 | extern int kill_proc_info(int, struct siginfo *, pid_t); |
| 1156 | extern int kill_proc_info_as_uid(int, struct siginfo *, pid_t, uid_t, uid_t); | 1156 | extern int kill_proc_info_as_uid(int, struct siginfo *, pid_t, uid_t, uid_t, u32); |
| 1157 | extern void do_notify_parent(struct task_struct *, int); | 1157 | extern void do_notify_parent(struct task_struct *, int); |
| 1158 | extern void force_sig(int, struct task_struct *); | 1158 | extern void force_sig(int, struct task_struct *); |
| 1159 | extern void force_sig_specific(int, struct task_struct *); | 1159 | extern void force_sig_specific(int, struct task_struct *); |
diff --git a/include/linux/security.h b/include/linux/security.h index 51805806f974..f75303831d09 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -67,7 +67,7 @@ struct xfrm_state; | |||
| 67 | struct xfrm_user_sec_ctx; | 67 | struct xfrm_user_sec_ctx; |
| 68 | 68 | ||
| 69 | extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb); | 69 | extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb); |
| 70 | extern int cap_netlink_recv(struct sk_buff *skb); | 70 | extern int cap_netlink_recv(struct sk_buff *skb, int cap); |
| 71 | 71 | ||
| 72 | /* | 72 | /* |
| 73 | * Values used in the task_security_ops calls | 73 | * Values used in the task_security_ops calls |
| @@ -567,6 +567,9 @@ struct swap_info_struct; | |||
| 567 | * @p. | 567 | * @p. |
| 568 | * @p contains the task_struct for the process. | 568 | * @p contains the task_struct for the process. |
| 569 | * Return 0 if permission is granted. | 569 | * Return 0 if permission is granted. |
| 570 | * @task_getsecid: | ||
| 571 | * Retrieve the security identifier of the process @p. | ||
| 572 | * @p contains the task_struct for the process and place is into @secid. | ||
| 570 | * @task_setgroups: | 573 | * @task_setgroups: |
| 571 | * Check permission before setting the supplementary group set of the | 574 | * Check permission before setting the supplementary group set of the |
| 572 | * current process. | 575 | * current process. |
| @@ -582,6 +585,10 @@ struct swap_info_struct; | |||
| 582 | * @p contains the task_struct of process. | 585 | * @p contains the task_struct of process. |
| 583 | * @ioprio contains the new ioprio value | 586 | * @ioprio contains the new ioprio value |
| 584 | * Return 0 if permission is granted. | 587 | * Return 0 if permission is granted. |
| 588 | * @task_getioprio | ||
| 589 | * Check permission before getting the ioprio value of @p. | ||
| 590 | * @p contains the task_struct of process. | ||
| 591 | * Return 0 if permission is granted. | ||
| 585 | * @task_setrlimit: | 592 | * @task_setrlimit: |
| 586 | * Check permission before setting the resource limits of the current | 593 | * Check permission before setting the resource limits of the current |
| 587 | * process for @resource to @new_rlim. The old resource limit values can | 594 | * process for @resource to @new_rlim. The old resource limit values can |
| @@ -615,6 +622,7 @@ struct swap_info_struct; | |||
| 615 | * @p contains the task_struct for process. | 622 | * @p contains the task_struct for process. |
| 616 | * @info contains the signal information. | 623 | * @info contains the signal information. |
| 617 | * @sig contains the signal value. | 624 | * @sig contains the signal value. |
| 625 | * @secid contains the sid of the process where the signal originated | ||
| 618 | * Return 0 if permission is granted. | 626 | * Return 0 if permission is granted. |
| 619 | * @task_wait: | 627 | * @task_wait: |
| 620 | * Check permission before allowing a process to reap a child process @p | 628 | * Check permission before allowing a process to reap a child process @p |
| @@ -656,6 +664,7 @@ struct swap_info_struct; | |||
| 656 | * Check permission before processing the received netlink message in | 664 | * Check permission before processing the received netlink message in |
| 657 | * @skb. | 665 | * @skb. |
| 658 | * @skb contains the sk_buff structure for the netlink message. | 666 | * @skb contains the sk_buff structure for the netlink message. |
| 667 | * @cap indicates the capability required | ||
| 659 | * Return 0 if permission is granted. | 668 | * Return 0 if permission is granted. |
| 660 | * | 669 | * |
| 661 | * Security hooks for Unix domain networking. | 670 | * Security hooks for Unix domain networking. |
| @@ -1218,16 +1227,18 @@ struct security_operations { | |||
| 1218 | int (*task_setpgid) (struct task_struct * p, pid_t pgid); | 1227 | int (*task_setpgid) (struct task_struct * p, pid_t pgid); |
| 1219 | int (*task_getpgid) (struct task_struct * p); | 1228 | int (*task_getpgid) (struct task_struct * p); |
| 1220 | int (*task_getsid) (struct task_struct * p); | 1229 | int (*task_getsid) (struct task_struct * p); |
| 1230 | void (*task_getsecid) (struct task_struct * p, u32 * secid); | ||
| 1221 | int (*task_setgroups) (struct group_info *group_info); | 1231 | int (*task_setgroups) (struct group_info *group_info); |
| 1222 | int (*task_setnice) (struct task_struct * p, int nice); | 1232 | int (*task_setnice) (struct task_struct * p, int nice); |
| 1223 | int (*task_setioprio) (struct task_struct * p, int ioprio); | 1233 | int (*task_setioprio) (struct task_struct * p, int ioprio); |
| 1234 | int (*task_getioprio) (struct task_struct * p); | ||
| 1224 | int (*task_setrlimit) (unsigned int resource, struct rlimit * new_rlim); | 1235 | int (*task_setrlimit) (unsigned int resource, struct rlimit * new_rlim); |
| 1225 | int (*task_setscheduler) (struct task_struct * p, int policy, | 1236 | int (*task_setscheduler) (struct task_struct * p, int policy, |
| 1226 | struct sched_param * lp); | 1237 | struct sched_param * lp); |
| 1227 | int (*task_getscheduler) (struct task_struct * p); | 1238 | int (*task_getscheduler) (struct task_struct * p); |
| 1228 | int (*task_movememory) (struct task_struct * p); | 1239 | int (*task_movememory) (struct task_struct * p); |
| 1229 | int (*task_kill) (struct task_struct * p, | 1240 | int (*task_kill) (struct task_struct * p, |
| 1230 | struct siginfo * info, int sig); | 1241 | struct siginfo * info, int sig, u32 secid); |
| 1231 | int (*task_wait) (struct task_struct * p); | 1242 | int (*task_wait) (struct task_struct * p); |
| 1232 | int (*task_prctl) (int option, unsigned long arg2, | 1243 | int (*task_prctl) (int option, unsigned long arg2, |
| 1233 | unsigned long arg3, unsigned long arg4, | 1244 | unsigned long arg3, unsigned long arg4, |
| @@ -1266,7 +1277,7 @@ struct security_operations { | |||
| 1266 | struct sembuf * sops, unsigned nsops, int alter); | 1277 | struct sembuf * sops, unsigned nsops, int alter); |
| 1267 | 1278 | ||
| 1268 | int (*netlink_send) (struct sock * sk, struct sk_buff * skb); | 1279 | int (*netlink_send) (struct sock * sk, struct sk_buff * skb); |
| 1269 | int (*netlink_recv) (struct sk_buff * skb); | 1280 | int (*netlink_recv) (struct sk_buff * skb, int cap); |
| 1270 | 1281 | ||
| 1271 | /* allow module stacking */ | 1282 | /* allow module stacking */ |
| 1272 | int (*register_security) (const char *name, | 1283 | int (*register_security) (const char *name, |
| @@ -1838,6 +1849,11 @@ static inline int security_task_getsid (struct task_struct *p) | |||
| 1838 | return security_ops->task_getsid (p); | 1849 | return security_ops->task_getsid (p); |
| 1839 | } | 1850 | } |
| 1840 | 1851 | ||
| 1852 | static inline void security_task_getsecid (struct task_struct *p, u32 *secid) | ||
| 1853 | { | ||
| 1854 | security_ops->task_getsecid (p, secid); | ||
| 1855 | } | ||
| 1856 | |||
| 1841 | static inline int security_task_setgroups (struct group_info *group_info) | 1857 | static inline int security_task_setgroups (struct group_info *group_info) |
| 1842 | { | 1858 | { |
| 1843 | return security_ops->task_setgroups (group_info); | 1859 | return security_ops->task_setgroups (group_info); |
| @@ -1853,6 +1869,11 @@ static inline int security_task_setioprio (struct task_struct *p, int ioprio) | |||
| 1853 | return security_ops->task_setioprio (p, ioprio); | 1869 | return security_ops->task_setioprio (p, ioprio); |
| 1854 | } | 1870 | } |
| 1855 | 1871 | ||
| 1872 | static inline int security_task_getioprio (struct task_struct *p) | ||
| 1873 | { | ||
| 1874 | return security_ops->task_getioprio (p); | ||
| 1875 | } | ||
| 1876 | |||
| 1856 | static inline int security_task_setrlimit (unsigned int resource, | 1877 | static inline int security_task_setrlimit (unsigned int resource, |
| 1857 | struct rlimit *new_rlim) | 1878 | struct rlimit *new_rlim) |
| 1858 | { | 1879 | { |
| @@ -1877,9 +1898,10 @@ static inline int security_task_movememory (struct task_struct *p) | |||
| 1877 | } | 1898 | } |
| 1878 | 1899 | ||
| 1879 | static inline int security_task_kill (struct task_struct *p, | 1900 | static inline int security_task_kill (struct task_struct *p, |
| 1880 | struct siginfo *info, int sig) | 1901 | struct siginfo *info, int sig, |
| 1902 | u32 secid) | ||
| 1881 | { | 1903 | { |
| 1882 | return security_ops->task_kill (p, info, sig); | 1904 | return security_ops->task_kill (p, info, sig, secid); |
| 1883 | } | 1905 | } |
| 1884 | 1906 | ||
| 1885 | static inline int security_task_wait (struct task_struct *p) | 1907 | static inline int security_task_wait (struct task_struct *p) |
| @@ -2032,9 +2054,9 @@ static inline int security_netlink_send(struct sock *sk, struct sk_buff * skb) | |||
| 2032 | return security_ops->netlink_send(sk, skb); | 2054 | return security_ops->netlink_send(sk, skb); |
| 2033 | } | 2055 | } |
| 2034 | 2056 | ||
| 2035 | static inline int security_netlink_recv(struct sk_buff * skb) | 2057 | static inline int security_netlink_recv(struct sk_buff * skb, int cap) |
| 2036 | { | 2058 | { |
| 2037 | return security_ops->netlink_recv(skb); | 2059 | return security_ops->netlink_recv(skb, cap); |
| 2038 | } | 2060 | } |
| 2039 | 2061 | ||
| 2040 | /* prototypes */ | 2062 | /* prototypes */ |
| @@ -2490,6 +2512,9 @@ static inline int security_task_getsid (struct task_struct *p) | |||
| 2490 | return 0; | 2512 | return 0; |
| 2491 | } | 2513 | } |
| 2492 | 2514 | ||
| 2515 | static inline void security_task_getsecid (struct task_struct *p, u32 *secid) | ||
| 2516 | { } | ||
| 2517 | |||
| 2493 | static inline int security_task_setgroups (struct group_info *group_info) | 2518 | static inline int security_task_setgroups (struct group_info *group_info) |
| 2494 | { | 2519 | { |
| 2495 | return 0; | 2520 | return 0; |
| @@ -2505,6 +2530,11 @@ static inline int security_task_setioprio (struct task_struct *p, int ioprio) | |||
| 2505 | return 0; | 2530 | return 0; |
| 2506 | } | 2531 | } |
| 2507 | 2532 | ||
| 2533 | static inline int security_task_getioprio (struct task_struct *p) | ||
| 2534 | { | ||
| 2535 | return 0; | ||
| 2536 | } | ||
| 2537 | |||
| 2508 | static inline int security_task_setrlimit (unsigned int resource, | 2538 | static inline int security_task_setrlimit (unsigned int resource, |
| 2509 | struct rlimit *new_rlim) | 2539 | struct rlimit *new_rlim) |
| 2510 | { | 2540 | { |
| @@ -2529,7 +2559,8 @@ static inline int security_task_movememory (struct task_struct *p) | |||
| 2529 | } | 2559 | } |
| 2530 | 2560 | ||
| 2531 | static inline int security_task_kill (struct task_struct *p, | 2561 | static inline int security_task_kill (struct task_struct *p, |
| 2532 | struct siginfo *info, int sig) | 2562 | struct siginfo *info, int sig, |
| 2563 | u32 secid) | ||
| 2533 | { | 2564 | { |
| 2534 | return 0; | 2565 | return 0; |
| 2535 | } | 2566 | } |
| @@ -2670,9 +2701,9 @@ static inline int security_netlink_send (struct sock *sk, struct sk_buff *skb) | |||
| 2670 | return cap_netlink_send (sk, skb); | 2701 | return cap_netlink_send (sk, skb); |
| 2671 | } | 2702 | } |
| 2672 | 2703 | ||
| 2673 | static inline int security_netlink_recv (struct sk_buff *skb) | 2704 | static inline int security_netlink_recv (struct sk_buff *skb, int cap) |
| 2674 | { | 2705 | { |
| 2675 | return cap_netlink_recv (skb); | 2706 | return cap_netlink_recv (skb, cap); |
| 2676 | } | 2707 | } |
| 2677 | 2708 | ||
| 2678 | static inline struct dentry *securityfs_create_dir(const char *name, | 2709 | static inline struct dentry *securityfs_create_dir(const char *name, |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 16eef03ce0eb..57d7d4965f9a 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -171,7 +171,15 @@ enum { | |||
| 171 | 171 | ||
| 172 | enum { | 172 | enum { |
| 173 | SKB_GSO_TCPV4 = 1 << 0, | 173 | SKB_GSO_TCPV4 = 1 << 0, |
| 174 | SKB_GSO_UDPV4 = 1 << 1, | 174 | SKB_GSO_UDP = 1 << 1, |
| 175 | |||
| 176 | /* This indicates the skb is from an untrusted source. */ | ||
| 177 | SKB_GSO_DODGY = 1 << 2, | ||
| 178 | |||
| 179 | /* This indicates the tcp segment has CWR set. */ | ||
| 180 | SKB_GSO_TCP_ECN = 1 << 3, | ||
| 181 | |||
| 182 | SKB_GSO_TCPV6 = 1 << 4, | ||
| 175 | }; | 183 | }; |
| 176 | 184 | ||
| 177 | /** | 185 | /** |
| @@ -1298,8 +1306,7 @@ extern void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to); | |||
| 1298 | extern void skb_split(struct sk_buff *skb, | 1306 | extern void skb_split(struct sk_buff *skb, |
| 1299 | struct sk_buff *skb1, const u32 len); | 1307 | struct sk_buff *skb1, const u32 len); |
| 1300 | 1308 | ||
| 1301 | extern void skb_release_data(struct sk_buff *skb); | 1309 | extern struct sk_buff *skb_segment(struct sk_buff *skb, int features); |
| 1302 | extern struct sk_buff *skb_segment(struct sk_buff *skb, int sg); | ||
| 1303 | 1310 | ||
| 1304 | static inline void *skb_header_pointer(const struct sk_buff *skb, int offset, | 1311 | static inline void *skb_header_pointer(const struct sk_buff *skb, int offset, |
| 1305 | int len, void *buffer) | 1312 | int len, void *buffer) |
diff --git a/include/linux/smp.h b/include/linux/smp.h index c93c3fe4308c..837e8bce1349 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
| @@ -125,4 +125,6 @@ static inline void smp_send_reschedule(int cpu) { } | |||
| 125 | #define put_cpu() preempt_enable() | 125 | #define put_cpu() preempt_enable() |
| 126 | #define put_cpu_no_resched() preempt_enable_no_resched() | 126 | #define put_cpu_no_resched() preempt_enable_no_resched() |
| 127 | 127 | ||
| 128 | void smp_setup_processor_id(void); | ||
| 129 | |||
| 128 | #endif /* __LINUX_SMP_H */ | 130 | #endif /* __LINUX_SMP_H */ |
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 503564384545..7b27c09b5604 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h | |||
| @@ -159,7 +159,9 @@ struct svc_rqst { | |||
| 159 | * determine what device number | 159 | * determine what device number |
| 160 | * to report (real or virtual) | 160 | * to report (real or virtual) |
| 161 | */ | 161 | */ |
| 162 | 162 | int rq_sendfile_ok; /* turned off in gss privacy | |
| 163 | * to prevent encrypting page | ||
| 164 | * cache pages */ | ||
| 163 | wait_queue_head_t rq_wait; /* synchronization */ | 165 | wait_queue_head_t rq_wait; /* synchronization */ |
| 164 | }; | 166 | }; |
| 165 | 167 | ||
diff --git a/include/linux/swap.h b/include/linux/swap.h index c41e2d6d1acc..cf6ca6e377bd 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
| @@ -189,7 +189,6 @@ extern long vm_total_pages; | |||
| 189 | 189 | ||
| 190 | #ifdef CONFIG_NUMA | 190 | #ifdef CONFIG_NUMA |
| 191 | extern int zone_reclaim_mode; | 191 | extern int zone_reclaim_mode; |
| 192 | extern int zone_reclaim_interval; | ||
| 193 | extern int zone_reclaim(struct zone *, gfp_t, unsigned int); | 192 | extern int zone_reclaim(struct zone *, gfp_t, unsigned int); |
| 194 | #else | 193 | #else |
| 195 | #define zone_reclaim_mode 0 | 194 | #define zone_reclaim_mode 0 |
diff --git a/include/linux/udp.h b/include/linux/udp.h index bdd39be09406..90223f057d50 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h | |||
| @@ -46,7 +46,7 @@ struct udp_sock { | |||
| 46 | unsigned int corkflag; /* Cork is required */ | 46 | unsigned int corkflag; /* Cork is required */ |
| 47 | __u16 encap_type; /* Is this an Encapsulation socket? */ | 47 | __u16 encap_type; /* Is this an Encapsulation socket? */ |
| 48 | /* | 48 | /* |
| 49 | * Following member retains the infomation to create a UDP header | 49 | * Following member retains the information to create a UDP header |
| 50 | * when the socket is uncorked. | 50 | * when the socket is uncorked. |
| 51 | */ | 51 | */ |
| 52 | __u16 len; /* total length of pending frames */ | 52 | __u16 len; /* total length of pending frames */ |
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h index e39b7cc43390..fc62887c5206 100644 --- a/include/linux/ufs_fs.h +++ b/include/linux/ufs_fs.h | |||
| @@ -993,7 +993,7 @@ extern void ufs_panic (struct super_block *, const char *, const char *, ...) __ | |||
| 993 | extern struct inode_operations ufs_fast_symlink_inode_operations; | 993 | extern struct inode_operations ufs_fast_symlink_inode_operations; |
| 994 | 994 | ||
| 995 | /* truncate.c */ | 995 | /* truncate.c */ |
| 996 | extern void ufs_truncate (struct inode *); | 996 | extern int ufs_truncate (struct inode *, loff_t); |
| 997 | 997 | ||
| 998 | static inline struct ufs_sb_info *UFS_SB(struct super_block *sb) | 998 | static inline struct ufs_sb_info *UFS_SB(struct super_block *sb) |
| 999 | { | 999 | { |
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h new file mode 100644 index 000000000000..3e0daf54133e --- /dev/null +++ b/include/linux/vmstat.h | |||
| @@ -0,0 +1,215 @@ | |||
| 1 | #ifndef _LINUX_VMSTAT_H | ||
| 2 | #define _LINUX_VMSTAT_H | ||
| 3 | |||
| 4 | #include <linux/types.h> | ||
| 5 | #include <linux/percpu.h> | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/mmzone.h> | ||
| 8 | #include <asm/atomic.h> | ||
| 9 | |||
| 10 | #ifdef CONFIG_VM_EVENT_COUNTERS | ||
| 11 | /* | ||
| 12 | * Light weight per cpu counter implementation. | ||
| 13 | * | ||
| 14 | * Counters should only be incremented and no critical kernel component | ||
| 15 | * should rely on the counter values. | ||
| 16 | * | ||
| 17 | * Counters are handled completely inline. On many platforms the code | ||
| 18 | * generated will simply be the increment of a global address. | ||
| 19 | */ | ||
| 20 | |||
| 21 | #define FOR_ALL_ZONES(x) x##_DMA, x##_DMA32, x##_NORMAL, x##_HIGH | ||
| 22 | |||
| 23 | enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, | ||
| 24 | FOR_ALL_ZONES(PGALLOC), | ||
| 25 | PGFREE, PGACTIVATE, PGDEACTIVATE, | ||
| 26 | PGFAULT, PGMAJFAULT, | ||
| 27 | FOR_ALL_ZONES(PGREFILL), | ||
| 28 | FOR_ALL_ZONES(PGSTEAL), | ||
| 29 | FOR_ALL_ZONES(PGSCAN_KSWAPD), | ||
| 30 | FOR_ALL_ZONES(PGSCAN_DIRECT), | ||
| 31 | PGINODESTEAL, SLABS_SCANNED, KSWAPD_STEAL, KSWAPD_INODESTEAL, | ||
| 32 | PAGEOUTRUN, ALLOCSTALL, PGROTATED, | ||
| 33 | NR_VM_EVENT_ITEMS | ||
| 34 | }; | ||
| 35 | |||
| 36 | struct vm_event_state { | ||
| 37 | unsigned long event[NR_VM_EVENT_ITEMS]; | ||
| 38 | }; | ||
| 39 | |||
| 40 | DECLARE_PER_CPU(struct vm_event_state, vm_event_states); | ||
| 41 | |||
| 42 | static inline void __count_vm_event(enum vm_event_item item) | ||
| 43 | { | ||
| 44 | __get_cpu_var(vm_event_states.event[item])++; | ||
| 45 | } | ||
| 46 | |||
| 47 | static inline void count_vm_event(enum vm_event_item item) | ||
| 48 | { | ||
| 49 | get_cpu_var(vm_event_states.event[item])++; | ||
| 50 | put_cpu(); | ||
| 51 | } | ||
| 52 | |||
| 53 | static inline void __count_vm_events(enum vm_event_item item, long delta) | ||
| 54 | { | ||
| 55 | __get_cpu_var(vm_event_states.event[item]) += delta; | ||
| 56 | } | ||
| 57 | |||
| 58 | static inline void count_vm_events(enum vm_event_item item, long delta) | ||
| 59 | { | ||
| 60 | get_cpu_var(vm_event_states.event[item])++; | ||
| 61 | put_cpu(); | ||
| 62 | } | ||
| 63 | |||
| 64 | extern void all_vm_events(unsigned long *); | ||
| 65 | extern void vm_events_fold_cpu(int cpu); | ||
| 66 | |||
| 67 | #else | ||
| 68 | |||
| 69 | /* Disable counters */ | ||
| 70 | #define get_cpu_vm_events(e) 0L | ||
| 71 | #define count_vm_event(e) do { } while (0) | ||
| 72 | #define count_vm_events(e,d) do { } while (0) | ||
| 73 | #define __count_vm_event(e) do { } while (0) | ||
| 74 | #define __count_vm_events(e,d) do { } while (0) | ||
| 75 | #define vm_events_fold_cpu(x) do { } while (0) | ||
| 76 | |||
| 77 | #endif /* CONFIG_VM_EVENT_COUNTERS */ | ||
| 78 | |||
| 79 | #define __count_zone_vm_events(item, zone, delta) \ | ||
| 80 | __count_vm_events(item##_DMA + zone_idx(zone), delta) | ||
| 81 | |||
| 82 | /* | ||
| 83 | * Zone based page accounting with per cpu differentials. | ||
| 84 | */ | ||
| 85 | extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]; | ||
| 86 | |||
| 87 | static inline void zone_page_state_add(long x, struct zone *zone, | ||
| 88 | enum zone_stat_item item) | ||
| 89 | { | ||
| 90 | atomic_long_add(x, &zone->vm_stat[item]); | ||
| 91 | atomic_long_add(x, &vm_stat[item]); | ||
| 92 | } | ||
| 93 | |||
| 94 | static inline unsigned long global_page_state(enum zone_stat_item item) | ||
| 95 | { | ||
| 96 | long x = atomic_long_read(&vm_stat[item]); | ||
| 97 | #ifdef CONFIG_SMP | ||
| 98 | if (x < 0) | ||
| 99 | x = 0; | ||
| 100 | #endif | ||
| 101 | return x; | ||
| 102 | } | ||
| 103 | |||
| 104 | static inline unsigned long zone_page_state(struct zone *zone, | ||
| 105 | enum zone_stat_item item) | ||
| 106 | { | ||
| 107 | long x = atomic_long_read(&zone->vm_stat[item]); | ||
| 108 | #ifdef CONFIG_SMP | ||
| 109 | if (x < 0) | ||
| 110 | x = 0; | ||
| 111 | #endif | ||
| 112 | return x; | ||
| 113 | } | ||
| 114 | |||
| 115 | #ifdef CONFIG_NUMA | ||
| 116 | /* | ||
| 117 | * Determine the per node value of a stat item. This function | ||
| 118 | * is called frequently in a NUMA machine, so try to be as | ||
| 119 | * frugal as possible. | ||
| 120 | */ | ||
| 121 | static inline unsigned long node_page_state(int node, | ||
| 122 | enum zone_stat_item item) | ||
| 123 | { | ||
| 124 | struct zone *zones = NODE_DATA(node)->node_zones; | ||
| 125 | |||
| 126 | return | ||
| 127 | #ifndef CONFIG_DMA_IS_NORMAL | ||
| 128 | #if !defined(CONFIG_DMA_IS_DMA32) && BITS_PER_LONG >= 64 | ||
| 129 | zone_page_state(&zones[ZONE_DMA32], item) + | ||
| 130 | #endif | ||
| 131 | zone_page_state(&zones[ZONE_NORMAL], item) + | ||
| 132 | #endif | ||
| 133 | #ifdef CONFIG_HIGHMEM | ||
| 134 | zone_page_state(&zones[ZONE_HIGHMEM], item) + | ||
| 135 | #endif | ||
| 136 | zone_page_state(&zones[ZONE_DMA], item); | ||
| 137 | } | ||
| 138 | |||
| 139 | extern void zone_statistics(struct zonelist *, struct zone *); | ||
| 140 | |||
| 141 | #else | ||
| 142 | |||
| 143 | #define node_page_state(node, item) global_page_state(item) | ||
| 144 | #define zone_statistics(_zl,_z) do { } while (0) | ||
| 145 | |||
| 146 | #endif /* CONFIG_NUMA */ | ||
| 147 | |||
| 148 | #define __add_zone_page_state(__z, __i, __d) \ | ||
| 149 | __mod_zone_page_state(__z, __i, __d) | ||
| 150 | #define __sub_zone_page_state(__z, __i, __d) \ | ||
| 151 | __mod_zone_page_state(__z, __i,-(__d)) | ||
| 152 | |||
| 153 | #define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d) | ||
| 154 | #define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d)) | ||
| 155 | |||
| 156 | static inline void zap_zone_vm_stats(struct zone *zone) | ||
| 157 | { | ||
| 158 | memset(zone->vm_stat, 0, sizeof(zone->vm_stat)); | ||
| 159 | } | ||
| 160 | |||
| 161 | extern void inc_zone_state(struct zone *, enum zone_stat_item); | ||
| 162 | |||
| 163 | #ifdef CONFIG_SMP | ||
| 164 | void __mod_zone_page_state(struct zone *, enum zone_stat_item item, int); | ||
| 165 | void __inc_zone_page_state(struct page *, enum zone_stat_item); | ||
| 166 | void __dec_zone_page_state(struct page *, enum zone_stat_item); | ||
| 167 | |||
| 168 | void mod_zone_page_state(struct zone *, enum zone_stat_item, int); | ||
| 169 | void inc_zone_page_state(struct page *, enum zone_stat_item); | ||
| 170 | void dec_zone_page_state(struct page *, enum zone_stat_item); | ||
| 171 | |||
| 172 | extern void inc_zone_state(struct zone *, enum zone_stat_item); | ||
| 173 | |||
| 174 | void refresh_cpu_vm_stats(int); | ||
| 175 | void refresh_vm_stats(void); | ||
| 176 | |||
| 177 | #else /* CONFIG_SMP */ | ||
| 178 | |||
| 179 | /* | ||
| 180 | * We do not maintain differentials in a single processor configuration. | ||
| 181 | * The functions directly modify the zone and global counters. | ||
| 182 | */ | ||
| 183 | static inline void __mod_zone_page_state(struct zone *zone, | ||
| 184 | enum zone_stat_item item, int delta) | ||
| 185 | { | ||
| 186 | zone_page_state_add(delta, zone, item); | ||
| 187 | } | ||
| 188 | |||
| 189 | static inline void __inc_zone_page_state(struct page *page, | ||
| 190 | enum zone_stat_item item) | ||
| 191 | { | ||
| 192 | atomic_long_inc(&page_zone(page)->vm_stat[item]); | ||
| 193 | atomic_long_inc(&vm_stat[item]); | ||
| 194 | } | ||
| 195 | |||
| 196 | static inline void __dec_zone_page_state(struct page *page, | ||
| 197 | enum zone_stat_item item) | ||
| 198 | { | ||
| 199 | atomic_long_dec(&page_zone(page)->vm_stat[item]); | ||
| 200 | atomic_long_dec(&vm_stat[item]); | ||
| 201 | } | ||
| 202 | |||
| 203 | /* | ||
| 204 | * We only use atomic operations to update counters. So there is no need to | ||
| 205 | * disable interrupts. | ||
| 206 | */ | ||
| 207 | #define inc_zone_page_state __inc_zone_page_state | ||
| 208 | #define dec_zone_page_state __dec_zone_page_state | ||
| 209 | #define mod_zone_page_state __mod_zone_page_state | ||
| 210 | |||
| 211 | static inline void refresh_cpu_vm_stats(int cpu) { } | ||
| 212 | static inline void refresh_vm_stats(void) { } | ||
| 213 | #endif | ||
| 214 | |||
| 215 | #endif /* _LINUX_VMSTAT_H */ | ||
diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h index ad9c171bfa07..3c43b95f4c0d 100644 --- a/include/media/tuner-types.h +++ b/include/media/tuner-types.h | |||
| @@ -20,6 +20,7 @@ struct tuner_range { | |||
| 20 | 20 | ||
| 21 | struct tuner_params { | 21 | struct tuner_params { |
| 22 | enum param_type type; | 22 | enum param_type type; |
| 23 | |||
| 23 | /* Many Philips based tuners have a comment like this in their | 24 | /* Many Philips based tuners have a comment like this in their |
| 24 | * datasheet: | 25 | * datasheet: |
| 25 | * | 26 | * |
| @@ -39,6 +40,60 @@ struct tuner_params { | |||
| 39 | * static unless the control byte was sent first. | 40 | * static unless the control byte was sent first. |
| 40 | */ | 41 | */ |
| 41 | unsigned int cb_first_if_lower_freq:1; | 42 | unsigned int cb_first_if_lower_freq:1; |
| 43 | /* Set to 1 if this tuner uses a tda9887 */ | ||
| 44 | unsigned int has_tda9887:1; | ||
| 45 | /* Many Philips tuners use tda9887 PORT1 to select the FM radio | ||
| 46 | sensitivity. If this setting is 1, then set PORT1 to 1 to | ||
| 47 | get proper FM reception. */ | ||
| 48 | unsigned int port1_fm_high_sensitivity:1; | ||
| 49 | /* Some Philips tuners use tda9887 PORT2 to select the FM radio | ||
| 50 | sensitivity. If this setting is 1, then set PORT2 to 1 to | ||
| 51 | get proper FM reception. */ | ||
| 52 | unsigned int port2_fm_high_sensitivity:1; | ||
| 53 | /* Most tuners with a tda9887 use QSS mode. Some (cheaper) tuners | ||
| 54 | use Intercarrier mode. If this setting is 1, then the tuner | ||
| 55 | needs to be set to intercarrier mode. */ | ||
| 56 | unsigned int intercarrier_mode:1; | ||
| 57 | /* This setting sets the default value for PORT1. | ||
| 58 | 0 means inactive, 1 means active. Note: the actual bit | ||
| 59 | value written to the tda9887 is inverted. So a 0 here | ||
| 60 | means a 1 in the B6 bit. */ | ||
| 61 | unsigned int port1_active:1; | ||
| 62 | /* This setting sets the default value for PORT2. | ||
| 63 | 0 means inactive, 1 means active. Note: the actual bit | ||
| 64 | value written to the tda9887 is inverted. So a 0 here | ||
| 65 | means a 1 in the B7 bit. */ | ||
| 66 | unsigned int port2_active:1; | ||
| 67 | /* Sometimes PORT1 is inverted when the SECAM-L' standard is selected. | ||
| 68 | Set this bit to 1 if this is needed. */ | ||
| 69 | unsigned int port1_invert_for_secam_lc:1; | ||
| 70 | /* Sometimes PORT2 is inverted when the SECAM-L' standard is selected. | ||
| 71 | Set this bit to 1 if this is needed. */ | ||
| 72 | unsigned int port2_invert_for_secam_lc:1; | ||
| 73 | /* Some cards require PORT1 to be 1 for mono Radio FM and 0 for stereo. */ | ||
| 74 | unsigned int port1_set_for_fm_mono:1; | ||
| 75 | /* Default tda9887 TOP value in dB for the low band. Default is 0. | ||
| 76 | Range: -16:+15 */ | ||
| 77 | signed int default_top_low:5; | ||
| 78 | /* Default tda9887 TOP value in dB for the mid band. Default is 0. | ||
| 79 | Range: -16:+15 */ | ||
| 80 | signed int default_top_mid:5; | ||
| 81 | /* Default tda9887 TOP value in dB for the high band. Default is 0. | ||
| 82 | Range: -16:+15 */ | ||
| 83 | signed int default_top_high:5; | ||
| 84 | /* Default tda9887 TOP value in dB for SECAM-L/L' for the low band. | ||
| 85 | Default is 0. Several tuners require a different TOP value for | ||
| 86 | the SECAM-L/L' standards. Range: -16:+15 */ | ||
| 87 | signed int default_top_secam_low:5; | ||
| 88 | /* Default tda9887 TOP value in dB for SECAM-L/L' for the mid band. | ||
| 89 | Default is 0. Several tuners require a different TOP value for | ||
| 90 | the SECAM-L/L' standards. Range: -16:+15 */ | ||
| 91 | signed int default_top_secam_mid:5; | ||
| 92 | /* Default tda9887 TOP value in dB for SECAM-L/L' for the high band. | ||
| 93 | Default is 0. Several tuners require a different TOP value for | ||
| 94 | the SECAM-L/L' standards. Range: -16:+15 */ | ||
| 95 | signed int default_top_secam_high:5; | ||
| 96 | |||
| 42 | 97 | ||
| 43 | unsigned int count; | 98 | unsigned int count; |
| 44 | struct tuner_range *ranges; | 99 | struct tuner_range *ranges; |
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 795f81f9ec7f..5ba72d95280c 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h | |||
| @@ -53,10 +53,16 @@ struct unix_address { | |||
| 53 | struct unix_skb_parms { | 53 | struct unix_skb_parms { |
| 54 | struct ucred creds; /* Skb credentials */ | 54 | struct ucred creds; /* Skb credentials */ |
| 55 | struct scm_fp_list *fp; /* Passed files */ | 55 | struct scm_fp_list *fp; /* Passed files */ |
| 56 | #ifdef CONFIG_SECURITY_NETWORK | ||
| 57 | char *secdata; /* Security context */ | ||
| 58 | u32 seclen; /* Security length */ | ||
| 59 | #endif | ||
| 56 | }; | 60 | }; |
| 57 | 61 | ||
| 58 | #define UNIXCB(skb) (*(struct unix_skb_parms*)&((skb)->cb)) | 62 | #define UNIXCB(skb) (*(struct unix_skb_parms*)&((skb)->cb)) |
| 59 | #define UNIXCREDS(skb) (&UNIXCB((skb)).creds) | 63 | #define UNIXCREDS(skb) (&UNIXCB((skb)).creds) |
| 64 | #define UNIXSECDATA(skb) (&UNIXCB((skb)).secdata) | ||
| 65 | #define UNIXSECLEN(skb) (&UNIXCB((skb)).seclen) | ||
| 60 | 66 | ||
| 61 | #define unix_state_rlock(s) spin_lock(&unix_sk(s)->lock) | 67 | #define unix_state_rlock(s) spin_lock(&unix_sk(s)->lock) |
| 62 | #define unix_state_runlock(s) spin_unlock(&unix_sk(s)->lock) | 68 | #define unix_state_runlock(s) spin_unlock(&unix_sk(s)->lock) |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index a398ae5e30f9..ab29dafb1a6a 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -146,7 +146,7 @@ static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst, | |||
| 146 | struct rt6_info *rt = (struct rt6_info *) dst; | 146 | struct rt6_info *rt = (struct rt6_info *) dst; |
| 147 | 147 | ||
| 148 | write_lock(&sk->sk_dst_lock); | 148 | write_lock(&sk->sk_dst_lock); |
| 149 | __sk_dst_set(sk, dst); | 149 | sk_setup_caps(sk, dst); |
| 150 | np->daddr_cache = daddr; | 150 | np->daddr_cache = daddr; |
| 151 | np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0; | 151 | np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0; |
| 152 | write_unlock(&sk->sk_dst_lock); | 152 | write_unlock(&sk->sk_dst_lock); |
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index 75b5b9333fc7..1925c65e617b 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h | |||
| @@ -169,17 +169,23 @@ psched_tod_diff(int delta_sec, int bound) | |||
| 169 | 169 | ||
| 170 | #define PSCHED_TADD2(tv, delta, tv_res) \ | 170 | #define PSCHED_TADD2(tv, delta, tv_res) \ |
| 171 | ({ \ | 171 | ({ \ |
| 172 | int __delta = (tv).tv_usec + (delta); \ | 172 | int __delta = (delta); \ |
| 173 | (tv_res).tv_sec = (tv).tv_sec; \ | 173 | (tv_res) = (tv); \ |
| 174 | if (__delta > USEC_PER_SEC) { (tv_res).tv_sec++; __delta -= USEC_PER_SEC; } \ | 174 | while(__delta >= USEC_PER_SEC){ \ |
| 175 | (tv_res).tv_sec++; \ | ||
| 176 | __delta -= USEC_PER_SEC; \ | ||
| 177 | } \ | ||
| 175 | (tv_res).tv_usec = __delta; \ | 178 | (tv_res).tv_usec = __delta; \ |
| 176 | }) | 179 | }) |
| 177 | 180 | ||
| 178 | #define PSCHED_TADD(tv, delta) \ | 181 | #define PSCHED_TADD(tv, delta) \ |
| 179 | ({ \ | 182 | ({ \ |
| 180 | (tv).tv_usec += (delta); \ | 183 | int __delta = (delta); \ |
| 181 | if ((tv).tv_usec > USEC_PER_SEC) { (tv).tv_sec++; \ | 184 | while(__delta >= USEC_PER_SEC){ \ |
| 182 | (tv).tv_usec -= USEC_PER_SEC; } \ | 185 | (tv).tv_sec++; \ |
| 186 | __delta -= USEC_PER_SEC; \ | ||
| 187 | } \ | ||
| 188 | (tv).tv_usec = __delta; \ | ||
| 183 | }) | 189 | }) |
| 184 | 190 | ||
| 185 | /* Set/check that time is in the "past perfect"; | 191 | /* Set/check that time is in the "past perfect"; |
diff --git a/include/net/protocol.h b/include/net/protocol.h index 3b6dc15c68a5..a225d6371cb1 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h | |||
| @@ -36,7 +36,8 @@ | |||
| 36 | struct net_protocol { | 36 | struct net_protocol { |
| 37 | int (*handler)(struct sk_buff *skb); | 37 | int (*handler)(struct sk_buff *skb); |
| 38 | void (*err_handler)(struct sk_buff *skb, u32 info); | 38 | void (*err_handler)(struct sk_buff *skb, u32 info); |
| 39 | struct sk_buff *(*gso_segment)(struct sk_buff *skb, int sg); | 39 | struct sk_buff *(*gso_segment)(struct sk_buff *skb, |
| 40 | int features); | ||
| 40 | int no_policy; | 41 | int no_policy; |
| 41 | }; | 42 | }; |
| 42 | 43 | ||
| @@ -49,11 +50,17 @@ struct inet6_protocol | |||
| 49 | struct inet6_skb_parm *opt, | 50 | struct inet6_skb_parm *opt, |
| 50 | int type, int code, int offset, | 51 | int type, int code, int offset, |
| 51 | __u32 info); | 52 | __u32 info); |
| 53 | |||
| 54 | struct sk_buff *(*gso_segment)(struct sk_buff *skb, | ||
| 55 | int features); | ||
| 56 | |||
| 52 | unsigned int flags; /* INET6_PROTO_xxx */ | 57 | unsigned int flags; /* INET6_PROTO_xxx */ |
| 53 | }; | 58 | }; |
| 54 | 59 | ||
| 55 | #define INET6_PROTO_NOPOLICY 0x1 | 60 | #define INET6_PROTO_NOPOLICY 0x1 |
| 56 | #define INET6_PROTO_FINAL 0x2 | 61 | #define INET6_PROTO_FINAL 0x2 |
| 62 | /* This should be set for any extension header which is compatible with GSO. */ | ||
| 63 | #define INET6_PROTO_GSO_EXTHDR 0x4 | ||
| 57 | #endif | 64 | #endif |
| 58 | 65 | ||
| 59 | /* This is used to register socket interfaces for IP protocols. */ | 66 | /* This is used to register socket interfaces for IP protocols. */ |
diff --git a/include/net/scm.h b/include/net/scm.h index 540619cb7160..02daa097cdcd 100644 --- a/include/net/scm.h +++ b/include/net/scm.h | |||
| @@ -19,6 +19,10 @@ struct scm_cookie | |||
| 19 | { | 19 | { |
| 20 | struct ucred creds; /* Skb credentials */ | 20 | struct ucred creds; /* Skb credentials */ |
| 21 | struct scm_fp_list *fp; /* Passed files */ | 21 | struct scm_fp_list *fp; /* Passed files */ |
| 22 | #ifdef CONFIG_SECURITY_NETWORK | ||
| 23 | char *secdata; /* Security context */ | ||
| 24 | u32 seclen; /* Security length */ | ||
| 25 | #endif | ||
| 22 | unsigned long seq; /* Connection seqno */ | 26 | unsigned long seq; /* Connection seqno */ |
| 23 | }; | 27 | }; |
| 24 | 28 | ||
| @@ -48,6 +52,17 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg, | |||
| 48 | return __scm_send(sock, msg, scm); | 52 | return __scm_send(sock, msg, scm); |
| 49 | } | 53 | } |
| 50 | 54 | ||
| 55 | #ifdef CONFIG_SECURITY_NETWORK | ||
| 56 | static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm) | ||
| 57 | { | ||
| 58 | if (test_bit(SOCK_PASSSEC, &sock->flags) && scm->secdata != NULL) | ||
| 59 | put_cmsg(msg, SOL_SOCKET, SCM_SECURITY, scm->seclen, scm->secdata); | ||
| 60 | } | ||
| 61 | #else | ||
| 62 | static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm) | ||
| 63 | { } | ||
| 64 | #endif /* CONFIG_SECURITY_NETWORK */ | ||
| 65 | |||
| 51 | static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, | 66 | static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, |
| 52 | struct scm_cookie *scm, int flags) | 67 | struct scm_cookie *scm, int flags) |
| 53 | { | 68 | { |
| @@ -62,6 +77,8 @@ static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, | |||
| 62 | if (test_bit(SOCK_PASSCRED, &sock->flags)) | 77 | if (test_bit(SOCK_PASSCRED, &sock->flags)) |
| 63 | put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(scm->creds), &scm->creds); | 78 | put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(scm->creds), &scm->creds); |
| 64 | 79 | ||
| 80 | scm_passec(sock, msg, scm); | ||
| 81 | |||
| 65 | if (!scm->fp) | 82 | if (!scm->fp) |
| 66 | return; | 83 | return; |
| 67 | 84 | ||
diff --git a/include/net/sock.h b/include/net/sock.h index 2d8d6adf1616..7b3d6b856946 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -140,6 +140,7 @@ struct sock_common { | |||
| 140 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, %SO_OOBINLINE settings | 140 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, %SO_OOBINLINE settings |
| 141 | * @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets | 141 | * @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets |
| 142 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) | 142 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) |
| 143 | * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) | ||
| 143 | * @sk_lingertime: %SO_LINGER l_linger setting | 144 | * @sk_lingertime: %SO_LINGER l_linger setting |
| 144 | * @sk_backlog: always used with the per-socket spinlock held | 145 | * @sk_backlog: always used with the per-socket spinlock held |
| 145 | * @sk_callback_lock: used with the callbacks in the end of this struct | 146 | * @sk_callback_lock: used with the callbacks in the end of this struct |
| @@ -211,6 +212,7 @@ struct sock { | |||
| 211 | gfp_t sk_allocation; | 212 | gfp_t sk_allocation; |
| 212 | int sk_sndbuf; | 213 | int sk_sndbuf; |
| 213 | int sk_route_caps; | 214 | int sk_route_caps; |
| 215 | int sk_gso_type; | ||
| 214 | int sk_rcvlowat; | 216 | int sk_rcvlowat; |
| 215 | unsigned long sk_flags; | 217 | unsigned long sk_flags; |
| 216 | unsigned long sk_lingertime; | 218 | unsigned long sk_lingertime; |
| @@ -383,7 +385,6 @@ enum sock_flags { | |||
| 383 | SOCK_USE_WRITE_QUEUE, /* whether to call sk->sk_write_space in sock_wfree */ | 385 | SOCK_USE_WRITE_QUEUE, /* whether to call sk->sk_write_space in sock_wfree */ |
| 384 | SOCK_DBG, /* %SO_DEBUG setting */ | 386 | SOCK_DBG, /* %SO_DEBUG setting */ |
| 385 | SOCK_RCVTSTAMP, /* %SO_TIMESTAMP setting */ | 387 | SOCK_RCVTSTAMP, /* %SO_TIMESTAMP setting */ |
| 386 | SOCK_NO_LARGESEND, /* whether to sent large segments or not */ | ||
| 387 | SOCK_LOCALROUTE, /* route locally only, %SO_DONTROUTE setting */ | 388 | SOCK_LOCALROUTE, /* route locally only, %SO_DONTROUTE setting */ |
| 388 | SOCK_QUEUE_SHRUNK, /* write queue has been shrunk recently */ | 389 | SOCK_QUEUE_SHRUNK, /* write queue has been shrunk recently */ |
| 389 | }; | 390 | }; |
| @@ -1026,15 +1027,20 @@ extern struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie); | |||
| 1026 | 1027 | ||
| 1027 | extern struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie); | 1028 | extern struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie); |
| 1028 | 1029 | ||
| 1030 | static inline int sk_can_gso(const struct sock *sk) | ||
| 1031 | { | ||
| 1032 | return net_gso_ok(sk->sk_route_caps, sk->sk_gso_type); | ||
| 1033 | } | ||
| 1034 | |||
| 1029 | static inline void sk_setup_caps(struct sock *sk, struct dst_entry *dst) | 1035 | static inline void sk_setup_caps(struct sock *sk, struct dst_entry *dst) |
| 1030 | { | 1036 | { |
| 1031 | __sk_dst_set(sk, dst); | 1037 | __sk_dst_set(sk, dst); |
| 1032 | sk->sk_route_caps = dst->dev->features; | 1038 | sk->sk_route_caps = dst->dev->features; |
| 1033 | if (sk->sk_route_caps & NETIF_F_GSO) | 1039 | if (sk->sk_route_caps & NETIF_F_GSO) |
| 1034 | sk->sk_route_caps |= NETIF_F_TSO; | 1040 | sk->sk_route_caps |= NETIF_F_GSO_MASK; |
| 1035 | if (sk->sk_route_caps & NETIF_F_TSO) { | 1041 | if (sk_can_gso(sk)) { |
| 1036 | if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len) | 1042 | if (dst->header_len) |
| 1037 | sk->sk_route_caps &= ~NETIF_F_TSO; | 1043 | sk->sk_route_caps &= ~NETIF_F_GSO_MASK; |
| 1038 | else | 1044 | else |
| 1039 | sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM; | 1045 | sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM; |
| 1040 | } | 1046 | } |
diff --git a/include/net/tcp.h b/include/net/tcp.h index ca3d38dfc00b..3cd803b0d7a5 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -751,7 +751,7 @@ static inline int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight) | |||
| 751 | if (in_flight >= tp->snd_cwnd) | 751 | if (in_flight >= tp->snd_cwnd) |
| 752 | return 1; | 752 | return 1; |
| 753 | 753 | ||
| 754 | if (!(sk->sk_route_caps & NETIF_F_TSO)) | 754 | if (!sk_can_gso(sk)) |
| 755 | return 0; | 755 | return 0; |
| 756 | 756 | ||
| 757 | left = tp->snd_cwnd - in_flight; | 757 | left = tp->snd_cwnd - in_flight; |
| @@ -1086,7 +1086,7 @@ extern struct request_sock_ops tcp_request_sock_ops; | |||
| 1086 | 1086 | ||
| 1087 | extern int tcp_v4_destroy_sock(struct sock *sk); | 1087 | extern int tcp_v4_destroy_sock(struct sock *sk); |
| 1088 | 1088 | ||
| 1089 | extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int sg); | 1089 | extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features); |
| 1090 | 1090 | ||
| 1091 | #ifdef CONFIG_PROC_FS | 1091 | #ifdef CONFIG_PROC_FS |
| 1092 | extern int tcp4_proc_init(void); | 1092 | extern int tcp4_proc_init(void); |
diff --git a/include/net/tcp_ecn.h b/include/net/tcp_ecn.h index c6b84397448d..4629d77173f2 100644 --- a/include/net/tcp_ecn.h +++ b/include/net/tcp_ecn.h | |||
| @@ -31,10 +31,9 @@ static inline void TCP_ECN_send_syn(struct sock *sk, struct tcp_sock *tp, | |||
| 31 | struct sk_buff *skb) | 31 | struct sk_buff *skb) |
| 32 | { | 32 | { |
| 33 | tp->ecn_flags = 0; | 33 | tp->ecn_flags = 0; |
| 34 | if (sysctl_tcp_ecn && !(sk->sk_route_caps & NETIF_F_TSO)) { | 34 | if (sysctl_tcp_ecn) { |
| 35 | TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_ECE|TCPCB_FLAG_CWR; | 35 | TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_ECE|TCPCB_FLAG_CWR; |
| 36 | tp->ecn_flags = TCP_ECN_OK; | 36 | tp->ecn_flags = TCP_ECN_OK; |
| 37 | sock_set_flag(sk, SOCK_NO_LARGESEND); | ||
| 38 | } | 37 | } |
| 39 | } | 38 | } |
| 40 | 39 | ||
| @@ -56,6 +55,7 @@ static inline void TCP_ECN_send(struct sock *sk, struct tcp_sock *tp, | |||
| 56 | if (tp->ecn_flags&TCP_ECN_QUEUE_CWR) { | 55 | if (tp->ecn_flags&TCP_ECN_QUEUE_CWR) { |
| 57 | tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR; | 56 | tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR; |
| 58 | skb->h.th->cwr = 1; | 57 | skb->h.th->cwr = 1; |
| 58 | skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN; | ||
| 59 | } | 59 | } |
| 60 | } else { | 60 | } else { |
| 61 | /* ACK or retransmitted segment: clear ECT|CE */ | 61 | /* ACK or retransmitted segment: clear ECT|CE */ |
diff --git a/init/Kconfig b/init/Kconfig index f70f2fd273c2..a5b073a103e7 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -54,8 +54,8 @@ config LOCK_KERNEL | |||
| 54 | 54 | ||
| 55 | config INIT_ENV_ARG_LIMIT | 55 | config INIT_ENV_ARG_LIMIT |
| 56 | int | 56 | int |
| 57 | default 32 if !USERMODE | 57 | default 32 if !UML |
| 58 | default 128 if USERMODE | 58 | default 128 if UML |
| 59 | help | 59 | help |
| 60 | Maximum of each of the number of arguments and environment | 60 | Maximum of each of the number of arguments and environment |
| 61 | variables passed to init from the kernel command line. | 61 | variables passed to init from the kernel command line. |
| @@ -379,6 +379,15 @@ config SLAB | |||
| 379 | SLOB is more space efficient but does not scale well and is | 379 | SLOB is more space efficient but does not scale well and is |
| 380 | more susceptible to fragmentation. | 380 | more susceptible to fragmentation. |
| 381 | 381 | ||
| 382 | config VM_EVENT_COUNTERS | ||
| 383 | default y | ||
| 384 | bool "Enable VM event counters for /proc/vmstat" if EMBEDDED | ||
| 385 | help | ||
| 386 | VM event counters are only needed to for event counts to be | ||
| 387 | shown. They have no function for the kernel itself. This | ||
| 388 | option allows the disabling of the VM event counters. | ||
| 389 | /proc/vmstat will only show page counts. | ||
| 390 | |||
| 382 | endmenu # General setup | 391 | endmenu # General setup |
| 383 | 392 | ||
| 384 | config TINY_SHMEM | 393 | config TINY_SHMEM |
diff --git a/init/main.c b/init/main.c index bce0eb7f4f8f..b2f3b566790e 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #define __KERNEL_SYSCALLS__ | 12 | #define __KERNEL_SYSCALLS__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/proc_fs.h> | 16 | #include <linux/proc_fs.h> |
| @@ -446,10 +445,17 @@ static void __init boot_cpu_init(void) | |||
| 446 | cpu_set(cpu, cpu_possible_map); | 445 | cpu_set(cpu, cpu_possible_map); |
| 447 | } | 446 | } |
| 448 | 447 | ||
| 448 | void __init __attribute__((weak)) smp_setup_processor_id(void) | ||
| 449 | { | ||
| 450 | } | ||
| 451 | |||
| 449 | asmlinkage void __init start_kernel(void) | 452 | asmlinkage void __init start_kernel(void) |
| 450 | { | 453 | { |
| 451 | char * command_line; | 454 | char * command_line; |
| 452 | extern struct kernel_param __start___param[], __stop___param[]; | 455 | extern struct kernel_param __start___param[], __stop___param[]; |
| 456 | |||
| 457 | smp_setup_processor_id(); | ||
| 458 | |||
| 453 | /* | 459 | /* |
| 454 | * Interrupts are still disabled. Do necessary setups, then | 460 | * Interrupts are still disabled. Do necessary setups, then |
| 455 | * enable them | 461 | * enable them |
diff --git a/ipc/compat.c b/ipc/compat.c index a544dfbb082a..4d20cfd38f0a 100644 --- a/ipc/compat.c +++ b/ipc/compat.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #include <linux/compat.h> | 23 | #include <linux/compat.h> |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/highuid.h> | 25 | #include <linux/highuid.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/capability.h> | 21 | #include <linux/capability.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/msg.h> | 23 | #include <linux/msg.h> |
| 25 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| @@ -66,7 +66,6 @@ | |||
| 66 | * Dustin Kirkland <dustin.kirkland@us.ibm.com> | 66 | * Dustin Kirkland <dustin.kirkland@us.ibm.com> |
| 67 | */ | 67 | */ |
| 68 | 68 | ||
| 69 | #include <linux/config.h> | ||
| 70 | #include <linux/slab.h> | 69 | #include <linux/slab.h> |
| 71 | #include <linux/spinlock.h> | 70 | #include <linux/spinlock.h> |
| 72 | #include <linux/init.h> | 71 | #include <linux/init.h> |
| @@ -17,7 +17,6 @@ | |||
| 17 | * Dustin Kirkland <dustin.kirkland@us.ibm.com> | 17 | * Dustin Kirkland <dustin.kirkland@us.ibm.com> |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 22 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 23 | #include <linux/hugetlb.h> | 22 | #include <linux/hugetlb.h> |
diff --git a/ipc/util.c b/ipc/util.c index 8193299f45f6..67b6d178db6e 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Dustin Kirkland <dustin.kirkland@us.ibm.com> | 14 | * Dustin Kirkland <dustin.kirkland@us.ibm.com> |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 19 | #include <linux/shm.h> | 18 | #include <linux/shm.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
diff --git a/kernel/acct.c b/kernel/acct.c index 126ca43d5d2b..f18e0b8df3e1 100644 --- a/kernel/acct.c +++ b/kernel/acct.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | * a struct file opened for write. Fixed. 2/6/2000, AV. | 43 | * a struct file opened for write. Fixed. 2/6/2000, AV. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/config.h> | ||
| 47 | #include <linux/mm.h> | 46 | #include <linux/mm.h> |
| 48 | #include <linux/slab.h> | 47 | #include <linux/slab.h> |
| 49 | #include <linux/acct.h> | 48 | #include <linux/acct.h> |
diff --git a/kernel/audit.c b/kernel/audit.c index 82443fb433ef..d417ca1db79b 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -445,7 +445,7 @@ void audit_send_reply(int pid, int seq, int type, int done, int multi, | |||
| 445 | * Check for appropriate CAP_AUDIT_ capabilities on incoming audit | 445 | * Check for appropriate CAP_AUDIT_ capabilities on incoming audit |
| 446 | * control messages. | 446 | * control messages. |
| 447 | */ | 447 | */ |
| 448 | static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type) | 448 | static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type) |
| 449 | { | 449 | { |
| 450 | int err = 0; | 450 | int err = 0; |
| 451 | 451 | ||
| @@ -459,13 +459,13 @@ static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type) | |||
| 459 | case AUDIT_DEL: | 459 | case AUDIT_DEL: |
| 460 | case AUDIT_DEL_RULE: | 460 | case AUDIT_DEL_RULE: |
| 461 | case AUDIT_SIGNAL_INFO: | 461 | case AUDIT_SIGNAL_INFO: |
| 462 | if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL)) | 462 | if (security_netlink_recv(skb, CAP_AUDIT_CONTROL)) |
| 463 | err = -EPERM; | 463 | err = -EPERM; |
| 464 | break; | 464 | break; |
| 465 | case AUDIT_USER: | 465 | case AUDIT_USER: |
| 466 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: | 466 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: |
| 467 | case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: | 467 | case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: |
| 468 | if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) | 468 | if (security_netlink_recv(skb, CAP_AUDIT_WRITE)) |
| 469 | err = -EPERM; | 469 | err = -EPERM; |
| 470 | break; | 470 | break; |
| 471 | default: /* bad msg */ | 471 | default: /* bad msg */ |
| @@ -488,7 +488,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 488 | char *ctx; | 488 | char *ctx; |
| 489 | u32 len; | 489 | u32 len; |
| 490 | 490 | ||
| 491 | err = audit_netlink_ok(NETLINK_CB(skb).eff_cap, msg_type); | 491 | err = audit_netlink_ok(skb, msg_type); |
| 492 | if (err) | 492 | if (err) |
| 493 | return err; | 493 | return err; |
| 494 | 494 | ||
diff --git a/kernel/audit.h b/kernel/audit.h index 8323e4132a33..6aa33b848cf2 100644 --- a/kernel/audit.h +++ b/kernel/audit.h | |||
| @@ -81,6 +81,7 @@ struct audit_krule { | |||
| 81 | u32 mask[AUDIT_BITMASK_SIZE]; | 81 | u32 mask[AUDIT_BITMASK_SIZE]; |
| 82 | u32 buflen; /* for data alloc on list rules */ | 82 | u32 buflen; /* for data alloc on list rules */ |
| 83 | u32 field_count; | 83 | u32 field_count; |
| 84 | char *filterkey; /* ties events to rules */ | ||
| 84 | struct audit_field *fields; | 85 | struct audit_field *fields; |
| 85 | struct audit_field *inode_f; /* quick access to an inode field */ | 86 | struct audit_field *inode_f; /* quick access to an inode field */ |
| 86 | struct audit_watch *watch; /* associated watch */ | 87 | struct audit_watch *watch; /* associated watch */ |
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 4c99d2c586ed..5b4e16276ca0 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c | |||
| @@ -141,6 +141,7 @@ static inline void audit_free_rule(struct audit_entry *e) | |||
| 141 | selinux_audit_rule_free(f->se_rule); | 141 | selinux_audit_rule_free(f->se_rule); |
| 142 | } | 142 | } |
| 143 | kfree(e->rule.fields); | 143 | kfree(e->rule.fields); |
| 144 | kfree(e->rule.filterkey); | ||
| 144 | kfree(e); | 145 | kfree(e); |
| 145 | } | 146 | } |
| 146 | 147 | ||
| @@ -278,6 +279,29 @@ static int audit_to_watch(struct audit_krule *krule, char *path, int len, | |||
| 278 | return 0; | 279 | return 0; |
| 279 | } | 280 | } |
| 280 | 281 | ||
| 282 | static __u32 *classes[AUDIT_SYSCALL_CLASSES]; | ||
| 283 | |||
| 284 | int __init audit_register_class(int class, unsigned *list) | ||
| 285 | { | ||
| 286 | __u32 *p = kzalloc(AUDIT_BITMASK_SIZE * sizeof(__u32), GFP_KERNEL); | ||
| 287 | if (!p) | ||
| 288 | return -ENOMEM; | ||
| 289 | while (*list != ~0U) { | ||
| 290 | unsigned n = *list++; | ||
| 291 | if (n >= AUDIT_BITMASK_SIZE * 32 - AUDIT_SYSCALL_CLASSES) { | ||
| 292 | kfree(p); | ||
| 293 | return -EINVAL; | ||
| 294 | } | ||
| 295 | p[AUDIT_WORD(n)] |= AUDIT_BIT(n); | ||
| 296 | } | ||
| 297 | if (class >= AUDIT_SYSCALL_CLASSES || classes[class]) { | ||
| 298 | kfree(p); | ||
| 299 | return -EINVAL; | ||
| 300 | } | ||
| 301 | classes[class] = p; | ||
| 302 | return 0; | ||
| 303 | } | ||
| 304 | |||
| 281 | /* Common user-space to kernel rule translation. */ | 305 | /* Common user-space to kernel rule translation. */ |
| 282 | static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) | 306 | static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) |
| 283 | { | 307 | { |
| @@ -321,6 +345,22 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) | |||
| 321 | for (i = 0; i < AUDIT_BITMASK_SIZE; i++) | 345 | for (i = 0; i < AUDIT_BITMASK_SIZE; i++) |
| 322 | entry->rule.mask[i] = rule->mask[i]; | 346 | entry->rule.mask[i] = rule->mask[i]; |
| 323 | 347 | ||
| 348 | for (i = 0; i < AUDIT_SYSCALL_CLASSES; i++) { | ||
| 349 | int bit = AUDIT_BITMASK_SIZE * 32 - i - 1; | ||
| 350 | __u32 *p = &entry->rule.mask[AUDIT_WORD(bit)]; | ||
| 351 | __u32 *class; | ||
| 352 | |||
| 353 | if (!(*p & AUDIT_BIT(bit))) | ||
| 354 | continue; | ||
| 355 | *p &= ~AUDIT_BIT(bit); | ||
| 356 | class = classes[i]; | ||
| 357 | if (class) { | ||
| 358 | int j; | ||
| 359 | for (j = 0; j < AUDIT_BITMASK_SIZE; j++) | ||
| 360 | entry->rule.mask[j] |= class[j]; | ||
| 361 | } | ||
| 362 | } | ||
| 363 | |||
| 324 | return entry; | 364 | return entry; |
| 325 | 365 | ||
| 326 | exit_err: | 366 | exit_err: |
| @@ -469,11 +509,16 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, | |||
| 469 | case AUDIT_ARG2: | 509 | case AUDIT_ARG2: |
| 470 | case AUDIT_ARG3: | 510 | case AUDIT_ARG3: |
| 471 | break; | 511 | break; |
| 472 | case AUDIT_SE_USER: | 512 | case AUDIT_SUBJ_USER: |
| 473 | case AUDIT_SE_ROLE: | 513 | case AUDIT_SUBJ_ROLE: |
| 474 | case AUDIT_SE_TYPE: | 514 | case AUDIT_SUBJ_TYPE: |
| 475 | case AUDIT_SE_SEN: | 515 | case AUDIT_SUBJ_SEN: |
| 476 | case AUDIT_SE_CLR: | 516 | case AUDIT_SUBJ_CLR: |
| 517 | case AUDIT_OBJ_USER: | ||
| 518 | case AUDIT_OBJ_ROLE: | ||
| 519 | case AUDIT_OBJ_TYPE: | ||
| 520 | case AUDIT_OBJ_LEV_LOW: | ||
| 521 | case AUDIT_OBJ_LEV_HIGH: | ||
| 477 | str = audit_unpack_string(&bufp, &remain, f->val); | 522 | str = audit_unpack_string(&bufp, &remain, f->val); |
| 478 | if (IS_ERR(str)) | 523 | if (IS_ERR(str)) |
| 479 | goto exit_free; | 524 | goto exit_free; |
| @@ -511,6 +556,16 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, | |||
| 511 | if (err) | 556 | if (err) |
| 512 | goto exit_free; | 557 | goto exit_free; |
| 513 | break; | 558 | break; |
| 559 | case AUDIT_FILTERKEY: | ||
| 560 | err = -EINVAL; | ||
| 561 | if (entry->rule.filterkey || f->val > AUDIT_MAX_KEY_LEN) | ||
| 562 | goto exit_free; | ||
| 563 | str = audit_unpack_string(&bufp, &remain, f->val); | ||
| 564 | if (IS_ERR(str)) | ||
| 565 | goto exit_free; | ||
| 566 | entry->rule.buflen += f->val; | ||
| 567 | entry->rule.filterkey = str; | ||
| 568 | break; | ||
| 514 | default: | 569 | default: |
| 515 | goto exit_free; | 570 | goto exit_free; |
| 516 | } | 571 | } |
| @@ -600,11 +655,16 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule) | |||
| 600 | data->fields[i] = f->type; | 655 | data->fields[i] = f->type; |
| 601 | data->fieldflags[i] = f->op; | 656 | data->fieldflags[i] = f->op; |
| 602 | switch(f->type) { | 657 | switch(f->type) { |
| 603 | case AUDIT_SE_USER: | 658 | case AUDIT_SUBJ_USER: |
| 604 | case AUDIT_SE_ROLE: | 659 | case AUDIT_SUBJ_ROLE: |
| 605 | case AUDIT_SE_TYPE: | 660 | case AUDIT_SUBJ_TYPE: |
| 606 | case AUDIT_SE_SEN: | 661 | case AUDIT_SUBJ_SEN: |
| 607 | case AUDIT_SE_CLR: | 662 | case AUDIT_SUBJ_CLR: |
| 663 | case AUDIT_OBJ_USER: | ||
| 664 | case AUDIT_OBJ_ROLE: | ||
| 665 | case AUDIT_OBJ_TYPE: | ||
| 666 | case AUDIT_OBJ_LEV_LOW: | ||
| 667 | case AUDIT_OBJ_LEV_HIGH: | ||
| 608 | data->buflen += data->values[i] = | 668 | data->buflen += data->values[i] = |
| 609 | audit_pack_string(&bufp, f->se_str); | 669 | audit_pack_string(&bufp, f->se_str); |
| 610 | break; | 670 | break; |
| @@ -612,6 +672,10 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule) | |||
| 612 | data->buflen += data->values[i] = | 672 | data->buflen += data->values[i] = |
| 613 | audit_pack_string(&bufp, krule->watch->path); | 673 | audit_pack_string(&bufp, krule->watch->path); |
| 614 | break; | 674 | break; |
| 675 | case AUDIT_FILTERKEY: | ||
| 676 | data->buflen += data->values[i] = | ||
| 677 | audit_pack_string(&bufp, krule->filterkey); | ||
| 678 | break; | ||
| 615 | default: | 679 | default: |
| 616 | data->values[i] = f->val; | 680 | data->values[i] = f->val; |
| 617 | } | 681 | } |
| @@ -639,11 +703,16 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b) | |||
| 639 | return 1; | 703 | return 1; |
| 640 | 704 | ||
| 641 | switch(a->fields[i].type) { | 705 | switch(a->fields[i].type) { |
| 642 | case AUDIT_SE_USER: | 706 | case AUDIT_SUBJ_USER: |
| 643 | case AUDIT_SE_ROLE: | 707 | case AUDIT_SUBJ_ROLE: |
| 644 | case AUDIT_SE_TYPE: | 708 | case AUDIT_SUBJ_TYPE: |
| 645 | case AUDIT_SE_SEN: | 709 | case AUDIT_SUBJ_SEN: |
| 646 | case AUDIT_SE_CLR: | 710 | case AUDIT_SUBJ_CLR: |
| 711 | case AUDIT_OBJ_USER: | ||
| 712 | case AUDIT_OBJ_ROLE: | ||
| 713 | case AUDIT_OBJ_TYPE: | ||
| 714 | case AUDIT_OBJ_LEV_LOW: | ||
| 715 | case AUDIT_OBJ_LEV_HIGH: | ||
| 647 | if (strcmp(a->fields[i].se_str, b->fields[i].se_str)) | 716 | if (strcmp(a->fields[i].se_str, b->fields[i].se_str)) |
| 648 | return 1; | 717 | return 1; |
| 649 | break; | 718 | break; |
| @@ -651,6 +720,11 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b) | |||
| 651 | if (strcmp(a->watch->path, b->watch->path)) | 720 | if (strcmp(a->watch->path, b->watch->path)) |
| 652 | return 1; | 721 | return 1; |
| 653 | break; | 722 | break; |
| 723 | case AUDIT_FILTERKEY: | ||
| 724 | /* both filterkeys exist based on above type compare */ | ||
| 725 | if (strcmp(a->filterkey, b->filterkey)) | ||
| 726 | return 1; | ||
| 727 | break; | ||
| 654 | default: | 728 | default: |
| 655 | if (a->fields[i].val != b->fields[i].val) | 729 | if (a->fields[i].val != b->fields[i].val) |
| 656 | return 1; | 730 | return 1; |
| @@ -730,6 +804,7 @@ static struct audit_entry *audit_dupe_rule(struct audit_krule *old, | |||
| 730 | u32 fcount = old->field_count; | 804 | u32 fcount = old->field_count; |
| 731 | struct audit_entry *entry; | 805 | struct audit_entry *entry; |
| 732 | struct audit_krule *new; | 806 | struct audit_krule *new; |
| 807 | char *fk; | ||
| 733 | int i, err = 0; | 808 | int i, err = 0; |
| 734 | 809 | ||
| 735 | entry = audit_init_entry(fcount); | 810 | entry = audit_init_entry(fcount); |
| @@ -753,13 +828,25 @@ static struct audit_entry *audit_dupe_rule(struct audit_krule *old, | |||
| 753 | * the originals will all be freed when the old rule is freed. */ | 828 | * the originals will all be freed when the old rule is freed. */ |
| 754 | for (i = 0; i < fcount; i++) { | 829 | for (i = 0; i < fcount; i++) { |
| 755 | switch (new->fields[i].type) { | 830 | switch (new->fields[i].type) { |
| 756 | case AUDIT_SE_USER: | 831 | case AUDIT_SUBJ_USER: |
| 757 | case AUDIT_SE_ROLE: | 832 | case AUDIT_SUBJ_ROLE: |
| 758 | case AUDIT_SE_TYPE: | 833 | case AUDIT_SUBJ_TYPE: |
| 759 | case AUDIT_SE_SEN: | 834 | case AUDIT_SUBJ_SEN: |
| 760 | case AUDIT_SE_CLR: | 835 | case AUDIT_SUBJ_CLR: |
| 836 | case AUDIT_OBJ_USER: | ||
| 837 | case AUDIT_OBJ_ROLE: | ||
| 838 | case AUDIT_OBJ_TYPE: | ||
| 839 | case AUDIT_OBJ_LEV_LOW: | ||
| 840 | case AUDIT_OBJ_LEV_HIGH: | ||
| 761 | err = audit_dupe_selinux_field(&new->fields[i], | 841 | err = audit_dupe_selinux_field(&new->fields[i], |
| 762 | &old->fields[i]); | 842 | &old->fields[i]); |
| 843 | break; | ||
| 844 | case AUDIT_FILTERKEY: | ||
| 845 | fk = kstrdup(old->filterkey, GFP_KERNEL); | ||
| 846 | if (unlikely(!fk)) | ||
| 847 | err = -ENOMEM; | ||
| 848 | else | ||
| 849 | new->filterkey = fk; | ||
| 763 | } | 850 | } |
| 764 | if (err) { | 851 | if (err) { |
| 765 | audit_free_rule(entry); | 852 | audit_free_rule(entry); |
| @@ -1245,6 +1332,34 @@ static void audit_list_rules(int pid, int seq, struct sk_buff_head *q) | |||
| 1245 | skb_queue_tail(q, skb); | 1332 | skb_queue_tail(q, skb); |
| 1246 | } | 1333 | } |
| 1247 | 1334 | ||
| 1335 | /* Log rule additions and removals */ | ||
| 1336 | static void audit_log_rule_change(uid_t loginuid, u32 sid, char *action, | ||
| 1337 | struct audit_krule *rule, int res) | ||
| 1338 | { | ||
| 1339 | struct audit_buffer *ab; | ||
| 1340 | |||
| 1341 | ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); | ||
| 1342 | if (!ab) | ||
| 1343 | return; | ||
| 1344 | audit_log_format(ab, "auid=%u", loginuid); | ||
| 1345 | if (sid) { | ||
| 1346 | char *ctx = NULL; | ||
| 1347 | u32 len; | ||
| 1348 | if (selinux_ctxid_to_string(sid, &ctx, &len)) | ||
| 1349 | audit_log_format(ab, " ssid=%u", sid); | ||
| 1350 | else | ||
| 1351 | audit_log_format(ab, " subj=%s", ctx); | ||
| 1352 | kfree(ctx); | ||
| 1353 | } | ||
| 1354 | audit_log_format(ab, " %s rule key=", action); | ||
| 1355 | if (rule->filterkey) | ||
| 1356 | audit_log_untrustedstring(ab, rule->filterkey); | ||
| 1357 | else | ||
| 1358 | audit_log_format(ab, "(null)"); | ||
| 1359 | audit_log_format(ab, " list=%d res=%d", rule->listnr, res); | ||
| 1360 | audit_log_end(ab); | ||
| 1361 | } | ||
| 1362 | |||
| 1248 | /** | 1363 | /** |
| 1249 | * audit_receive_filter - apply all rules to the specified message type | 1364 | * audit_receive_filter - apply all rules to the specified message type |
| 1250 | * @type: audit message type | 1365 | * @type: audit message type |
| @@ -1304,24 +1419,7 @@ int audit_receive_filter(int type, int pid, int uid, int seq, void *data, | |||
| 1304 | 1419 | ||
| 1305 | err = audit_add_rule(entry, | 1420 | err = audit_add_rule(entry, |
| 1306 | &audit_filter_list[entry->rule.listnr]); | 1421 | &audit_filter_list[entry->rule.listnr]); |
| 1307 | 1422 | audit_log_rule_change(loginuid, sid, "add", &entry->rule, !err); | |
| 1308 | if (sid) { | ||
| 1309 | char *ctx = NULL; | ||
| 1310 | u32 len; | ||
| 1311 | if (selinux_ctxid_to_string(sid, &ctx, &len)) { | ||
| 1312 | /* Maybe call audit_panic? */ | ||
| 1313 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | ||
| 1314 | "auid=%u ssid=%u add rule to list=%d res=%d", | ||
| 1315 | loginuid, sid, entry->rule.listnr, !err); | ||
| 1316 | } else | ||
| 1317 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | ||
| 1318 | "auid=%u subj=%s add rule to list=%d res=%d", | ||
| 1319 | loginuid, ctx, entry->rule.listnr, !err); | ||
| 1320 | kfree(ctx); | ||
| 1321 | } else | ||
| 1322 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | ||
| 1323 | "auid=%u add rule to list=%d res=%d", | ||
| 1324 | loginuid, entry->rule.listnr, !err); | ||
| 1325 | 1423 | ||
| 1326 | if (err) | 1424 | if (err) |
| 1327 | audit_free_rule(entry); | 1425 | audit_free_rule(entry); |
| @@ -1337,24 +1435,8 @@ int audit_receive_filter(int type, int pid, int uid, int seq, void *data, | |||
| 1337 | 1435 | ||
| 1338 | err = audit_del_rule(entry, | 1436 | err = audit_del_rule(entry, |
| 1339 | &audit_filter_list[entry->rule.listnr]); | 1437 | &audit_filter_list[entry->rule.listnr]); |
| 1340 | 1438 | audit_log_rule_change(loginuid, sid, "remove", &entry->rule, | |
| 1341 | if (sid) { | 1439 | !err); |
| 1342 | char *ctx = NULL; | ||
| 1343 | u32 len; | ||
| 1344 | if (selinux_ctxid_to_string(sid, &ctx, &len)) { | ||
| 1345 | /* Maybe call audit_panic? */ | ||
| 1346 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | ||
| 1347 | "auid=%u ssid=%u remove rule from list=%d res=%d", | ||
| 1348 | loginuid, sid, entry->rule.listnr, !err); | ||
| 1349 | } else | ||
| 1350 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | ||
| 1351 | "auid=%u subj=%s remove rule from list=%d res=%d", | ||
| 1352 | loginuid, ctx, entry->rule.listnr, !err); | ||
| 1353 | kfree(ctx); | ||
| 1354 | } else | ||
| 1355 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | ||
| 1356 | "auid=%u remove rule from list=%d res=%d", | ||
| 1357 | loginuid, entry->rule.listnr, !err); | ||
| 1358 | 1440 | ||
| 1359 | audit_free_rule(entry); | 1441 | audit_free_rule(entry); |
| 1360 | break; | 1442 | break; |
| @@ -1514,11 +1596,16 @@ static inline int audit_rule_has_selinux(struct audit_krule *rule) | |||
| 1514 | for (i = 0; i < rule->field_count; i++) { | 1596 | for (i = 0; i < rule->field_count; i++) { |
| 1515 | struct audit_field *f = &rule->fields[i]; | 1597 | struct audit_field *f = &rule->fields[i]; |
| 1516 | switch (f->type) { | 1598 | switch (f->type) { |
| 1517 | case AUDIT_SE_USER: | 1599 | case AUDIT_SUBJ_USER: |
| 1518 | case AUDIT_SE_ROLE: | 1600 | case AUDIT_SUBJ_ROLE: |
| 1519 | case AUDIT_SE_TYPE: | 1601 | case AUDIT_SUBJ_TYPE: |
| 1520 | case AUDIT_SE_SEN: | 1602 | case AUDIT_SUBJ_SEN: |
| 1521 | case AUDIT_SE_CLR: | 1603 | case AUDIT_SUBJ_CLR: |
| 1604 | case AUDIT_OBJ_USER: | ||
| 1605 | case AUDIT_OBJ_ROLE: | ||
| 1606 | case AUDIT_OBJ_TYPE: | ||
| 1607 | case AUDIT_OBJ_LEV_LOW: | ||
| 1608 | case AUDIT_OBJ_LEV_HIGH: | ||
| 1522 | return 1; | 1609 | return 1; |
| 1523 | } | 1610 | } |
| 1524 | } | 1611 | } |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index dc5e3f01efe7..ae40ac8c39e7 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -186,6 +186,7 @@ struct audit_context { | |||
| 186 | int auditable; /* 1 if record should be written */ | 186 | int auditable; /* 1 if record should be written */ |
| 187 | int name_count; | 187 | int name_count; |
| 188 | struct audit_names names[AUDIT_NAMES]; | 188 | struct audit_names names[AUDIT_NAMES]; |
| 189 | char * filterkey; /* key for rule that triggered record */ | ||
| 189 | struct dentry * pwd; | 190 | struct dentry * pwd; |
| 190 | struct vfsmount * pwdmnt; | 191 | struct vfsmount * pwdmnt; |
| 191 | struct audit_context *previous; /* For nested syscalls */ | 192 | struct audit_context *previous; /* For nested syscalls */ |
| @@ -320,11 +321,11 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
| 320 | if (ctx) | 321 | if (ctx) |
| 321 | result = audit_comparator(ctx->loginuid, f->op, f->val); | 322 | result = audit_comparator(ctx->loginuid, f->op, f->val); |
| 322 | break; | 323 | break; |
| 323 | case AUDIT_SE_USER: | 324 | case AUDIT_SUBJ_USER: |
| 324 | case AUDIT_SE_ROLE: | 325 | case AUDIT_SUBJ_ROLE: |
| 325 | case AUDIT_SE_TYPE: | 326 | case AUDIT_SUBJ_TYPE: |
| 326 | case AUDIT_SE_SEN: | 327 | case AUDIT_SUBJ_SEN: |
| 327 | case AUDIT_SE_CLR: | 328 | case AUDIT_SUBJ_CLR: |
| 328 | /* NOTE: this may return negative values indicating | 329 | /* NOTE: this may return negative values indicating |
| 329 | a temporary error. We simply treat this as a | 330 | a temporary error. We simply treat this as a |
| 330 | match for now to avoid losing information that | 331 | match for now to avoid losing information that |
| @@ -341,6 +342,46 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
| 341 | ctx); | 342 | ctx); |
| 342 | } | 343 | } |
| 343 | break; | 344 | break; |
| 345 | case AUDIT_OBJ_USER: | ||
| 346 | case AUDIT_OBJ_ROLE: | ||
| 347 | case AUDIT_OBJ_TYPE: | ||
| 348 | case AUDIT_OBJ_LEV_LOW: | ||
| 349 | case AUDIT_OBJ_LEV_HIGH: | ||
| 350 | /* The above note for AUDIT_SUBJ_USER...AUDIT_SUBJ_CLR | ||
| 351 | also applies here */ | ||
| 352 | if (f->se_rule) { | ||
| 353 | /* Find files that match */ | ||
| 354 | if (name) { | ||
| 355 | result = selinux_audit_rule_match( | ||
| 356 | name->osid, f->type, f->op, | ||
| 357 | f->se_rule, ctx); | ||
| 358 | } else if (ctx) { | ||
| 359 | for (j = 0; j < ctx->name_count; j++) { | ||
| 360 | if (selinux_audit_rule_match( | ||
| 361 | ctx->names[j].osid, | ||
| 362 | f->type, f->op, | ||
| 363 | f->se_rule, ctx)) { | ||
| 364 | ++result; | ||
| 365 | break; | ||
| 366 | } | ||
| 367 | } | ||
| 368 | } | ||
| 369 | /* Find ipc objects that match */ | ||
| 370 | if (ctx) { | ||
| 371 | struct audit_aux_data *aux; | ||
| 372 | for (aux = ctx->aux; aux; | ||
| 373 | aux = aux->next) { | ||
| 374 | if (aux->type == AUDIT_IPC) { | ||
| 375 | struct audit_aux_data_ipcctl *axi = (void *)aux; | ||
| 376 | if (selinux_audit_rule_match(axi->osid, f->type, f->op, f->se_rule, ctx)) { | ||
| 377 | ++result; | ||
| 378 | break; | ||
| 379 | } | ||
| 380 | } | ||
| 381 | } | ||
| 382 | } | ||
| 383 | } | ||
| 384 | break; | ||
| 344 | case AUDIT_ARG0: | 385 | case AUDIT_ARG0: |
| 345 | case AUDIT_ARG1: | 386 | case AUDIT_ARG1: |
| 346 | case AUDIT_ARG2: | 387 | case AUDIT_ARG2: |
| @@ -348,11 +389,17 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
| 348 | if (ctx) | 389 | if (ctx) |
| 349 | result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val); | 390 | result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val); |
| 350 | break; | 391 | break; |
| 392 | case AUDIT_FILTERKEY: | ||
| 393 | /* ignore this field for filtering */ | ||
| 394 | result = 1; | ||
| 395 | break; | ||
| 351 | } | 396 | } |
| 352 | 397 | ||
| 353 | if (!result) | 398 | if (!result) |
| 354 | return 0; | 399 | return 0; |
| 355 | } | 400 | } |
| 401 | if (rule->filterkey) | ||
| 402 | ctx->filterkey = kstrdup(rule->filterkey, GFP_ATOMIC); | ||
| 356 | switch (rule->action) { | 403 | switch (rule->action) { |
| 357 | case AUDIT_NEVER: *state = AUDIT_DISABLED; break; | 404 | case AUDIT_NEVER: *state = AUDIT_DISABLED; break; |
| 358 | case AUDIT_ALWAYS: *state = AUDIT_RECORD_CONTEXT; break; | 405 | case AUDIT_ALWAYS: *state = AUDIT_RECORD_CONTEXT; break; |
| @@ -627,6 +674,7 @@ static inline void audit_free_context(struct audit_context *context) | |||
| 627 | } | 674 | } |
| 628 | audit_free_names(context); | 675 | audit_free_names(context); |
| 629 | audit_free_aux(context); | 676 | audit_free_aux(context); |
| 677 | kfree(context->filterkey); | ||
| 630 | kfree(context); | 678 | kfree(context); |
| 631 | context = previous; | 679 | context = previous; |
| 632 | } while (context); | 680 | } while (context); |
| @@ -735,6 +783,11 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts | |||
| 735 | context->euid, context->suid, context->fsuid, | 783 | context->euid, context->suid, context->fsuid, |
| 736 | context->egid, context->sgid, context->fsgid, tty); | 784 | context->egid, context->sgid, context->fsgid, tty); |
| 737 | audit_log_task_info(ab, tsk); | 785 | audit_log_task_info(ab, tsk); |
| 786 | if (context->filterkey) { | ||
| 787 | audit_log_format(ab, " key="); | ||
| 788 | audit_log_untrustedstring(ab, context->filterkey); | ||
| 789 | } else | ||
| 790 | audit_log_format(ab, " key=(null)"); | ||
| 738 | audit_log_end(ab); | 791 | audit_log_end(ab); |
| 739 | 792 | ||
| 740 | for (aux = context->aux; aux; aux = aux->next) { | 793 | for (aux = context->aux; aux; aux = aux->next) { |
| @@ -1060,6 +1113,8 @@ void audit_syscall_exit(int valid, long return_code) | |||
| 1060 | } else { | 1113 | } else { |
| 1061 | audit_free_names(context); | 1114 | audit_free_names(context); |
| 1062 | audit_free_aux(context); | 1115 | audit_free_aux(context); |
| 1116 | kfree(context->filterkey); | ||
| 1117 | context->filterkey = NULL; | ||
| 1063 | tsk->audit_context = context; | 1118 | tsk->audit_context = context; |
| 1064 | } | 1119 | } |
| 1065 | } | 1120 | } |
diff --git a/kernel/configs.c b/kernel/configs.c index 009e1ebdcb88..f9e31974f4ad 100644 --- a/kernel/configs.c +++ b/kernel/configs.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/proc_fs.h> | 28 | #include <linux/proc_fs.h> |
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 1535af3a912d..c232dc077438 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * distribution for more details. | 18 | * distribution for more details. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/cpu.h> | 21 | #include <linux/cpu.h> |
| 23 | #include <linux/cpumask.h> | 22 | #include <linux/cpumask.h> |
| 24 | #include <linux/cpuset.h> | 23 | #include <linux/cpuset.h> |
| @@ -1064,7 +1063,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs, char *buf) | |||
| 1064 | } | 1063 | } |
| 1065 | 1064 | ||
| 1066 | /* | 1065 | /* |
| 1067 | * Frequency meter - How fast is some event occuring? | 1066 | * Frequency meter - How fast is some event occurring? |
| 1068 | * | 1067 | * |
| 1069 | * These routines manage a digitally filtered, constant time based, | 1068 | * These routines manage a digitally filtered, constant time based, |
| 1070 | * event frequency meter. There are four routines: | 1069 | * event frequency meter. There are four routines: |
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c index c01cead2cfd6..3c2eaea66b1e 100644 --- a/kernel/exec_domain.c +++ b/kernel/exec_domain.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * 2001-05-06 Complete rewrite, Christoph Hellwig (hch@infradead.org) | 7 | * 2001-05-06 Complete rewrite, Christoph Hellwig (hch@infradead.org) |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 13 | #include <linux/kmod.h> | 12 | #include <linux/kmod.h> |
diff --git a/kernel/exit.c b/kernel/exit.c index ab06b9f88f64..7f7ef2258553 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
| 9 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
| 10 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
diff --git a/kernel/fork.c b/kernel/fork.c index 628198a4f28a..9064bf9e131b 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * management can be a bitch. See 'mm/memory.c': 'copy_page_range()' | 11 | * management can be a bitch. See 'mm/memory.c': 'copy_page_range()' |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/unistd.h> | 16 | #include <linux/unistd.h> |
diff --git a/kernel/futex.c b/kernel/futex.c index 6c91f938005d..15caf93e4a43 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -630,8 +630,10 @@ static int futex_wake(u32 __user *uaddr, int nr_wake) | |||
| 630 | 630 | ||
| 631 | list_for_each_entry_safe(this, next, head, list) { | 631 | list_for_each_entry_safe(this, next, head, list) { |
| 632 | if (match_futex (&this->key, &key)) { | 632 | if (match_futex (&this->key, &key)) { |
| 633 | if (this->pi_state) | 633 | if (this->pi_state) { |
| 634 | return -EINVAL; | 634 | ret = -EINVAL; |
| 635 | break; | ||
| 636 | } | ||
| 635 | wake_futex(this); | 637 | wake_futex(this); |
| 636 | if (++ret >= nr_wake) | 638 | if (++ret >= nr_wake) |
| 637 | break; | 639 | break; |
| @@ -1208,7 +1210,7 @@ static int do_futex_lock_pi(u32 __user *uaddr, int detect, int trylock, | |||
| 1208 | } | 1210 | } |
| 1209 | 1211 | ||
| 1210 | down_read(&curr->mm->mmap_sem); | 1212 | down_read(&curr->mm->mmap_sem); |
| 1211 | hb = queue_lock(&q, -1, NULL); | 1213 | spin_lock(q.lock_ptr); |
| 1212 | 1214 | ||
| 1213 | /* | 1215 | /* |
| 1214 | * Got the lock. We might not be the anticipated owner if we | 1216 | * Got the lock. We might not be the anticipated owner if we |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 9eb1d518ee1c..fcce5181e453 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * This file contains driver APIs to the irq subsystem. | 7 | * This file contains driver APIs to the irq subsystem. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/random.h> | 12 | #include <linux/random.h> |
| @@ -115,7 +114,7 @@ void enable_irq(unsigned int irq) | |||
| 115 | spin_lock_irqsave(&desc->lock, flags); | 114 | spin_lock_irqsave(&desc->lock, flags); |
| 116 | switch (desc->depth) { | 115 | switch (desc->depth) { |
| 117 | case 0: | 116 | case 0: |
| 118 | printk(KERN_WARNING "Unablanced enable_irq(%d)\n", irq); | 117 | printk(KERN_WARNING "Unbalanced enable for IRQ %d\n", irq); |
| 119 | WARN_ON(1); | 118 | WARN_ON(1); |
| 120 | break; | 119 | break; |
| 121 | case 1: { | 120 | case 1: { |
| @@ -237,7 +236,8 @@ int setup_irq(unsigned int irq, struct irqaction *new) | |||
| 237 | 236 | ||
| 238 | #if defined(CONFIG_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ) | 237 | #if defined(CONFIG_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ) |
| 239 | /* All handlers must agree on per-cpuness */ | 238 | /* All handlers must agree on per-cpuness */ |
| 240 | if ((old->flags & IRQ_PER_CPU) != (new->flags & IRQ_PER_CPU)) | 239 | if ((old->flags & SA_PERCPU_IRQ) != |
| 240 | (new->flags & SA_PERCPU_IRQ)) | ||
| 241 | goto mismatch; | 241 | goto mismatch; |
| 242 | #endif | 242 | #endif |
| 243 | 243 | ||
| @@ -267,9 +267,10 @@ int setup_irq(unsigned int irq, struct irqaction *new) | |||
| 267 | * SA_TRIGGER_* but the PIC does not support | 267 | * SA_TRIGGER_* but the PIC does not support |
| 268 | * multiple flow-types? | 268 | * multiple flow-types? |
| 269 | */ | 269 | */ |
| 270 | printk(KERN_WARNING "setup_irq(%d) SA_TRIGGER" | 270 | printk(KERN_WARNING "No SA_TRIGGER set_type " |
| 271 | "set. No set_type function available\n", | 271 | "function for IRQ %d (%s)\n", irq, |
| 272 | irq); | 272 | desc->chip ? desc->chip->name : |
| 273 | "unknown"); | ||
| 273 | } else | 274 | } else |
| 274 | compat_irq_chip_set_default_handler(desc); | 275 | compat_irq_chip_set_default_handler(desc); |
| 275 | 276 | ||
| @@ -299,7 +300,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) | |||
| 299 | mismatch: | 300 | mismatch: |
| 300 | spin_unlock_irqrestore(&desc->lock, flags); | 301 | spin_unlock_irqrestore(&desc->lock, flags); |
| 301 | if (!(new->flags & SA_PROBEIRQ)) { | 302 | if (!(new->flags & SA_PROBEIRQ)) { |
| 302 | printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__); | 303 | printk(KERN_ERR "IRQ handler type mismatch for IRQ %d\n", irq); |
| 303 | dump_stack(); | 304 | dump_stack(); |
| 304 | } | 305 | } |
| 305 | return -EBUSY; | 306 | return -EBUSY; |
| @@ -366,7 +367,7 @@ void free_irq(unsigned int irq, void *dev_id) | |||
| 366 | kfree(action); | 367 | kfree(action); |
| 367 | return; | 368 | return; |
| 368 | } | 369 | } |
| 369 | printk(KERN_ERR "Trying to free free IRQ%d\n", irq); | 370 | printk(KERN_ERR "Trying to free already-free IRQ %d\n", irq); |
| 370 | spin_unlock_irqrestore(&desc->lock, flags); | 371 | spin_unlock_irqrestore(&desc->lock, flags); |
| 371 | return; | 372 | return; |
| 372 | } | 373 | } |
diff --git a/kernel/kmod.c b/kernel/kmod.c index 20a997c73c3d..1b7157af051c 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #define __KERNEL_SYSCALLS__ | 21 | #define __KERNEL_SYSCALLS__ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/syscalls.h> | 25 | #include <linux/syscalls.h> |
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 9e28478a17a5..e0ffe4ab0917 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/kobject.h> | 11 | #include <linux/kobject.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/sysfs.h> | 13 | #include <linux/sysfs.h> |
diff --git a/kernel/module.c b/kernel/module.c index 99c022ac3d21..281172f01e9a 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
| 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | */ | 18 | */ |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/moduleloader.h> | 20 | #include <linux/moduleloader.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/kernel/panic.c b/kernel/panic.c index cc2a4c9c36ac..ab13f0f668b5 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * This function is used through-out the kernel (including mm and fs) | 8 | * This function is used through-out the kernel (including mm and fs) |
| 9 | * to indicate a major problem. | 9 | * to indicate a major problem. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
diff --git a/kernel/params.c b/kernel/params.c index af43ecdc8d9b..91aea7aa532e 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | along with this program; if not, write to the Free Software | 15 | along with this program; if not, write to the Free Software |
| 16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 857b4fa09124..ae44a70aae8a 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
| @@ -100,18 +100,6 @@ config PM_STD_PARTITION | |||
| 100 | suspended image to. It will simply pick the first available swap | 100 | suspended image to. It will simply pick the first available swap |
| 101 | device. | 101 | device. |
| 102 | 102 | ||
| 103 | config SWSUSP_ENCRYPT | ||
| 104 | bool "Encrypt suspend image" | ||
| 105 | depends on SOFTWARE_SUSPEND && CRYPTO=y && (CRYPTO_AES=y || CRYPTO_AES_586=y || CRYPTO_AES_X86_64=y) | ||
| 106 | default "" | ||
| 107 | ---help--- | ||
| 108 | To prevent data gathering from swap after resume you can encrypt | ||
| 109 | the suspend image with a temporary key that is deleted on | ||
| 110 | resume. | ||
| 111 | |||
| 112 | Note that the temporary key is stored unencrypted on disk while the | ||
| 113 | system is suspended. | ||
| 114 | |||
| 115 | config SUSPEND_SMP | 103 | config SUSPEND_SMP |
| 116 | bool | 104 | bool |
| 117 | depends on HOTPLUG_CPU && X86 && PM | 105 | depends on HOTPLUG_CPU && X86 && PM |
diff --git a/kernel/printk.c b/kernel/printk.c index 95b7fe17f124..39ae24d2a415 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/interrupt.h> /* For in_interrupt() */ | 28 | #include <linux/interrupt.h> /* For in_interrupt() */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 31 | #include <linux/smp.h> | 30 | #include <linux/smp.h> |
| 32 | #include <linux/security.h> | 31 | #include <linux/security.h> |
diff --git a/kernel/profile.c b/kernel/profile.c index 5a730fdb1a2c..d5bd75e7501c 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * to resolve timer interrupt livelocks, William Irwin, Oracle, 2004 | 13 | * to resolve timer interrupt livelocks, William Irwin, Oracle, 2004 |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/profile.h> | 17 | #include <linux/profile.h> |
| 19 | #include <linux/bootmem.h> | 18 | #include <linux/bootmem.h> |
diff --git a/kernel/resource.c b/kernel/resource.c index bf1130d81b7f..129cf046e561 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Arbitrary resource management. | 7 | * Arbitrary resource management. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
diff --git a/kernel/sched.c b/kernel/sched.c index 2629c1711fd6..d5e37072ea54 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -4386,7 +4386,16 @@ asmlinkage long sys_sched_yield(void) | |||
| 4386 | return 0; | 4386 | return 0; |
| 4387 | } | 4387 | } |
| 4388 | 4388 | ||
| 4389 | static inline void __cond_resched(void) | 4389 | static inline int __resched_legal(void) |
| 4390 | { | ||
| 4391 | if (unlikely(preempt_count())) | ||
| 4392 | return 0; | ||
| 4393 | if (unlikely(system_state != SYSTEM_RUNNING)) | ||
| 4394 | return 0; | ||
| 4395 | return 1; | ||
| 4396 | } | ||
| 4397 | |||
| 4398 | static void __cond_resched(void) | ||
| 4390 | { | 4399 | { |
| 4391 | #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP | 4400 | #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP |
| 4392 | __might_sleep(__FILE__, __LINE__); | 4401 | __might_sleep(__FILE__, __LINE__); |
| @@ -4396,10 +4405,6 @@ static inline void __cond_resched(void) | |||
| 4396 | * PREEMPT_ACTIVE, which could trigger a second | 4405 | * PREEMPT_ACTIVE, which could trigger a second |
| 4397 | * cond_resched() call. | 4406 | * cond_resched() call. |
| 4398 | */ | 4407 | */ |
| 4399 | if (unlikely(preempt_count())) | ||
| 4400 | return; | ||
| 4401 | if (unlikely(system_state != SYSTEM_RUNNING)) | ||
| 4402 | return; | ||
| 4403 | do { | 4408 | do { |
| 4404 | add_preempt_count(PREEMPT_ACTIVE); | 4409 | add_preempt_count(PREEMPT_ACTIVE); |
| 4405 | schedule(); | 4410 | schedule(); |
| @@ -4409,13 +4414,12 @@ static inline void __cond_resched(void) | |||
| 4409 | 4414 | ||
| 4410 | int __sched cond_resched(void) | 4415 | int __sched cond_resched(void) |
| 4411 | { | 4416 | { |
| 4412 | if (need_resched()) { | 4417 | if (need_resched() && __resched_legal()) { |
| 4413 | __cond_resched(); | 4418 | __cond_resched(); |
| 4414 | return 1; | 4419 | return 1; |
| 4415 | } | 4420 | } |
| 4416 | return 0; | 4421 | return 0; |
| 4417 | } | 4422 | } |
| 4418 | |||
| 4419 | EXPORT_SYMBOL(cond_resched); | 4423 | EXPORT_SYMBOL(cond_resched); |
| 4420 | 4424 | ||
| 4421 | /* | 4425 | /* |
| @@ -4436,7 +4440,7 @@ int cond_resched_lock(spinlock_t *lock) | |||
| 4436 | ret = 1; | 4440 | ret = 1; |
| 4437 | spin_lock(lock); | 4441 | spin_lock(lock); |
| 4438 | } | 4442 | } |
| 4439 | if (need_resched()) { | 4443 | if (need_resched() && __resched_legal()) { |
| 4440 | _raw_spin_unlock(lock); | 4444 | _raw_spin_unlock(lock); |
| 4441 | preempt_enable_no_resched(); | 4445 | preempt_enable_no_resched(); |
| 4442 | __cond_resched(); | 4446 | __cond_resched(); |
| @@ -4445,14 +4449,13 @@ int cond_resched_lock(spinlock_t *lock) | |||
| 4445 | } | 4449 | } |
| 4446 | return ret; | 4450 | return ret; |
| 4447 | } | 4451 | } |
| 4448 | |||
| 4449 | EXPORT_SYMBOL(cond_resched_lock); | 4452 | EXPORT_SYMBOL(cond_resched_lock); |
| 4450 | 4453 | ||
| 4451 | int __sched cond_resched_softirq(void) | 4454 | int __sched cond_resched_softirq(void) |
| 4452 | { | 4455 | { |
| 4453 | BUG_ON(!in_softirq()); | 4456 | BUG_ON(!in_softirq()); |
| 4454 | 4457 | ||
| 4455 | if (need_resched()) { | 4458 | if (need_resched() && __resched_legal()) { |
| 4456 | __local_bh_enable(); | 4459 | __local_bh_enable(); |
| 4457 | __cond_resched(); | 4460 | __cond_resched(); |
| 4458 | local_bh_disable(); | 4461 | local_bh_disable(); |
| @@ -4460,10 +4463,8 @@ int __sched cond_resched_softirq(void) | |||
| 4460 | } | 4463 | } |
| 4461 | return 0; | 4464 | return 0; |
| 4462 | } | 4465 | } |
| 4463 | |||
| 4464 | EXPORT_SYMBOL(cond_resched_softirq); | 4466 | EXPORT_SYMBOL(cond_resched_softirq); |
| 4465 | 4467 | ||
| 4466 | |||
| 4467 | /** | 4468 | /** |
| 4468 | * yield - yield the current processor to other threads. | 4469 | * yield - yield the current processor to other threads. |
| 4469 | * | 4470 | * |
diff --git a/kernel/signal.c b/kernel/signal.c index 52adf53929f6..7fe874d12fae 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * to allow signals to be sent reliably. | 10 | * to allow signals to be sent reliably. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/smp_lock.h> | 15 | #include <linux/smp_lock.h> |
| @@ -584,7 +583,7 @@ static int check_kill_permission(int sig, struct siginfo *info, | |||
| 584 | && !capable(CAP_KILL)) | 583 | && !capable(CAP_KILL)) |
| 585 | return error; | 584 | return error; |
| 586 | 585 | ||
| 587 | error = security_task_kill(t, info, sig); | 586 | error = security_task_kill(t, info, sig, 0); |
| 588 | if (!error) | 587 | if (!error) |
| 589 | audit_signal_info(sig, t); /* Let audit system see the signal */ | 588 | audit_signal_info(sig, t); /* Let audit system see the signal */ |
| 590 | return error; | 589 | return error; |
| @@ -1107,7 +1106,7 @@ kill_proc_info(int sig, struct siginfo *info, pid_t pid) | |||
| 1107 | 1106 | ||
| 1108 | /* like kill_proc_info(), but doesn't use uid/euid of "current" */ | 1107 | /* like kill_proc_info(), but doesn't use uid/euid of "current" */ |
| 1109 | int kill_proc_info_as_uid(int sig, struct siginfo *info, pid_t pid, | 1108 | int kill_proc_info_as_uid(int sig, struct siginfo *info, pid_t pid, |
| 1110 | uid_t uid, uid_t euid) | 1109 | uid_t uid, uid_t euid, u32 secid) |
| 1111 | { | 1110 | { |
| 1112 | int ret = -EINVAL; | 1111 | int ret = -EINVAL; |
| 1113 | struct task_struct *p; | 1112 | struct task_struct *p; |
| @@ -1127,6 +1126,9 @@ int kill_proc_info_as_uid(int sig, struct siginfo *info, pid_t pid, | |||
| 1127 | ret = -EPERM; | 1126 | ret = -EPERM; |
| 1128 | goto out_unlock; | 1127 | goto out_unlock; |
| 1129 | } | 1128 | } |
| 1129 | ret = security_task_kill(p, info, sig, secid); | ||
| 1130 | if (ret) | ||
| 1131 | goto out_unlock; | ||
| 1130 | if (sig && p->sighand) { | 1132 | if (sig && p->sighand) { |
| 1131 | unsigned long flags; | 1133 | unsigned long flags; |
| 1132 | spin_lock_irqsave(&p->sighand->siglock, flags); | 1134 | spin_lock_irqsave(&p->sighand->siglock, flags); |
diff --git a/kernel/spinlock.c b/kernel/spinlock.c index d1b810782bc4..b31e54eadf56 100644 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * SMP and the DEBUG_SPINLOCK cases. (UP-nondebug inlines them) | 9 | * SMP and the DEBUG_SPINLOCK cases. (UP-nondebug inlines them) |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 14 | #include <linux/preempt.h> | 13 | #include <linux/preempt.h> |
| 15 | #include <linux/spinlock.h> | 14 | #include <linux/spinlock.h> |
diff --git a/kernel/sys.c b/kernel/sys.c index 2d5179c67cec..dbb3b9c7ea64 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/utsname.h> | 9 | #include <linux/utsname.h> |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 93a2c5398648..99a58f279077 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Removed it and replaced it with older style, 03/23/00, Bill Wendling | 18 | * Removed it and replaced it with older style, 03/23/00, Bill Wendling |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 24 | #include <linux/swap.h> | 23 | #include <linux/swap.h> |
| @@ -933,15 +932,6 @@ static ctl_table vm_table[] = { | |||
| 933 | .strategy = &sysctl_intvec, | 932 | .strategy = &sysctl_intvec, |
| 934 | .extra1 = &zero, | 933 | .extra1 = &zero, |
| 935 | }, | 934 | }, |
| 936 | { | ||
| 937 | .ctl_name = VM_ZONE_RECLAIM_INTERVAL, | ||
| 938 | .procname = "zone_reclaim_interval", | ||
| 939 | .data = &zone_reclaim_interval, | ||
| 940 | .maxlen = sizeof(zone_reclaim_interval), | ||
| 941 | .mode = 0644, | ||
| 942 | .proc_handler = &proc_dointvec_jiffies, | ||
| 943 | .strategy = &sysctl_jiffies, | ||
| 944 | }, | ||
| 945 | #endif | 935 | #endif |
| 946 | #ifdef CONFIG_X86_32 | 936 | #ifdef CONFIG_X86_32 |
| 947 | { | 937 | { |
diff --git a/kernel/wait.c b/kernel/wait.c index 791681cfea98..5985d866531f 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * (C) 2004 William Irwin, Oracle | 4 | * (C) 2004 William Irwin, Oracle |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c index 6bb7319e09a0..a2055bc3ef62 100644 --- a/lib/bust_spinlocks.c +++ b/lib/bust_spinlocks.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * and panic() information from reaching the user. | 7 | * and panic() information from reaching the user. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 12 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 13 | #include <linux/tty.h> | 12 | #include <linux/tty.h> |
diff --git a/lib/extable.c b/lib/extable.c index 01c08b5836f5..463f4560f16d 100644 --- a/lib/extable.c +++ b/lib/extable.c | |||
| @@ -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/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/sort.h> | 14 | #include <linux/sort.h> |
diff --git a/lib/semaphore-sleepers.c b/lib/semaphore-sleepers.c index 4d5f18889fa5..128180523860 100644 --- a/lib/semaphore-sleepers.c +++ b/lib/semaphore-sleepers.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org> | 13 | * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org> |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 17 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index d8b6bb419d49..93c15ee3f8ea 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * DEBUG_SPINLOCK. | 6 | * DEBUG_SPINLOCK. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
| 11 | #include <linux/interrupt.h> | 10 | #include <linux/interrupt.h> |
| 12 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
diff --git a/lib/textsearch.c b/lib/textsearch.c index 6f3093efbd7b..2cb4a437942e 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
| @@ -93,7 +93,6 @@ | |||
| 93 | * ========================================================================== | 93 | * ========================================================================== |
| 94 | */ | 94 | */ |
| 95 | 95 | ||
| 96 | #include <linux/config.h> | ||
| 97 | #include <linux/module.h> | 96 | #include <linux/module.h> |
| 98 | #include <linux/types.h> | 97 | #include <linux/types.h> |
| 99 | #include <linux/string.h> | 98 | #include <linux/string.h> |
diff --git a/lib/ts_bm.c b/lib/ts_bm.c index c4c1ac5fbd1a..0110e4414805 100644 --- a/lib/ts_bm.c +++ b/lib/ts_bm.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * matchings spread over multiple fragments, then go BM. | 35 | * matchings spread over multiple fragments, then go BM. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 41 | #include <linux/types.h> | 40 | #include <linux/types.h> |
diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c index ca3211206eef..87847c2ae9e2 100644 --- a/lib/ts_fsm.c +++ b/lib/ts_fsm.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * however while in strict mode the average runtime can be better. | 26 | * however while in strict mode the average runtime can be better. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/string.h> | 31 | #include <linux/string.h> |
diff --git a/lib/ts_kmp.c b/lib/ts_kmp.c index 7fd45451b44a..3ced628cab4b 100644 --- a/lib/ts_kmp.c +++ b/lib/ts_kmp.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * [2] See finite automation theory | 30 | * [2] See finite automation theory |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 36 | #include <linux/string.h> | 35 | #include <linux/string.h> |
diff --git a/mm/Makefile b/mm/Makefile index 0b8f73f2ed16..9dd824c11eeb 100644 --- a/mm/Makefile +++ b/mm/Makefile | |||
| @@ -10,7 +10,7 @@ mmu-$(CONFIG_MMU) := fremap.o highmem.o madvise.o memory.o mincore.o \ | |||
| 10 | obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ | 10 | obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ |
| 11 | page_alloc.o page-writeback.o pdflush.o \ | 11 | page_alloc.o page-writeback.o pdflush.o \ |
| 12 | readahead.o swap.o truncate.o vmscan.o \ | 12 | readahead.o swap.o truncate.o vmscan.o \ |
| 13 | prio_tree.o util.o mmzone.o $(mmu-y) | 13 | prio_tree.o util.o mmzone.o vmstat.o $(mmu-y) |
| 14 | 14 | ||
| 15 | obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o | 15 | obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o |
| 16 | obj-$(CONFIG_HUGETLBFS) += hugetlb.o | 16 | obj-$(CONFIG_HUGETLBFS) += hugetlb.o |
diff --git a/mm/filemap.c b/mm/filemap.c index 648f2c0c8e18..d087fc3d3281 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * most "normal" filesystems (but you don't /have/ to use this: | 9 | * most "normal" filesystems (but you don't /have/ to use this: |
| 10 | * the NFS filesystem used to do this differently, for example) | 10 | * the NFS filesystem used to do this differently, for example) |
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 15 | #include <linux/compiler.h> | 14 | #include <linux/compiler.h> |
| @@ -120,7 +119,7 @@ void __remove_from_page_cache(struct page *page) | |||
| 120 | radix_tree_delete(&mapping->page_tree, page->index); | 119 | radix_tree_delete(&mapping->page_tree, page->index); |
| 121 | page->mapping = NULL; | 120 | page->mapping = NULL; |
| 122 | mapping->nrpages--; | 121 | mapping->nrpages--; |
| 123 | pagecache_acct(-1); | 122 | __dec_zone_page_state(page, NR_FILE_PAGES); |
| 124 | } | 123 | } |
| 125 | 124 | ||
| 126 | void remove_from_page_cache(struct page *page) | 125 | void remove_from_page_cache(struct page *page) |
| @@ -449,7 +448,7 @@ int add_to_page_cache(struct page *page, struct address_space *mapping, | |||
| 449 | page->mapping = mapping; | 448 | page->mapping = mapping; |
| 450 | page->index = offset; | 449 | page->index = offset; |
| 451 | mapping->nrpages++; | 450 | mapping->nrpages++; |
| 452 | pagecache_acct(1); | 451 | __inc_zone_page_state(page, NR_FILE_PAGES); |
| 453 | } | 452 | } |
| 454 | write_unlock_irq(&mapping->tree_lock); | 453 | write_unlock_irq(&mapping->tree_lock); |
| 455 | radix_tree_preload_end(); | 454 | radix_tree_preload_end(); |
| @@ -1416,7 +1415,7 @@ retry_find: | |||
| 1416 | */ | 1415 | */ |
| 1417 | if (!did_readaround) { | 1416 | if (!did_readaround) { |
| 1418 | majmin = VM_FAULT_MAJOR; | 1417 | majmin = VM_FAULT_MAJOR; |
| 1419 | inc_page_state(pgmajfault); | 1418 | count_vm_event(PGMAJFAULT); |
| 1420 | } | 1419 | } |
| 1421 | did_readaround = 1; | 1420 | did_readaround = 1; |
| 1422 | ra_pages = max_sane_readahead(file->f_ra.ra_pages); | 1421 | ra_pages = max_sane_readahead(file->f_ra.ra_pages); |
| @@ -1487,7 +1486,7 @@ no_cached_page: | |||
| 1487 | page_not_uptodate: | 1486 | page_not_uptodate: |
| 1488 | if (!did_readaround) { | 1487 | if (!did_readaround) { |
| 1489 | majmin = VM_FAULT_MAJOR; | 1488 | majmin = VM_FAULT_MAJOR; |
| 1490 | inc_page_state(pgmajfault); | 1489 | count_vm_event(PGMAJFAULT); |
| 1491 | } | 1490 | } |
| 1492 | lock_page(page); | 1491 | lock_page(page); |
| 1493 | 1492 | ||
diff --git a/mm/highmem.c b/mm/highmem.c index 9b274fdf9d08..9b2a5403c447 100644 --- a/mm/highmem.c +++ b/mm/highmem.c | |||
| @@ -315,8 +315,8 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool, int err) | |||
| 315 | if (bvec->bv_page == org_vec->bv_page) | 315 | if (bvec->bv_page == org_vec->bv_page) |
| 316 | continue; | 316 | continue; |
| 317 | 317 | ||
| 318 | mempool_free(bvec->bv_page, pool); | 318 | dec_zone_page_state(bvec->bv_page, NR_BOUNCE); |
| 319 | dec_page_state(nr_bounce); | 319 | mempool_free(bvec->bv_page, pool); |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | bio_endio(bio_orig, bio_orig->bi_size, err); | 322 | bio_endio(bio_orig, bio_orig->bi_size, err); |
| @@ -397,7 +397,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig, | |||
| 397 | to->bv_page = mempool_alloc(pool, q->bounce_gfp); | 397 | to->bv_page = mempool_alloc(pool, q->bounce_gfp); |
| 398 | to->bv_len = from->bv_len; | 398 | to->bv_len = from->bv_len; |
| 399 | to->bv_offset = from->bv_offset; | 399 | to->bv_offset = from->bv_offset; |
| 400 | inc_page_state(nr_bounce); | 400 | inc_zone_page_state(to->bv_page, NR_BOUNCE); |
| 401 | 401 | ||
| 402 | if (rw == WRITE) { | 402 | if (rw == WRITE) { |
| 403 | char *vto, *vfrom; | 403 | char *vto, *vfrom; |
diff --git a/mm/memory.c b/mm/memory.c index 247b5c312b9b..7e2a4b1580e3 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -126,7 +126,7 @@ static void free_pte_range(struct mmu_gather *tlb, pmd_t *pmd) | |||
| 126 | pmd_clear(pmd); | 126 | pmd_clear(pmd); |
| 127 | pte_lock_deinit(page); | 127 | pte_lock_deinit(page); |
| 128 | pte_free_tlb(tlb, page); | 128 | pte_free_tlb(tlb, page); |
| 129 | dec_page_state(nr_page_table_pages); | 129 | dec_zone_page_state(page, NR_PAGETABLE); |
| 130 | tlb->mm->nr_ptes--; | 130 | tlb->mm->nr_ptes--; |
| 131 | } | 131 | } |
| 132 | 132 | ||
| @@ -311,7 +311,7 @@ int __pte_alloc(struct mm_struct *mm, pmd_t *pmd, unsigned long address) | |||
| 311 | pte_free(new); | 311 | pte_free(new); |
| 312 | } else { | 312 | } else { |
| 313 | mm->nr_ptes++; | 313 | mm->nr_ptes++; |
| 314 | inc_page_state(nr_page_table_pages); | 314 | inc_zone_page_state(new, NR_PAGETABLE); |
| 315 | pmd_populate(mm, pmd, new); | 315 | pmd_populate(mm, pmd, new); |
| 316 | } | 316 | } |
| 317 | spin_unlock(&mm->page_table_lock); | 317 | spin_unlock(&mm->page_table_lock); |
| @@ -1951,7 +1951,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 1951 | 1951 | ||
| 1952 | /* Had to read the page from swap area: Major fault */ | 1952 | /* Had to read the page from swap area: Major fault */ |
| 1953 | ret = VM_FAULT_MAJOR; | 1953 | ret = VM_FAULT_MAJOR; |
| 1954 | inc_page_state(pgmajfault); | 1954 | count_vm_event(PGMAJFAULT); |
| 1955 | grab_swap_token(); | 1955 | grab_swap_token(); |
| 1956 | } | 1956 | } |
| 1957 | 1957 | ||
| @@ -2324,7 +2324,7 @@ int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 2324 | 2324 | ||
| 2325 | __set_current_state(TASK_RUNNING); | 2325 | __set_current_state(TASK_RUNNING); |
| 2326 | 2326 | ||
| 2327 | inc_page_state(pgfault); | 2327 | count_vm_event(PGFAULT); |
| 2328 | 2328 | ||
| 2329 | if (unlikely(is_vm_hugetlb_page(vma))) | 2329 | if (unlikely(is_vm_hugetlb_page(vma))) |
| 2330 | return hugetlb_fault(mm, vma, address, write_access); | 2330 | return hugetlb_fault(mm, vma, address, write_access); |
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index ea4038838b0a..01c9fb97c619 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) | 4 | * Copyright (C) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/stddef.h> | 7 | #include <linux/stddef.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/swap.h> | 9 | #include <linux/swap.h> |
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 6b9740bbf4c0..e07e27e846a2 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
| @@ -1209,10 +1209,8 @@ static struct page *alloc_page_interleave(gfp_t gfp, unsigned order, | |||
| 1209 | 1209 | ||
| 1210 | zl = NODE_DATA(nid)->node_zonelists + gfp_zone(gfp); | 1210 | zl = NODE_DATA(nid)->node_zonelists + gfp_zone(gfp); |
| 1211 | page = __alloc_pages(gfp, order, zl); | 1211 | page = __alloc_pages(gfp, order, zl); |
| 1212 | if (page && page_zone(page) == zl->zones[0]) { | 1212 | if (page && page_zone(page) == zl->zones[0]) |
| 1213 | zone_pcp(zl->zones[0],get_cpu())->interleave_hit++; | 1213 | inc_zone_page_state(page, NUMA_INTERLEAVE_HIT); |
| 1214 | put_cpu(); | ||
| 1215 | } | ||
| 1216 | return page; | 1214 | return page; |
| 1217 | } | 1215 | } |
| 1218 | 1216 | ||
| @@ -96,7 +96,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin) | |||
| 96 | if (sysctl_overcommit_memory == OVERCOMMIT_GUESS) { | 96 | if (sysctl_overcommit_memory == OVERCOMMIT_GUESS) { |
| 97 | unsigned long n; | 97 | unsigned long n; |
| 98 | 98 | ||
| 99 | free = get_page_cache_size(); | 99 | free = global_page_state(NR_FILE_PAGES); |
| 100 | free += nr_swap_pages; | 100 | free += nr_swap_pages; |
| 101 | 101 | ||
| 102 | /* | 102 | /* |
diff --git a/mm/mmzone.c b/mm/mmzone.c index b022370e612e..0959ee1a4795 100644 --- a/mm/mmzone.c +++ b/mm/mmzone.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/stddef.h> | 8 | #include <linux/stddef.h> |
| 10 | #include <linux/mmzone.h> | 9 | #include <linux/mmzone.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
diff --git a/mm/nommu.c b/mm/nommu.c index 029fadac0fb5..5151c44a8257 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
| @@ -1122,7 +1122,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin) | |||
| 1122 | if (sysctl_overcommit_memory == OVERCOMMIT_GUESS) { | 1122 | if (sysctl_overcommit_memory == OVERCOMMIT_GUESS) { |
| 1123 | unsigned long n; | 1123 | unsigned long n; |
| 1124 | 1124 | ||
| 1125 | free = get_page_cache_size(); | 1125 | free = global_page_state(NR_FILE_PAGES); |
| 1126 | free += nr_swap_pages; | 1126 | free += nr_swap_pages; |
| 1127 | 1127 | ||
| 1128 | /* | 1128 | /* |
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 4ec7026c7bab..e630188ccc40 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -99,22 +99,6 @@ EXPORT_SYMBOL(laptop_mode); | |||
| 99 | 99 | ||
| 100 | static void background_writeout(unsigned long _min_pages); | 100 | static void background_writeout(unsigned long _min_pages); |
| 101 | 101 | ||
| 102 | struct writeback_state | ||
| 103 | { | ||
| 104 | unsigned long nr_dirty; | ||
| 105 | unsigned long nr_unstable; | ||
| 106 | unsigned long nr_mapped; | ||
| 107 | unsigned long nr_writeback; | ||
| 108 | }; | ||
| 109 | |||
| 110 | static void get_writeback_state(struct writeback_state *wbs) | ||
| 111 | { | ||
| 112 | wbs->nr_dirty = read_page_state(nr_dirty); | ||
| 113 | wbs->nr_unstable = read_page_state(nr_unstable); | ||
| 114 | wbs->nr_mapped = read_page_state(nr_mapped); | ||
| 115 | wbs->nr_writeback = read_page_state(nr_writeback); | ||
| 116 | } | ||
| 117 | |||
| 118 | /* | 102 | /* |
| 119 | * Work out the current dirty-memory clamping and background writeout | 103 | * Work out the current dirty-memory clamping and background writeout |
| 120 | * thresholds. | 104 | * thresholds. |
| @@ -133,8 +117,8 @@ static void get_writeback_state(struct writeback_state *wbs) | |||
| 133 | * clamping level. | 117 | * clamping level. |
| 134 | */ | 118 | */ |
| 135 | static void | 119 | static void |
| 136 | get_dirty_limits(struct writeback_state *wbs, long *pbackground, long *pdirty, | 120 | get_dirty_limits(long *pbackground, long *pdirty, |
| 137 | struct address_space *mapping) | 121 | struct address_space *mapping) |
| 138 | { | 122 | { |
| 139 | int background_ratio; /* Percentages */ | 123 | int background_ratio; /* Percentages */ |
| 140 | int dirty_ratio; | 124 | int dirty_ratio; |
| @@ -144,8 +128,6 @@ get_dirty_limits(struct writeback_state *wbs, long *pbackground, long *pdirty, | |||
| 144 | unsigned long available_memory = total_pages; | 128 | unsigned long available_memory = total_pages; |
| 145 | struct task_struct *tsk; | 129 | struct task_struct *tsk; |
| 146 | 130 | ||
| 147 | get_writeback_state(wbs); | ||
| 148 | |||
| 149 | #ifdef CONFIG_HIGHMEM | 131 | #ifdef CONFIG_HIGHMEM |
| 150 | /* | 132 | /* |
| 151 | * If this mapping can only allocate from low memory, | 133 | * If this mapping can only allocate from low memory, |
| @@ -156,7 +138,9 @@ get_dirty_limits(struct writeback_state *wbs, long *pbackground, long *pdirty, | |||
| 156 | #endif | 138 | #endif |
| 157 | 139 | ||
| 158 | 140 | ||
| 159 | unmapped_ratio = 100 - (wbs->nr_mapped * 100) / total_pages; | 141 | unmapped_ratio = 100 - ((global_page_state(NR_FILE_MAPPED) + |
| 142 | global_page_state(NR_ANON_PAGES)) * 100) / | ||
| 143 | total_pages; | ||
| 160 | 144 | ||
| 161 | dirty_ratio = vm_dirty_ratio; | 145 | dirty_ratio = vm_dirty_ratio; |
| 162 | if (dirty_ratio > unmapped_ratio / 2) | 146 | if (dirty_ratio > unmapped_ratio / 2) |
| @@ -189,7 +173,6 @@ get_dirty_limits(struct writeback_state *wbs, long *pbackground, long *pdirty, | |||
| 189 | */ | 173 | */ |
| 190 | static void balance_dirty_pages(struct address_space *mapping) | 174 | static void balance_dirty_pages(struct address_space *mapping) |
| 191 | { | 175 | { |
| 192 | struct writeback_state wbs; | ||
| 193 | long nr_reclaimable; | 176 | long nr_reclaimable; |
| 194 | long background_thresh; | 177 | long background_thresh; |
| 195 | long dirty_thresh; | 178 | long dirty_thresh; |
| @@ -207,11 +190,12 @@ static void balance_dirty_pages(struct address_space *mapping) | |||
| 207 | .range_cyclic = 1, | 190 | .range_cyclic = 1, |
| 208 | }; | 191 | }; |
| 209 | 192 | ||
| 210 | get_dirty_limits(&wbs, &background_thresh, | 193 | get_dirty_limits(&background_thresh, &dirty_thresh, mapping); |
| 211 | &dirty_thresh, mapping); | 194 | nr_reclaimable = global_page_state(NR_FILE_DIRTY) + |
| 212 | nr_reclaimable = wbs.nr_dirty + wbs.nr_unstable; | 195 | global_page_state(NR_UNSTABLE_NFS); |
| 213 | if (nr_reclaimable + wbs.nr_writeback <= dirty_thresh) | 196 | if (nr_reclaimable + global_page_state(NR_WRITEBACK) <= |
| 214 | break; | 197 | dirty_thresh) |
| 198 | break; | ||
| 215 | 199 | ||
| 216 | if (!dirty_exceeded) | 200 | if (!dirty_exceeded) |
| 217 | dirty_exceeded = 1; | 201 | dirty_exceeded = 1; |
| @@ -224,11 +208,14 @@ static void balance_dirty_pages(struct address_space *mapping) | |||
| 224 | */ | 208 | */ |
| 225 | if (nr_reclaimable) { | 209 | if (nr_reclaimable) { |
| 226 | writeback_inodes(&wbc); | 210 | writeback_inodes(&wbc); |
| 227 | get_dirty_limits(&wbs, &background_thresh, | 211 | get_dirty_limits(&background_thresh, |
| 228 | &dirty_thresh, mapping); | 212 | &dirty_thresh, mapping); |
| 229 | nr_reclaimable = wbs.nr_dirty + wbs.nr_unstable; | 213 | nr_reclaimable = global_page_state(NR_FILE_DIRTY) + |
| 230 | if (nr_reclaimable + wbs.nr_writeback <= dirty_thresh) | 214 | global_page_state(NR_UNSTABLE_NFS); |
| 231 | break; | 215 | if (nr_reclaimable + |
| 216 | global_page_state(NR_WRITEBACK) | ||
| 217 | <= dirty_thresh) | ||
| 218 | break; | ||
| 232 | pages_written += write_chunk - wbc.nr_to_write; | 219 | pages_written += write_chunk - wbc.nr_to_write; |
| 233 | if (pages_written >= write_chunk) | 220 | if (pages_written >= write_chunk) |
| 234 | break; /* We've done our duty */ | 221 | break; /* We've done our duty */ |
| @@ -236,8 +223,9 @@ static void balance_dirty_pages(struct address_space *mapping) | |||
| 236 | blk_congestion_wait(WRITE, HZ/10); | 223 | blk_congestion_wait(WRITE, HZ/10); |
| 237 | } | 224 | } |
| 238 | 225 | ||
| 239 | if (nr_reclaimable + wbs.nr_writeback <= dirty_thresh && dirty_exceeded) | 226 | if (nr_reclaimable + global_page_state(NR_WRITEBACK) |
| 240 | dirty_exceeded = 0; | 227 | <= dirty_thresh && dirty_exceeded) |
| 228 | dirty_exceeded = 0; | ||
| 241 | 229 | ||
| 242 | if (writeback_in_progress(bdi)) | 230 | if (writeback_in_progress(bdi)) |
| 243 | return; /* pdflush is already working this queue */ | 231 | return; /* pdflush is already working this queue */ |
| @@ -299,12 +287,11 @@ EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr); | |||
| 299 | 287 | ||
| 300 | void throttle_vm_writeout(void) | 288 | void throttle_vm_writeout(void) |
| 301 | { | 289 | { |
| 302 | struct writeback_state wbs; | ||
| 303 | long background_thresh; | 290 | long background_thresh; |
| 304 | long dirty_thresh; | 291 | long dirty_thresh; |
| 305 | 292 | ||
| 306 | for ( ; ; ) { | 293 | for ( ; ; ) { |
| 307 | get_dirty_limits(&wbs, &background_thresh, &dirty_thresh, NULL); | 294 | get_dirty_limits(&background_thresh, &dirty_thresh, NULL); |
| 308 | 295 | ||
| 309 | /* | 296 | /* |
| 310 | * Boost the allowable dirty threshold a bit for page | 297 | * Boost the allowable dirty threshold a bit for page |
| @@ -312,8 +299,9 @@ void throttle_vm_writeout(void) | |||
| 312 | */ | 299 | */ |
| 313 | dirty_thresh += dirty_thresh / 10; /* wheeee... */ | 300 | dirty_thresh += dirty_thresh / 10; /* wheeee... */ |
| 314 | 301 | ||
| 315 | if (wbs.nr_unstable + wbs.nr_writeback <= dirty_thresh) | 302 | if (global_page_state(NR_UNSTABLE_NFS) + |
| 316 | break; | 303 | global_page_state(NR_WRITEBACK) <= dirty_thresh) |
| 304 | break; | ||
| 317 | blk_congestion_wait(WRITE, HZ/10); | 305 | blk_congestion_wait(WRITE, HZ/10); |
| 318 | } | 306 | } |
| 319 | } | 307 | } |
| @@ -336,12 +324,12 @@ static void background_writeout(unsigned long _min_pages) | |||
| 336 | }; | 324 | }; |
| 337 | 325 | ||
| 338 | for ( ; ; ) { | 326 | for ( ; ; ) { |
| 339 | struct writeback_state wbs; | ||
| 340 | long background_thresh; | 327 | long background_thresh; |
| 341 | long dirty_thresh; | 328 | long dirty_thresh; |
| 342 | 329 | ||
| 343 | get_dirty_limits(&wbs, &background_thresh, &dirty_thresh, NULL); | 330 | get_dirty_limits(&background_thresh, &dirty_thresh, NULL); |
| 344 | if (wbs.nr_dirty + wbs.nr_unstable < background_thresh | 331 | if (global_page_state(NR_FILE_DIRTY) + |
| 332 | global_page_state(NR_UNSTABLE_NFS) < background_thresh | ||
| 345 | && min_pages <= 0) | 333 | && min_pages <= 0) |
| 346 | break; | 334 | break; |
| 347 | wbc.encountered_congestion = 0; | 335 | wbc.encountered_congestion = 0; |
| @@ -365,12 +353,9 @@ static void background_writeout(unsigned long _min_pages) | |||
| 365 | */ | 353 | */ |
| 366 | int wakeup_pdflush(long nr_pages) | 354 | int wakeup_pdflush(long nr_pages) |
| 367 | { | 355 | { |
| 368 | if (nr_pages == 0) { | 356 | if (nr_pages == 0) |
| 369 | struct writeback_state wbs; | 357 | nr_pages = global_page_state(NR_FILE_DIRTY) + |
| 370 | 358 | global_page_state(NR_UNSTABLE_NFS); | |
| 371 | get_writeback_state(&wbs); | ||
| 372 | nr_pages = wbs.nr_dirty + wbs.nr_unstable; | ||
| 373 | } | ||
| 374 | return pdflush_operation(background_writeout, nr_pages); | 359 | return pdflush_operation(background_writeout, nr_pages); |
| 375 | } | 360 | } |
| 376 | 361 | ||
| @@ -401,7 +386,6 @@ static void wb_kupdate(unsigned long arg) | |||
| 401 | unsigned long start_jif; | 386 | unsigned long start_jif; |
| 402 | unsigned long next_jif; | 387 | unsigned long next_jif; |
| 403 | long nr_to_write; | 388 | long nr_to_write; |
| 404 | struct writeback_state wbs; | ||
| 405 | struct writeback_control wbc = { | 389 | struct writeback_control wbc = { |
| 406 | .bdi = NULL, | 390 | .bdi = NULL, |
| 407 | .sync_mode = WB_SYNC_NONE, | 391 | .sync_mode = WB_SYNC_NONE, |
| @@ -414,11 +398,11 @@ static void wb_kupdate(unsigned long arg) | |||
| 414 | 398 | ||
| 415 | sync_supers(); | 399 | sync_supers(); |
| 416 | 400 | ||
| 417 | get_writeback_state(&wbs); | ||
| 418 | oldest_jif = jiffies - dirty_expire_interval; | 401 | oldest_jif = jiffies - dirty_expire_interval; |
| 419 | start_jif = jiffies; | 402 | start_jif = jiffies; |
| 420 | next_jif = start_jif + dirty_writeback_interval; | 403 | next_jif = start_jif + dirty_writeback_interval; |
| 421 | nr_to_write = wbs.nr_dirty + wbs.nr_unstable + | 404 | nr_to_write = global_page_state(NR_FILE_DIRTY) + |
| 405 | global_page_state(NR_UNSTABLE_NFS) + | ||
| 422 | (inodes_stat.nr_inodes - inodes_stat.nr_unused); | 406 | (inodes_stat.nr_inodes - inodes_stat.nr_unused); |
| 423 | while (nr_to_write > 0) { | 407 | while (nr_to_write > 0) { |
| 424 | wbc.encountered_congestion = 0; | 408 | wbc.encountered_congestion = 0; |
| @@ -640,7 +624,8 @@ int __set_page_dirty_nobuffers(struct page *page) | |||
| 640 | if (mapping2) { /* Race with truncate? */ | 624 | if (mapping2) { /* Race with truncate? */ |
| 641 | BUG_ON(mapping2 != mapping); | 625 | BUG_ON(mapping2 != mapping); |
| 642 | if (mapping_cap_account_dirty(mapping)) | 626 | if (mapping_cap_account_dirty(mapping)) |
| 643 | inc_page_state(nr_dirty); | 627 | __inc_zone_page_state(page, |
| 628 | NR_FILE_DIRTY); | ||
| 644 | radix_tree_tag_set(&mapping->page_tree, | 629 | radix_tree_tag_set(&mapping->page_tree, |
| 645 | page_index(page), PAGECACHE_TAG_DIRTY); | 630 | page_index(page), PAGECACHE_TAG_DIRTY); |
| 646 | } | 631 | } |
| @@ -727,9 +712,9 @@ int test_clear_page_dirty(struct page *page) | |||
| 727 | radix_tree_tag_clear(&mapping->page_tree, | 712 | radix_tree_tag_clear(&mapping->page_tree, |
| 728 | page_index(page), | 713 | page_index(page), |
| 729 | PAGECACHE_TAG_DIRTY); | 714 | PAGECACHE_TAG_DIRTY); |
| 730 | write_unlock_irqrestore(&mapping->tree_lock, flags); | ||
| 731 | if (mapping_cap_account_dirty(mapping)) | 715 | if (mapping_cap_account_dirty(mapping)) |
| 732 | dec_page_state(nr_dirty); | 716 | __dec_zone_page_state(page, NR_FILE_DIRTY); |
| 717 | write_unlock_irqrestore(&mapping->tree_lock, flags); | ||
| 733 | return 1; | 718 | return 1; |
| 734 | } | 719 | } |
| 735 | write_unlock_irqrestore(&mapping->tree_lock, flags); | 720 | write_unlock_irqrestore(&mapping->tree_lock, flags); |
| @@ -760,7 +745,7 @@ int clear_page_dirty_for_io(struct page *page) | |||
| 760 | if (mapping) { | 745 | if (mapping) { |
| 761 | if (TestClearPageDirty(page)) { | 746 | if (TestClearPageDirty(page)) { |
| 762 | if (mapping_cap_account_dirty(mapping)) | 747 | if (mapping_cap_account_dirty(mapping)) |
| 763 | dec_page_state(nr_dirty); | 748 | dec_zone_page_state(page, NR_FILE_DIRTY); |
| 764 | return 1; | 749 | return 1; |
| 765 | } | 750 | } |
| 766 | return 0; | 751 | return 0; |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 084a2de7e52a..3e792a583f3b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * (lots of bits borrowed from Ingo Molnar & Andrew Morton) | 14 | * (lots of bits borrowed from Ingo Molnar & Andrew Morton) |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 20 | #include <linux/swap.h> | 19 | #include <linux/swap.h> |
| @@ -456,7 +455,7 @@ static void __free_pages_ok(struct page *page, unsigned int order) | |||
| 456 | 455 | ||
| 457 | kernel_map_pages(page, 1 << order, 0); | 456 | kernel_map_pages(page, 1 << order, 0); |
| 458 | local_irq_save(flags); | 457 | local_irq_save(flags); |
| 459 | __mod_page_state(pgfree, 1 << order); | 458 | __count_vm_events(PGFREE, 1 << order); |
| 460 | free_one_page(page_zone(page), page, order); | 459 | free_one_page(page_zone(page), page, order); |
| 461 | local_irq_restore(flags); | 460 | local_irq_restore(flags); |
| 462 | } | 461 | } |
| @@ -709,27 +708,6 @@ void drain_local_pages(void) | |||
| 709 | } | 708 | } |
| 710 | #endif /* CONFIG_PM */ | 709 | #endif /* CONFIG_PM */ |
| 711 | 710 | ||
| 712 | static void zone_statistics(struct zonelist *zonelist, struct zone *z, int cpu) | ||
| 713 | { | ||
| 714 | #ifdef CONFIG_NUMA | ||
| 715 | pg_data_t *pg = z->zone_pgdat; | ||
| 716 | pg_data_t *orig = zonelist->zones[0]->zone_pgdat; | ||
| 717 | struct per_cpu_pageset *p; | ||
| 718 | |||
| 719 | p = zone_pcp(z, cpu); | ||
| 720 | if (pg == orig) { | ||
| 721 | p->numa_hit++; | ||
| 722 | } else { | ||
| 723 | p->numa_miss++; | ||
| 724 | zone_pcp(zonelist->zones[0], cpu)->numa_foreign++; | ||
| 725 | } | ||
| 726 | if (pg == NODE_DATA(numa_node_id())) | ||
| 727 | p->local_node++; | ||
| 728 | else | ||
| 729 | p->other_node++; | ||
| 730 | #endif | ||
| 731 | } | ||
| 732 | |||
| 733 | /* | 711 | /* |
| 734 | * Free a 0-order page | 712 | * Free a 0-order page |
| 735 | */ | 713 | */ |
| @@ -750,7 +728,7 @@ static void fastcall free_hot_cold_page(struct page *page, int cold) | |||
| 750 | 728 | ||
| 751 | pcp = &zone_pcp(zone, get_cpu())->pcp[cold]; | 729 | pcp = &zone_pcp(zone, get_cpu())->pcp[cold]; |
| 752 | local_irq_save(flags); | 730 | local_irq_save(flags); |
| 753 | __inc_page_state(pgfree); | 731 | __count_vm_event(PGFREE); |
| 754 | list_add(&page->lru, &pcp->list); | 732 | list_add(&page->lru, &pcp->list); |
| 755 | pcp->count++; | 733 | pcp->count++; |
| 756 | if (pcp->count >= pcp->high) { | 734 | if (pcp->count >= pcp->high) { |
| @@ -826,8 +804,8 @@ again: | |||
| 826 | goto failed; | 804 | goto failed; |
| 827 | } | 805 | } |
| 828 | 806 | ||
| 829 | __mod_page_state_zone(zone, pgalloc, 1 << order); | 807 | __count_zone_vm_events(PGALLOC, zone, 1 << order); |
| 830 | zone_statistics(zonelist, zone, cpu); | 808 | zone_statistics(zonelist, zone); |
| 831 | local_irq_restore(flags); | 809 | local_irq_restore(flags); |
| 832 | put_cpu(); | 810 | put_cpu(); |
| 833 | 811 | ||
| @@ -1231,141 +1209,6 @@ static void show_node(struct zone *zone) | |||
| 1231 | #define show_node(zone) do { } while (0) | 1209 | #define show_node(zone) do { } while (0) |
| 1232 | #endif | 1210 | #endif |
| 1233 | 1211 | ||
| 1234 | /* | ||
| 1235 | * Accumulate the page_state information across all CPUs. | ||
| 1236 | * The result is unavoidably approximate - it can change | ||
| 1237 | * during and after execution of this function. | ||
| 1238 | */ | ||
| 1239 | static DEFINE_PER_CPU(struct page_state, page_states) = {0}; | ||
| 1240 | |||
| 1241 | atomic_t nr_pagecache = ATOMIC_INIT(0); | ||
| 1242 | EXPORT_SYMBOL(nr_pagecache); | ||
| 1243 | #ifdef CONFIG_SMP | ||
| 1244 | DEFINE_PER_CPU(long, nr_pagecache_local) = 0; | ||
| 1245 | #endif | ||
| 1246 | |||
| 1247 | static void __get_page_state(struct page_state *ret, int nr, cpumask_t *cpumask) | ||
| 1248 | { | ||
| 1249 | unsigned cpu; | ||
| 1250 | |||
| 1251 | memset(ret, 0, nr * sizeof(unsigned long)); | ||
| 1252 | cpus_and(*cpumask, *cpumask, cpu_online_map); | ||
| 1253 | |||
| 1254 | for_each_cpu_mask(cpu, *cpumask) { | ||
| 1255 | unsigned long *in; | ||
| 1256 | unsigned long *out; | ||
| 1257 | unsigned off; | ||
| 1258 | unsigned next_cpu; | ||
| 1259 | |||
| 1260 | in = (unsigned long *)&per_cpu(page_states, cpu); | ||
| 1261 | |||
| 1262 | next_cpu = next_cpu(cpu, *cpumask); | ||
| 1263 | if (likely(next_cpu < NR_CPUS)) | ||
| 1264 | prefetch(&per_cpu(page_states, next_cpu)); | ||
| 1265 | |||
| 1266 | out = (unsigned long *)ret; | ||
| 1267 | for (off = 0; off < nr; off++) | ||
| 1268 | *out++ += *in++; | ||
| 1269 | } | ||
| 1270 | } | ||
| 1271 | |||
| 1272 | void get_page_state_node(struct page_state *ret, int node) | ||
| 1273 | { | ||
| 1274 | int nr; | ||
| 1275 | cpumask_t mask = node_to_cpumask(node); | ||
| 1276 | |||
| 1277 | nr = offsetof(struct page_state, GET_PAGE_STATE_LAST); | ||
| 1278 | nr /= sizeof(unsigned long); | ||
| 1279 | |||
| 1280 | __get_page_state(ret, nr+1, &mask); | ||
| 1281 | } | ||
| 1282 | |||
| 1283 | void get_page_state(struct page_state *ret) | ||
| 1284 | { | ||
| 1285 | int nr; | ||
| 1286 | cpumask_t mask = CPU_MASK_ALL; | ||
| 1287 | |||
| 1288 | nr = offsetof(struct page_state, GET_PAGE_STATE_LAST); | ||
| 1289 | nr /= sizeof(unsigned long); | ||
| 1290 | |||
| 1291 | __get_page_state(ret, nr + 1, &mask); | ||
| 1292 | } | ||
| 1293 | |||
| 1294 | void get_full_page_state(struct page_state *ret) | ||
| 1295 | { | ||
| 1296 | cpumask_t mask = CPU_MASK_ALL; | ||
| 1297 | |||
| 1298 | __get_page_state(ret, sizeof(*ret) / sizeof(unsigned long), &mask); | ||
| 1299 | } | ||
| 1300 | |||
| 1301 | unsigned long read_page_state_offset(unsigned long offset) | ||
| 1302 | { | ||
| 1303 | unsigned long ret = 0; | ||
| 1304 | int cpu; | ||
| 1305 | |||
| 1306 | for_each_online_cpu(cpu) { | ||
| 1307 | unsigned long in; | ||
| 1308 | |||
| 1309 | in = (unsigned long)&per_cpu(page_states, cpu) + offset; | ||
| 1310 | ret += *((unsigned long *)in); | ||
| 1311 | } | ||
| 1312 | return ret; | ||
| 1313 | } | ||
| 1314 | |||
| 1315 | void __mod_page_state_offset(unsigned long offset, unsigned long delta) | ||
| 1316 | { | ||
| 1317 | void *ptr; | ||
| 1318 | |||
| 1319 | ptr = &__get_cpu_var(page_states); | ||
| 1320 | *(unsigned long *)(ptr + offset) += delta; | ||
| 1321 | } | ||
| 1322 | EXPORT_SYMBOL(__mod_page_state_offset); | ||
| 1323 | |||
| 1324 | void mod_page_state_offset(unsigned long offset, unsigned long delta) | ||
| 1325 | { | ||
| 1326 | unsigned long flags; | ||
| 1327 | void *ptr; | ||
| 1328 | |||
| 1329 | local_irq_save(flags); | ||
| 1330 | ptr = &__get_cpu_var(page_states); | ||
| 1331 | *(unsigned long *)(ptr + offset) += delta; | ||
| 1332 | local_irq_restore(flags); | ||
| 1333 | } | ||
| 1334 | EXPORT_SYMBOL(mod_page_state_offset); | ||
| 1335 | |||
| 1336 | void __get_zone_counts(unsigned long *active, unsigned long *inactive, | ||
| 1337 | unsigned long *free, struct pglist_data *pgdat) | ||
| 1338 | { | ||
| 1339 | struct zone *zones = pgdat->node_zones; | ||
| 1340 | int i; | ||
| 1341 | |||
| 1342 | *active = 0; | ||
| 1343 | *inactive = 0; | ||
| 1344 | *free = 0; | ||
| 1345 | for (i = 0; i < MAX_NR_ZONES; i++) { | ||
| 1346 | *active += zones[i].nr_active; | ||
| 1347 | *inactive += zones[i].nr_inactive; | ||
| 1348 | *free += zones[i].free_pages; | ||
| 1349 | } | ||
| 1350 | } | ||
| 1351 | |||
| 1352 | void get_zone_counts(unsigned long *active, | ||
| 1353 | unsigned long *inactive, unsigned long *free) | ||
| 1354 | { | ||
| 1355 | struct pglist_data *pgdat; | ||
| 1356 | |||
| 1357 | *active = 0; | ||
| 1358 | *inactive = 0; | ||
| 1359 | *free = 0; | ||
| 1360 | for_each_online_pgdat(pgdat) { | ||
| 1361 | unsigned long l, m, n; | ||
| 1362 | __get_zone_counts(&l, &m, &n, pgdat); | ||
| 1363 | *active += l; | ||
| 1364 | *inactive += m; | ||
| 1365 | *free += n; | ||
| 1366 | } | ||
| 1367 | } | ||
| 1368 | |||
| 1369 | void si_meminfo(struct sysinfo *val) | 1212 | void si_meminfo(struct sysinfo *val) |
| 1370 | { | 1213 | { |
| 1371 | val->totalram = totalram_pages; | 1214 | val->totalram = totalram_pages; |
| @@ -1406,7 +1249,6 @@ void si_meminfo_node(struct sysinfo *val, int nid) | |||
| 1406 | */ | 1249 | */ |
| 1407 | void show_free_areas(void) | 1250 | void show_free_areas(void) |
| 1408 | { | 1251 | { |
| 1409 | struct page_state ps; | ||
| 1410 | int cpu, temperature; | 1252 | int cpu, temperature; |
| 1411 | unsigned long active; | 1253 | unsigned long active; |
| 1412 | unsigned long inactive; | 1254 | unsigned long inactive; |
| @@ -1438,7 +1280,6 @@ void show_free_areas(void) | |||
| 1438 | } | 1280 | } |
| 1439 | } | 1281 | } |
| 1440 | 1282 | ||
| 1441 | get_page_state(&ps); | ||
| 1442 | get_zone_counts(&active, &inactive, &free); | 1283 | get_zone_counts(&active, &inactive, &free); |
| 1443 | 1284 | ||
| 1444 | printk("Free pages: %11ukB (%ukB HighMem)\n", | 1285 | printk("Free pages: %11ukB (%ukB HighMem)\n", |
| @@ -1449,13 +1290,13 @@ void show_free_areas(void) | |||
| 1449 | "unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n", | 1290 | "unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n", |
| 1450 | active, | 1291 | active, |
| 1451 | inactive, | 1292 | inactive, |
| 1452 | ps.nr_dirty, | 1293 | global_page_state(NR_FILE_DIRTY), |
| 1453 | ps.nr_writeback, | 1294 | global_page_state(NR_WRITEBACK), |
| 1454 | ps.nr_unstable, | 1295 | global_page_state(NR_UNSTABLE_NFS), |
| 1455 | nr_free_pages(), | 1296 | nr_free_pages(), |
| 1456 | ps.nr_slab, | 1297 | global_page_state(NR_SLAB), |
| 1457 | ps.nr_mapped, | 1298 | global_page_state(NR_FILE_MAPPED), |
| 1458 | ps.nr_page_table_pages); | 1299 | global_page_state(NR_PAGETABLE)); |
| 1459 | 1300 | ||
| 1460 | for_each_zone(zone) { | 1301 | for_each_zone(zone) { |
| 1461 | int i; | 1302 | int i; |
| @@ -2180,6 +2021,7 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat, | |||
| 2180 | zone->nr_scan_inactive = 0; | 2021 | zone->nr_scan_inactive = 0; |
| 2181 | zone->nr_active = 0; | 2022 | zone->nr_active = 0; |
| 2182 | zone->nr_inactive = 0; | 2023 | zone->nr_inactive = 0; |
| 2024 | zap_zone_vm_stats(zone); | ||
| 2183 | atomic_set(&zone->reclaim_in_progress, 0); | 2025 | atomic_set(&zone->reclaim_in_progress, 0); |
| 2184 | if (!size) | 2026 | if (!size) |
| 2185 | continue; | 2027 | continue; |
| @@ -2253,307 +2095,18 @@ void __init free_area_init(unsigned long *zones_size) | |||
| 2253 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL); | 2095 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL); |
| 2254 | } | 2096 | } |
| 2255 | 2097 | ||
| 2256 | #ifdef CONFIG_PROC_FS | ||
| 2257 | |||
| 2258 | #include <linux/seq_file.h> | ||
| 2259 | |||
| 2260 | static void *frag_start(struct seq_file *m, loff_t *pos) | ||
| 2261 | { | ||
| 2262 | pg_data_t *pgdat; | ||
| 2263 | loff_t node = *pos; | ||
| 2264 | for (pgdat = first_online_pgdat(); | ||
| 2265 | pgdat && node; | ||
| 2266 | pgdat = next_online_pgdat(pgdat)) | ||
| 2267 | --node; | ||
| 2268 | |||
| 2269 | return pgdat; | ||
| 2270 | } | ||
| 2271 | |||
| 2272 | static void *frag_next(struct seq_file *m, void *arg, loff_t *pos) | ||
| 2273 | { | ||
| 2274 | pg_data_t *pgdat = (pg_data_t *)arg; | ||
| 2275 | |||
| 2276 | (*pos)++; | ||
| 2277 | return next_online_pgdat(pgdat); | ||
| 2278 | } | ||
| 2279 | |||
| 2280 | static void frag_stop(struct seq_file *m, void *arg) | ||
| 2281 | { | ||
| 2282 | } | ||
| 2283 | |||
| 2284 | /* | ||
| 2285 | * This walks the free areas for each zone. | ||
| 2286 | */ | ||
| 2287 | static int frag_show(struct seq_file *m, void *arg) | ||
| 2288 | { | ||
| 2289 | pg_data_t *pgdat = (pg_data_t *)arg; | ||
| 2290 | struct zone *zone; | ||
| 2291 | struct zone *node_zones = pgdat->node_zones; | ||
| 2292 | unsigned long flags; | ||
| 2293 | int order; | ||
| 2294 | |||
| 2295 | for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) { | ||
| 2296 | if (!populated_zone(zone)) | ||
| 2297 | continue; | ||
| 2298 | |||
| 2299 | spin_lock_irqsave(&zone->lock, flags); | ||
| 2300 | seq_printf(m, "Node %d, zone %8s ", pgdat->node_id, zone->name); | ||
| 2301 | for (order = 0; order < MAX_ORDER; ++order) | ||
| 2302 | seq_printf(m, "%6lu ", zone->free_area[order].nr_free); | ||
| 2303 | spin_unlock_irqrestore(&zone->lock, flags); | ||
| 2304 | seq_putc(m, '\n'); | ||
| 2305 | } | ||
| 2306 | return 0; | ||
| 2307 | } | ||
| 2308 | |||
| 2309 | struct seq_operations fragmentation_op = { | ||
| 2310 | .start = frag_start, | ||
| 2311 | .next = frag_next, | ||
| 2312 | .stop = frag_stop, | ||
| 2313 | .show = frag_show, | ||
| 2314 | }; | ||
| 2315 | |||
| 2316 | /* | ||
| 2317 | * Output information about zones in @pgdat. | ||
| 2318 | */ | ||
| 2319 | static int zoneinfo_show(struct seq_file *m, void *arg) | ||
| 2320 | { | ||
| 2321 | pg_data_t *pgdat = arg; | ||
| 2322 | struct zone *zone; | ||
| 2323 | struct zone *node_zones = pgdat->node_zones; | ||
| 2324 | unsigned long flags; | ||
| 2325 | |||
| 2326 | for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; zone++) { | ||
| 2327 | int i; | ||
| 2328 | |||
| 2329 | if (!populated_zone(zone)) | ||
| 2330 | continue; | ||
| 2331 | |||
| 2332 | spin_lock_irqsave(&zone->lock, flags); | ||
| 2333 | seq_printf(m, "Node %d, zone %8s", pgdat->node_id, zone->name); | ||
| 2334 | seq_printf(m, | ||
| 2335 | "\n pages free %lu" | ||
| 2336 | "\n min %lu" | ||
| 2337 | "\n low %lu" | ||
| 2338 | "\n high %lu" | ||
| 2339 | "\n active %lu" | ||
| 2340 | "\n inactive %lu" | ||
| 2341 | "\n scanned %lu (a: %lu i: %lu)" | ||
| 2342 | "\n spanned %lu" | ||
| 2343 | "\n present %lu", | ||
| 2344 | zone->free_pages, | ||
| 2345 | zone->pages_min, | ||
| 2346 | zone->pages_low, | ||
| 2347 | zone->pages_high, | ||
| 2348 | zone->nr_active, | ||
| 2349 | zone->nr_inactive, | ||
| 2350 | zone->pages_scanned, | ||
| 2351 | zone->nr_scan_active, zone->nr_scan_inactive, | ||
| 2352 | zone->spanned_pages, | ||
| 2353 | zone->present_pages); | ||
| 2354 | seq_printf(m, | ||
| 2355 | "\n protection: (%lu", | ||
| 2356 | zone->lowmem_reserve[0]); | ||
| 2357 | for (i = 1; i < ARRAY_SIZE(zone->lowmem_reserve); i++) | ||
| 2358 | seq_printf(m, ", %lu", zone->lowmem_reserve[i]); | ||
| 2359 | seq_printf(m, | ||
| 2360 | ")" | ||
| 2361 | "\n pagesets"); | ||
| 2362 | for_each_online_cpu(i) { | ||
| 2363 | struct per_cpu_pageset *pageset; | ||
| 2364 | int j; | ||
| 2365 | |||
| 2366 | pageset = zone_pcp(zone, i); | ||
| 2367 | for (j = 0; j < ARRAY_SIZE(pageset->pcp); j++) { | ||
| 2368 | if (pageset->pcp[j].count) | ||
| 2369 | break; | ||
| 2370 | } | ||
| 2371 | if (j == ARRAY_SIZE(pageset->pcp)) | ||
| 2372 | continue; | ||
| 2373 | for (j = 0; j < ARRAY_SIZE(pageset->pcp); j++) { | ||
| 2374 | seq_printf(m, | ||
| 2375 | "\n cpu: %i pcp: %i" | ||
| 2376 | "\n count: %i" | ||
| 2377 | "\n high: %i" | ||
| 2378 | "\n batch: %i", | ||
| 2379 | i, j, | ||
| 2380 | pageset->pcp[j].count, | ||
| 2381 | pageset->pcp[j].high, | ||
| 2382 | pageset->pcp[j].batch); | ||
| 2383 | } | ||
| 2384 | #ifdef CONFIG_NUMA | ||
| 2385 | seq_printf(m, | ||
| 2386 | "\n numa_hit: %lu" | ||
| 2387 | "\n numa_miss: %lu" | ||
| 2388 | "\n numa_foreign: %lu" | ||
| 2389 | "\n interleave_hit: %lu" | ||
| 2390 | "\n local_node: %lu" | ||
| 2391 | "\n other_node: %lu", | ||
| 2392 | pageset->numa_hit, | ||
| 2393 | pageset->numa_miss, | ||
| 2394 | pageset->numa_foreign, | ||
| 2395 | pageset->interleave_hit, | ||
| 2396 | pageset->local_node, | ||
| 2397 | pageset->other_node); | ||
| 2398 | #endif | ||
| 2399 | } | ||
| 2400 | seq_printf(m, | ||
| 2401 | "\n all_unreclaimable: %u" | ||
| 2402 | "\n prev_priority: %i" | ||
| 2403 | "\n temp_priority: %i" | ||
| 2404 | "\n start_pfn: %lu", | ||
| 2405 | zone->all_unreclaimable, | ||
| 2406 | zone->prev_priority, | ||
| 2407 | zone->temp_priority, | ||
| 2408 | zone->zone_start_pfn); | ||
| 2409 | spin_unlock_irqrestore(&zone->lock, flags); | ||
| 2410 | seq_putc(m, '\n'); | ||
| 2411 | } | ||
| 2412 | return 0; | ||
| 2413 | } | ||
| 2414 | |||
| 2415 | struct seq_operations zoneinfo_op = { | ||
| 2416 | .start = frag_start, /* iterate over all zones. The same as in | ||
| 2417 | * fragmentation. */ | ||
| 2418 | .next = frag_next, | ||
| 2419 | .stop = frag_stop, | ||
| 2420 | .show = zoneinfo_show, | ||
| 2421 | }; | ||
| 2422 | |||
| 2423 | static char *vmstat_text[] = { | ||
| 2424 | "nr_dirty", | ||
| 2425 | "nr_writeback", | ||
| 2426 | "nr_unstable", | ||
| 2427 | "nr_page_table_pages", | ||
| 2428 | "nr_mapped", | ||
| 2429 | "nr_slab", | ||
| 2430 | |||
| 2431 | "pgpgin", | ||
| 2432 | "pgpgout", | ||
| 2433 | "pswpin", | ||
| 2434 | "pswpout", | ||
| 2435 | |||
| 2436 | "pgalloc_high", | ||
| 2437 | "pgalloc_normal", | ||
| 2438 | "pgalloc_dma32", | ||
| 2439 | "pgalloc_dma", | ||
| 2440 | |||
| 2441 | "pgfree", | ||
| 2442 | "pgactivate", | ||
| 2443 | "pgdeactivate", | ||
| 2444 | |||
| 2445 | "pgfault", | ||
| 2446 | "pgmajfault", | ||
| 2447 | |||
| 2448 | "pgrefill_high", | ||
| 2449 | "pgrefill_normal", | ||
| 2450 | "pgrefill_dma32", | ||
| 2451 | "pgrefill_dma", | ||
| 2452 | |||
| 2453 | "pgsteal_high", | ||
| 2454 | "pgsteal_normal", | ||
| 2455 | "pgsteal_dma32", | ||
| 2456 | "pgsteal_dma", | ||
| 2457 | |||
| 2458 | "pgscan_kswapd_high", | ||
| 2459 | "pgscan_kswapd_normal", | ||
| 2460 | "pgscan_kswapd_dma32", | ||
| 2461 | "pgscan_kswapd_dma", | ||
| 2462 | |||
| 2463 | "pgscan_direct_high", | ||
| 2464 | "pgscan_direct_normal", | ||
| 2465 | "pgscan_direct_dma32", | ||
| 2466 | "pgscan_direct_dma", | ||
| 2467 | |||
| 2468 | "pginodesteal", | ||
| 2469 | "slabs_scanned", | ||
| 2470 | "kswapd_steal", | ||
| 2471 | "kswapd_inodesteal", | ||
| 2472 | "pageoutrun", | ||
| 2473 | "allocstall", | ||
| 2474 | |||
| 2475 | "pgrotated", | ||
| 2476 | "nr_bounce", | ||
| 2477 | }; | ||
| 2478 | |||
| 2479 | static void *vmstat_start(struct seq_file *m, loff_t *pos) | ||
| 2480 | { | ||
| 2481 | struct page_state *ps; | ||
| 2482 | |||
| 2483 | if (*pos >= ARRAY_SIZE(vmstat_text)) | ||
| 2484 | return NULL; | ||
| 2485 | |||
| 2486 | ps = kmalloc(sizeof(*ps), GFP_KERNEL); | ||
| 2487 | m->private = ps; | ||
| 2488 | if (!ps) | ||
| 2489 | return ERR_PTR(-ENOMEM); | ||
| 2490 | get_full_page_state(ps); | ||
| 2491 | ps->pgpgin /= 2; /* sectors -> kbytes */ | ||
| 2492 | ps->pgpgout /= 2; | ||
| 2493 | return (unsigned long *)ps + *pos; | ||
| 2494 | } | ||
| 2495 | |||
| 2496 | static void *vmstat_next(struct seq_file *m, void *arg, loff_t *pos) | ||
| 2497 | { | ||
| 2498 | (*pos)++; | ||
| 2499 | if (*pos >= ARRAY_SIZE(vmstat_text)) | ||
| 2500 | return NULL; | ||
| 2501 | return (unsigned long *)m->private + *pos; | ||
| 2502 | } | ||
| 2503 | |||
| 2504 | static int vmstat_show(struct seq_file *m, void *arg) | ||
| 2505 | { | ||
| 2506 | unsigned long *l = arg; | ||
| 2507 | unsigned long off = l - (unsigned long *)m->private; | ||
| 2508 | |||
| 2509 | seq_printf(m, "%s %lu\n", vmstat_text[off], *l); | ||
| 2510 | return 0; | ||
| 2511 | } | ||
| 2512 | |||
| 2513 | static void vmstat_stop(struct seq_file *m, void *arg) | ||
| 2514 | { | ||
| 2515 | kfree(m->private); | ||
| 2516 | m->private = NULL; | ||
| 2517 | } | ||
| 2518 | |||
| 2519 | struct seq_operations vmstat_op = { | ||
| 2520 | .start = vmstat_start, | ||
| 2521 | .next = vmstat_next, | ||
| 2522 | .stop = vmstat_stop, | ||
| 2523 | .show = vmstat_show, | ||
| 2524 | }; | ||
| 2525 | |||
| 2526 | #endif /* CONFIG_PROC_FS */ | ||
| 2527 | |||
| 2528 | #ifdef CONFIG_HOTPLUG_CPU | 2098 | #ifdef CONFIG_HOTPLUG_CPU |
| 2529 | static int page_alloc_cpu_notify(struct notifier_block *self, | 2099 | static int page_alloc_cpu_notify(struct notifier_block *self, |
| 2530 | unsigned long action, void *hcpu) | 2100 | unsigned long action, void *hcpu) |
| 2531 | { | 2101 | { |
| 2532 | int cpu = (unsigned long)hcpu; | 2102 | int cpu = (unsigned long)hcpu; |
| 2533 | long *count; | ||
| 2534 | unsigned long *src, *dest; | ||
| 2535 | 2103 | ||
| 2536 | if (action == CPU_DEAD) { | 2104 | if (action == CPU_DEAD) { |
| 2537 | int i; | ||
| 2538 | |||
| 2539 | /* Drain local pagecache count. */ | ||
| 2540 | count = &per_cpu(nr_pagecache_local, cpu); | ||
| 2541 | atomic_add(*count, &nr_pagecache); | ||
| 2542 | *count = 0; | ||
| 2543 | local_irq_disable(); | 2105 | local_irq_disable(); |
| 2544 | __drain_pages(cpu); | 2106 | __drain_pages(cpu); |
| 2545 | 2107 | vm_events_fold_cpu(cpu); | |
| 2546 | /* Add dead cpu's page_states to our own. */ | ||
| 2547 | dest = (unsigned long *)&__get_cpu_var(page_states); | ||
| 2548 | src = (unsigned long *)&per_cpu(page_states, cpu); | ||
| 2549 | |||
| 2550 | for (i = 0; i < sizeof(struct page_state)/sizeof(unsigned long); | ||
| 2551 | i++) { | ||
| 2552 | dest[i] += src[i]; | ||
| 2553 | src[i] = 0; | ||
| 2554 | } | ||
| 2555 | |||
| 2556 | local_irq_enable(); | 2108 | local_irq_enable(); |
| 2109 | refresh_cpu_vm_stats(cpu); | ||
| 2557 | } | 2110 | } |
| 2558 | return NOTIFY_OK; | 2111 | return NOTIFY_OK; |
| 2559 | } | 2112 | } |
diff --git a/mm/page_io.c b/mm/page_io.c index bb2b0d53889c..88029948d00a 100644 --- a/mm/page_io.c +++ b/mm/page_io.c | |||
| @@ -101,7 +101,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) | |||
| 101 | } | 101 | } |
| 102 | if (wbc->sync_mode == WB_SYNC_ALL) | 102 | if (wbc->sync_mode == WB_SYNC_ALL) |
| 103 | rw |= (1 << BIO_RW_SYNC); | 103 | rw |= (1 << BIO_RW_SYNC); |
| 104 | inc_page_state(pswpout); | 104 | count_vm_event(PSWPOUT); |
| 105 | set_page_writeback(page); | 105 | set_page_writeback(page); |
| 106 | unlock_page(page); | 106 | unlock_page(page); |
| 107 | submit_bio(rw, bio); | 107 | submit_bio(rw, bio); |
| @@ -123,7 +123,7 @@ int swap_readpage(struct file *file, struct page *page) | |||
| 123 | ret = -ENOMEM; | 123 | ret = -ENOMEM; |
| 124 | goto out; | 124 | goto out; |
| 125 | } | 125 | } |
| 126 | inc_page_state(pswpin); | 126 | count_vm_event(PSWPIN); |
| 127 | submit_bio(READ, bio); | 127 | submit_bio(READ, bio); |
| 128 | out: | 128 | out: |
| 129 | return ret; | 129 | return ret; |
| @@ -455,7 +455,7 @@ static void __page_set_anon_rmap(struct page *page, | |||
| 455 | * nr_mapped state can be updated without turning off | 455 | * nr_mapped state can be updated without turning off |
| 456 | * interrupts because it is not modified via interrupt. | 456 | * interrupts because it is not modified via interrupt. |
| 457 | */ | 457 | */ |
| 458 | __inc_page_state(nr_mapped); | 458 | __inc_zone_page_state(page, NR_ANON_PAGES); |
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | /** | 461 | /** |
| @@ -499,7 +499,7 @@ void page_add_new_anon_rmap(struct page *page, | |||
| 499 | void page_add_file_rmap(struct page *page) | 499 | void page_add_file_rmap(struct page *page) |
| 500 | { | 500 | { |
| 501 | if (atomic_inc_and_test(&page->_mapcount)) | 501 | if (atomic_inc_and_test(&page->_mapcount)) |
| 502 | __inc_page_state(nr_mapped); | 502 | __inc_zone_page_state(page, NR_FILE_MAPPED); |
| 503 | } | 503 | } |
| 504 | 504 | ||
| 505 | /** | 505 | /** |
| @@ -531,7 +531,8 @@ void page_remove_rmap(struct page *page) | |||
| 531 | */ | 531 | */ |
| 532 | if (page_test_and_clear_dirty(page)) | 532 | if (page_test_and_clear_dirty(page)) |
| 533 | set_page_dirty(page); | 533 | set_page_dirty(page); |
| 534 | __dec_page_state(nr_mapped); | 534 | __dec_zone_page_state(page, |
| 535 | PageAnon(page) ? NR_ANON_PAGES : NR_FILE_MAPPED); | ||
| 535 | } | 536 | } |
| 536 | } | 537 | } |
| 537 | 538 | ||
diff --git a/mm/shmem.c b/mm/shmem.c index b14ff817d162..db21c51531ca 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * which makes it a completely usable filesystem. | 23 | * which makes it a completely usable filesystem. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
| @@ -1045,12 +1044,12 @@ repeat: | |||
| 1045 | swappage = lookup_swap_cache(swap); | 1044 | swappage = lookup_swap_cache(swap); |
| 1046 | if (!swappage) { | 1045 | if (!swappage) { |
| 1047 | shmem_swp_unmap(entry); | 1046 | shmem_swp_unmap(entry); |
| 1048 | spin_unlock(&info->lock); | ||
| 1049 | /* here we actually do the io */ | 1047 | /* here we actually do the io */ |
| 1050 | if (type && *type == VM_FAULT_MINOR) { | 1048 | if (type && *type == VM_FAULT_MINOR) { |
| 1051 | inc_page_state(pgmajfault); | 1049 | __count_vm_event(PGMAJFAULT); |
| 1052 | *type = VM_FAULT_MAJOR; | 1050 | *type = VM_FAULT_MAJOR; |
| 1053 | } | 1051 | } |
| 1052 | spin_unlock(&info->lock); | ||
| 1054 | swappage = shmem_swapin(info, swap, idx); | 1053 | swappage = shmem_swapin(info, swap, idx); |
| 1055 | if (!swappage) { | 1054 | if (!swappage) { |
| 1056 | spin_lock(&info->lock); | 1055 | spin_lock(&info->lock); |
| @@ -309,6 +309,13 @@ struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS]; | |||
| 309 | #define SIZE_AC 1 | 309 | #define SIZE_AC 1 |
| 310 | #define SIZE_L3 (1 + MAX_NUMNODES) | 310 | #define SIZE_L3 (1 + MAX_NUMNODES) |
| 311 | 311 | ||
| 312 | static int drain_freelist(struct kmem_cache *cache, | ||
| 313 | struct kmem_list3 *l3, int tofree); | ||
| 314 | static void free_block(struct kmem_cache *cachep, void **objpp, int len, | ||
| 315 | int node); | ||
| 316 | static void enable_cpucache(struct kmem_cache *cachep); | ||
| 317 | static void cache_reap(void *unused); | ||
| 318 | |||
| 312 | /* | 319 | /* |
| 313 | * This function must be completely optimized away if a constant is passed to | 320 | * This function must be completely optimized away if a constant is passed to |
| 314 | * it. Mostly the same as what is in linux/slab.h except it returns an index. | 321 | * it. Mostly the same as what is in linux/slab.h except it returns an index. |
| @@ -456,7 +463,7 @@ struct kmem_cache { | |||
| 456 | #define STATS_DEC_ACTIVE(x) ((x)->num_active--) | 463 | #define STATS_DEC_ACTIVE(x) ((x)->num_active--) |
| 457 | #define STATS_INC_ALLOCED(x) ((x)->num_allocations++) | 464 | #define STATS_INC_ALLOCED(x) ((x)->num_allocations++) |
| 458 | #define STATS_INC_GROWN(x) ((x)->grown++) | 465 | #define STATS_INC_GROWN(x) ((x)->grown++) |
| 459 | #define STATS_INC_REAPED(x) ((x)->reaped++) | 466 | #define STATS_ADD_REAPED(x,y) ((x)->reaped += (y)) |
| 460 | #define STATS_SET_HIGH(x) \ | 467 | #define STATS_SET_HIGH(x) \ |
| 461 | do { \ | 468 | do { \ |
| 462 | if ((x)->num_active > (x)->high_mark) \ | 469 | if ((x)->num_active > (x)->high_mark) \ |
| @@ -480,7 +487,7 @@ struct kmem_cache { | |||
| 480 | #define STATS_DEC_ACTIVE(x) do { } while (0) | 487 | #define STATS_DEC_ACTIVE(x) do { } while (0) |
| 481 | #define STATS_INC_ALLOCED(x) do { } while (0) | 488 | #define STATS_INC_ALLOCED(x) do { } while (0) |
| 482 | #define STATS_INC_GROWN(x) do { } while (0) | 489 | #define STATS_INC_GROWN(x) do { } while (0) |
| 483 | #define STATS_INC_REAPED(x) do { } while (0) | 490 | #define STATS_ADD_REAPED(x,y) do { } while (0) |
| 484 | #define STATS_SET_HIGH(x) do { } while (0) | 491 | #define STATS_SET_HIGH(x) do { } while (0) |
| 485 | #define STATS_INC_ERR(x) do { } while (0) | 492 | #define STATS_INC_ERR(x) do { } while (0) |
| 486 | #define STATS_INC_NODEALLOCS(x) do { } while (0) | 493 | #define STATS_INC_NODEALLOCS(x) do { } while (0) |
| @@ -700,12 +707,6 @@ int slab_is_available(void) | |||
| 700 | 707 | ||
| 701 | static DEFINE_PER_CPU(struct work_struct, reap_work); | 708 | static DEFINE_PER_CPU(struct work_struct, reap_work); |
| 702 | 709 | ||
| 703 | static void free_block(struct kmem_cache *cachep, void **objpp, int len, | ||
| 704 | int node); | ||
| 705 | static void enable_cpucache(struct kmem_cache *cachep); | ||
| 706 | static void cache_reap(void *unused); | ||
| 707 | static int __node_shrink(struct kmem_cache *cachep, int node); | ||
| 708 | |||
| 709 | static inline struct array_cache *cpu_cache_get(struct kmem_cache *cachep) | 710 | static inline struct array_cache *cpu_cache_get(struct kmem_cache *cachep) |
| 710 | { | 711 | { |
| 711 | return cachep->array[smp_processor_id()]; | 712 | return cachep->array[smp_processor_id()]; |
| @@ -1241,10 +1242,7 @@ free_array_cache: | |||
| 1241 | l3 = cachep->nodelists[node]; | 1242 | l3 = cachep->nodelists[node]; |
| 1242 | if (!l3) | 1243 | if (!l3) |
| 1243 | continue; | 1244 | continue; |
| 1244 | spin_lock_irq(&l3->list_lock); | 1245 | drain_freelist(cachep, l3, l3->free_objects); |
| 1245 | /* free slabs belonging to this node */ | ||
| 1246 | __node_shrink(cachep, node); | ||
| 1247 | spin_unlock_irq(&l3->list_lock); | ||
| 1248 | } | 1246 | } |
| 1249 | mutex_unlock(&cache_chain_mutex); | 1247 | mutex_unlock(&cache_chain_mutex); |
| 1250 | break; | 1248 | break; |
| @@ -1507,7 +1505,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid) | |||
| 1507 | nr_pages = (1 << cachep->gfporder); | 1505 | nr_pages = (1 << cachep->gfporder); |
| 1508 | if (cachep->flags & SLAB_RECLAIM_ACCOUNT) | 1506 | if (cachep->flags & SLAB_RECLAIM_ACCOUNT) |
| 1509 | atomic_add(nr_pages, &slab_reclaim_pages); | 1507 | atomic_add(nr_pages, &slab_reclaim_pages); |
| 1510 | add_page_state(nr_slab, nr_pages); | 1508 | add_zone_page_state(page_zone(page), NR_SLAB, nr_pages); |
| 1511 | for (i = 0; i < nr_pages; i++) | 1509 | for (i = 0; i < nr_pages; i++) |
| 1512 | __SetPageSlab(page + i); | 1510 | __SetPageSlab(page + i); |
| 1513 | return page_address(page); | 1511 | return page_address(page); |
| @@ -1522,12 +1520,12 @@ static void kmem_freepages(struct kmem_cache *cachep, void *addr) | |||
| 1522 | struct page *page = virt_to_page(addr); | 1520 | struct page *page = virt_to_page(addr); |
| 1523 | const unsigned long nr_freed = i; | 1521 | const unsigned long nr_freed = i; |
| 1524 | 1522 | ||
| 1523 | sub_zone_page_state(page_zone(page), NR_SLAB, nr_freed); | ||
| 1525 | while (i--) { | 1524 | while (i--) { |
| 1526 | BUG_ON(!PageSlab(page)); | 1525 | BUG_ON(!PageSlab(page)); |
| 1527 | __ClearPageSlab(page); | 1526 | __ClearPageSlab(page); |
| 1528 | page++; | 1527 | page++; |
| 1529 | } | 1528 | } |
| 1530 | sub_page_state(nr_slab, nr_freed); | ||
| 1531 | if (current->reclaim_state) | 1529 | if (current->reclaim_state) |
| 1532 | current->reclaim_state->reclaimed_slab += nr_freed; | 1530 | current->reclaim_state->reclaimed_slab += nr_freed; |
| 1533 | free_pages((unsigned long)addr, cachep->gfporder); | 1531 | free_pages((unsigned long)addr, cachep->gfporder); |
| @@ -2248,32 +2246,45 @@ static void drain_cpu_caches(struct kmem_cache *cachep) | |||
| 2248 | } | 2246 | } |
| 2249 | } | 2247 | } |
| 2250 | 2248 | ||
| 2251 | static int __node_shrink(struct kmem_cache *cachep, int node) | 2249 | /* |
| 2250 | * Remove slabs from the list of free slabs. | ||
| 2251 | * Specify the number of slabs to drain in tofree. | ||
| 2252 | * | ||
| 2253 | * Returns the actual number of slabs released. | ||
| 2254 | */ | ||
| 2255 | static int drain_freelist(struct kmem_cache *cache, | ||
| 2256 | struct kmem_list3 *l3, int tofree) | ||
| 2252 | { | 2257 | { |
| 2258 | struct list_head *p; | ||
| 2259 | int nr_freed; | ||
| 2253 | struct slab *slabp; | 2260 | struct slab *slabp; |
| 2254 | struct kmem_list3 *l3 = cachep->nodelists[node]; | ||
| 2255 | int ret; | ||
| 2256 | 2261 | ||
| 2257 | for (;;) { | 2262 | nr_freed = 0; |
| 2258 | struct list_head *p; | 2263 | while (nr_freed < tofree && !list_empty(&l3->slabs_free)) { |
| 2259 | 2264 | ||
| 2265 | spin_lock_irq(&l3->list_lock); | ||
| 2260 | p = l3->slabs_free.prev; | 2266 | p = l3->slabs_free.prev; |
| 2261 | if (p == &l3->slabs_free) | 2267 | if (p == &l3->slabs_free) { |
| 2262 | break; | 2268 | spin_unlock_irq(&l3->list_lock); |
| 2269 | goto out; | ||
| 2270 | } | ||
| 2263 | 2271 | ||
| 2264 | slabp = list_entry(l3->slabs_free.prev, struct slab, list); | 2272 | slabp = list_entry(p, struct slab, list); |
| 2265 | #if DEBUG | 2273 | #if DEBUG |
| 2266 | BUG_ON(slabp->inuse); | 2274 | BUG_ON(slabp->inuse); |
| 2267 | #endif | 2275 | #endif |
| 2268 | list_del(&slabp->list); | 2276 | list_del(&slabp->list); |
| 2269 | 2277 | /* | |
| 2270 | l3->free_objects -= cachep->num; | 2278 | * Safe to drop the lock. The slab is no longer linked |
| 2279 | * to the cache. | ||
| 2280 | */ | ||
| 2281 | l3->free_objects -= cache->num; | ||
| 2271 | spin_unlock_irq(&l3->list_lock); | 2282 | spin_unlock_irq(&l3->list_lock); |
| 2272 | slab_destroy(cachep, slabp); | 2283 | slab_destroy(cache, slabp); |
| 2273 | spin_lock_irq(&l3->list_lock); | 2284 | nr_freed++; |
| 2274 | } | 2285 | } |
| 2275 | ret = !list_empty(&l3->slabs_full) || !list_empty(&l3->slabs_partial); | 2286 | out: |
| 2276 | return ret; | 2287 | return nr_freed; |
| 2277 | } | 2288 | } |
| 2278 | 2289 | ||
| 2279 | static int __cache_shrink(struct kmem_cache *cachep) | 2290 | static int __cache_shrink(struct kmem_cache *cachep) |
| @@ -2286,11 +2297,13 @@ static int __cache_shrink(struct kmem_cache *cachep) | |||
| 2286 | check_irq_on(); | 2297 | check_irq_on(); |
| 2287 | for_each_online_node(i) { | 2298 | for_each_online_node(i) { |
| 2288 | l3 = cachep->nodelists[i]; | 2299 | l3 = cachep->nodelists[i]; |
| 2289 | if (l3) { | 2300 | if (!l3) |
| 2290 | spin_lock_irq(&l3->list_lock); | 2301 | continue; |
| 2291 | ret += __node_shrink(cachep, i); | 2302 | |
| 2292 | spin_unlock_irq(&l3->list_lock); | 2303 | drain_freelist(cachep, l3, l3->free_objects); |
| 2293 | } | 2304 | |
| 2305 | ret += !list_empty(&l3->slabs_full) || | ||
| 2306 | !list_empty(&l3->slabs_partial); | ||
| 2294 | } | 2307 | } |
| 2295 | return (ret ? 1 : 0); | 2308 | return (ret ? 1 : 0); |
| 2296 | } | 2309 | } |
| @@ -3694,10 +3707,6 @@ static void cache_reap(void *unused) | |||
| 3694 | } | 3707 | } |
| 3695 | 3708 | ||
| 3696 | list_for_each_entry(searchp, &cache_chain, next) { | 3709 | list_for_each_entry(searchp, &cache_chain, next) { |
| 3697 | struct list_head *p; | ||
| 3698 | int tofree; | ||
| 3699 | struct slab *slabp; | ||
| 3700 | |||
| 3701 | check_irq_on(); | 3710 | check_irq_on(); |
| 3702 | 3711 | ||
| 3703 | /* | 3712 | /* |
| @@ -3722,47 +3731,22 @@ static void cache_reap(void *unused) | |||
| 3722 | 3731 | ||
| 3723 | drain_array(searchp, l3, l3->shared, 0, node); | 3732 | drain_array(searchp, l3, l3->shared, 0, node); |
| 3724 | 3733 | ||
| 3725 | if (l3->free_touched) { | 3734 | if (l3->free_touched) |
| 3726 | l3->free_touched = 0; | 3735 | l3->free_touched = 0; |
| 3727 | goto next; | 3736 | else { |
| 3728 | } | 3737 | int freed; |
| 3729 | |||
| 3730 | tofree = (l3->free_limit + 5 * searchp->num - 1) / | ||
| 3731 | (5 * searchp->num); | ||
| 3732 | do { | ||
| 3733 | /* | ||
| 3734 | * Do not lock if there are no free blocks. | ||
| 3735 | */ | ||
| 3736 | if (list_empty(&l3->slabs_free)) | ||
| 3737 | break; | ||
| 3738 | |||
| 3739 | spin_lock_irq(&l3->list_lock); | ||
| 3740 | p = l3->slabs_free.next; | ||
| 3741 | if (p == &(l3->slabs_free)) { | ||
| 3742 | spin_unlock_irq(&l3->list_lock); | ||
| 3743 | break; | ||
| 3744 | } | ||
| 3745 | 3738 | ||
| 3746 | slabp = list_entry(p, struct slab, list); | 3739 | freed = drain_freelist(searchp, l3, (l3->free_limit + |
| 3747 | BUG_ON(slabp->inuse); | 3740 | 5 * searchp->num - 1) / (5 * searchp->num)); |
| 3748 | list_del(&slabp->list); | 3741 | STATS_ADD_REAPED(searchp, freed); |
| 3749 | STATS_INC_REAPED(searchp); | 3742 | } |
| 3750 | |||
| 3751 | /* | ||
| 3752 | * Safe to drop the lock. The slab is no longer linked | ||
| 3753 | * to the cache. searchp cannot disappear, we hold | ||
| 3754 | * cache_chain_lock | ||
| 3755 | */ | ||
| 3756 | l3->free_objects -= searchp->num; | ||
| 3757 | spin_unlock_irq(&l3->list_lock); | ||
| 3758 | slab_destroy(searchp, slabp); | ||
| 3759 | } while (--tofree > 0); | ||
| 3760 | next: | 3743 | next: |
| 3761 | cond_resched(); | 3744 | cond_resched(); |
| 3762 | } | 3745 | } |
| 3763 | check_irq_on(); | 3746 | check_irq_on(); |
| 3764 | mutex_unlock(&cache_chain_mutex); | 3747 | mutex_unlock(&cache_chain_mutex); |
| 3765 | next_reap_node(); | 3748 | next_reap_node(); |
| 3749 | refresh_cpu_vm_stats(smp_processor_id()); | ||
| 3766 | /* Set up the next iteration */ | 3750 | /* Set up the next iteration */ |
| 3767 | schedule_delayed_work(&__get_cpu_var(reap_work), REAPTIMEOUT_CPUC); | 3751 | schedule_delayed_work(&__get_cpu_var(reap_work), REAPTIMEOUT_CPUC); |
| 3768 | } | 3752 | } |
| @@ -29,7 +29,6 @@ | |||
| 29 | * essentially no allocation space overhead. | 29 | * essentially no allocation space overhead. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 34 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
| 35 | #include <linux/cache.h> | 34 | #include <linux/cache.h> |
diff --git a/mm/sparse.c b/mm/sparse.c index c7a2b3a0e46b..86c52ab80878 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * sparse memory mappings. | 2 | * sparse memory mappings. |
| 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 | #include <linux/bootmem.h> | 6 | #include <linux/bootmem.h> |
| @@ -87,7 +87,7 @@ int rotate_reclaimable_page(struct page *page) | |||
| 87 | spin_lock_irqsave(&zone->lru_lock, flags); | 87 | spin_lock_irqsave(&zone->lru_lock, flags); |
| 88 | if (PageLRU(page) && !PageActive(page)) { | 88 | if (PageLRU(page) && !PageActive(page)) { |
| 89 | list_move_tail(&page->lru, &zone->inactive_list); | 89 | list_move_tail(&page->lru, &zone->inactive_list); |
| 90 | inc_page_state(pgrotated); | 90 | __count_vm_event(PGROTATED); |
| 91 | } | 91 | } |
| 92 | if (!test_clear_page_writeback(page)) | 92 | if (!test_clear_page_writeback(page)) |
| 93 | BUG(); | 93 | BUG(); |
| @@ -107,7 +107,7 @@ void fastcall activate_page(struct page *page) | |||
| 107 | del_page_from_inactive_list(zone, page); | 107 | del_page_from_inactive_list(zone, page); |
| 108 | SetPageActive(page); | 108 | SetPageActive(page); |
| 109 | add_page_to_active_list(zone, page); | 109 | add_page_to_active_list(zone, page); |
| 110 | inc_page_state(pgactivate); | 110 | __count_vm_event(PGACTIVATE); |
| 111 | } | 111 | } |
| 112 | spin_unlock_irq(&zone->lru_lock); | 112 | spin_unlock_irq(&zone->lru_lock); |
| 113 | } | 113 | } |
diff --git a/mm/swap_state.c b/mm/swap_state.c index 7535211bb495..fccbd9bba77b 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c | |||
| @@ -87,7 +87,7 @@ static int __add_to_swap_cache(struct page *page, swp_entry_t entry, | |||
| 87 | SetPageSwapCache(page); | 87 | SetPageSwapCache(page); |
| 88 | set_page_private(page, entry.val); | 88 | set_page_private(page, entry.val); |
| 89 | total_swapcache_pages++; | 89 | total_swapcache_pages++; |
| 90 | pagecache_acct(1); | 90 | __inc_zone_page_state(page, NR_FILE_PAGES); |
| 91 | } | 91 | } |
| 92 | write_unlock_irq(&swapper_space.tree_lock); | 92 | write_unlock_irq(&swapper_space.tree_lock); |
| 93 | radix_tree_preload_end(); | 93 | radix_tree_preload_end(); |
| @@ -132,7 +132,7 @@ void __delete_from_swap_cache(struct page *page) | |||
| 132 | set_page_private(page, 0); | 132 | set_page_private(page, 0); |
| 133 | ClearPageSwapCache(page); | 133 | ClearPageSwapCache(page); |
| 134 | total_swapcache_pages--; | 134 | total_swapcache_pages--; |
| 135 | pagecache_acct(-1); | 135 | __dec_zone_page_state(page, NR_FILE_PAGES); |
| 136 | INC_CACHE_INFO(del_total); | 136 | INC_CACHE_INFO(del_total); |
| 137 | } | 137 | } |
| 138 | 138 | ||
diff --git a/mm/swapfile.c b/mm/swapfile.c index cc367f7e75d8..e70d6c6d6fee 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Swap reorganised 29.12.95, Stephen Tweedie | 5 | * Swap reorganised 29.12.95, Stephen Tweedie |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/hugetlb.h> | 9 | #include <linux/hugetlb.h> |
| 11 | #include <linux/mman.h> | 10 | #include <linux/mman.h> |
diff --git a/mm/vmscan.c b/mm/vmscan.c index eeacb0d695c3..ff2ebe9458a3 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -47,8 +47,6 @@ struct scan_control { | |||
| 47 | /* Incremented by the number of inactive pages that were scanned */ | 47 | /* Incremented by the number of inactive pages that were scanned */ |
| 48 | unsigned long nr_scanned; | 48 | unsigned long nr_scanned; |
| 49 | 49 | ||
| 50 | unsigned long nr_mapped; /* From page_state */ | ||
| 51 | |||
| 52 | /* This context's GFP mask */ | 50 | /* This context's GFP mask */ |
| 53 | gfp_t gfp_mask; | 51 | gfp_t gfp_mask; |
| 54 | 52 | ||
| @@ -217,7 +215,7 @@ unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask, | |||
| 217 | break; | 215 | break; |
| 218 | if (shrink_ret < nr_before) | 216 | if (shrink_ret < nr_before) |
| 219 | ret += nr_before - shrink_ret; | 217 | ret += nr_before - shrink_ret; |
| 220 | mod_page_state(slabs_scanned, this_scan); | 218 | count_vm_events(SLABS_SCANNED, this_scan); |
| 221 | total_scan -= this_scan; | 219 | total_scan -= this_scan; |
| 222 | 220 | ||
| 223 | cond_resched(); | 221 | cond_resched(); |
| @@ -571,7 +569,7 @@ keep: | |||
| 571 | list_splice(&ret_pages, page_list); | 569 | list_splice(&ret_pages, page_list); |
| 572 | if (pagevec_count(&freed_pvec)) | 570 | if (pagevec_count(&freed_pvec)) |
| 573 | __pagevec_release_nonlru(&freed_pvec); | 571 | __pagevec_release_nonlru(&freed_pvec); |
| 574 | mod_page_state(pgactivate, pgactivate); | 572 | count_vm_events(PGACTIVATE, pgactivate); |
| 575 | return nr_reclaimed; | 573 | return nr_reclaimed; |
| 576 | } | 574 | } |
| 577 | 575 | ||
| @@ -661,11 +659,11 @@ static unsigned long shrink_inactive_list(unsigned long max_scan, | |||
| 661 | nr_reclaimed += nr_freed; | 659 | nr_reclaimed += nr_freed; |
| 662 | local_irq_disable(); | 660 | local_irq_disable(); |
| 663 | if (current_is_kswapd()) { | 661 | if (current_is_kswapd()) { |
| 664 | __mod_page_state_zone(zone, pgscan_kswapd, nr_scan); | 662 | __count_zone_vm_events(PGSCAN_KSWAPD, zone, nr_scan); |
| 665 | __mod_page_state(kswapd_steal, nr_freed); | 663 | __count_vm_events(KSWAPD_STEAL, nr_freed); |
| 666 | } else | 664 | } else |
| 667 | __mod_page_state_zone(zone, pgscan_direct, nr_scan); | 665 | __count_zone_vm_events(PGSCAN_DIRECT, zone, nr_scan); |
| 668 | __mod_page_state_zone(zone, pgsteal, nr_freed); | 666 | __count_vm_events(PGACTIVATE, nr_freed); |
| 669 | 667 | ||
| 670 | if (nr_taken == 0) | 668 | if (nr_taken == 0) |
| 671 | goto done; | 669 | goto done; |
| @@ -744,7 +742,9 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, | |||
| 744 | * how much memory | 742 | * how much memory |
| 745 | * is mapped. | 743 | * is mapped. |
| 746 | */ | 744 | */ |
| 747 | mapped_ratio = (sc->nr_mapped * 100) / vm_total_pages; | 745 | mapped_ratio = ((global_page_state(NR_FILE_MAPPED) + |
| 746 | global_page_state(NR_ANON_PAGES)) * 100) / | ||
| 747 | vm_total_pages; | ||
| 748 | 748 | ||
| 749 | /* | 749 | /* |
| 750 | * Now decide how much we really want to unmap some pages. The | 750 | * Now decide how much we really want to unmap some pages. The |
| @@ -841,11 +841,10 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, | |||
| 841 | } | 841 | } |
| 842 | } | 842 | } |
| 843 | zone->nr_active += pgmoved; | 843 | zone->nr_active += pgmoved; |
| 844 | spin_unlock(&zone->lru_lock); | ||
| 845 | 844 | ||
| 846 | __mod_page_state_zone(zone, pgrefill, pgscanned); | 845 | __count_zone_vm_events(PGREFILL, zone, pgscanned); |
| 847 | __mod_page_state(pgdeactivate, pgdeactivate); | 846 | __count_vm_events(PGDEACTIVATE, pgdeactivate); |
| 848 | local_irq_enable(); | 847 | spin_unlock_irq(&zone->lru_lock); |
| 849 | 848 | ||
| 850 | pagevec_release(&pvec); | 849 | pagevec_release(&pvec); |
| 851 | } | 850 | } |
| @@ -977,7 +976,7 @@ unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask) | |||
| 977 | .swappiness = vm_swappiness, | 976 | .swappiness = vm_swappiness, |
| 978 | }; | 977 | }; |
| 979 | 978 | ||
| 980 | inc_page_state(allocstall); | 979 | count_vm_event(ALLOCSTALL); |
| 981 | 980 | ||
| 982 | for (i = 0; zones[i] != NULL; i++) { | 981 | for (i = 0; zones[i] != NULL; i++) { |
| 983 | struct zone *zone = zones[i]; | 982 | struct zone *zone = zones[i]; |
| @@ -990,7 +989,6 @@ unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask) | |||
| 990 | } | 989 | } |
| 991 | 990 | ||
| 992 | for (priority = DEF_PRIORITY; priority >= 0; priority--) { | 991 | for (priority = DEF_PRIORITY; priority >= 0; priority--) { |
| 993 | sc.nr_mapped = read_page_state(nr_mapped); | ||
| 994 | sc.nr_scanned = 0; | 992 | sc.nr_scanned = 0; |
| 995 | if (!priority) | 993 | if (!priority) |
| 996 | disable_swap_token(); | 994 | disable_swap_token(); |
| @@ -1075,9 +1073,7 @@ loop_again: | |||
| 1075 | total_scanned = 0; | 1073 | total_scanned = 0; |
| 1076 | nr_reclaimed = 0; | 1074 | nr_reclaimed = 0; |
| 1077 | sc.may_writepage = !laptop_mode; | 1075 | sc.may_writepage = !laptop_mode; |
| 1078 | sc.nr_mapped = read_page_state(nr_mapped); | 1076 | count_vm_event(PAGEOUTRUN); |
| 1079 | |||
| 1080 | inc_page_state(pageoutrun); | ||
| 1081 | 1077 | ||
| 1082 | for (i = 0; i < pgdat->nr_zones; i++) { | 1078 | for (i = 0; i < pgdat->nr_zones; i++) { |
| 1083 | struct zone *zone = pgdat->node_zones + i; | 1079 | struct zone *zone = pgdat->node_zones + i; |
| @@ -1365,7 +1361,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages) | |||
| 1365 | for_each_zone(zone) | 1361 | for_each_zone(zone) |
| 1366 | lru_pages += zone->nr_active + zone->nr_inactive; | 1362 | lru_pages += zone->nr_active + zone->nr_inactive; |
| 1367 | 1363 | ||
| 1368 | nr_slab = read_page_state(nr_slab); | 1364 | nr_slab = global_page_state(NR_SLAB); |
| 1369 | /* If slab caches are huge, it's better to hit them first */ | 1365 | /* If slab caches are huge, it's better to hit them first */ |
| 1370 | while (nr_slab >= lru_pages) { | 1366 | while (nr_slab >= lru_pages) { |
| 1371 | reclaim_state.reclaimed_slab = 0; | 1367 | reclaim_state.reclaimed_slab = 0; |
| @@ -1407,9 +1403,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages) | |||
| 1407 | for (prio = DEF_PRIORITY; prio >= 0; prio--) { | 1403 | for (prio = DEF_PRIORITY; prio >= 0; prio--) { |
| 1408 | unsigned long nr_to_scan = nr_pages - ret; | 1404 | unsigned long nr_to_scan = nr_pages - ret; |
| 1409 | 1405 | ||
| 1410 | sc.nr_mapped = read_page_state(nr_mapped); | ||
| 1411 | sc.nr_scanned = 0; | 1406 | sc.nr_scanned = 0; |
| 1412 | |||
| 1413 | ret += shrink_all_zones(nr_to_scan, prio, pass, &sc); | 1407 | ret += shrink_all_zones(nr_to_scan, prio, pass, &sc); |
| 1414 | if (ret >= nr_pages) | 1408 | if (ret >= nr_pages) |
| 1415 | goto out; | 1409 | goto out; |
| @@ -1523,11 +1517,6 @@ int zone_reclaim_mode __read_mostly; | |||
| 1523 | #define RECLAIM_SLAB (1<<3) /* Do a global slab shrink if the zone is out of memory */ | 1517 | #define RECLAIM_SLAB (1<<3) /* Do a global slab shrink if the zone is out of memory */ |
| 1524 | 1518 | ||
| 1525 | /* | 1519 | /* |
| 1526 | * Mininum time between zone reclaim scans | ||
| 1527 | */ | ||
| 1528 | int zone_reclaim_interval __read_mostly = 30*HZ; | ||
| 1529 | |||
| 1530 | /* | ||
| 1531 | * Priority for ZONE_RECLAIM. This determines the fraction of pages | 1520 | * Priority for ZONE_RECLAIM. This determines the fraction of pages |
| 1532 | * of a node considered for each zone_reclaim. 4 scans 1/16th of | 1521 | * of a node considered for each zone_reclaim. 4 scans 1/16th of |
| 1533 | * a zone. | 1522 | * a zone. |
| @@ -1548,7 +1537,6 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) | |||
| 1548 | struct scan_control sc = { | 1537 | struct scan_control sc = { |
| 1549 | .may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE), | 1538 | .may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE), |
| 1550 | .may_swap = !!(zone_reclaim_mode & RECLAIM_SWAP), | 1539 | .may_swap = !!(zone_reclaim_mode & RECLAIM_SWAP), |
| 1551 | .nr_mapped = read_page_state(nr_mapped), | ||
| 1552 | .swap_cluster_max = max_t(unsigned long, nr_pages, | 1540 | .swap_cluster_max = max_t(unsigned long, nr_pages, |
| 1553 | SWAP_CLUSTER_MAX), | 1541 | SWAP_CLUSTER_MAX), |
| 1554 | .gfp_mask = gfp_mask, | 1542 | .gfp_mask = gfp_mask, |
| @@ -1593,16 +1581,6 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) | |||
| 1593 | 1581 | ||
| 1594 | p->reclaim_state = NULL; | 1582 | p->reclaim_state = NULL; |
| 1595 | current->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE); | 1583 | current->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE); |
| 1596 | |||
| 1597 | if (nr_reclaimed == 0) { | ||
| 1598 | /* | ||
| 1599 | * We were unable to reclaim enough pages to stay on node. We | ||
| 1600 | * now allow off node accesses for a certain time period before | ||
| 1601 | * trying again to reclaim pages from the local zone. | ||
| 1602 | */ | ||
| 1603 | zone->last_unsuccessful_zone_reclaim = jiffies; | ||
| 1604 | } | ||
| 1605 | |||
| 1606 | return nr_reclaimed >= nr_pages; | 1584 | return nr_reclaimed >= nr_pages; |
| 1607 | } | 1585 | } |
| 1608 | 1586 | ||
| @@ -1612,13 +1590,17 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) | |||
| 1612 | int node_id; | 1590 | int node_id; |
| 1613 | 1591 | ||
| 1614 | /* | 1592 | /* |
| 1615 | * Do not reclaim if there was a recent unsuccessful attempt at zone | 1593 | * Do not reclaim if there are not enough reclaimable pages in this |
| 1616 | * reclaim. In that case we let allocations go off node for the | 1594 | * zone that would satify this allocations. |
| 1617 | * zone_reclaim_interval. Otherwise we would scan for each off-node | 1595 | * |
| 1618 | * page allocation. | 1596 | * All unmapped pagecache pages are reclaimable. |
| 1597 | * | ||
| 1598 | * Both counters may be temporarily off a bit so we use | ||
| 1599 | * SWAP_CLUSTER_MAX as the boundary. It may also be good to | ||
| 1600 | * leave a few frequently used unmapped pagecache pages around. | ||
| 1619 | */ | 1601 | */ |
| 1620 | if (time_before(jiffies, | 1602 | if (zone_page_state(zone, NR_FILE_PAGES) - |
| 1621 | zone->last_unsuccessful_zone_reclaim + zone_reclaim_interval)) | 1603 | zone_page_state(zone, NR_FILE_MAPPED) < SWAP_CLUSTER_MAX) |
| 1622 | return 0; | 1604 | return 0; |
| 1623 | 1605 | ||
| 1624 | /* | 1606 | /* |
diff --git a/mm/vmstat.c b/mm/vmstat.c new file mode 100644 index 000000000000..73b83d67bab6 --- /dev/null +++ b/mm/vmstat.c | |||
| @@ -0,0 +1,614 @@ | |||
| 1 | /* | ||
| 2 | * linux/mm/vmstat.c | ||
| 3 | * | ||
| 4 | * Manages VM statistics | ||
| 5 | * Copyright (C) 1991, 1992, 1993, 1994 Linus Torvalds | ||
| 6 | * | ||
| 7 | * zoned VM statistics | ||
| 8 | * Copyright (C) 2006 Silicon Graphics, Inc., | ||
| 9 | * Christoph Lameter <christoph@lameter.com> | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/mm.h> | ||
| 14 | #include <linux/module.h> | ||
| 15 | |||
| 16 | void __get_zone_counts(unsigned long *active, unsigned long *inactive, | ||
| 17 | unsigned long *free, struct pglist_data *pgdat) | ||
| 18 | { | ||
| 19 | struct zone *zones = pgdat->node_zones; | ||
| 20 | int i; | ||
| 21 | |||
| 22 | *active = 0; | ||
| 23 | *inactive = 0; | ||
| 24 | *free = 0; | ||
| 25 | for (i = 0; i < MAX_NR_ZONES; i++) { | ||
| 26 | *active += zones[i].nr_active; | ||
| 27 | *inactive += zones[i].nr_inactive; | ||
| 28 | *free += zones[i].free_pages; | ||
| 29 | } | ||
| 30 | } | ||
| 31 | |||
| 32 | void get_zone_counts(unsigned long *active, | ||
| 33 | unsigned long *inactive, unsigned long *free) | ||
| 34 | { | ||
| 35 | struct pglist_data *pgdat; | ||
| 36 | |||
| 37 | *active = 0; | ||
| 38 | *inactive = 0; | ||
| 39 | *free = 0; | ||
| 40 | for_each_online_pgdat(pgdat) { | ||
| 41 | unsigned long l, m, n; | ||
| 42 | __get_zone_counts(&l, &m, &n, pgdat); | ||
| 43 | *active += l; | ||
| 44 | *inactive += m; | ||
| 45 | *free += n; | ||
| 46 | } | ||
| 47 | } | ||
| 48 | |||
| 49 | #ifdef CONFIG_VM_EVENT_COUNTERS | ||
| 50 | DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; | ||
| 51 | EXPORT_PER_CPU_SYMBOL(vm_event_states); | ||
| 52 | |||
| 53 | static void sum_vm_events(unsigned long *ret, cpumask_t *cpumask) | ||
| 54 | { | ||
| 55 | int cpu = 0; | ||
| 56 | int i; | ||
| 57 | |||
| 58 | memset(ret, 0, NR_VM_EVENT_ITEMS * sizeof(unsigned long)); | ||
| 59 | |||
| 60 | cpu = first_cpu(*cpumask); | ||
| 61 | while (cpu < NR_CPUS) { | ||
| 62 | struct vm_event_state *this = &per_cpu(vm_event_states, cpu); | ||
| 63 | |||
| 64 | cpu = next_cpu(cpu, *cpumask); | ||
| 65 | |||
| 66 | if (cpu < NR_CPUS) | ||
| 67 | prefetch(&per_cpu(vm_event_states, cpu)); | ||
| 68 | |||
| 69 | |||
| 70 | for (i = 0; i < NR_VM_EVENT_ITEMS; i++) | ||
| 71 | ret[i] += this->event[i]; | ||
| 72 | } | ||
| 73 | } | ||
| 74 | |||
| 75 | /* | ||
| 76 | * Accumulate the vm event counters across all CPUs. | ||
| 77 | * The result is unavoidably approximate - it can change | ||
| 78 | * during and after execution of this function. | ||
| 79 | */ | ||
| 80 | void all_vm_events(unsigned long *ret) | ||
| 81 | { | ||
| 82 | sum_vm_events(ret, &cpu_online_map); | ||
| 83 | } | ||
| 84 | |||
| 85 | #ifdef CONFIG_HOTPLUG | ||
| 86 | /* | ||
| 87 | * Fold the foreign cpu events into our own. | ||
| 88 | * | ||
| 89 | * This is adding to the events on one processor | ||
| 90 | * but keeps the global counts constant. | ||
| 91 | */ | ||
| 92 | void vm_events_fold_cpu(int cpu) | ||
| 93 | { | ||
| 94 | struct vm_event_state *fold_state = &per_cpu(vm_event_states, cpu); | ||
| 95 | int i; | ||
| 96 | |||
| 97 | for (i = 0; i < NR_VM_EVENT_ITEMS; i++) { | ||
| 98 | count_vm_events(i, fold_state->event[i]); | ||
| 99 | fold_state->event[i] = 0; | ||
| 100 | } | ||
| 101 | } | ||
| 102 | #endif /* CONFIG_HOTPLUG */ | ||
| 103 | |||
| 104 | #endif /* CONFIG_VM_EVENT_COUNTERS */ | ||
| 105 | |||
| 106 | /* | ||
| 107 | * Manage combined zone based / global counters | ||
| 108 | * | ||
| 109 | * vm_stat contains the global counters | ||
| 110 | */ | ||
| 111 | atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]; | ||
| 112 | EXPORT_SYMBOL(vm_stat); | ||
| 113 | |||
| 114 | #ifdef CONFIG_SMP | ||
| 115 | |||
| 116 | #define STAT_THRESHOLD 32 | ||
| 117 | |||
| 118 | /* | ||
| 119 | * Determine pointer to currently valid differential byte given a zone and | ||
| 120 | * the item number. | ||
| 121 | * | ||
| 122 | * Preemption must be off | ||
| 123 | */ | ||
| 124 | static inline s8 *diff_pointer(struct zone *zone, enum zone_stat_item item) | ||
| 125 | { | ||
| 126 | return &zone_pcp(zone, smp_processor_id())->vm_stat_diff[item]; | ||
| 127 | } | ||
| 128 | |||
| 129 | /* | ||
| 130 | * For use when we know that interrupts are disabled. | ||
| 131 | */ | ||
| 132 | void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item, | ||
| 133 | int delta) | ||
| 134 | { | ||
| 135 | s8 *p; | ||
| 136 | long x; | ||
| 137 | |||
| 138 | p = diff_pointer(zone, item); | ||
| 139 | x = delta + *p; | ||
| 140 | |||
| 141 | if (unlikely(x > STAT_THRESHOLD || x < -STAT_THRESHOLD)) { | ||
| 142 | zone_page_state_add(x, zone, item); | ||
| 143 | x = 0; | ||
| 144 | } | ||
| 145 | |||
| 146 | *p = x; | ||
| 147 | } | ||
| 148 | EXPORT_SYMBOL(__mod_zone_page_state); | ||
| 149 | |||
| 150 | /* | ||
| 151 | * For an unknown interrupt state | ||
| 152 | */ | ||
| 153 | void mod_zone_page_state(struct zone *zone, enum zone_stat_item item, | ||
| 154 | int delta) | ||
| 155 | { | ||
| 156 | unsigned long flags; | ||
| 157 | |||
| 158 | local_irq_save(flags); | ||
| 159 | __mod_zone_page_state(zone, item, delta); | ||
| 160 | local_irq_restore(flags); | ||
| 161 | } | ||
| 162 | EXPORT_SYMBOL(mod_zone_page_state); | ||
| 163 | |||
| 164 | /* | ||
| 165 | * Optimized increment and decrement functions. | ||
| 166 | * | ||
| 167 | * These are only for a single page and therefore can take a struct page * | ||
| 168 | * argument instead of struct zone *. This allows the inclusion of the code | ||
| 169 | * generated for page_zone(page) into the optimized functions. | ||
| 170 | * | ||
| 171 | * No overflow check is necessary and therefore the differential can be | ||
| 172 | * incremented or decremented in place which may allow the compilers to | ||
| 173 | * generate better code. | ||
| 174 | * | ||
| 175 | * The increment or decrement is known and therefore one boundary check can | ||
| 176 | * be omitted. | ||
| 177 | * | ||
| 178 | * Some processors have inc/dec instructions that are atomic vs an interrupt. | ||
| 179 | * However, the code must first determine the differential location in a zone | ||
| 180 | * based on the processor number and then inc/dec the counter. There is no | ||
| 181 | * guarantee without disabling preemption that the processor will not change | ||
| 182 | * in between and therefore the atomicity vs. interrupt cannot be exploited | ||
| 183 | * in a useful way here. | ||
| 184 | */ | ||
| 185 | static void __inc_zone_state(struct zone *zone, enum zone_stat_item item) | ||
| 186 | { | ||
| 187 | s8 *p = diff_pointer(zone, item); | ||
| 188 | |||
| 189 | (*p)++; | ||
| 190 | |||
| 191 | if (unlikely(*p > STAT_THRESHOLD)) { | ||
| 192 | zone_page_state_add(*p, zone, item); | ||
| 193 | *p = 0; | ||
| 194 | } | ||
| 195 | } | ||
| 196 | |||
| 197 | void __inc_zone_page_state(struct page *page, enum zone_stat_item item) | ||
| 198 | { | ||
| 199 | __inc_zone_state(page_zone(page), item); | ||
| 200 | } | ||
| 201 | EXPORT_SYMBOL(__inc_zone_page_state); | ||
| 202 | |||
| 203 | void __dec_zone_page_state(struct page *page, enum zone_stat_item item) | ||
| 204 | { | ||
| 205 | struct zone *zone = page_zone(page); | ||
| 206 | s8 *p = diff_pointer(zone, item); | ||
| 207 | |||
| 208 | (*p)--; | ||
| 209 | |||
| 210 | if (unlikely(*p < -STAT_THRESHOLD)) { | ||
| 211 | zone_page_state_add(*p, zone, item); | ||
| 212 | *p = 0; | ||
| 213 | } | ||
| 214 | } | ||
| 215 | EXPORT_SYMBOL(__dec_zone_page_state); | ||
| 216 | |||
| 217 | void inc_zone_state(struct zone *zone, enum zone_stat_item item) | ||
| 218 | { | ||
| 219 | unsigned long flags; | ||
| 220 | |||
| 221 | local_irq_save(flags); | ||
| 222 | __inc_zone_state(zone, item); | ||
| 223 | local_irq_restore(flags); | ||
| 224 | } | ||
| 225 | |||
| 226 | void inc_zone_page_state(struct page *page, enum zone_stat_item item) | ||
| 227 | { | ||
| 228 | unsigned long flags; | ||
| 229 | struct zone *zone; | ||
| 230 | |||
| 231 | zone = page_zone(page); | ||
| 232 | local_irq_save(flags); | ||
| 233 | __inc_zone_state(zone, item); | ||
| 234 | local_irq_restore(flags); | ||
| 235 | } | ||
| 236 | EXPORT_SYMBOL(inc_zone_page_state); | ||
| 237 | |||
| 238 | void dec_zone_page_state(struct page *page, enum zone_stat_item item) | ||
| 239 | { | ||
| 240 | unsigned long flags; | ||
| 241 | struct zone *zone; | ||
| 242 | s8 *p; | ||
| 243 | |||
| 244 | zone = page_zone(page); | ||
| 245 | local_irq_save(flags); | ||
| 246 | p = diff_pointer(zone, item); | ||
| 247 | |||
| 248 | (*p)--; | ||
| 249 | |||
| 250 | if (unlikely(*p < -STAT_THRESHOLD)) { | ||
| 251 | zone_page_state_add(*p, zone, item); | ||
| 252 | *p = 0; | ||
| 253 | } | ||
| 254 | local_irq_restore(flags); | ||
| 255 | } | ||
| 256 | EXPORT_SYMBOL(dec_zone_page_state); | ||
| 257 | |||
| 258 | /* | ||
| 259 | * Update the zone counters for one cpu. | ||
| 260 | */ | ||
| 261 | void refresh_cpu_vm_stats(int cpu) | ||
| 262 | { | ||
| 263 | struct zone *zone; | ||
| 264 | int i; | ||
| 265 | unsigned long flags; | ||
| 266 | |||
| 267 | for_each_zone(zone) { | ||
| 268 | struct per_cpu_pageset *pcp; | ||
| 269 | |||
| 270 | pcp = zone_pcp(zone, cpu); | ||
| 271 | |||
| 272 | for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) | ||
| 273 | if (pcp->vm_stat_diff[i]) { | ||
| 274 | local_irq_save(flags); | ||
| 275 | zone_page_state_add(pcp->vm_stat_diff[i], | ||
| 276 | zone, i); | ||
| 277 | pcp->vm_stat_diff[i] = 0; | ||
| 278 | local_irq_restore(flags); | ||
| 279 | } | ||
| 280 | } | ||
| 281 | } | ||
| 282 | |||
| 283 | static void __refresh_cpu_vm_stats(void *dummy) | ||
| 284 | { | ||
| 285 | refresh_cpu_vm_stats(smp_processor_id()); | ||
| 286 | } | ||
| 287 | |||
| 288 | /* | ||
| 289 | * Consolidate all counters. | ||
| 290 | * | ||
| 291 | * Note that the result is less inaccurate but still inaccurate | ||
| 292 | * if concurrent processes are allowed to run. | ||
| 293 | */ | ||
| 294 | void refresh_vm_stats(void) | ||
| 295 | { | ||
| 296 | on_each_cpu(__refresh_cpu_vm_stats, NULL, 0, 1); | ||
| 297 | } | ||
| 298 | EXPORT_SYMBOL(refresh_vm_stats); | ||
| 299 | |||
| 300 | #endif | ||
| 301 | |||
| 302 | #ifdef CONFIG_NUMA | ||
| 303 | /* | ||
| 304 | * zonelist = the list of zones passed to the allocator | ||
| 305 | * z = the zone from which the allocation occurred. | ||
| 306 | * | ||
| 307 | * Must be called with interrupts disabled. | ||
| 308 | */ | ||
| 309 | void zone_statistics(struct zonelist *zonelist, struct zone *z) | ||
| 310 | { | ||
| 311 | if (z->zone_pgdat == zonelist->zones[0]->zone_pgdat) { | ||
| 312 | __inc_zone_state(z, NUMA_HIT); | ||
| 313 | } else { | ||
| 314 | __inc_zone_state(z, NUMA_MISS); | ||
| 315 | __inc_zone_state(zonelist->zones[0], NUMA_FOREIGN); | ||
| 316 | } | ||
| 317 | if (z->zone_pgdat == NODE_DATA(numa_node_id())) | ||
| 318 | __inc_zone_state(z, NUMA_LOCAL); | ||
| 319 | else | ||
| 320 | __inc_zone_state(z, NUMA_OTHER); | ||
| 321 | } | ||
| 322 | #endif | ||
| 323 | |||
| 324 | #ifdef CONFIG_PROC_FS | ||
| 325 | |||
| 326 | #include <linux/seq_file.h> | ||
| 327 | |||
| 328 | static void *frag_start(struct seq_file *m, loff_t *pos) | ||
| 329 | { | ||
| 330 | pg_data_t *pgdat; | ||
| 331 | loff_t node = *pos; | ||
| 332 | for (pgdat = first_online_pgdat(); | ||
| 333 | pgdat && node; | ||
| 334 | pgdat = next_online_pgdat(pgdat)) | ||
| 335 | --node; | ||
| 336 | |||
| 337 | return pgdat; | ||
| 338 | } | ||
| 339 | |||
| 340 | static void *frag_next(struct seq_file *m, void *arg, loff_t *pos) | ||
| 341 | { | ||
| 342 | pg_data_t *pgdat = (pg_data_t *)arg; | ||
| 343 | |||
| 344 | (*pos)++; | ||
| 345 | return next_online_pgdat(pgdat); | ||
| 346 | } | ||
| 347 | |||
| 348 | static void frag_stop(struct seq_file *m, void *arg) | ||
| 349 | { | ||
| 350 | } | ||
| 351 | |||
| 352 | /* | ||
| 353 | * This walks the free areas for each zone. | ||
| 354 | */ | ||
| 355 | static int frag_show(struct seq_file *m, void *arg) | ||
| 356 | { | ||
| 357 | pg_data_t *pgdat = (pg_data_t *)arg; | ||
| 358 | struct zone *zone; | ||
| 359 | struct zone *node_zones = pgdat->node_zones; | ||
| 360 | unsigned long flags; | ||
| 361 | int order; | ||
| 362 | |||
| 363 | for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) { | ||
| 364 | if (!populated_zone(zone)) | ||
| 365 | continue; | ||
| 366 | |||
| 367 | spin_lock_irqsave(&zone->lock, flags); | ||
| 368 | seq_printf(m, "Node %d, zone %8s ", pgdat->node_id, zone->name); | ||
| 369 | for (order = 0; order < MAX_ORDER; ++order) | ||
| 370 | seq_printf(m, "%6lu ", zone->free_area[order].nr_free); | ||
| 371 | spin_unlock_irqrestore(&zone->lock, flags); | ||
| 372 | seq_putc(m, '\n'); | ||
| 373 | } | ||
| 374 | return 0; | ||
| 375 | } | ||
| 376 | |||
| 377 | struct seq_operations fragmentation_op = { | ||
| 378 | .start = frag_start, | ||
| 379 | .next = frag_next, | ||
| 380 | .stop = frag_stop, | ||
| 381 | .show = frag_show, | ||
| 382 | }; | ||
| 383 | |||
| 384 | static char *vmstat_text[] = { | ||
| 385 | /* Zoned VM counters */ | ||
| 386 | "nr_anon_pages", | ||
| 387 | "nr_mapped", | ||
| 388 | "nr_file_pages", | ||
| 389 | "nr_slab", | ||
| 390 | "nr_page_table_pages", | ||
| 391 | "nr_dirty", | ||
| 392 | "nr_writeback", | ||
| 393 | "nr_unstable", | ||
| 394 | "nr_bounce", | ||
| 395 | |||
| 396 | #ifdef CONFIG_NUMA | ||
| 397 | "numa_hit", | ||
| 398 | "numa_miss", | ||
| 399 | "numa_foreign", | ||
| 400 | "numa_interleave", | ||
| 401 | "numa_local", | ||
| 402 | "numa_other", | ||
| 403 | #endif | ||
| 404 | |||
| 405 | #ifdef CONFIG_VM_EVENT_COUNTERS | ||
| 406 | "pgpgin", | ||
| 407 | "pgpgout", | ||
| 408 | "pswpin", | ||
| 409 | "pswpout", | ||
| 410 | |||
| 411 | "pgalloc_dma", | ||
| 412 | "pgalloc_dma32", | ||
| 413 | "pgalloc_normal", | ||
| 414 | "pgalloc_high", | ||
| 415 | |||
| 416 | "pgfree", | ||
| 417 | "pgactivate", | ||
| 418 | "pgdeactivate", | ||
| 419 | |||
| 420 | "pgfault", | ||
| 421 | "pgmajfault", | ||
| 422 | |||
| 423 | "pgrefill_dma", | ||
| 424 | "pgrefill_dma32", | ||
| 425 | "pgrefill_normal", | ||
| 426 | "pgrefill_high", | ||
| 427 | |||
| 428 | "pgsteal_dma", | ||
| 429 | "pgsteal_dma32", | ||
| 430 | "pgsteal_normal", | ||
| 431 | "pgsteal_high", | ||
| 432 | |||
| 433 | "pgscan_kswapd_dma", | ||
| 434 | "pgscan_kswapd_dma32", | ||
| 435 | "pgscan_kswapd_normal", | ||
| 436 | "pgscan_kswapd_high", | ||
| 437 | |||
| 438 | "pgscan_direct_dma", | ||
| 439 | "pgscan_direct_dma32", | ||
| 440 | "pgscan_direct_normal", | ||
| 441 | "pgscan_direct_high", | ||
| 442 | |||
| 443 | "pginodesteal", | ||
| 444 | "slabs_scanned", | ||
| 445 | "kswapd_steal", | ||
| 446 | "kswapd_inodesteal", | ||
| 447 | "pageoutrun", | ||
| 448 | "allocstall", | ||
| 449 | |||
| 450 | "pgrotated", | ||
| 451 | #endif | ||
| 452 | }; | ||
| 453 | |||
| 454 | /* | ||
| 455 | * Output information about zones in @pgdat. | ||
| 456 | */ | ||
| 457 | static int zoneinfo_show(struct seq_file *m, void *arg) | ||
| 458 | { | ||
| 459 | pg_data_t *pgdat = arg; | ||
| 460 | struct zone *zone; | ||
| 461 | struct zone *node_zones = pgdat->node_zones; | ||
| 462 | unsigned long flags; | ||
| 463 | |||
| 464 | for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; zone++) { | ||
| 465 | int i; | ||
| 466 | |||
| 467 | if (!populated_zone(zone)) | ||
| 468 | continue; | ||
| 469 | |||
| 470 | spin_lock_irqsave(&zone->lock, flags); | ||
| 471 | seq_printf(m, "Node %d, zone %8s", pgdat->node_id, zone->name); | ||
| 472 | seq_printf(m, | ||
| 473 | "\n pages free %lu" | ||
| 474 | "\n min %lu" | ||
| 475 | "\n low %lu" | ||
| 476 | "\n high %lu" | ||
| 477 | "\n active %lu" | ||
| 478 | "\n inactive %lu" | ||
| 479 | "\n scanned %lu (a: %lu i: %lu)" | ||
| 480 | "\n spanned %lu" | ||
| 481 | "\n present %lu", | ||
| 482 | zone->free_pages, | ||
| 483 | zone->pages_min, | ||
| 484 | zone->pages_low, | ||
| 485 | zone->pages_high, | ||
| 486 | zone->nr_active, | ||
| 487 | zone->nr_inactive, | ||
| 488 | zone->pages_scanned, | ||
| 489 | zone->nr_scan_active, zone->nr_scan_inactive, | ||
| 490 | zone->spanned_pages, | ||
| 491 | zone->present_pages); | ||
| 492 | |||
| 493 | for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) | ||
| 494 | seq_printf(m, "\n %-12s %lu", vmstat_text[i], | ||
| 495 | zone_page_state(zone, i)); | ||
| 496 | |||
| 497 | seq_printf(m, | ||
| 498 | "\n protection: (%lu", | ||
| 499 | zone->lowmem_reserve[0]); | ||
| 500 | for (i = 1; i < ARRAY_SIZE(zone->lowmem_reserve); i++) | ||
| 501 | seq_printf(m, ", %lu", zone->lowmem_reserve[i]); | ||
| 502 | seq_printf(m, | ||
| 503 | ")" | ||
| 504 | "\n pagesets"); | ||
| 505 | for_each_online_cpu(i) { | ||
| 506 | struct per_cpu_pageset *pageset; | ||
| 507 | int j; | ||
| 508 | |||
| 509 | pageset = zone_pcp(zone, i); | ||
| 510 | for (j = 0; j < ARRAY_SIZE(pageset->pcp); j++) { | ||
| 511 | if (pageset->pcp[j].count) | ||
| 512 | break; | ||
| 513 | } | ||
| 514 | if (j == ARRAY_SIZE(pageset->pcp)) | ||
| 515 | continue; | ||
| 516 | for (j = 0; j < ARRAY_SIZE(pageset->pcp); j++) { | ||
| 517 | seq_printf(m, | ||
| 518 | "\n cpu: %i pcp: %i" | ||
| 519 | "\n count: %i" | ||
| 520 | "\n high: %i" | ||
| 521 | "\n batch: %i", | ||
| 522 | i, j, | ||
| 523 | pageset->pcp[j].count, | ||
| 524 | pageset->pcp[j].high, | ||
| 525 | pageset->pcp[j].batch); | ||
| 526 | } | ||
| 527 | } | ||
| 528 | seq_printf(m, | ||
| 529 | "\n all_unreclaimable: %u" | ||
| 530 | "\n prev_priority: %i" | ||
| 531 | "\n temp_priority: %i" | ||
| 532 | "\n start_pfn: %lu", | ||
| 533 | zone->all_unreclaimable, | ||
| 534 | zone->prev_priority, | ||
| 535 | zone->temp_priority, | ||
| 536 | zone->zone_start_pfn); | ||
| 537 | spin_unlock_irqrestore(&zone->lock, flags); | ||
| 538 | seq_putc(m, '\n'); | ||
| 539 | } | ||
| 540 | return 0; | ||
| 541 | } | ||
| 542 | |||
| 543 | struct seq_operations zoneinfo_op = { | ||
| 544 | .start = frag_start, /* iterate over all zones. The same as in | ||
| 545 | * fragmentation. */ | ||
| 546 | .next = frag_next, | ||
| 547 | .stop = frag_stop, | ||
| 548 | .show = zoneinfo_show, | ||
| 549 | }; | ||
| 550 | |||
| 551 | static void *vmstat_start(struct seq_file *m, loff_t *pos) | ||
| 552 | { | ||
| 553 | unsigned long *v; | ||
| 554 | #ifdef CONFIG_VM_EVENT_COUNTERS | ||
| 555 | unsigned long *e; | ||
| 556 | #endif | ||
| 557 | int i; | ||
| 558 | |||
| 559 | if (*pos >= ARRAY_SIZE(vmstat_text)) | ||
| 560 | return NULL; | ||
| 561 | |||
| 562 | #ifdef CONFIG_VM_EVENT_COUNTERS | ||
| 563 | v = kmalloc(NR_VM_ZONE_STAT_ITEMS * sizeof(unsigned long) | ||
| 564 | + sizeof(struct vm_event_state), GFP_KERNEL); | ||
| 565 | #else | ||
| 566 | v = kmalloc(NR_VM_ZONE_STAT_ITEMS * sizeof(unsigned long), | ||
| 567 | GFP_KERNEL); | ||
| 568 | #endif | ||
| 569 | m->private = v; | ||
| 570 | if (!v) | ||
| 571 | return ERR_PTR(-ENOMEM); | ||
| 572 | for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) | ||
| 573 | v[i] = global_page_state(i); | ||
| 574 | #ifdef CONFIG_VM_EVENT_COUNTERS | ||
| 575 | e = v + NR_VM_ZONE_STAT_ITEMS; | ||
| 576 | all_vm_events(e); | ||
| 577 | e[PGPGIN] /= 2; /* sectors -> kbytes */ | ||
| 578 | e[PGPGOUT] /= 2; | ||
| 579 | #endif | ||
| 580 | return v + *pos; | ||
| 581 | } | ||
| 582 | |||
| 583 | static void *vmstat_next(struct seq_file *m, void *arg, loff_t *pos) | ||
| 584 | { | ||
| 585 | (*pos)++; | ||
| 586 | if (*pos >= ARRAY_SIZE(vmstat_text)) | ||
| 587 | return NULL; | ||
| 588 | return (unsigned long *)m->private + *pos; | ||
| 589 | } | ||
| 590 | |||
| 591 | static int vmstat_show(struct seq_file *m, void *arg) | ||
| 592 | { | ||
| 593 | unsigned long *l = arg; | ||
| 594 | unsigned long off = l - (unsigned long *)m->private; | ||
| 595 | |||
| 596 | seq_printf(m, "%s %lu\n", vmstat_text[off], *l); | ||
| 597 | return 0; | ||
| 598 | } | ||
| 599 | |||
| 600 | static void vmstat_stop(struct seq_file *m, void *arg) | ||
| 601 | { | ||
| 602 | kfree(m->private); | ||
| 603 | m->private = NULL; | ||
| 604 | } | ||
| 605 | |||
| 606 | struct seq_operations vmstat_op = { | ||
| 607 | .start = vmstat_start, | ||
| 608 | .next = vmstat_next, | ||
| 609 | .stop = vmstat_stop, | ||
| 610 | .show = vmstat_show, | ||
| 611 | }; | ||
| 612 | |||
| 613 | #endif /* CONFIG_PROC_FS */ | ||
| 614 | |||
diff --git a/net/802/fc.c b/net/802/fc.c index 282c4ab1abe6..2a27e37bc4cb 100644 --- a/net/802/fc.c +++ b/net/802/fc.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * v 1.0 03/22/99 | 10 | * v 1.0 03/22/99 |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 15 | #include <asm/system.h> | 14 | #include <asm/system.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
diff --git a/net/802/fddi.c b/net/802/fddi.c index ac242a4bc346..797c6d961deb 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Maciej W. Rozycki : IPv6 support | 26 | * Maciej W. Rozycki : IPv6 support |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <asm/system.h> | 30 | #include <asm/system.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
diff --git a/net/802/sysctl_net_802.c b/net/802/sysctl_net_802.c index 700129556c13..ead56037398b 100644 --- a/net/802/sysctl_net_802.c +++ b/net/802/sysctl_net_802.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | #include <linux/if_tr.h> | 14 | #include <linux/if_tr.h> |
| 16 | #include <linux/sysctl.h> | 15 | #include <linux/sysctl.h> |
diff --git a/net/802/tr.c b/net/802/tr.c index e9dc803f2fe0..d7d8f40c4fed 100644 --- a/net/802/tr.c +++ b/net/802/tr.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
| 19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index 7b214cffc956..a8fc0de1f969 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Jan 20, 1998 Ben Greear Initial Version | 17 | * Jan 20, 1998 Ben Greear Initial Version |
| 18 | *****************************************************************************/ | 18 | *****************************************************************************/ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/stddef.h> /* offsetof(), etc. */ | 21 | #include <linux/stddef.h> /* offsetof(), etc. */ |
| 23 | #include <linux/errno.h> /* return codes */ | 22 | #include <linux/errno.h> /* return codes */ |
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 7076097debc2..f3777ec5bcb9 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * | 29 | * |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/if_arp.h> | 32 | #include <linux/if_arp.h> |
| 34 | #include <net/sock.h> | 33 | #include <net/sock.h> |
| 35 | #include <net/datalink.h> | 34 | #include <net/datalink.h> |
diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c index dc4048dd98c1..7ae4916cd26d 100644 --- a/net/appletalk/atalk_proc.c +++ b/net/appletalk/atalk_proc.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Free Software Foundation, version 2. | 8 | * Free Software Foundation, version 2. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 13 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
| 14 | #include <linux/seq_file.h> | 13 | #include <linux/seq_file.h> |
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 7b1eb9a4fc96..5ee96d4b40e9 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | * | 51 | * |
| 52 | */ | 52 | */ |
| 53 | 53 | ||
| 54 | #include <linux/config.h> | ||
| 55 | #include <linux/capability.h> | 54 | #include <linux/capability.h> |
| 56 | #include <linux/module.h> | 55 | #include <linux/module.h> |
| 57 | #include <linux/if_arp.h> | 56 | #include <linux/if_arp.h> |
diff --git a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c index af7f0604395d..40b0af7437a2 100644 --- a/net/appletalk/sysctl_net_atalk.c +++ b/net/appletalk/sysctl_net_atalk.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Dynamic registration, added aarp entries. (5/30/97 Chris Horn) | 6 | * Dynamic registration, added aarp entries. (5/30/97 Chris Horn) |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/sysctl.h> | 9 | #include <linux/sysctl.h> |
| 11 | #include <net/sock.h> | 10 | #include <net/sock.h> |
| 12 | #include <linux/atalk.h> | 11 | #include <linux/atalk.h> |
diff --git a/net/atm/Makefile b/net/atm/Makefile index d5818751f6ba..89656d6c0b90 100644 --- a/net/atm/Makefile +++ b/net/atm/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for the ATM Protocol Families. | 2 | # Makefile for the ATM Protocol Families. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | atm-y := addr.o pvc.o signaling.o svc.o ioctl.o common.o atm_misc.o raw.o resources.o | 5 | atm-y := addr.o pvc.o signaling.o svc.o ioctl.o common.o atm_misc.o raw.o resources.o atm_sysfs.o |
| 6 | mpoa-objs := mpc.o mpoa_caches.o mpoa_proc.o | 6 | mpoa-objs := mpc.o mpoa_caches.o mpoa_proc.o |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_ATM) += atm.o | 8 | obj-$(CONFIG_ATM) += atm.o |
diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c new file mode 100644 index 000000000000..5df4b9a068bb --- /dev/null +++ b/net/atm/atm_sysfs.c | |||
| @@ -0,0 +1,176 @@ | |||
| 1 | /* ATM driver model support. */ | ||
| 2 | |||
| 3 | #include <linux/config.h> | ||
| 4 | #include <linux/kernel.h> | ||
| 5 | #include <linux/init.h> | ||
| 6 | #include <linux/kobject.h> | ||
| 7 | #include <linux/atmdev.h> | ||
| 8 | #include "common.h" | ||
| 9 | #include "resources.h" | ||
| 10 | |||
| 11 | #define to_atm_dev(cldev) container_of(cldev, struct atm_dev, class_dev) | ||
| 12 | |||
| 13 | static ssize_t show_type(struct class_device *cdev, char *buf) | ||
| 14 | { | ||
| 15 | struct atm_dev *adev = to_atm_dev(cdev); | ||
| 16 | return sprintf(buf, "%s\n", adev->type); | ||
| 17 | } | ||
| 18 | |||
| 19 | static ssize_t show_address(struct class_device *cdev, char *buf) | ||
| 20 | { | ||
| 21 | char *pos = buf; | ||
| 22 | struct atm_dev *adev = to_atm_dev(cdev); | ||
| 23 | int i; | ||
| 24 | |||
| 25 | for (i = 0; i < (ESI_LEN - 1); i++) | ||
| 26 | pos += sprintf(pos, "%02x:", adev->esi[i]); | ||
| 27 | pos += sprintf(pos, "%02x\n", adev->esi[i]); | ||
| 28 | |||
| 29 | return pos - buf; | ||
| 30 | } | ||
| 31 | |||
| 32 | static ssize_t show_atmaddress(struct class_device *cdev, char *buf) | ||
| 33 | { | ||
| 34 | unsigned long flags; | ||
| 35 | char *pos = buf; | ||
| 36 | struct atm_dev *adev = to_atm_dev(cdev); | ||
| 37 | struct atm_dev_addr *aaddr; | ||
| 38 | int bin[] = { 1, 2, 10, 6, 1 }, *fmt = bin; | ||
| 39 | int i, j; | ||
| 40 | |||
| 41 | spin_lock_irqsave(&adev->lock, flags); | ||
| 42 | list_for_each_entry(aaddr, &adev->local, entry) { | ||
| 43 | for(i = 0, j = 0; i < ATM_ESA_LEN; ++i, ++j) { | ||
| 44 | if (j == *fmt) { | ||
| 45 | pos += sprintf(pos, "."); | ||
| 46 | ++fmt; | ||
| 47 | j = 0; | ||
| 48 | } | ||
| 49 | pos += sprintf(pos, "%02x", aaddr->addr.sas_addr.prv[i]); | ||
| 50 | } | ||
| 51 | pos += sprintf(pos, "\n"); | ||
| 52 | } | ||
| 53 | spin_unlock_irqrestore(&adev->lock, flags); | ||
| 54 | |||
| 55 | return pos - buf; | ||
| 56 | } | ||
| 57 | |||
| 58 | static ssize_t show_carrier(struct class_device *cdev, char *buf) | ||
| 59 | { | ||
| 60 | char *pos = buf; | ||
| 61 | struct atm_dev *adev = to_atm_dev(cdev); | ||
| 62 | |||
| 63 | pos += sprintf(pos, "%d\n", | ||
| 64 | adev->signal == ATM_PHY_SIG_LOST ? 0 : 1); | ||
| 65 | |||
| 66 | return pos - buf; | ||
| 67 | } | ||
| 68 | |||
| 69 | static ssize_t show_link_rate(struct class_device *cdev, char *buf) | ||
| 70 | { | ||
| 71 | char *pos = buf; | ||
| 72 | struct atm_dev *adev = to_atm_dev(cdev); | ||
| 73 | int link_rate; | ||
| 74 | |||
| 75 | /* show the link rate, not the data rate */ | ||
| 76 | switch (adev->link_rate) { | ||
| 77 | case ATM_OC3_PCR: | ||
| 78 | link_rate = 155520000; | ||
| 79 | break; | ||
| 80 | case ATM_OC12_PCR: | ||
| 81 | link_rate = 622080000; | ||
| 82 | break; | ||
| 83 | case ATM_25_PCR: | ||
| 84 | link_rate = 25600000; | ||
| 85 | break; | ||
| 86 | default: | ||
| 87 | link_rate = adev->link_rate * 8 * 53; | ||
| 88 | } | ||
| 89 | pos += sprintf(pos, "%d\n", link_rate); | ||
| 90 | |||
| 91 | return pos - buf; | ||
| 92 | } | ||
| 93 | |||
| 94 | static CLASS_DEVICE_ATTR(address, S_IRUGO, show_address, NULL); | ||
| 95 | static CLASS_DEVICE_ATTR(atmaddress, S_IRUGO, show_atmaddress, NULL); | ||
| 96 | static CLASS_DEVICE_ATTR(carrier, S_IRUGO, show_carrier, NULL); | ||
| 97 | static CLASS_DEVICE_ATTR(type, S_IRUGO, show_type, NULL); | ||
| 98 | static CLASS_DEVICE_ATTR(link_rate, S_IRUGO, show_link_rate, NULL); | ||
| 99 | |||
| 100 | static struct class_device_attribute *atm_attrs[] = { | ||
| 101 | &class_device_attr_atmaddress, | ||
| 102 | &class_device_attr_address, | ||
| 103 | &class_device_attr_carrier, | ||
| 104 | &class_device_attr_type, | ||
| 105 | &class_device_attr_link_rate, | ||
| 106 | NULL | ||
| 107 | }; | ||
| 108 | |||
| 109 | static int atm_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size) | ||
| 110 | { | ||
| 111 | struct atm_dev *adev; | ||
| 112 | int i = 0, len = 0; | ||
| 113 | |||
| 114 | if (!cdev) | ||
| 115 | return -ENODEV; | ||
| 116 | |||
| 117 | adev = to_atm_dev(cdev); | ||
| 118 | if (!adev) | ||
| 119 | return -ENODEV; | ||
| 120 | |||
| 121 | if (add_uevent_var(envp, num_envp, &i, buf, size, &len, | ||
| 122 | "NAME=%s%d", adev->type, adev->number)) | ||
| 123 | return -ENOMEM; | ||
| 124 | |||
| 125 | envp[i] = NULL; | ||
| 126 | return 0; | ||
| 127 | } | ||
| 128 | |||
| 129 | static void atm_release(struct class_device *cdev) | ||
| 130 | { | ||
| 131 | struct atm_dev *adev = to_atm_dev(cdev); | ||
| 132 | |||
| 133 | kfree(adev); | ||
| 134 | } | ||
| 135 | |||
| 136 | static struct class atm_class = { | ||
| 137 | .name = "atm", | ||
| 138 | .release = atm_release, | ||
| 139 | .uevent = atm_uevent, | ||
| 140 | }; | ||
| 141 | |||
| 142 | int atm_register_sysfs(struct atm_dev *adev) | ||
| 143 | { | ||
| 144 | struct class_device *cdev = &adev->class_dev; | ||
| 145 | int i, err; | ||
| 146 | |||
| 147 | cdev->class = &atm_class; | ||
| 148 | class_set_devdata(cdev, adev); | ||
| 149 | |||
| 150 | snprintf(cdev->class_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number); | ||
| 151 | err = class_device_register(cdev); | ||
| 152 | if (err < 0) | ||
| 153 | return err; | ||
| 154 | |||
| 155 | for (i = 0; atm_attrs[i]; i++) | ||
| 156 | class_device_create_file(cdev, atm_attrs[i]); | ||
| 157 | |||
| 158 | return 0; | ||
| 159 | } | ||
| 160 | |||
| 161 | void atm_unregister_sysfs(struct atm_dev *adev) | ||
| 162 | { | ||
| 163 | struct class_device *cdev = &adev->class_dev; | ||
| 164 | |||
| 165 | class_device_del(cdev); | ||
| 166 | } | ||
| 167 | |||
| 168 | int __init atm_sysfs_init(void) | ||
| 169 | { | ||
| 170 | return class_register(&atm_class); | ||
| 171 | } | ||
| 172 | |||
| 173 | void __exit atm_sysfs_exit(void) | ||
| 174 | { | ||
| 175 | class_unregister(&atm_class); | ||
| 176 | } | ||
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 680ccb12aae8..a487233dc466 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
| @@ -5,7 +5,6 @@ Author: Marcell GAL, 2000, XDSL Ltd, Hungary | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/list.h> | 10 | #include <linux/list.h> |
diff --git a/net/atm/clip.c b/net/atm/clip.c index f92f9c94d2c7..87a454f5c89c 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ | 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 7 | #include <linux/errno.h> | 6 | #include <linux/errno.h> |
| 8 | #include <linux/kernel.h> /* for UINT_MAX */ | 7 | #include <linux/kernel.h> /* for UINT_MAX */ |
diff --git a/net/atm/common.c b/net/atm/common.c index ae002220fa99..fbabff494468 100644 --- a/net/atm/common.c +++ b/net/atm/common.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ | 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 8 | #include <linux/kmod.h> | 7 | #include <linux/kmod.h> |
| 9 | #include <linux/net.h> /* struct socket, struct proto_ops */ | 8 | #include <linux/net.h> /* struct socket, struct proto_ops */ |
| @@ -791,8 +790,14 @@ static int __init atm_init(void) | |||
| 791 | printk(KERN_ERR "atm_proc_init() failed with %d\n",error); | 790 | printk(KERN_ERR "atm_proc_init() failed with %d\n",error); |
| 792 | goto out_atmsvc_exit; | 791 | goto out_atmsvc_exit; |
| 793 | } | 792 | } |
| 793 | if ((error = atm_sysfs_init()) < 0) { | ||
| 794 | printk(KERN_ERR "atm_sysfs_init() failed with %d\n",error); | ||
| 795 | goto out_atmproc_exit; | ||
| 796 | } | ||
| 794 | out: | 797 | out: |
| 795 | return error; | 798 | return error; |
| 799 | out_atmproc_exit: | ||
| 800 | atm_proc_exit(); | ||
| 796 | out_atmsvc_exit: | 801 | out_atmsvc_exit: |
| 797 | atmsvc_exit(); | 802 | atmsvc_exit(); |
| 798 | out_atmpvc_exit: | 803 | out_atmpvc_exit: |
| @@ -805,6 +810,7 @@ out_unregister_vcc_proto: | |||
| 805 | static void __exit atm_exit(void) | 810 | static void __exit atm_exit(void) |
| 806 | { | 811 | { |
| 807 | atm_proc_exit(); | 812 | atm_proc_exit(); |
| 813 | atm_sysfs_exit(); | ||
| 808 | atmsvc_exit(); | 814 | atmsvc_exit(); |
| 809 | atmpvc_exit(); | 815 | atmpvc_exit(); |
| 810 | proto_unregister(&vcc_proto); | 816 | proto_unregister(&vcc_proto); |
diff --git a/net/atm/common.h b/net/atm/common.h index 4887c317cefe..a422da7788fb 100644 --- a/net/atm/common.h +++ b/net/atm/common.h | |||
| @@ -28,6 +28,8 @@ int atmpvc_init(void); | |||
| 28 | void atmpvc_exit(void); | 28 | void atmpvc_exit(void); |
| 29 | int atmsvc_init(void); | 29 | int atmsvc_init(void); |
| 30 | void atmsvc_exit(void); | 30 | void atmsvc_exit(void); |
| 31 | int atm_sysfs_init(void); | ||
| 32 | void atm_sysfs_exit(void); | ||
| 31 | 33 | ||
| 32 | #ifdef CONFIG_PROC_FS | 34 | #ifdef CONFIG_PROC_FS |
| 33 | int atm_proc_init(void); | 35 | int atm_proc_init(void); |
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c index 851cfa6312af..8c2022c3e81d 100644 --- a/net/atm/ioctl.c +++ b/net/atm/ioctl.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | /* 2003 John Levon <levon@movementarian.org> */ | 4 | /* 2003 John Levon <levon@movementarian.org> */ |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/kmod.h> | 8 | #include <linux/kmod.h> |
| 10 | #include <linux/net.h> /* struct socket, struct proto_ops */ | 9 | #include <linux/net.h> /* struct socket, struct proto_ops */ |
diff --git a/net/atm/lec.c b/net/atm/lec.c index c4fc722fef9a..4b68a18171cf 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * | 4 | * |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 9 | #include <linux/bitops.h> | 8 | #include <linux/bitops.h> |
| 10 | #include <linux/capability.h> | 9 | #include <linux/capability.h> |
diff --git a/net/atm/lec.h b/net/atm/lec.h index 6606082b29a8..c22a8bfa1f81 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _LEC_H_ | 9 | #ifndef _LEC_H_ |
| 10 | #define _LEC_H_ | 10 | #define _LEC_H_ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/atmdev.h> | 12 | #include <linux/atmdev.h> |
| 14 | #include <linux/netdevice.h> | 13 | #include <linux/netdevice.h> |
| 15 | #include <linux/atmlec.h> | 14 | #include <linux/atmlec.h> |
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 5fe77df00186..9aafe1e2f048 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/atmlec.h> | 25 | #include <linux/atmlec.h> |
| 26 | #include <linux/atmmpc.h> | 26 | #include <linux/atmmpc.h> |
| 27 | /* Modular too */ | 27 | /* Modular too */ |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | 29 | ||
| 31 | #include "lec.h" | 30 | #include "lec.h" |
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index 60834b5a14d6..d37b8911b3ab 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | 1 | ||
| 3 | #ifdef CONFIG_PROC_FS | 2 | #ifdef CONFIG_PROC_FS |
| 4 | #include <linux/errno.h> | 3 | #include <linux/errno.h> |
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c index 1489067c1e84..76a7d8ff6c0e 100644 --- a/net/atm/pppoatm.c +++ b/net/atm/pppoatm.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/skbuff.h> | 38 | #include <linux/skbuff.h> |
| 40 | #include <linux/atm.h> | 39 | #include <linux/atm.h> |
diff --git a/net/atm/proc.c b/net/atm/proc.c index 4041054e5282..3f95b0886a6a 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * the reader. | 8 | * the reader. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> /* for EXPORT_SYMBOL */ | 11 | #include <linux/module.h> /* for EXPORT_SYMBOL */ |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
diff --git a/net/atm/pvc.c b/net/atm/pvc.c index f2c541774dcd..b2148b43a426 100644 --- a/net/atm/pvc.c +++ b/net/atm/pvc.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ | 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/net.h> /* struct socket, struct proto_ops */ | 6 | #include <linux/net.h> /* struct socket, struct proto_ops */ |
| 8 | #include <linux/atm.h> /* ATM stuff */ | 7 | #include <linux/atm.h> /* ATM stuff */ |
| 9 | #include <linux/atmdev.h> /* ATM devices */ | 8 | #include <linux/atmdev.h> /* ATM devices */ |
diff --git a/net/atm/resources.c b/net/atm/resources.c index 18ac80698f83..de25c6408b04 100644 --- a/net/atm/resources.c +++ b/net/atm/resources.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * use the default destruct function initialized by sock_init_data */ | 8 | * use the default destruct function initialized by sock_init_data */ |
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/ctype.h> | 11 | #include <linux/ctype.h> |
| 13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 14 | #include <linux/atmdev.h> | 13 | #include <linux/atmdev.h> |
| @@ -114,14 +113,27 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, | |||
| 114 | printk(KERN_ERR "atm_dev_register: " | 113 | printk(KERN_ERR "atm_dev_register: " |
| 115 | "atm_proc_dev_register failed for dev %s\n", | 114 | "atm_proc_dev_register failed for dev %s\n", |
| 116 | type); | 115 | type); |
| 117 | mutex_unlock(&atm_dev_mutex); | 116 | goto out_fail; |
| 118 | kfree(dev); | 117 | } |
| 119 | return NULL; | 118 | |
| 119 | if (atm_register_sysfs(dev) < 0) { | ||
| 120 | printk(KERN_ERR "atm_dev_register: " | ||
| 121 | "atm_register_sysfs failed for dev %s\n", | ||
| 122 | type); | ||
| 123 | atm_proc_dev_deregister(dev); | ||
| 124 | goto out_fail; | ||
| 120 | } | 125 | } |
| 126 | |||
| 121 | list_add_tail(&dev->dev_list, &atm_devs); | 127 | list_add_tail(&dev->dev_list, &atm_devs); |
| 122 | mutex_unlock(&atm_dev_mutex); | ||
| 123 | 128 | ||
| 129 | out: | ||
| 130 | mutex_unlock(&atm_dev_mutex); | ||
| 124 | return dev; | 131 | return dev; |
| 132 | |||
| 133 | out_fail: | ||
| 134 | kfree(dev); | ||
| 135 | dev = NULL; | ||
| 136 | goto out; | ||
| 125 | } | 137 | } |
| 126 | 138 | ||
| 127 | 139 | ||
| @@ -140,6 +152,7 @@ void atm_dev_deregister(struct atm_dev *dev) | |||
| 140 | mutex_unlock(&atm_dev_mutex); | 152 | mutex_unlock(&atm_dev_mutex); |
| 141 | 153 | ||
| 142 | atm_dev_release_vccs(dev); | 154 | atm_dev_release_vccs(dev); |
| 155 | atm_unregister_sysfs(dev); | ||
| 143 | atm_proc_dev_deregister(dev); | 156 | atm_proc_dev_deregister(dev); |
| 144 | 157 | ||
| 145 | atm_dev_put(dev); | 158 | atm_dev_put(dev); |
diff --git a/net/atm/resources.h b/net/atm/resources.h index ac7222fee7a8..1d004aaaeec1 100644 --- a/net/atm/resources.h +++ b/net/atm/resources.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef NET_ATM_RESOURCES_H | 6 | #ifndef NET_ATM_RESOURCES_H |
| 7 | #define NET_ATM_RESOURCES_H | 7 | #define NET_ATM_RESOURCES_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/atmdev.h> | 9 | #include <linux/atmdev.h> |
| 11 | #include <linux/mutex.h> | 10 | #include <linux/mutex.h> |
| 12 | 11 | ||
| @@ -43,4 +42,6 @@ static inline void atm_proc_dev_deregister(struct atm_dev *dev) | |||
| 43 | 42 | ||
| 44 | #endif /* CONFIG_PROC_FS */ | 43 | #endif /* CONFIG_PROC_FS */ |
| 45 | 44 | ||
| 45 | int atm_register_sysfs(struct atm_dev *adev); | ||
| 46 | void atm_unregister_sysfs(struct atm_dev *adev); | ||
| 46 | #endif | 47 | #endif |
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index a2e0dd047e9f..10a3c0aa8398 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Copyright (C) Hans Alblas PE1AYX (hans@esrac.ele.tue.nl) | 13 | * Copyright (C) Hans Alblas PE1AYX (hans@esrac.ele.tue.nl) |
| 14 | * Copyright (C) Frederic Rible F1OAT (frible@teaser.fr) | 14 | * Copyright (C) Frederic Rible F1OAT (frible@teaser.fr) |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/capability.h> | 16 | #include <linux/capability.h> |
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c index dab77efe34a6..47e6e790bd67 100644 --- a/net/ax25/ax25_dev.c +++ b/net/ax25/ax25_dev.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) | 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/socket.h> | 11 | #include <linux/socket.h> |
diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c index 3bb152710b77..77ba07c67682 100644 --- a/net/ax25/ax25_iface.c +++ b/net/ax25/ax25_iface.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) | 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/socket.h> | 11 | #include <linux/socket.h> |
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c index a0b534f80f17..9be5c15e63d3 100644 --- a/net/ax25/ax25_ip.c +++ b/net/ax25/ax25_ip.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) | 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/socket.h> | 11 | #include <linux/socket.h> |
diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c index 5d99852b239c..d7736e585336 100644 --- a/net/ax25/ax25_out.c +++ b/net/ax25/ax25_out.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) | 8 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) |
| 9 | * Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de) | 9 | * Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de) |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/socket.h> | 13 | #include <linux/socket.h> |
diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c index ec254057f212..72594867fab6 100644 --- a/net/ax25/ax25_timer.c +++ b/net/ax25/ax25_timer.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Copyright (C) Frederic Rible F1OAT (frible@teaser.fr) | 12 | * Copyright (C) Frederic Rible F1OAT (frible@teaser.fr) |
| 13 | * Copyright (C) 2002 Ralf Baechle DO1GRB (ralf@gnu.org) | 13 | * Copyright (C) 2002 Ralf Baechle DO1GRB (ralf@gnu.org) |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/socket.h> | 17 | #include <linux/socket.h> |
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c index bdb64c36df12..369a75b160f2 100644 --- a/net/ax25/sysctl_net_ax25.c +++ b/net/ax25/sysctl_net_ax25.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) 1996 Mike Shaver (shaver@zeroknowledge.com) | 7 | * Copyright (C) 1996 Mike Shaver (shaver@zeroknowledge.com) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/sysctl.h> | 10 | #include <linux/sysctl.h> |
| 12 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 469eda0f0dfd..51f867062e1d 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth address family and sockets. */ | 25 | /* Bluetooth address family and sockets. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index d908d49dc9f8..e620061fb50f 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * $Id: core.c,v 1.20 2002/08/04 21:23:58 maxk Exp $ | 29 | * $Id: core.c,v 1.20 2002/08/04 21:23:58 maxk Exp $ |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | 33 | ||
| 35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 921204f95f4a..7f7b27db6a8f 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * $Id: netdev.c,v 1.8 2002/08/04 21:23:58 maxk Exp $ | 29 | * $Id: netdev.c,v 1.8 2002/08/04 21:23:58 maxk Exp $ |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | 33 | ||
| 35 | #include <linux/socket.h> | 34 | #include <linux/socket.h> |
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c index 2bfe796cf05d..28c55835422a 100644 --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * $Id: sock.c,v 1.4 2002/08/04 21:23:58 maxk Exp $ | 28 | * $Id: sock.c,v 1.4 2002/08/04 21:23:58 maxk Exp $ |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | 32 | ||
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c index b2e7e38531c6..6fb47e00e188 100644 --- a/net/bluetooth/cmtp/capi.c +++ b/net/bluetooth/cmtp/capi.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | SOFTWARE IS DISCLAIMED. | 20 | SOFTWARE IS DISCLAIMED. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index 901eff7ebe74..182254a580e2 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | SOFTWARE IS DISCLAIMED. | 20 | SOFTWARE IS DISCLAIMED. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c index 8f8fad23f78a..10ad7fd91d83 100644 --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | SOFTWARE IS DISCLAIMED. | 20 | SOFTWARE IS DISCLAIMED. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index f812ed129e58..5c0c2b1ef34a 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth HCI connection handling. */ | 25 | /* Bluetooth HCI connection handling. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index a49a6975092d..f67240beb0dd 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth HCI core. */ | 25 | /* Bluetooth HCI core. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/kmod.h> | 28 | #include <linux/kmod.h> |
| 30 | 29 | ||
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index eb64555d1fb3..618bacee1b1c 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth HCI event handling. */ | 25 | /* Bluetooth HCI event handling. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 97bdec73d17e..1a35d343e08a 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth HCI sockets. */ | 25 | /* Bluetooth HCI sockets. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 0ed38740388c..19b234c86f33 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | /* Bluetooth HCI driver model support. */ | 1 | /* Bluetooth HCI driver model support. */ |
| 2 | 2 | ||
| 3 | #include <linux/config.h> | ||
| 4 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 5 | #include <linux/init.h> | 4 | #include <linux/init.h> |
| 6 | 5 | ||
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index cdb9cfafd960..b9c24a55425c 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | SOFTWARE IS DISCLAIMED. | 20 | SOFTWARE IS DISCLAIMED. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c index b8f67761b886..099646e4e2ef 100644 --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | SOFTWARE IS DISCLAIMED. | 20 | SOFTWARE IS DISCLAIMED. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 25 | 24 | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index f6b4a8085357..770101177da1 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth L2CAP core and sockets. */ | 25 | /* Bluetooth L2CAP core and sockets. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c index ee6a66979913..e5fd0cb70ae9 100644 --- a/net/bluetooth/lib.c +++ b/net/bluetooth/lib.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth kernel library. */ | 25 | /* Bluetooth kernel library. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index e99010ce8bb2..bd46e8927f29 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * $Id: core.c,v 1.42 2002/10/01 23:26:25 maxk Exp $ | 27 | * $Id: core.c,v 1.42 2002/10/01 23:26:25 maxk Exp $ |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 33 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 757d2dd3b02f..4e9962c8cfa6 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * $Id: sock.c,v 1.24 2002/10/03 01:00:34 maxk Exp $ | 27 | * $Id: sock.c,v 1.24 2002/10/03 01:00:34 maxk Exp $ |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | 31 | ||
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index b105a715fa93..2ff2d5b87c93 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * $Id: tty.c,v 1.24 2002/10/03 01:54:38 holtmann Exp $ | 27 | * $Id: tty.c,v 1.24 2002/10/03 01:54:38 holtmann Exp $ |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | 31 | ||
| 33 | #include <linux/tty.h> | 32 | #include <linux/tty.h> |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 0c2d13ad69bb..a5f1e44db5d3 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | /* Bluetooth SCO sockets. */ | 25 | /* Bluetooth SCO sockets. */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | 28 | ||
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
diff --git a/net/bridge/br.c b/net/bridge/br.c index 654401ceb2db..2994387999a8 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or (at your option) any later version. | 13 | * 2 of the License, or (at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/netdevice.h> | 18 | #include <linux/netdevice.h> |
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 2afdc7c0736c..f8dbcee80eba 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
| @@ -184,6 +184,6 @@ void br_dev_setup(struct net_device *dev) | |||
| 184 | dev->set_mac_address = br_set_mac_address; | 184 | dev->set_mac_address = br_set_mac_address; |
| 185 | dev->priv_flags = IFF_EBRIDGE; | 185 | dev->priv_flags = IFF_EBRIDGE; |
| 186 | 186 | ||
| 187 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | 187 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | |
| 188 | | NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_NO_CSUM; | 188 | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_GSO_ROBUST; |
| 189 | } | 189 | } |
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 07956ecf545e..f55ef682ef84 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
| @@ -392,7 +392,8 @@ void br_features_recompute(struct net_bridge *br) | |||
| 392 | features &= feature; | 392 | features &= feature; |
| 393 | } | 393 | } |
| 394 | 394 | ||
| 395 | br->dev->features = features | checksum | NETIF_F_LLTX; | 395 | br->dev->features = features | checksum | NETIF_F_LLTX | |
| 396 | NETIF_F_GSO_ROBUST; | ||
| 396 | } | 397 | } |
| 397 | 398 | ||
| 398 | /* called with RTNL */ | 399 | /* called with RTNL */ |
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index ee5a51761260..02693a230dc1 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
| 34 | #include <linux/socket.h> | 33 | #include <linux/socket.h> |
| 35 | #include <linux/skbuff.h> | 34 | #include <linux/skbuff.h> |
diff --git a/net/core/dev.c b/net/core/dev.c index f1c52cbd6ef7..066a60a75280 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -76,7 +76,6 @@ | |||
| 76 | #include <asm/system.h> | 76 | #include <asm/system.h> |
| 77 | #include <linux/bitops.h> | 77 | #include <linux/bitops.h> |
| 78 | #include <linux/capability.h> | 78 | #include <linux/capability.h> |
| 79 | #include <linux/config.h> | ||
| 80 | #include <linux/cpu.h> | 79 | #include <linux/cpu.h> |
| 81 | #include <linux/types.h> | 80 | #include <linux/types.h> |
| 82 | #include <linux/kernel.h> | 81 | #include <linux/kernel.h> |
| @@ -1190,11 +1189,14 @@ out: | |||
| 1190 | /** | 1189 | /** |
| 1191 | * skb_gso_segment - Perform segmentation on skb. | 1190 | * skb_gso_segment - Perform segmentation on skb. |
| 1192 | * @skb: buffer to segment | 1191 | * @skb: buffer to segment |
| 1193 | * @sg: whether scatter-gather is supported on the target. | 1192 | * @features: features for the output path (see dev->features) |
| 1194 | * | 1193 | * |
| 1195 | * This function segments the given skb and returns a list of segments. | 1194 | * This function segments the given skb and returns a list of segments. |
| 1195 | * | ||
| 1196 | * It may return NULL if the skb requires no segmentation. This is | ||
| 1197 | * only possible when GSO is used for verifying header integrity. | ||
| 1196 | */ | 1198 | */ |
| 1197 | struct sk_buff *skb_gso_segment(struct sk_buff *skb, int sg) | 1199 | struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features) |
| 1198 | { | 1200 | { |
| 1199 | struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); | 1201 | struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); |
| 1200 | struct packet_type *ptype; | 1202 | struct packet_type *ptype; |
| @@ -1210,12 +1212,14 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, int sg) | |||
| 1210 | rcu_read_lock(); | 1212 | rcu_read_lock(); |
| 1211 | list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type) & 15], list) { | 1213 | list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type) & 15], list) { |
| 1212 | if (ptype->type == type && !ptype->dev && ptype->gso_segment) { | 1214 | if (ptype->type == type && !ptype->dev && ptype->gso_segment) { |
| 1213 | segs = ptype->gso_segment(skb, sg); | 1215 | segs = ptype->gso_segment(skb, features); |
| 1214 | break; | 1216 | break; |
| 1215 | } | 1217 | } |
| 1216 | } | 1218 | } |
| 1217 | rcu_read_unlock(); | 1219 | rcu_read_unlock(); |
| 1218 | 1220 | ||
| 1221 | __skb_push(skb, skb->data - skb->mac.raw); | ||
| 1222 | |||
| 1219 | return segs; | 1223 | return segs; |
| 1220 | } | 1224 | } |
| 1221 | 1225 | ||
| @@ -1234,7 +1238,6 @@ void netdev_rx_csum_fault(struct net_device *dev) | |||
| 1234 | EXPORT_SYMBOL(netdev_rx_csum_fault); | 1238 | EXPORT_SYMBOL(netdev_rx_csum_fault); |
| 1235 | #endif | 1239 | #endif |
| 1236 | 1240 | ||
| 1237 | #ifdef CONFIG_HIGHMEM | ||
| 1238 | /* Actually, we should eliminate this check as soon as we know, that: | 1241 | /* Actually, we should eliminate this check as soon as we know, that: |
| 1239 | * 1. IOMMU is present and allows to map all the memory. | 1242 | * 1. IOMMU is present and allows to map all the memory. |
| 1240 | * 2. No high memory really exists on this machine. | 1243 | * 2. No high memory really exists on this machine. |
| @@ -1242,6 +1245,7 @@ EXPORT_SYMBOL(netdev_rx_csum_fault); | |||
| 1242 | 1245 | ||
| 1243 | static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb) | 1246 | static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb) |
| 1244 | { | 1247 | { |
| 1248 | #ifdef CONFIG_HIGHMEM | ||
| 1245 | int i; | 1249 | int i; |
| 1246 | 1250 | ||
| 1247 | if (dev->features & NETIF_F_HIGHDMA) | 1251 | if (dev->features & NETIF_F_HIGHDMA) |
| @@ -1251,11 +1255,9 @@ static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb) | |||
| 1251 | if (PageHighMem(skb_shinfo(skb)->frags[i].page)) | 1255 | if (PageHighMem(skb_shinfo(skb)->frags[i].page)) |
| 1252 | return 1; | 1256 | return 1; |
| 1253 | 1257 | ||
| 1258 | #endif | ||
| 1254 | return 0; | 1259 | return 0; |
| 1255 | } | 1260 | } |
| 1256 | #else | ||
| 1257 | #define illegal_highdma(dev, skb) (0) | ||
| 1258 | #endif | ||
| 1259 | 1261 | ||
| 1260 | struct dev_gso_cb { | 1262 | struct dev_gso_cb { |
| 1261 | void (*destructor)(struct sk_buff *skb); | 1263 | void (*destructor)(struct sk_buff *skb); |
| @@ -1291,9 +1293,15 @@ static int dev_gso_segment(struct sk_buff *skb) | |||
| 1291 | { | 1293 | { |
| 1292 | struct net_device *dev = skb->dev; | 1294 | struct net_device *dev = skb->dev; |
| 1293 | struct sk_buff *segs; | 1295 | struct sk_buff *segs; |
| 1296 | int features = dev->features & ~(illegal_highdma(dev, skb) ? | ||
| 1297 | NETIF_F_SG : 0); | ||
| 1298 | |||
| 1299 | segs = skb_gso_segment(skb, features); | ||
| 1300 | |||
| 1301 | /* Verifying header integrity only. */ | ||
| 1302 | if (!segs) | ||
| 1303 | return 0; | ||
| 1294 | 1304 | ||
| 1295 | segs = skb_gso_segment(skb, dev->features & NETIF_F_SG && | ||
| 1296 | !illegal_highdma(dev, skb)); | ||
| 1297 | if (unlikely(IS_ERR(segs))) | 1305 | if (unlikely(IS_ERR(segs))) |
| 1298 | return PTR_ERR(segs); | 1306 | return PTR_ERR(segs); |
| 1299 | 1307 | ||
| @@ -1310,13 +1318,17 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1310 | if (netdev_nit) | 1318 | if (netdev_nit) |
| 1311 | dev_queue_xmit_nit(skb, dev); | 1319 | dev_queue_xmit_nit(skb, dev); |
| 1312 | 1320 | ||
| 1313 | if (!netif_needs_gso(dev, skb)) | 1321 | if (netif_needs_gso(dev, skb)) { |
| 1314 | return dev->hard_start_xmit(skb, dev); | 1322 | if (unlikely(dev_gso_segment(skb))) |
| 1323 | goto out_kfree_skb; | ||
| 1324 | if (skb->next) | ||
| 1325 | goto gso; | ||
| 1326 | } | ||
| 1315 | 1327 | ||
| 1316 | if (unlikely(dev_gso_segment(skb))) | 1328 | return dev->hard_start_xmit(skb, dev); |
| 1317 | goto out_kfree_skb; | ||
| 1318 | } | 1329 | } |
| 1319 | 1330 | ||
| 1331 | gso: | ||
| 1320 | do { | 1332 | do { |
| 1321 | struct sk_buff *nskb = skb->next; | 1333 | struct sk_buff *nskb = skb->next; |
| 1322 | int rc; | 1334 | int rc; |
diff --git a/net/core/link_watch.c b/net/core/link_watch.c index 0f37266411b5..4b36114744c5 100644 --- a/net/core/link_watch.c +++ b/net/core/link_watch.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/netdevice.h> | 15 | #include <linux/netdevice.h> |
| 17 | #include <linux/if.h> | 16 | #include <linux/if.h> |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 50a8c73caf97..7ad681f5e712 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Harald Welte Add neighbour cache statistics like rtstat | 15 | * Harald Welte Add neighbour cache statistics like rtstat |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 47a6fceb6771..13472762b18b 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/capability.h> | 12 | #include <linux/capability.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
| 16 | #include <linux/if_arp.h> | 15 | #include <linux/if_arp.h> |
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 3fcfa9c59e1f..20e5bb73f147 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * Vitaly E. Lavrov RTA_OK arithmetics was wrong. | 16 | * Vitaly E. Lavrov RTA_OK arithmetics was wrong. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| @@ -663,7 +662,7 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp) | |||
| 663 | sz_idx = type>>2; | 662 | sz_idx = type>>2; |
| 664 | kind = type&3; | 663 | kind = type&3; |
| 665 | 664 | ||
| 666 | if (kind != 2 && security_netlink_recv(skb)) { | 665 | if (kind != 2 && security_netlink_recv(skb, CAP_NET_ADMIN)) { |
| 667 | *errp = -EPERM; | 666 | *errp = -EPERM; |
| 668 | return -1; | 667 | return -1; |
| 669 | } | 668 | } |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 6edbb90cbcec..7cfbdb215ba2 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | * The functions in this file will not compile correctly with gcc 2.4.x | 38 | * The functions in this file will not compile correctly with gcc 2.4.x |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/config.h> | ||
| 42 | #include <linux/module.h> | 41 | #include <linux/module.h> |
| 43 | #include <linux/types.h> | 42 | #include <linux/types.h> |
| 44 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| @@ -272,7 +271,7 @@ static void skb_clone_fraglist(struct sk_buff *skb) | |||
| 272 | skb_get(list); | 271 | skb_get(list); |
| 273 | } | 272 | } |
| 274 | 273 | ||
| 275 | void skb_release_data(struct sk_buff *skb) | 274 | static void skb_release_data(struct sk_buff *skb) |
| 276 | { | 275 | { |
| 277 | if (!skb->cloned || | 276 | if (!skb->cloned || |
| 278 | !atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1, | 277 | !atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1, |
| @@ -1848,13 +1847,13 @@ EXPORT_SYMBOL_GPL(skb_pull_rcsum); | |||
| 1848 | /** | 1847 | /** |
| 1849 | * skb_segment - Perform protocol segmentation on skb. | 1848 | * skb_segment - Perform protocol segmentation on skb. |
| 1850 | * @skb: buffer to segment | 1849 | * @skb: buffer to segment |
| 1851 | * @sg: whether scatter-gather can be used for generated segments | 1850 | * @features: features for the output path (see dev->features) |
| 1852 | * | 1851 | * |
| 1853 | * This function performs segmentation on the given skb. It returns | 1852 | * This function performs segmentation on the given skb. It returns |
| 1854 | * the segment at the given position. It returns NULL if there are | 1853 | * the segment at the given position. It returns NULL if there are |
| 1855 | * no more segments to generate, or when an error is encountered. | 1854 | * no more segments to generate, or when an error is encountered. |
| 1856 | */ | 1855 | */ |
| 1857 | struct sk_buff *skb_segment(struct sk_buff *skb, int sg) | 1856 | struct sk_buff *skb_segment(struct sk_buff *skb, int features) |
| 1858 | { | 1857 | { |
| 1859 | struct sk_buff *segs = NULL; | 1858 | struct sk_buff *segs = NULL; |
| 1860 | struct sk_buff *tail = NULL; | 1859 | struct sk_buff *tail = NULL; |
| @@ -1863,6 +1862,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int sg) | |||
| 1863 | unsigned int offset = doffset; | 1862 | unsigned int offset = doffset; |
| 1864 | unsigned int headroom; | 1863 | unsigned int headroom; |
| 1865 | unsigned int len; | 1864 | unsigned int len; |
| 1865 | int sg = features & NETIF_F_SG; | ||
| 1866 | int nfrags = skb_shinfo(skb)->nr_frags; | 1866 | int nfrags = skb_shinfo(skb)->nr_frags; |
| 1867 | int err = -ENOMEM; | 1867 | int err = -ENOMEM; |
| 1868 | int i = 0; | 1868 | int i = 0; |
diff --git a/net/core/sock.c b/net/core/sock.c index 5d820c376653..533b9317144b 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
| @@ -92,7 +92,6 @@ | |||
| 92 | */ | 92 | */ |
| 93 | 93 | ||
| 94 | #include <linux/capability.h> | 94 | #include <linux/capability.h> |
| 95 | #include <linux/config.h> | ||
| 96 | #include <linux/errno.h> | 95 | #include <linux/errno.h> |
| 97 | #include <linux/types.h> | 96 | #include <linux/types.h> |
| 98 | #include <linux/socket.h> | 97 | #include <linux/socket.h> |
| @@ -565,6 +564,13 @@ set_rcvbuf: | |||
| 565 | ret = -ENONET; | 564 | ret = -ENONET; |
| 566 | break; | 565 | break; |
| 567 | 566 | ||
| 567 | case SO_PASSSEC: | ||
| 568 | if (valbool) | ||
| 569 | set_bit(SOCK_PASSSEC, &sock->flags); | ||
| 570 | else | ||
| 571 | clear_bit(SOCK_PASSSEC, &sock->flags); | ||
| 572 | break; | ||
| 573 | |||
| 568 | /* We implement the SO_SNDLOWAT etc to | 574 | /* We implement the SO_SNDLOWAT etc to |
| 569 | not be settable (1003.1g 5.3) */ | 575 | not be settable (1003.1g 5.3) */ |
| 570 | default: | 576 | default: |
| @@ -723,6 +729,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname, | |||
| 723 | v.val = sk->sk_state == TCP_LISTEN; | 729 | v.val = sk->sk_state == TCP_LISTEN; |
| 724 | break; | 730 | break; |
| 725 | 731 | ||
| 732 | case SO_PASSSEC: | ||
| 733 | v.val = test_bit(SOCK_PASSSEC, &sock->flags) ? 1 : 0; | ||
| 734 | break; | ||
| 735 | |||
| 726 | case SO_PEERSEC: | 736 | case SO_PEERSEC: |
| 727 | return security_socket_getpeersec_stream(sock, optval, optlen, len); | 737 | return security_socket_getpeersec_stream(sock, optval, optlen, len); |
| 728 | 738 | ||
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 710453656721..02534131d88e 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 9 | #include <linux/sysctl.h> | 9 | #include <linux/sysctl.h> |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/socket.h> | 11 | #include <linux/socket.h> |
| 13 | #include <net/sock.h> | 12 | #include <net/sock.h> |
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h index ec7a89bb7b39..0adf4b56c34c 100644 --- a/net/dccp/ackvec.h +++ b/net/dccp/ackvec.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/compiler.h> | 14 | #include <linux/compiler.h> |
| 16 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 17 | #include <linux/time.h> | 16 | #include <linux/time.h> |
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index d4f9e2d33453..e9615627dcd6 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * - jiffies wrapping | 30 | * - jiffies wrapping |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include "../ccid.h" | 33 | #include "../ccid.h" |
| 35 | #include "../dccp.h" | 34 | #include "../dccp.h" |
| 36 | #include "ccid2.h" | 35 | #include "ccid2.h" |
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index b4a51d0355a5..c39bff706cfc 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 34 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include "../ccid.h" | 37 | #include "../ccid.h" |
| 39 | #include "../dccp.h" | 38 | #include "../dccp.h" |
| 40 | #include "lib/packet_history.h" | 39 | #include "lib/packet_history.h" |
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index f18b96d4e5a2..5ade4f668b22 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #ifndef _DCCP_CCID3_H_ | 36 | #ifndef _DCCP_CCID3_H_ |
| 37 | #define _DCCP_CCID3_H_ | 37 | #define _DCCP_CCID3_H_ |
| 38 | 38 | ||
| 39 | #include <linux/config.h> | ||
| 40 | #include <linux/list.h> | 39 | #include <linux/list.h> |
| 41 | #include <linux/time.h> | 40 | #include <linux/time.h> |
| 42 | #include <linux/types.h> | 41 | #include <linux/types.h> |
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c index 4c01a54143ad..5d7b7d864385 100644 --- a/net/dccp/ccids/lib/loss_interval.c +++ b/net/dccp/ccids/lib/loss_interval.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * (at your option) any later version. | 11 | * (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | 15 | ||
| 17 | #include "loss_interval.h" | 16 | #include "loss_interval.h" |
diff --git a/net/dccp/ccids/lib/loss_interval.h b/net/dccp/ccids/lib/loss_interval.h index 417d9d82df3e..43bf78269d1d 100644 --- a/net/dccp/ccids/lib/loss_interval.h +++ b/net/dccp/ccids/lib/loss_interval.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * any later version. | 13 | * any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 18 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 19 | #include <linux/time.h> | 18 | #include <linux/time.h> |
diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c index d3f9d2053830..ad98d6a322eb 100644 --- a/net/dccp/ccids/lib/packet_history.c +++ b/net/dccp/ccids/lib/packet_history.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 34 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 40 | 39 | ||
diff --git a/net/dccp/ccids/lib/packet_history.h b/net/dccp/ccids/lib/packet_history.h index 122e96737ff6..673c209e4e85 100644 --- a/net/dccp/ccids/lib/packet_history.h +++ b/net/dccp/ccids/lib/packet_history.h | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #ifndef _DCCP_PKT_HIST_ | 37 | #ifndef _DCCP_PKT_HIST_ |
| 38 | #define _DCCP_PKT_HIST_ | 38 | #define _DCCP_PKT_HIST_ |
| 39 | 39 | ||
| 40 | #include <linux/config.h> | ||
| 41 | #include <linux/list.h> | 40 | #include <linux/list.h> |
| 42 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
| 43 | #include <linux/time.h> | 42 | #include <linux/time.h> |
diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c index add3cae65e2d..4fd2ebebf5a0 100644 --- a/net/dccp/ccids/lib/tfrc_equation.c +++ b/net/dccp/ccids/lib/tfrc_equation.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * (at your option) any later version. | 12 | * (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | 16 | ||
| 18 | #include <asm/div64.h> | 17 | #include <asm/div64.h> |
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 1fe509148689..d00a2f4ee5dd 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/dccp.h> | 15 | #include <linux/dccp.h> |
| 17 | #include <net/snmp.h> | 16 | #include <net/snmp.h> |
| 18 | #include <net/sock.h> | 17 | #include <net/sock.h> |
diff --git a/net/dccp/diag.c b/net/dccp/diag.c index 0f25dc395967..0f3745585a94 100644 --- a/net/dccp/diag.c +++ b/net/dccp/diag.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | 12 | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/inet_diag.h> | 14 | #include <linux/inet_diag.h> |
diff --git a/net/dccp/feat.c b/net/dccp/feat.c index b39e2a597889..a1b0682ee77c 100644 --- a/net/dccp/feat.c +++ b/net/dccp/feat.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | 14 | ||
| 16 | #include "dccp.h" | 15 | #include "dccp.h" |
diff --git a/net/dccp/input.c b/net/dccp/input.c index bfc53665516b..7f9dc6ac58c9 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/dccp.h> | 13 | #include <linux/dccp.h> |
| 15 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
| 16 | 15 | ||
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index f2c011fd2ba1..c3073e7e81d3 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/dccp.h> | 13 | #include <linux/dccp.h> |
| 15 | #include <linux/icmp.h> | 14 | #include <linux/icmp.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 65e2ab0886e6..ff42bc43263d 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/random.h> | 16 | #include <linux/random.h> |
| 18 | #include <linux/xfrm.h> | 17 | #include <linux/xfrm.h> |
diff --git a/net/dccp/ipv6.h b/net/dccp/ipv6.h index e4d4e9309270..6eef81fdbe56 100644 --- a/net/dccp/ipv6.h +++ b/net/dccp/ipv6.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/dccp.h> | 14 | #include <linux/dccp.h> |
| 16 | #include <linux/ipv6.h> | 15 | #include <linux/ipv6.h> |
| 17 | 16 | ||
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index c0349e5b0551..9045438d6b36 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/dccp.h> | 13 | #include <linux/dccp.h> |
| 15 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
| 16 | #include <linux/timer.h> | 15 | #include <linux/timer.h> |
diff --git a/net/dccp/options.c b/net/dccp/options.c index e9feb2a0c770..c3cda1e39aa8 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version |
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/dccp.h> | 14 | #include <linux/dccp.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
diff --git a/net/dccp/output.c b/net/dccp/output.c index 7409e4a3abdf..58669beee132 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/dccp.h> | 13 | #include <linux/dccp.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/skbuff.h> | 15 | #include <linux/skbuff.h> |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 5317fd3e6691..f4f0627ea41c 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/dccp.h> | 12 | #include <linux/dccp.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c index 64c89e9c229e..c1ba9451bc3d 100644 --- a/net/dccp/sysctl.c +++ b/net/dccp/sysctl.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * as published by the Free Software Foundation. | 9 | * as published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 14 | #include <linux/sysctl.h> | 13 | #include <linux/sysctl.h> |
| 15 | 14 | ||
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 5244415e5f18..8447742f5615 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/dccp.h> | 13 | #include <linux/dccp.h> |
| 15 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
| 16 | 15 | ||
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 2b289ef20ab3..5486247735f6 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
| @@ -99,7 +99,6 @@ Version 0.0.6 2.1.110 07-aug-98 Eduardo Marcelo Serrat | |||
| 99 | dn_bind fixes | 99 | dn_bind fixes |
| 100 | *******************************************************************************/ | 100 | *******************************************************************************/ |
| 101 | 101 | ||
| 102 | #include <linux/config.h> | ||
| 103 | #include <linux/module.h> | 102 | #include <linux/module.h> |
| 104 | #include <linux/errno.h> | 103 | #include <linux/errno.h> |
| 105 | #include <linux/types.h> | 104 | #include <linux/types.h> |
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index a26ff9f44576..98a25208440d 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * devices. All mtu based now. | 24 | * devices. All mtu based now. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/capability.h> | 27 | #include <linux/capability.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index bd4ce8681a12..0375077391b7 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * this code was copied from it. | 17 | * this code was copied from it. |
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/net.h> | 21 | #include <linux/net.h> |
| 23 | #include <linux/socket.h> | 22 | #include <linux/socket.h> |
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index 66e230c3b328..5ce9c9e0565c 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/net.h> | 27 | #include <linux/net.h> |
| 29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 30 | #include <linux/socket.h> | 29 | #include <linux/socket.h> |
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c index a2ba9db1c376..86f7f3b28e70 100644 --- a/net/decnet/dn_nsp_in.c +++ b/net/decnet/dn_nsp_in.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | GNU General Public License for more details. | 45 | GNU General Public License for more details. |
| 46 | *******************************************************************************/ | 46 | *******************************************************************************/ |
| 47 | 47 | ||
| 48 | #include <linux/config.h> | ||
| 49 | #include <linux/errno.h> | 48 | #include <linux/errno.h> |
| 50 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| 51 | #include <linux/socket.h> | 50 | #include <linux/socket.h> |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 5abf7057af00..1355614ec11b 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | GNU General Public License for more details. | 55 | GNU General Public License for more details. |
| 56 | *******************************************************************************/ | 56 | *******************************************************************************/ |
| 57 | 57 | ||
| 58 | #include <linux/config.h> | ||
| 59 | #include <linux/errno.h> | 58 | #include <linux/errno.h> |
| 60 | #include <linux/types.h> | 59 | #include <linux/types.h> |
| 61 | #include <linux/socket.h> | 60 | #include <linux/socket.h> |
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index 446faafe2065..06e785fe5757 100644 --- a/net/decnet/dn_rules.c +++ b/net/decnet/dn_rules.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Changes: | 13 | * Changes: |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 18 | #include <linux/net.h> | 17 | #include <linux/net.h> |
| 19 | #include <linux/socket.h> | 18 | #include <linux/socket.h> |
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 0ebc46af1bdd..37d9d0a1ac8c 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Changes: | 12 | * Changes: |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 17 | #include <linux/net.h> | 16 | #include <linux/net.h> |
| 18 | #include <linux/socket.h> | 17 | #include <linux/socket.h> |
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c index 74133ecd7700..8b99bd33540d 100644 --- a/net/decnet/netfilter/dn_rtmsg.c +++ b/net/decnet/netfilter/dn_rtmsg.c | |||
| @@ -107,7 +107,7 @@ static inline void dnrmg_receive_user_skb(struct sk_buff *skb) | |||
| 107 | if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) | 107 | if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) |
| 108 | return; | 108 | return; |
| 109 | 109 | ||
| 110 | if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN)) | 110 | if (security_netlink_recv(skb, CAP_NET_ADMIN)) |
| 111 | RCV_SKB_FAIL(-EPERM); | 111 | RCV_SKB_FAIL(-EPERM); |
| 112 | 112 | ||
| 113 | /* Eventually we might send routing messages too */ | 113 | /* Eventually we might send routing messages too */ |
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c index bda5920215fd..e246f054f368 100644 --- a/net/decnet/sysctl_net_decnet.c +++ b/net/decnet/sysctl_net_decnet.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Steve Whitehouse - Memory buffer settings, like the tcp ones | 13 | * Steve Whitehouse - Memory buffer settings, like the tcp ones |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 18 | #include <linux/sysctl.h> | 17 | #include <linux/sysctl.h> |
| 19 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index 868265619dbb..309ae4c6549a 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | 13 | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index c971f14712ec..387c71c584ee 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | #include <linux/etherdevice.h> | 51 | #include <linux/etherdevice.h> |
| 52 | #include <linux/skbuff.h> | 52 | #include <linux/skbuff.h> |
| 53 | #include <linux/errno.h> | 53 | #include <linux/errno.h> |
| 54 | #include <linux/config.h> | ||
| 55 | #include <linux/init.h> | 54 | #include <linux/init.h> |
| 56 | #include <linux/if_ether.h> | 55 | #include <linux/if_ether.h> |
| 57 | #include <net/dst.h> | 56 | #include <net/dst.h> |
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c index 78b2d13e80e3..492647382ad0 100644 --- a/net/ieee80211/ieee80211_crypt_ccmp.c +++ b/net/ieee80211/ieee80211_crypt_ccmp.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * more details. | 9 | * more details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index 3fa5df2e1f0b..34dba0ba545d 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * more details. | 9 | * more details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c index 649e581fa565..c5a87724aabe 100644 --- a/net/ieee80211/ieee80211_crypt_wep.c +++ b/net/ieee80211/ieee80211_crypt_wep.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * more details. | 9 | * more details. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/net/ieee80211/ieee80211_geo.c b/net/ieee80211/ieee80211_geo.c index 192243ab35ed..305a09de85a5 100644 --- a/net/ieee80211/ieee80211_geo.c +++ b/net/ieee80211/ieee80211_geo.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | ******************************************************************************/ | 25 | ******************************************************************************/ |
| 26 | #include <linux/compiler.h> | 26 | #include <linux/compiler.h> |
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/if_arp.h> | 28 | #include <linux/if_arp.h> |
| 30 | #include <linux/in6.h> | 29 | #include <linux/in6.h> |
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 2cb84d84f671..13b1e5fff7e4 100644 --- a/net/ieee80211/ieee80211_module.c +++ b/net/ieee80211/ieee80211_module.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | *******************************************************************************/ | 31 | *******************************************************************************/ |
| 32 | 32 | ||
| 33 | #include <linux/compiler.h> | 33 | #include <linux/compiler.h> |
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/if_arp.h> | 35 | #include <linux/if_arp.h> |
| 37 | #include <linux/in6.h> | 36 | #include <linux/in6.h> |
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 2bf567fd5a17..47ccf159372c 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/compiler.h> | 16 | #include <linux/compiler.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/if_arp.h> | 18 | #include <linux/if_arp.h> |
| 20 | #include <linux/in6.h> | 19 | #include <linux/in6.h> |
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 6a5de1b84459..de148ae594f3 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | ******************************************************************************/ | 25 | ******************************************************************************/ |
| 26 | #include <linux/compiler.h> | 26 | #include <linux/compiler.h> |
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/if_arp.h> | 28 | #include <linux/if_arp.h> |
| 30 | #include <linux/in6.h> | 29 | #include <linux/in6.h> |
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 461216b47948..8d157157bf8e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -1097,7 +1097,7 @@ int inet_sk_rebuild_header(struct sock *sk) | |||
| 1097 | 1097 | ||
| 1098 | EXPORT_SYMBOL(inet_sk_rebuild_header); | 1098 | EXPORT_SYMBOL(inet_sk_rebuild_header); |
| 1099 | 1099 | ||
| 1100 | static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int sg) | 1100 | static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features) |
| 1101 | { | 1101 | { |
| 1102 | struct sk_buff *segs = ERR_PTR(-EINVAL); | 1102 | struct sk_buff *segs = ERR_PTR(-EINVAL); |
| 1103 | struct iphdr *iph; | 1103 | struct iphdr *iph; |
| @@ -1126,10 +1126,10 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int sg) | |||
| 1126 | rcu_read_lock(); | 1126 | rcu_read_lock(); |
| 1127 | ops = rcu_dereference(inet_protos[proto]); | 1127 | ops = rcu_dereference(inet_protos[proto]); |
| 1128 | if (ops && ops->gso_segment) | 1128 | if (ops && ops->gso_segment) |
| 1129 | segs = ops->gso_segment(skb, sg); | 1129 | segs = ops->gso_segment(skb, features); |
| 1130 | rcu_read_unlock(); | 1130 | rcu_read_unlock(); |
| 1131 | 1131 | ||
| 1132 | if (IS_ERR(segs)) | 1132 | if (!segs || unlikely(IS_ERR(segs))) |
| 1133 | goto out; | 1133 | goto out; |
| 1134 | 1134 | ||
| 1135 | skb = segs; | 1135 | skb = segs; |
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index c7782230080d..8e748be36c5a 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <net/ip.h> | 2 | #include <net/ip.h> |
| 4 | #include <net/xfrm.h> | 3 | #include <net/xfrm.h> |
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 4749d504c629..7b51b3bdb548 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
| @@ -80,7 +80,6 @@ | |||
| 80 | #include <linux/kernel.h> | 80 | #include <linux/kernel.h> |
| 81 | #include <linux/sched.h> | 81 | #include <linux/sched.h> |
| 82 | #include <linux/capability.h> | 82 | #include <linux/capability.h> |
| 83 | #include <linux/config.h> | ||
| 84 | #include <linux/socket.h> | 83 | #include <linux/socket.h> |
| 85 | #include <linux/sockios.h> | 84 | #include <linux/sockios.h> |
| 86 | #include <linux/errno.h> | 85 | #include <linux/errno.h> |
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index c1b42b5257f8..ec5da4fbd9f4 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/ip.h> | 16 | #include <linux/ip.h> |
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 54419b27686f..a7c65e9e5ec9 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * if no match found. | 27 | * if no match found. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | 30 | ||
| 32 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 33 | #include <asm/system.h> | 32 | #include <asm/system.h> |
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 9bbdd4494551..4e112738b3fa 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <net/ip.h> | 2 | #include <net/ip.h> |
| 4 | #include <net/xfrm.h> | 3 | #include <net/xfrm.h> |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 31387abf53a2..ba2a70745a63 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * 2 of the License, or (at your option) any later version. | 15 | * 2 of the License, or (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
| 21 | #include <asm/system.h> | 20 | #include <asm/system.h> |
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index e2890ec8159e..3c1d32ad35f2 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * 2 of the License, or (at your option) any later version. | 15 | * 2 of the License, or (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
| 20 | #include <asm/system.h> | 19 | #include <asm/system.h> |
| 21 | #include <linux/bitops.h> | 20 | #include <linux/bitops.h> |
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index ec566f3e66c7..6c642d11d4ca 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * Marc Boucher : routing by fwmark | 19 | * Marc Boucher : routing by fwmark |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
| 24 | #include <asm/system.h> | 23 | #include <asm/system.h> |
| 25 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 0f4145babb14..5f87533684d5 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * 2 of the License, or (at your option) any later version. | 15 | * 2 of the License, or (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
| 20 | #include <asm/system.h> | 19 | #include <asm/system.h> |
| 21 | #include <linux/bitops.h> | 20 | #include <linux/bitops.h> |
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 95a639f2e3db..1cb65305e102 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | 52 | ||
| 53 | #define VERSION "0.407" | 53 | #define VERSION "0.407" |
| 54 | 54 | ||
| 55 | #include <linux/config.h> | ||
| 56 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
| 57 | #include <asm/system.h> | 56 | #include <asm/system.h> |
| 58 | #include <asm/bitops.h> | 57 | #include <asm/bitops.h> |
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 017900172f7d..4c86ac3d882d 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | * | 64 | * |
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/config.h> | ||
| 68 | #include <linux/module.h> | 67 | #include <linux/module.h> |
| 69 | #include <linux/types.h> | 68 | #include <linux/types.h> |
| 70 | #include <linux/jiffies.h> | 69 | #include <linux/jiffies.h> |
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index ab680c851aa2..d299c8e547d6 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
| @@ -72,7 +72,6 @@ | |||
| 72 | * Vinay Kulkarni | 72 | * Vinay Kulkarni |
| 73 | */ | 73 | */ |
| 74 | 74 | ||
| 75 | #include <linux/config.h> | ||
| 76 | #include <linux/module.h> | 75 | #include <linux/module.h> |
| 77 | #include <asm/uaccess.h> | 76 | #include <asm/uaccess.h> |
| 78 | #include <asm/system.h> | 77 | #include <asm/system.h> |
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 9a01bb81f8bf..e50a1bfd7ccc 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or(at your option) any later version. | 13 | * 2 of the License, or(at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/jhash.h> | 17 | #include <linux/jhash.h> |
| 19 | 18 | ||
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 457db99c76df..8e7e41b66c79 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/fcntl.h> | 16 | #include <linux/fcntl.h> |
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index ee9b5515b9ae..95fac5532994 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or (at your option) any later version. | 13 | * 2 of the License, or (at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/random.h> | 17 | #include <linux/random.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index 417f126c749e..cdd805344c61 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * From code orinally in TCP | 8 | * From code orinally in TCP |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | #include <net/inet_hashtables.h> | 12 | #include <net/inet_hashtables.h> |
| 14 | #include <net/inet_timewait_sock.h> | 13 | #include <net/inet_timewait_sock.h> |
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c index 9f0bb529ab70..a22d11d2911c 100644 --- a/net/ipv4/ip_forward.c +++ b/net/ipv4/ip_forward.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Mike McLagan : Routing by source | 21 | * Mike McLagan : Routing by source |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 26 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 27 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index da734c439179..b84b53a47526 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/compiler.h> | 25 | #include <linux/compiler.h> |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index ab99bebdcdc8..6ff9b10d9563 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/capability.h> | 13 | #include <linux/capability.h> |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index c9026dbf4c93..e1a7dba2fa8a 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c | |||
| @@ -121,7 +121,6 @@ | |||
| 121 | #include <linux/kernel.h> | 121 | #include <linux/kernel.h> |
| 122 | #include <linux/string.h> | 122 | #include <linux/string.h> |
| 123 | #include <linux/errno.h> | 123 | #include <linux/errno.h> |
| 124 | #include <linux/config.h> | ||
| 125 | 124 | ||
| 126 | #include <linux/net.h> | 125 | #include <linux/net.h> |
| 127 | #include <linux/socket.h> | 126 | #include <linux/socket.h> |
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 7624fd1d8f9f..ca0e714613fb 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | #include <linux/mm.h> | 53 | #include <linux/mm.h> |
| 54 | #include <linux/string.h> | 54 | #include <linux/string.h> |
| 55 | #include <linux/errno.h> | 55 | #include <linux/errno.h> |
| 56 | #include <linux/config.h> | ||
| 57 | 56 | ||
| 58 | #include <linux/socket.h> | 57 | #include <linux/socket.h> |
| 59 | #include <linux/sockios.h> | 58 | #include <linux/sockios.h> |
| @@ -744,7 +743,7 @@ static inline int ip_ufo_append_data(struct sock *sk, | |||
| 744 | if (!err) { | 743 | if (!err) { |
| 745 | /* specify the length of each IP datagram fragment*/ | 744 | /* specify the length of each IP datagram fragment*/ |
| 746 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen; | 745 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen; |
| 747 | skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4; | 746 | skb_shinfo(skb)->gso_type = SKB_GSO_UDP; |
| 748 | __skb_queue_tail(&sk->sk_write_queue, skb); | 747 | __skb_queue_tail(&sk->sk_write_queue, skb); |
| 749 | 748 | ||
| 750 | return 0; | 749 | return 0; |
| @@ -1089,7 +1088,7 @@ ssize_t ip_append_page(struct sock *sk, struct page *page, | |||
| 1089 | if ((sk->sk_protocol == IPPROTO_UDP) && | 1088 | if ((sk->sk_protocol == IPPROTO_UDP) && |
| 1090 | (rt->u.dst.dev->features & NETIF_F_UFO)) { | 1089 | (rt->u.dst.dev->features & NETIF_F_UFO)) { |
| 1091 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen; | 1090 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen; |
| 1092 | skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4; | 1091 | skb_shinfo(skb)->gso_type = SKB_GSO_UDP; |
| 1093 | } | 1092 | } |
| 1094 | 1093 | ||
| 1095 | 1094 | ||
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 12e0bf19f24a..84f43a3c9098 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Mike McLagan : Routing by source | 17 | * Mike McLagan : Routing by source |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 3ed8b57a1002..8e0374847532 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * - Compression stats. | 13 | * - Compression stats. |
| 14 | * - Adaptive compression. | 14 | * - Adaptive compression. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <asm/scatterlist.h> | 17 | #include <asm/scatterlist.h> |
| 19 | #include <asm/semaphore.h> | 18 | #include <asm/semaphore.h> |
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index ea398ee43f28..3291d5192aad 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
| @@ -94,7 +94,6 @@ | |||
| 94 | 94 | ||
| 95 | 95 | ||
| 96 | #include <linux/capability.h> | 96 | #include <linux/capability.h> |
| 97 | #include <linux/config.h> | ||
| 98 | #include <linux/module.h> | 97 | #include <linux/module.h> |
| 99 | #include <linux/types.h> | 98 | #include <linux/types.h> |
| 100 | #include <linux/sched.h> | 99 | #include <linux/sched.h> |
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 717ab7d6d7b6..ba33f8621c67 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * | 28 | * |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <asm/system.h> | 31 | #include <asm/system.h> |
| 33 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
diff --git a/net/ipv4/ipvs/ip_vs_est.c b/net/ipv4/ipvs/ip_vs_est.c index c453e1e57f4b..4c1940381ba0 100644 --- a/net/ipv4/ipvs/ip_vs_est.c +++ b/net/ipv4/ipvs/ip_vs_est.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Changes: | 13 | * Changes: |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/jiffies.h> | 17 | #include <linux/jiffies.h> |
| 19 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
diff --git a/net/ipv4/multipath_drr.c b/net/ipv4/multipath_drr.c index db67373f9b34..252e837b17a5 100644 --- a/net/ipv4/multipath_drr.c +++ b/net/ipv4/multipath_drr.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/net/ipv4/multipath_random.c b/net/ipv4/multipath_random.c index 5249dbe7c559..b8c289f247cb 100644 --- a/net/ipv4/multipath_random.c +++ b/net/ipv4/multipath_random.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/net/ipv4/multipath_rr.c b/net/ipv4/multipath_rr.c index b6cd2870478f..bba5abe5542d 100644 --- a/net/ipv4/multipath_rr.c +++ b/net/ipv4/multipath_rr.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c index 342d0b9098f5..d25ec4ae09e5 100644 --- a/net/ipv4/multipath_wrandom.c +++ b/net/ipv4/multipath_wrandom.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index e1d7f5fbc526..ef0b5aac5838 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
| @@ -332,7 +332,7 @@ config IP_NF_MATCH_HASHLIMIT | |||
| 332 | help | 332 | help |
| 333 | This option adds a new iptables `hashlimit' match. | 333 | This option adds a new iptables `hashlimit' match. |
| 334 | 334 | ||
| 335 | As opposed to `limit', this match dynamically crates a hash table | 335 | As opposed to `limit', this match dynamically creates a hash table |
| 336 | of limit buckets, based on your selection of source/destination | 336 | of limit buckets, based on your selection of source/destination |
| 337 | ip addresses and/or ports. | 337 | ip addresses and/or ports. |
| 338 | 338 | ||
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c index d0d19192026d..80c73ca90116 100644 --- a/net/ipv4/netfilter/arp_tables.c +++ b/net/ipv4/netfilter/arp_tables.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/skbuff.h> | 13 | #include <linux/skbuff.h> |
| 15 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
| @@ -1120,7 +1119,8 @@ int arpt_register_table(struct arpt_table *table, | |||
| 1120 | return ret; | 1119 | return ret; |
| 1121 | } | 1120 | } |
| 1122 | 1121 | ||
| 1123 | if (xt_register_table(table, &bootstrap, newinfo) != 0) { | 1122 | ret = xt_register_table(table, &bootstrap, newinfo); |
| 1123 | if (ret != 0) { | ||
| 1124 | xt_free_table_info(newinfo); | 1124 | xt_free_table_info(newinfo); |
| 1125 | return ret; | 1125 | return ret; |
| 1126 | } | 1126 | } |
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 7e4cf9a4d15f..aa459177c3f8 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * - export ip_conntrack[_expect]_{find_get,put} functions | 17 | * - export ip_conntrack[_expect]_{find_get,put} functions |
| 18 | * */ | 18 | * */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/icmp.h> | 21 | #include <linux/icmp.h> |
| 23 | #include <linux/ip.h> | 22 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c index 4dcf526c3944..1d18c863f064 100644 --- a/net/ipv4/netfilter/ip_conntrack_ftp.c +++ b/net/ipv4/netfilter/ip_conntrack_ftp.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/netfilter.h> | 12 | #include <linux/netfilter.h> |
| 14 | #include <linux/ip.h> | 13 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323.c b/net/ipv4/netfilter/ip_conntrack_helper_h323.c index 0665674218c6..af35235672d5 100644 --- a/net/ipv4/netfilter/ip_conntrack_helper_h323.c +++ b/net/ipv4/netfilter/ip_conntrack_helper_h323.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * For more information, please see http://nath323.sourceforge.net/ | 11 | * For more information, please see http://nath323.sourceforge.net/ |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/netfilter.h> | 15 | #include <linux/netfilter.h> |
| 17 | #include <linux/ip.h> | 16 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c index 8ccfe17bb253..b020a33e65e9 100644 --- a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c +++ b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * | 46 | * |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 51 | #include <linux/netfilter.h> | 50 | #include <linux/netfilter.h> |
| 52 | #include <linux/ip.h> | 51 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c index a2ac5ce544b2..44889075f3b2 100644 --- a/net/ipv4/netfilter/ip_conntrack_irc.c +++ b/net/ipv4/netfilter/ip_conntrack_irc.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/netfilter.h> | 26 | #include <linux/netfilter.h> |
| 28 | #include <linux/ip.h> | 27 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_gre.c b/net/ipv4/netfilter/ip_conntrack_proto_gre.c index 21ee124c0463..4ee016c427b4 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/timer.h> | 28 | #include <linux/timer.h> |
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c index 0416073c5600..2d3612cd5f18 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c | |||
| @@ -254,7 +254,7 @@ static int do_basic_checks(struct ip_conntrack *conntrack, | |||
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | DEBUGP("Basic checks passed\n"); | 256 | DEBUGP("Basic checks passed\n"); |
| 257 | return 0; | 257 | return count == 0; |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | static int new_state(enum ip_conntrack_dir dir, | 260 | static int new_state(enum ip_conntrack_dir dir, |
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index c5c2ce5cdeb8..fb920e76ec10 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * version 2.2 | 19 | * version 2.2 |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 25 | #include <linux/timer.h> | 24 | #include <linux/timer.h> |
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index 88445aac3f28..7bd3c22003a2 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/ip.h> | 16 | #include <linux/ip.h> |
| 18 | #include <linux/netfilter.h> | 17 | #include <linux/netfilter.h> |
diff --git a/net/ipv4/netfilter/ip_nat_helper.c b/net/ipv4/netfilter/ip_nat_helper.c index 5d506e0564d5..cbcaa45370ae 100644 --- a/net/ipv4/netfilter/ip_nat_helper.c +++ b/net/ipv4/netfilter/ip_nat_helper.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * - make ip_nat_resize_packet more generic (TCP and UDP) | 15 | * - make ip_nat_resize_packet more generic (TCP and UDP) |
| 16 | * - add ip_nat_mangle_udp_packet | 16 | * - add ip_nat_mangle_udp_packet |
| 17 | */ | 17 | */ |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kmod.h> | 19 | #include <linux/kmod.h> |
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
diff --git a/net/ipv4/netfilter/ip_nat_helper_pptp.c b/net/ipv4/netfilter/ip_nat_helper_pptp.c index f3977726ff09..1d149964dc38 100644 --- a/net/ipv4/netfilter/ip_nat_helper_pptp.c +++ b/net/ipv4/netfilter/ip_nat_helper_pptp.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * | 35 | * |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 40 | #include <linux/ip.h> | 39 | #include <linux/ip.h> |
| 41 | #include <linux/tcp.h> | 40 | #include <linux/tcp.h> |
diff --git a/net/ipv4/netfilter/ip_nat_proto_gre.c b/net/ipv4/netfilter/ip_nat_proto_gre.c index 96ceabaec402..38acfdf540eb 100644 --- a/net/ipv4/netfilter/ip_nat_proto_gre.c +++ b/net/ipv4/netfilter/ip_nat_proto_gre.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | #include <linux/ip.h> | 27 | #include <linux/ip.h> |
| 29 | #include <linux/netfilter_ipv4/ip_nat.h> | 28 | #include <linux/netfilter_ipv4/ip_nat.h> |
diff --git a/net/ipv4/netfilter/ip_nat_snmp_basic.c b/net/ipv4/netfilter/ip_nat_snmp_basic.c index d20d557f915a..0b1b416759cc 100644 --- a/net/ipv4/netfilter/ip_nat_snmp_basic.c +++ b/net/ipv4/netfilter/ip_nat_snmp_basic.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | * 2000-08-06: Convert to new helper API (Harald Welte). | 43 | * 2000-08-06: Convert to new helper API (Harald Welte). |
| 44 | * | 44 | * |
| 45 | */ | 45 | */ |
| 46 | #include <linux/config.h> | ||
| 47 | #include <linux/in.h> | 46 | #include <linux/in.h> |
| 48 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 49 | #include <linux/types.h> | 48 | #include <linux/types.h> |
diff --git a/net/ipv4/netfilter/ip_nat_standalone.c b/net/ipv4/netfilter/ip_nat_standalone.c index 67e676783da9..17de077a7901 100644 --- a/net/ipv4/netfilter/ip_nat_standalone.c +++ b/net/ipv4/netfilter/ip_nat_standalone.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * - now capable of multiple expectations for one master | 18 | * - now capable of multiple expectations for one master |
| 19 | * */ | 19 | * */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | #include <linux/icmp.h> | 22 | #include <linux/icmp.h> |
| 24 | #include <linux/ip.h> | 23 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c index b93f0494362f..198ac36db861 100644 --- a/net/ipv4/netfilter/ip_queue.c +++ b/net/ipv4/netfilter/ip_queue.c | |||
| @@ -457,11 +457,19 @@ dev_cmp(struct ipq_queue_entry *entry, unsigned long ifindex) | |||
| 457 | if (entry->info->indev) | 457 | if (entry->info->indev) |
| 458 | if (entry->info->indev->ifindex == ifindex) | 458 | if (entry->info->indev->ifindex == ifindex) |
| 459 | return 1; | 459 | return 1; |
| 460 | |||
| 461 | if (entry->info->outdev) | 460 | if (entry->info->outdev) |
| 462 | if (entry->info->outdev->ifindex == ifindex) | 461 | if (entry->info->outdev->ifindex == ifindex) |
| 463 | return 1; | 462 | return 1; |
| 464 | 463 | #ifdef CONFIG_BRIDGE_NETFILTER | |
| 464 | if (entry->skb->nf_bridge) { | ||
| 465 | if (entry->skb->nf_bridge->physindev && | ||
| 466 | entry->skb->nf_bridge->physindev->ifindex == ifindex) | ||
| 467 | return 1; | ||
| 468 | if (entry->skb->nf_bridge->physoutdev && | ||
| 469 | entry->skb->nf_bridge->physoutdev->ifindex == ifindex) | ||
| 470 | return 1; | ||
| 471 | } | ||
| 472 | #endif | ||
| 465 | return 0; | 473 | return 0; |
| 466 | } | 474 | } |
| 467 | 475 | ||
| @@ -507,7 +515,7 @@ ipq_rcv_skb(struct sk_buff *skb) | |||
| 507 | if (type <= IPQM_BASE) | 515 | if (type <= IPQM_BASE) |
| 508 | return; | 516 | return; |
| 509 | 517 | ||
| 510 | if (security_netlink_recv(skb)) | 518 | if (security_netlink_recv(skb, CAP_NET_ADMIN)) |
| 511 | RCV_SKB_FAIL(-EPERM); | 519 | RCV_SKB_FAIL(-EPERM); |
| 512 | 520 | ||
| 513 | write_lock_bh(&queue_lock); | 521 | write_lock_bh(&queue_lock); |
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 706c0025ec5e..fc5bdd5eb7d3 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 08 Oct 2005 Harald Welte <lafore@netfilter.org> | 14 | * 08 Oct 2005 Harald Welte <lafore@netfilter.org> |
| 15 | * - Generalize into "x_tables" layer and "{ip,ip6,arp}_tables" | 15 | * - Generalize into "x_tables" layer and "{ip,ip6,arp}_tables" |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/cache.h> | 17 | #include <linux/cache.h> |
| 19 | #include <linux/capability.h> | 18 | #include <linux/capability.h> |
| 20 | #include <linux/skbuff.h> | 19 | #include <linux/skbuff.h> |
| @@ -2113,7 +2112,8 @@ int ipt_register_table(struct xt_table *table, const struct ipt_replace *repl) | |||
| 2113 | return ret; | 2112 | return ret; |
| 2114 | } | 2113 | } |
| 2115 | 2114 | ||
| 2116 | if (xt_register_table(table, &bootstrap, newinfo) != 0) { | 2115 | ret = xt_register_table(table, &bootstrap, newinfo); |
| 2116 | if (ret != 0) { | ||
| 2117 | xt_free_table_info(newinfo); | 2117 | xt_free_table_info(newinfo); |
| 2118 | return ret; | 2118 | return ret; |
| 2119 | } | 2119 | } |
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index dbc83c5d7aa6..cbffeae3f565 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
| 15 | #include <linux/jhash.h> | 14 | #include <linux/jhash.h> |
| 16 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c index 8b3e7f99b861..ebd94f2abf0d 100644 --- a/net/ipv4/netfilter/ipt_MASQUERADE.c +++ b/net/ipv4/netfilter/ipt_MASQUERADE.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/inetdevice.h> | 13 | #include <linux/inetdevice.h> |
| 15 | #include <linux/ip.h> | 14 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ipt_NETMAP.c b/net/ipv4/netfilter/ipt_NETMAP.c index 2fcf1075b027..736c4b5a86a7 100644 --- a/net/ipv4/netfilter/ipt_NETMAP.c +++ b/net/ipv4/netfilter/ipt_NETMAP.c | |||
| @@ -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 | #include <linux/ip.h> | 13 | #include <linux/ip.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/netdevice.h> | 15 | #include <linux/netdevice.h> |
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c index 431a3ce6f7b7..269bc2067cb8 100644 --- a/net/ipv4/netfilter/ipt_REJECT.c +++ b/net/ipv4/netfilter/ipt_REJECT.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/skbuff.h> | 16 | #include <linux/skbuff.h> |
| 18 | #include <linux/ip.h> | 17 | #include <linux/ip.h> |
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c index c84cc03389d8..d7dd7fe7051c 100644 --- a/net/ipv4/netfilter/ipt_ULOG.c +++ b/net/ipv4/netfilter/ipt_ULOG.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 50 | #include <linux/config.h> | ||
| 51 | #include <linux/spinlock.h> | 50 | #include <linux/spinlock.h> |
| 52 | #include <linux/socket.h> | 51 | #include <linux/socket.h> |
| 53 | #include <linux/skbuff.h> | 52 | #include <linux/skbuff.h> |
diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c index 397b95cc026b..4e7998beda63 100644 --- a/net/ipv4/netfilter/iptable_mangle.c +++ b/net/ipv4/netfilter/iptable_mangle.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | * Extended to all five netfilter hooks by Brad Chapman & Harald Welte | 11 | * Extended to all five netfilter hooks by Brad Chapman & Harald Welte |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/netfilter_ipv4/ip_tables.h> | 14 | #include <linux/netfilter_ipv4/ip_tables.h> |
| 16 | #include <linux/netdevice.h> | 15 | #include <linux/netdevice.h> |
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 8cc8e1b36778..0af803df82b0 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Derived from net/ipv4/netfilter/ip_conntrack_standalone.c | 14 | * Derived from net/ipv4/netfilter/ip_conntrack_standalone.c |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/ip.h> | 18 | #include <linux/ip.h> |
| 20 | #include <linux/netfilter.h> | 19 | #include <linux/netfilter.h> |
diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c index 291831e792af..05f5114828ea 100644 --- a/net/ipv4/protocol.c +++ b/net/ipv4/protocol.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
| 34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/socket.h> | 35 | #include <linux/socket.h> |
| 37 | #include <linux/in.h> | 36 | #include <linux/in.h> |
| 38 | #include <linux/inet.h> | 37 | #include <linux/inet.h> |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 60b11aece5c3..da44fabf4dc5 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | * 2 of the License, or (at your option) any later version. | 64 | * 2 of the License, or (at your option) any later version. |
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/config.h> | ||
| 68 | #include <linux/module.h> | 67 | #include <linux/module.h> |
| 69 | #include <asm/uaccess.h> | 68 | #include <asm/uaccess.h> |
| 70 | #include <asm/system.h> | 69 | #include <asm/system.h> |
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index ce4cd5f35511..70cea9d08a38 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/sysctl.h> | 12 | #include <linux/sysctl.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/igmp.h> | 13 | #include <linux/igmp.h> |
| 15 | #include <linux/inetdevice.h> | 14 | #include <linux/inetdevice.h> |
| 16 | #include <net/snmp.h> | 15 | #include <net/snmp.h> |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c04176be7ed1..804458712d88 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -247,7 +247,6 @@ | |||
| 247 | * TCP_CLOSE socket is finished | 247 | * TCP_CLOSE socket is finished |
| 248 | */ | 248 | */ |
| 249 | 249 | ||
| 250 | #include <linux/config.h> | ||
| 251 | #include <linux/module.h> | 250 | #include <linux/module.h> |
| 252 | #include <linux/types.h> | 251 | #include <linux/types.h> |
| 253 | #include <linux/fcntl.h> | 252 | #include <linux/fcntl.h> |
| @@ -643,7 +642,7 @@ static inline int select_size(struct sock *sk, struct tcp_sock *tp) | |||
| 643 | int tmp = tp->mss_cache; | 642 | int tmp = tp->mss_cache; |
| 644 | 643 | ||
| 645 | if (sk->sk_route_caps & NETIF_F_SG) { | 644 | if (sk->sk_route_caps & NETIF_F_SG) { |
| 646 | if (sk->sk_route_caps & NETIF_F_TSO) | 645 | if (sk_can_gso(sk)) |
| 647 | tmp = 0; | 646 | tmp = 0; |
| 648 | else { | 647 | else { |
| 649 | int pgbreak = SKB_MAX_HEAD(MAX_TCP_HEADER); | 648 | int pgbreak = SKB_MAX_HEAD(MAX_TCP_HEADER); |
| @@ -2145,7 +2144,7 @@ int compat_tcp_getsockopt(struct sock *sk, int level, int optname, | |||
| 2145 | EXPORT_SYMBOL(compat_tcp_getsockopt); | 2144 | EXPORT_SYMBOL(compat_tcp_getsockopt); |
| 2146 | #endif | 2145 | #endif |
| 2147 | 2146 | ||
| 2148 | struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int sg) | 2147 | struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features) |
| 2149 | { | 2148 | { |
| 2150 | struct sk_buff *segs = ERR_PTR(-EINVAL); | 2149 | struct sk_buff *segs = ERR_PTR(-EINVAL); |
| 2151 | struct tcphdr *th; | 2150 | struct tcphdr *th; |
| @@ -2169,7 +2168,17 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int sg) | |||
| 2169 | oldlen = (u16)~skb->len; | 2168 | oldlen = (u16)~skb->len; |
| 2170 | __skb_pull(skb, thlen); | 2169 | __skb_pull(skb, thlen); |
| 2171 | 2170 | ||
| 2172 | segs = skb_segment(skb, sg); | 2171 | if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) { |
| 2172 | /* Packet is from an untrusted source, reset gso_segs. */ | ||
| 2173 | int mss = skb_shinfo(skb)->gso_size; | ||
| 2174 | |||
| 2175 | skb_shinfo(skb)->gso_segs = (skb->len + mss - 1) / mss; | ||
| 2176 | |||
| 2177 | segs = NULL; | ||
| 2178 | goto out; | ||
| 2179 | } | ||
| 2180 | |||
| 2181 | segs = skb_segment(skb, features); | ||
| 2173 | if (IS_ERR(segs)) | 2182 | if (IS_ERR(segs)) |
| 2174 | goto out; | 2183 | goto out; |
| 2175 | 2184 | ||
| @@ -2205,6 +2214,7 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int sg) | |||
| 2205 | out: | 2214 | out: |
| 2206 | return segs; | 2215 | return segs; |
| 2207 | } | 2216 | } |
| 2217 | EXPORT_SYMBOL(tcp_tso_segment); | ||
| 2208 | 2218 | ||
| 2209 | extern void __skb_cb_too_small_for_tcp(int, int); | 2219 | extern void __skb_cb_too_small_for_tcp(int, int); |
| 2210 | extern struct tcp_congestion_ops tcp_reno; | 2220 | extern struct tcp_congestion_ops tcp_reno; |
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c index b2d9021ad22b..b0134ab08379 100644 --- a/net/ipv4/tcp_bic.c +++ b/net/ipv4/tcp_bic.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * this behaves the same as the original Reno. | 12 | * this behaves the same as the original Reno. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <net/tcp.h> | 17 | #include <net/tcp.h> |
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c index 857eefc52aab..5765f9d03174 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org> | 6 | * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c index 78b7a6b9e4de..2be27980ca78 100644 --- a/net/ipv4/tcp_cubic.c +++ b/net/ipv4/tcp_cubic.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * this behaves the same as the original Reno. | 12 | * this behaves the same as the original Reno. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <net/tcp.h> | 17 | #include <net/tcp.h> |
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c index c148c1081880..57c5f0b10e6c 100644 --- a/net/ipv4/tcp_diag.c +++ b/net/ipv4/tcp_diag.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * 2 of the License, or (at your option) any later version. | 11 | * 2 of the License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | 14 | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/inet_diag.h> | 16 | #include <linux/inet_diag.h> |
| @@ -26,7 +25,10 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, | |||
| 26 | const struct tcp_sock *tp = tcp_sk(sk); | 25 | const struct tcp_sock *tp = tcp_sk(sk); |
| 27 | struct tcp_info *info = _info; | 26 | struct tcp_info *info = _info; |
| 28 | 27 | ||
| 29 | r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq; | 28 | if (sk->sk_state == TCP_LISTEN) |
| 29 | r->idiag_rqueue = sk->sk_ack_backlog; | ||
| 30 | else | ||
| 31 | r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq; | ||
| 30 | r->idiag_wqueue = tp->write_seq - tp->snd_una; | 32 | r->idiag_wqueue = tp->write_seq - tp->snd_una; |
| 31 | if (info != NULL) | 33 | if (info != NULL) |
| 32 | tcp_get_info(sk, info); | 34 | tcp_get_info(sk, info); |
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c index 1120245b2373..aaa1538c0692 100644 --- a/net/ipv4/tcp_highspeed.c +++ b/net/ipv4/tcp_highspeed.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * John Heffner <jheffner@psc.edu> | 6 | * John Heffner <jheffner@psc.edu> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <net/tcp.h> | 10 | #include <net/tcp.h> |
| 12 | 11 | ||
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c index 3d92c1859267..6edfe5e4510e 100644 --- a/net/ipv4/tcp_htcp.c +++ b/net/ipv4/tcp_htcp.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * http://www.hamilton.ie/net/htcp3.pdf | 6 | * http://www.hamilton.ie/net/htcp3.pdf |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <net/tcp.h> | 11 | #include <net/tcp.h> |
diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c index 40dbb3877510..7406e0c5fb8e 100644 --- a/net/ipv4/tcp_hybla.c +++ b/net/ipv4/tcp_hybla.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * root at danielinux.net | 10 | * root at danielinux.net |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <net/tcp.h> | 14 | #include <net/tcp.h> |
| 16 | 15 | ||
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 94fe5b1f9dcb..738dad9f7d49 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | * Pasi Sarolahti: F-RTO for dealing with spurious RTOs | 63 | * Pasi Sarolahti: F-RTO for dealing with spurious RTOs |
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | #include <linux/config.h> | ||
| 67 | #include <linux/mm.h> | 66 | #include <linux/mm.h> |
| 68 | #include <linux/module.h> | 67 | #include <linux/module.h> |
| 69 | #include <linux/sysctl.h> | 68 | #include <linux/sysctl.h> |
| @@ -4178,8 +4177,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, | |||
| 4178 | */ | 4177 | */ |
| 4179 | 4178 | ||
| 4180 | TCP_ECN_rcv_synack(tp, th); | 4179 | TCP_ECN_rcv_synack(tp, th); |
| 4181 | if (tp->ecn_flags&TCP_ECN_OK) | ||
| 4182 | sock_set_flag(sk, SOCK_NO_LARGESEND); | ||
| 4183 | 4180 | ||
| 4184 | tp->snd_wl1 = TCP_SKB_CB(skb)->seq; | 4181 | tp->snd_wl1 = TCP_SKB_CB(skb)->seq; |
| 4185 | tcp_ack(sk, skb, FLAG_SLOWPATH); | 4182 | tcp_ack(sk, skb, FLAG_SLOWPATH); |
| @@ -4322,8 +4319,6 @@ discard: | |||
| 4322 | tp->max_window = tp->snd_wnd; | 4319 | tp->max_window = tp->snd_wnd; |
| 4323 | 4320 | ||
| 4324 | TCP_ECN_rcv_syn(tp, th); | 4321 | TCP_ECN_rcv_syn(tp, th); |
| 4325 | if (tp->ecn_flags&TCP_ECN_OK) | ||
| 4326 | sock_set_flag(sk, SOCK_NO_LARGESEND); | ||
| 4327 | 4322 | ||
| 4328 | tcp_mtup_init(sk); | 4323 | tcp_mtup_init(sk); |
| 4329 | tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); | 4324 | tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 25ecc6e2478b..8355b729fa95 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | * a single port at the same time. | 52 | * a single port at the same time. |
| 53 | */ | 53 | */ |
| 54 | 54 | ||
| 55 | #include <linux/config.h> | ||
| 56 | 55 | ||
| 57 | #include <linux/types.h> | 56 | #include <linux/types.h> |
| 58 | #include <linux/fcntl.h> | 57 | #include <linux/fcntl.h> |
| @@ -242,6 +241,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
| 242 | goto failure; | 241 | goto failure; |
| 243 | 242 | ||
| 244 | /* OK, now commit destination to socket. */ | 243 | /* OK, now commit destination to socket. */ |
| 244 | sk->sk_gso_type = SKB_GSO_TCPV4; | ||
| 245 | sk_setup_caps(sk, &rt->u.dst); | 245 | sk_setup_caps(sk, &rt->u.dst); |
| 246 | 246 | ||
| 247 | if (!tp->write_seq) | 247 | if (!tp->write_seq) |
| @@ -884,6 +884,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
| 884 | if (!newsk) | 884 | if (!newsk) |
| 885 | goto exit; | 885 | goto exit; |
| 886 | 886 | ||
| 887 | newsk->sk_gso_type = SKB_GSO_TCPV4; | ||
| 887 | sk_setup_caps(newsk, dst); | 888 | sk_setup_caps(newsk, dst); |
| 888 | 889 | ||
| 889 | newtp = tcp_sk(newsk); | 890 | newtp = tcp_sk(newsk); |
| @@ -1726,7 +1727,8 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) | |||
| 1726 | sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " | 1727 | sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " |
| 1727 | "%08X %5d %8d %lu %d %p %u %u %u %u %d", | 1728 | "%08X %5d %8d %lu %d %p %u %u %u %u %d", |
| 1728 | i, src, srcp, dest, destp, sp->sk_state, | 1729 | i, src, srcp, dest, destp, sp->sk_state, |
| 1729 | tp->write_seq - tp->snd_una, tp->rcv_nxt - tp->copied_seq, | 1730 | tp->write_seq - tp->snd_una, |
| 1731 | (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq), | ||
| 1730 | timer_active, | 1732 | timer_active, |
| 1731 | jiffies_to_clock_t(timer_expires - jiffies), | 1733 | jiffies_to_clock_t(timer_expires - jiffies), |
| 1732 | icsk->icsk_retransmits, | 1734 | icsk->icsk_retransmits, |
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 2b9b7f6c7f7c..e0851697ad5e 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Jorge Cwik, <jorge@laser.satlink.net> | 20 | * Jorge Cwik, <jorge@laser.satlink.net> |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/sysctl.h> | 25 | #include <linux/sysctl.h> |
| @@ -440,8 +439,6 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, | |||
| 440 | newicsk->icsk_ack.last_seg_size = skb->len - newtp->tcp_header_len; | 439 | newicsk->icsk_ack.last_seg_size = skb->len - newtp->tcp_header_len; |
| 441 | newtp->rx_opt.mss_clamp = req->mss; | 440 | newtp->rx_opt.mss_clamp = req->mss; |
| 442 | TCP_ECN_openreq_child(newtp, req); | 441 | TCP_ECN_openreq_child(newtp, req); |
| 443 | if (newtp->ecn_flags&TCP_ECN_OK) | ||
| 444 | sock_set_flag(newsk, SOCK_NO_LARGESEND); | ||
| 445 | 442 | ||
| 446 | TCP_INC_STATS_BH(TCP_MIB_PASSIVEOPENS); | 443 | TCP_INC_STATS_BH(TCP_MIB_PASSIVEOPENS); |
| 447 | } | 444 | } |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index bdd71db8bf90..5c08ea20a18d 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -510,8 +510,7 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb) | |||
| 510 | 510 | ||
| 511 | static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, unsigned int mss_now) | 511 | static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, unsigned int mss_now) |
| 512 | { | 512 | { |
| 513 | if (skb->len <= mss_now || | 513 | if (skb->len <= mss_now || !sk_can_gso(sk)) { |
| 514 | !(sk->sk_route_caps & NETIF_F_TSO)) { | ||
| 515 | /* Avoid the costly divide in the normal | 514 | /* Avoid the costly divide in the normal |
| 516 | * non-TSO case. | 515 | * non-TSO case. |
| 517 | */ | 516 | */ |
| @@ -525,7 +524,7 @@ static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, unsigned | |||
| 525 | factor /= mss_now; | 524 | factor /= mss_now; |
| 526 | skb_shinfo(skb)->gso_segs = factor; | 525 | skb_shinfo(skb)->gso_segs = factor; |
| 527 | skb_shinfo(skb)->gso_size = mss_now; | 526 | skb_shinfo(skb)->gso_size = mss_now; |
| 528 | skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4; | 527 | skb_shinfo(skb)->gso_type = sk->sk_gso_type; |
| 529 | } | 528 | } |
| 530 | } | 529 | } |
| 531 | 530 | ||
| @@ -824,9 +823,7 @@ unsigned int tcp_current_mss(struct sock *sk, int large_allowed) | |||
| 824 | 823 | ||
| 825 | mss_now = tp->mss_cache; | 824 | mss_now = tp->mss_cache; |
| 826 | 825 | ||
| 827 | if (large_allowed && | 826 | if (large_allowed && sk_can_gso(sk) && !tp->urg_mode) |
| 828 | (sk->sk_route_caps & NETIF_F_TSO) && | ||
| 829 | !tp->urg_mode) | ||
| 830 | doing_tso = 1; | 827 | doing_tso = 1; |
| 831 | 828 | ||
| 832 | if (dst) { | 829 | if (dst) { |
| @@ -2044,8 +2041,6 @@ struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst, | |||
| 2044 | memset(th, 0, sizeof(struct tcphdr)); | 2041 | memset(th, 0, sizeof(struct tcphdr)); |
| 2045 | th->syn = 1; | 2042 | th->syn = 1; |
| 2046 | th->ack = 1; | 2043 | th->ack = 1; |
| 2047 | if (dst->dev->features&NETIF_F_TSO) | ||
| 2048 | ireq->ecn_ok = 0; | ||
| 2049 | TCP_ECN_make_synack(req, th); | 2044 | TCP_ECN_make_synack(req, th); |
| 2050 | th->source = inet_sk(sk)->sport; | 2045 | th->source = inet_sk(sk)->sport; |
| 2051 | th->dest = ireq->rmt_port; | 2046 | th->dest = ireq->rmt_port; |
diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c index 26d7486ee501..4624501e9680 100644 --- a/net/ipv4/tcp_scalable.c +++ b/net/ipv4/tcp_scalable.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * John Heffner <jheffner@sc.edu> | 5 | * John Heffner <jheffner@sc.edu> |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <net/tcp.h> | 9 | #include <net/tcp.h> |
| 11 | 10 | ||
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index 3b7403495052..490360b5b4bf 100644 --- a/net/ipv4/tcp_vegas.c +++ b/net/ipv4/tcp_vegas.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * assumed senders never went idle. | 31 | * assumed senders never went idle. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/skbuff.h> | 36 | #include <linux/skbuff.h> |
diff --git a/net/ipv4/tcp_westwood.c b/net/ipv4/tcp_westwood.c index 4247da1384bf..5446312ffd2a 100644 --- a/net/ipv4/tcp_westwood.c +++ b/net/ipv4/tcp_westwood.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * ssthresh after packet loss. The probing phase is as the original Reno. | 21 | * ssthresh after packet loss. The probing phase is as the original Reno. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 3f93292b0ad8..9bfcddad695b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -91,7 +91,6 @@ | |||
| 91 | #include <linux/errno.h> | 91 | #include <linux/errno.h> |
| 92 | #include <linux/timer.h> | 92 | #include <linux/timer.h> |
| 93 | #include <linux/mm.h> | 93 | #include <linux/mm.h> |
| 94 | #include <linux/config.h> | ||
| 95 | #include <linux/inet.h> | 94 | #include <linux/inet.h> |
| 96 | #include <linux/ipv6.h> | 95 | #include <linux/ipv6.h> |
| 97 | #include <linux/netdevice.h> | 96 | #include <linux/netdevice.h> |
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index c0465284dfac..8f50eae47d03 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/compiler.h> | 11 | #include <linux/compiler.h> |
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/inetdevice.h> | 12 | #include <linux/inetdevice.h> |
| 14 | #include <net/xfrm.h> | 13 | #include <net/xfrm.h> |
| 15 | #include <net/ip.h> | 14 | #include <net/ip.h> |
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 4da664538f52..c250d0af10d7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | * status etc. | 40 | * status etc. |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/errno.h> | 43 | #include <linux/errno.h> |
| 45 | #include <linux/types.h> | 44 | #include <linux/types.h> |
| 46 | #include <linux/socket.h> | 45 | #include <linux/socket.h> |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index e19457fe4f6e..5a0ba58b86cc 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/capability.h> | 25 | #include <linux/capability.h> |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/socket.h> | 28 | #include <linux/socket.h> |
| @@ -660,8 +659,6 @@ int inet6_sk_rebuild_header(struct sock *sk) | |||
| 660 | } | 659 | } |
| 661 | 660 | ||
| 662 | ip6_dst_store(sk, dst, NULL); | 661 | ip6_dst_store(sk, dst, NULL); |
| 663 | sk->sk_route_caps = dst->dev->features & | ||
| 664 | ~(NETIF_F_IP_CSUM | NETIF_F_TSO); | ||
| 665 | } | 662 | } |
| 666 | 663 | ||
| 667 | return 0; | 664 | return 0; |
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index d31c0d6c0448..9d4831bd4335 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * This file is derived from net/ipv4/ah.c. | 24 | * This file is derived from net/ipv4/ah.c. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <net/ip.h> | 28 | #include <net/ip.h> |
| 30 | #include <net/ah.h> | 29 | #include <net/ah.h> |
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index 39ec528923f6..f6881d7a0385 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/capability.h> | 16 | #include <linux/capability.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index a15a6f320f70..a278d5e862fe 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * This file is derived from net/ipv4/esp.c | 24 | * This file is derived from net/ipv4/esp.c |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <net/ip.h> | 28 | #include <net/ip.h> |
| 30 | #include <net/xfrm.h> | 29 | #include <net/xfrm.h> |
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index a18d4256372c..9d0ee7f0eeb5 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c | |||
| @@ -179,7 +179,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp) | |||
| 179 | 179 | ||
| 180 | static struct inet6_protocol destopt_protocol = { | 180 | static struct inet6_protocol destopt_protocol = { |
| 181 | .handler = ipv6_destopt_rcv, | 181 | .handler = ipv6_destopt_rcv, |
| 182 | .flags = INET6_PROTO_NOPOLICY, | 182 | .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_GSO_EXTHDR, |
| 183 | }; | 183 | }; |
| 184 | 184 | ||
| 185 | void __init ipv6_destopt_init(void) | 185 | void __init ipv6_destopt_init(void) |
| @@ -340,7 +340,7 @@ looped_back: | |||
| 340 | 340 | ||
| 341 | static struct inet6_protocol rthdr_protocol = { | 341 | static struct inet6_protocol rthdr_protocol = { |
| 342 | .handler = ipv6_rthdr_rcv, | 342 | .handler = ipv6_rthdr_rcv, |
| 343 | .flags = INET6_PROTO_NOPOLICY, | 343 | .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_GSO_EXTHDR, |
| 344 | }; | 344 | }; |
| 345 | 345 | ||
| 346 | void __init ipv6_rthdr_init(void) | 346 | void __init ipv6_rthdr_init(void) |
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index eb2865d5ae28..5c950cc79d80 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * 2 of the License, or(at your option) any later version. | 13 | * 2 of the License, or(at your option) any later version. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/in6.h> | 17 | #include <linux/in6.h> |
| 19 | #include <linux/ipv6.h> | 18 | #include <linux/ipv6.h> |
| @@ -187,8 +186,6 @@ int inet6_csk_xmit(struct sk_buff *skb, int ipfragok) | |||
| 187 | } | 186 | } |
| 188 | 187 | ||
| 189 | ip6_dst_store(sk, dst, NULL); | 188 | ip6_dst_store(sk, dst, NULL); |
| 190 | sk->sk_route_caps = dst->dev->features & | ||
| 191 | ~(NETIF_F_IP_CSUM | NETIF_F_TSO); | ||
| 192 | } | 189 | } |
| 193 | 190 | ||
| 194 | skb->dst = dst_clone(dst); | 191 | skb->dst = dst_clone(dst); |
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 2ae84c961678..d2f3fc990bfa 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 2 of the License, or (at your option) any later version. | 14 | * 2 of the License, or (at your option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/random.h> | 18 | #include <linux/random.h> |
| 20 | 19 | ||
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 2cb6149349bf..764221220afd 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * remove ip6_null_entry from the top of | 19 | * remove ip6_null_entry from the top of |
| 20 | * routing table. | 20 | * routing table. |
| 21 | */ | 21 | */ |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 25 | #include <linux/net.h> | 24 | #include <linux/net.h> |
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index f9ca63912fbf..1d672b0547f2 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/capability.h> | 12 | #include <linux/capability.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/socket.h> | 15 | #include <linux/socket.h> |
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index aceee252503d..df8f051c0fce 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
| @@ -84,14 +84,9 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
| 84 | */ | 84 | */ |
| 85 | IP6CB(skb)->iif = skb->dst ? ((struct rt6_info *)skb->dst)->rt6i_idev->dev->ifindex : dev->ifindex; | 85 | IP6CB(skb)->iif = skb->dst ? ((struct rt6_info *)skb->dst)->rt6i_idev->dev->ifindex : dev->ifindex; |
| 86 | 86 | ||
| 87 | if (skb->len < sizeof(struct ipv6hdr)) | 87 | if (unlikely(!pskb_may_pull(skb, sizeof(*hdr)))) |
| 88 | goto err; | 88 | goto err; |
| 89 | 89 | ||
| 90 | if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) { | ||
| 91 | IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS); | ||
| 92 | goto drop; | ||
| 93 | } | ||
| 94 | |||
| 95 | hdr = skb->nh.ipv6h; | 90 | hdr = skb->nh.ipv6h; |
| 96 | 91 | ||
| 97 | if (hdr->version != 6) | 92 | if (hdr->version != 6) |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index abb94de33768..2c5b44575af0 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * for datagram xmit | 28 | * for datagram xmit |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| @@ -230,7 +229,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, | |||
| 230 | skb->priority = sk->sk_priority; | 229 | skb->priority = sk->sk_priority; |
| 231 | 230 | ||
| 232 | mtu = dst_mtu(dst); | 231 | mtu = dst_mtu(dst); |
| 233 | if ((skb->len <= mtu) || ipfragok) { | 232 | if ((skb->len <= mtu) || ipfragok || skb_shinfo(skb)->gso_size) { |
| 234 | IP6_INC_STATS(IPSTATS_MIB_OUTREQUESTS); | 233 | IP6_INC_STATS(IPSTATS_MIB_OUTREQUESTS); |
| 235 | return NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, dst->dev, | 234 | return NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, dst->dev, |
| 236 | dst_output); | 235 | dst_output); |
| @@ -835,7 +834,7 @@ static inline int ip6_ufo_append_data(struct sock *sk, | |||
| 835 | /* specify the length of each IP datagram fragment*/ | 834 | /* specify the length of each IP datagram fragment*/ |
| 836 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen - | 835 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen - |
| 837 | sizeof(struct frag_hdr); | 836 | sizeof(struct frag_hdr); |
| 838 | skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4; | 837 | skb_shinfo(skb)->gso_type = SKB_GSO_UDP; |
| 839 | ipv6_select_ident(skb, &fhdr); | 838 | ipv6_select_ident(skb, &fhdr); |
| 840 | skb_shinfo(skb)->ip6_frag_id = fhdr.identification; | 839 | skb_shinfo(skb)->ip6_frag_id = fhdr.identification; |
| 841 | __skb_queue_tail(&sk->sk_write_queue, skb); | 840 | __skb_queue_tail(&sk->sk_write_queue, skb); |
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index a995796b5a57..bc77c0e1a943 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 24 | #include <linux/capability.h> | 23 | #include <linux/capability.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index f28cd37feed3..b285b0357084 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * The decompression of IP datagram MUST be done after the reassembly, | 30 | * The decompression of IP datagram MUST be done after the reassembly, |
| 31 | * AH/ESP processing. | 31 | * AH/ESP processing. |
| 32 | */ | 32 | */ |
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 35 | #include <net/ip.h> | 34 | #include <net/ip.h> |
| 36 | #include <net/xfrm.h> | 35 | #include <net/xfrm.h> |
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 4c20eeb3d568..c28e5c287447 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/capability.h> | 29 | #include <linux/capability.h> |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| 32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 33 | #include <linux/socket.h> | 32 | #include <linux/socket.h> |
| @@ -58,9 +57,71 @@ | |||
| 58 | 57 | ||
| 59 | DEFINE_SNMP_STAT(struct ipstats_mib, ipv6_statistics) __read_mostly; | 58 | DEFINE_SNMP_STAT(struct ipstats_mib, ipv6_statistics) __read_mostly; |
| 60 | 59 | ||
| 60 | static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, int features) | ||
| 61 | { | ||
| 62 | struct sk_buff *segs = ERR_PTR(-EINVAL); | ||
| 63 | struct ipv6hdr *ipv6h; | ||
| 64 | struct inet6_protocol *ops; | ||
| 65 | int proto; | ||
| 66 | |||
| 67 | if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h)))) | ||
| 68 | goto out; | ||
| 69 | |||
| 70 | ipv6h = skb->nh.ipv6h; | ||
| 71 | proto = ipv6h->nexthdr; | ||
| 72 | __skb_pull(skb, sizeof(*ipv6h)); | ||
| 73 | |||
| 74 | rcu_read_lock(); | ||
| 75 | for (;;) { | ||
| 76 | struct ipv6_opt_hdr *opth; | ||
| 77 | int len; | ||
| 78 | |||
| 79 | if (proto != NEXTHDR_HOP) { | ||
| 80 | ops = rcu_dereference(inet6_protos[proto]); | ||
| 81 | |||
| 82 | if (unlikely(!ops)) | ||
| 83 | goto unlock; | ||
| 84 | |||
| 85 | if (!(ops->flags & INET6_PROTO_GSO_EXTHDR)) | ||
| 86 | break; | ||
| 87 | } | ||
| 88 | |||
| 89 | if (unlikely(!pskb_may_pull(skb, 8))) | ||
| 90 | goto unlock; | ||
| 91 | |||
| 92 | opth = (void *)skb->data; | ||
| 93 | len = opth->hdrlen * 8 + 8; | ||
| 94 | |||
| 95 | if (unlikely(!pskb_may_pull(skb, len))) | ||
| 96 | goto unlock; | ||
| 97 | |||
| 98 | proto = opth->nexthdr; | ||
| 99 | __skb_pull(skb, len); | ||
| 100 | } | ||
| 101 | |||
| 102 | skb->h.raw = skb->data; | ||
| 103 | if (likely(ops->gso_segment)) | ||
| 104 | segs = ops->gso_segment(skb, features); | ||
| 105 | |||
| 106 | unlock: | ||
| 107 | rcu_read_unlock(); | ||
| 108 | |||
| 109 | if (unlikely(IS_ERR(segs))) | ||
| 110 | goto out; | ||
| 111 | |||
| 112 | for (skb = segs; skb; skb = skb->next) { | ||
| 113 | ipv6h = skb->nh.ipv6h; | ||
| 114 | ipv6h->payload_len = htons(skb->len - skb->mac_len); | ||
| 115 | } | ||
| 116 | |||
| 117 | out: | ||
| 118 | return segs; | ||
| 119 | } | ||
| 120 | |||
| 61 | static struct packet_type ipv6_packet_type = { | 121 | static struct packet_type ipv6_packet_type = { |
| 62 | .type = __constant_htons(ETH_P_IPV6), | 122 | .type = __constant_htons(ETH_P_IPV6), |
| 63 | .func = ipv6_rcv, | 123 | .func = ipv6_rcv, |
| 124 | .gso_segment = ipv6_gso_segment, | ||
| 64 | }; | 125 | }; |
| 65 | 126 | ||
| 66 | struct ip6_ra_chain *ip6_ra_chain; | 127 | struct ip6_ra_chain *ip6_ra_chain; |
diff --git a/net/ipv6/ipv6_syms.c b/net/ipv6/ipv6_syms.c index 16482785bdfd..dd4d1ce77769 100644 --- a/net/ipv6/ipv6_syms.c +++ b/net/ipv6/ipv6_syms.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/config.h> | ||
| 3 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 4 | #include <net/protocol.h> | 3 | #include <net/protocol.h> |
| 5 | #include <net/ipv6.h> | 4 | #include <net/ipv6.h> |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 6e871afbb2c7..9d697d4dcffc 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * - MLDv2 support | 28 | * - MLDv2 support |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 33 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index dfa20d3be9b6..b50055b9278d 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | #include <linux/module.h> | 50 | #include <linux/module.h> |
| 51 | #include <linux/config.h> | ||
| 52 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| 53 | #include <linux/types.h> | 52 | #include <linux/types.h> |
| 54 | #include <linux/socket.h> | 53 | #include <linux/socket.h> |
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index b4b7d441af25..968a14be0d05 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c | |||
| @@ -505,7 +505,7 @@ ipq_rcv_skb(struct sk_buff *skb) | |||
| 505 | if (type <= IPQM_BASE) | 505 | if (type <= IPQM_BASE) |
| 506 | return; | 506 | return; |
| 507 | 507 | ||
| 508 | if (security_netlink_recv(skb)) | 508 | if (security_netlink_recv(skb, CAP_NET_ADMIN)) |
| 509 | RCV_SKB_FAIL(-EPERM); | 509 | RCV_SKB_FAIL(-EPERM); |
| 510 | 510 | ||
| 511 | write_lock_bh(&queue_lock); | 511 | write_lock_bh(&queue_lock); |
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 2e72f89a7019..7ef143c0ebf6 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/capability.h> | 21 | #include <linux/capability.h> |
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/in.h> | 22 | #include <linux/in.h> |
| 24 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
| 25 | #include <linux/kmod.h> | 24 | #include <linux/kmod.h> |
| @@ -1281,7 +1280,8 @@ int ip6t_register_table(struct xt_table *table, | |||
| 1281 | return ret; | 1280 | return ret; |
| 1282 | } | 1281 | } |
| 1283 | 1282 | ||
| 1284 | if (xt_register_table(table, &bootstrap, newinfo) != 0) { | 1283 | ret = xt_register_table(table, &bootstrap, newinfo); |
| 1284 | if (ret != 0) { | ||
| 1285 | xt_free_table_info(newinfo); | 1285 | xt_free_table_info(newinfo); |
| 1286 | return ret; | 1286 | return ret; |
| 1287 | } | 1287 | } |
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c index de1175c27f6d..8629ba195d2d 100644 --- a/net/ipv6/netfilter/ip6t_REJECT.c +++ b/net/ipv6/netfilter/ip6t_REJECT.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * 2 of the License, or (at your option) any later version. | 15 | * 2 of the License, or (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/skbuff.h> | 19 | #include <linux/skbuff.h> |
| 21 | #include <linux/icmpv6.h> | 20 | #include <linux/icmpv6.h> |
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 2a71c3b669f1..c2ab38ff46af 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * structures. | 20 | * structures. |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 25 | #include <linux/ipv6.h> | 24 | #include <linux/ipv6.h> |
| 26 | #include <linux/in6.h> | 25 | #include <linux/in6.h> |
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index c32a029e43f0..00d5583807f7 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * 2 of the License, or (at your option) any later version. | 14 | * 2 of the License, or (at your option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/string.h> | 19 | #include <linux/string.h> |
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 779ddf77f4d4..efee7a6301a8 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * as published by the Free Software Foundation; either version | 17 | * as published by the Free Software Foundation; either version |
| 18 | * 2 of the License, or (at your option) any later version. | 18 | * 2 of the License, or (at your option) any later version. |
| 19 | */ | 19 | */ |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 22 | #include <linux/socket.h> | 21 | #include <linux/socket.h> |
| 23 | #include <linux/net.h> | 22 | #include <linux/net.h> |
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index eef985e010ea..4e299c69e1c6 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * YOSHIFUJI,H. @USAGI Always remove fragment header to | 28 | * YOSHIFUJI,H. @USAGI Always remove fragment header to |
| 29 | * calculate ICV correctly. | 29 | * calculate ICV correctly. |
| 30 | */ | 30 | */ |
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/string.h> | 33 | #include <linux/string.h> |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e728980160d2..87c39c978cd0 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/capability.h> | 27 | #include <linux/capability.h> |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 31 | #include <linux/times.h> | 30 | #include <linux/times.h> |
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 6578c3080f47..c56aeece2bf5 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * Nate Thompson <nate@thebog.net>: 6to4 support | 18 | * Nate Thompson <nate@thebog.net>: 6to4 support |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/capability.h> | 22 | #include <linux/capability.h> |
| 24 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index 8eff9fa1e983..7a4639db1346 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 9 | #include <linux/sysctl.h> | 9 | #include <linux/sysctl.h> |
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/in6.h> | 10 | #include <linux/in6.h> |
| 12 | #include <linux/ipv6.h> | 11 | #include <linux/ipv6.h> |
| 13 | #include <net/ndisc.h> | 12 | #include <net/ndisc.h> |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index a50eb306e9e2..5bdcb9002cf7 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 32 | #include <linux/socket.h> | 31 | #include <linux/socket.h> |
| @@ -270,9 +269,8 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, | |||
| 270 | ipv6_addr_copy(&np->saddr, saddr); | 269 | ipv6_addr_copy(&np->saddr, saddr); |
| 271 | inet->rcv_saddr = LOOPBACK4_IPV6; | 270 | inet->rcv_saddr = LOOPBACK4_IPV6; |
| 272 | 271 | ||
| 272 | sk->sk_gso_type = SKB_GSO_TCPV6; | ||
| 273 | ip6_dst_store(sk, dst, NULL); | 273 | ip6_dst_store(sk, dst, NULL); |
| 274 | sk->sk_route_caps = dst->dev->features & | ||
| 275 | ~(NETIF_F_IP_CSUM | NETIF_F_TSO); | ||
| 276 | 274 | ||
| 277 | icsk->icsk_ext_hdr_len = 0; | 275 | icsk->icsk_ext_hdr_len = 0; |
| 278 | if (np->opt) | 276 | if (np->opt) |
| @@ -930,9 +928,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
| 930 | * comment in that function for the gory details. -acme | 928 | * comment in that function for the gory details. -acme |
| 931 | */ | 929 | */ |
| 932 | 930 | ||
| 931 | sk->sk_gso_type = SKB_GSO_TCPV6; | ||
| 933 | ip6_dst_store(newsk, dst, NULL); | 932 | ip6_dst_store(newsk, dst, NULL); |
| 934 | newsk->sk_route_caps = dst->dev->features & | ||
| 935 | ~(NETIF_F_IP_CSUM | NETIF_F_TSO); | ||
| 936 | 933 | ||
| 937 | newtcp6sk = (struct tcp6_sock *)newsk; | 934 | newtcp6sk = (struct tcp6_sock *)newsk; |
| 938 | inet_sk(newsk)->pinet6 = &newtcp6sk->inet6; | 935 | inet_sk(newsk)->pinet6 = &newtcp6sk->inet6; |
| @@ -1469,7 +1466,8 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) | |||
| 1469 | dest->s6_addr32[0], dest->s6_addr32[1], | 1466 | dest->s6_addr32[0], dest->s6_addr32[1], |
| 1470 | dest->s6_addr32[2], dest->s6_addr32[3], destp, | 1467 | dest->s6_addr32[2], dest->s6_addr32[3], destp, |
| 1471 | sp->sk_state, | 1468 | sp->sk_state, |
| 1472 | tp->write_seq-tp->snd_una, tp->rcv_nxt-tp->copied_seq, | 1469 | tp->write_seq-tp->snd_una, |
| 1470 | (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq), | ||
| 1473 | timer_active, | 1471 | timer_active, |
| 1474 | jiffies_to_clock_t(timer_expires - jiffies), | 1472 | jiffies_to_clock_t(timer_expires - jiffies), |
| 1475 | icsk->icsk_retransmits, | 1473 | icsk->icsk_retransmits, |
| @@ -1605,6 +1603,7 @@ struct proto tcpv6_prot = { | |||
| 1605 | static struct inet6_protocol tcpv6_protocol = { | 1603 | static struct inet6_protocol tcpv6_protocol = { |
| 1606 | .handler = tcp_v6_rcv, | 1604 | .handler = tcp_v6_rcv, |
| 1607 | .err_handler = tcp_v6_err, | 1605 | .err_handler = tcp_v6_err, |
| 1606 | .gso_segment = tcp_tso_segment, | ||
| 1608 | .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, | 1607 | .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, |
| 1609 | }; | 1608 | }; |
| 1610 | 1609 | ||
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 8d3432a70f3a..ccc57f434cd3 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * 2 of the License, or (at your option) any later version. | 23 | * 2 of the License, or (at your option) any later version. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/socket.h> | 28 | #include <linux/socket.h> |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index ee715f2691e9..73cd250aecbb 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/compiler.h> | 14 | #include <linux/compiler.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/netdevice.h> | 15 | #include <linux/netdevice.h> |
| 17 | #include <net/addrconf.h> | 16 | #include <net/addrconf.h> |
| 18 | #include <net/xfrm.h> | 17 | #include <net/xfrm.h> |
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index d37768e5064f..6b44fe8516c3 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * Based on net/ipv4/xfrm4_tunnel.c | 21 | * Based on net/ipv4/xfrm4_tunnel.c |
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/xfrm.h> | 25 | #include <linux/xfrm.h> |
| 27 | #include <linux/list.h> | 26 | #include <linux/list.h> |
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 811d998725bc..aa34ff4b707c 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | * See net/ipx/ChangeLog. | 28 | * See net/ipx/ChangeLog. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | #include <linux/capability.h> | 31 | #include <linux/capability.h> |
| 33 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 34 | #include <linux/if_arp.h> | 33 | #include <linux/if_arp.h> |
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c index 1f73d9ea434d..4c0c71206e54 100644 --- a/net/ipx/ipx_proc.c +++ b/net/ipx/ipx_proc.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright(C) Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 2002 | 4 | * Copyright(C) Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 2002 |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #ifdef CONFIG_PROC_FS | 8 | #ifdef CONFIG_PROC_FS |
| 10 | #include <linux/proc_fs.h> | 9 | #include <linux/proc_fs.h> |
diff --git a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c index bba3431cd9a5..a30dbb1e08fb 100644 --- a/net/ipx/ipx_route.c +++ b/net/ipx/ipx_route.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * See net/ipx/ChangeLog. | 7 | * See net/ipx/ChangeLog. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/list.h> | 10 | #include <linux/list.h> |
| 12 | #include <linux/route.h> | 11 | #include <linux/route.h> |
| 13 | #include <linux/spinlock.h> | 12 | #include <linux/spinlock.h> |
diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c index 510eda96d10a..fa574735c76f 100644 --- a/net/ipx/sysctl_net_ipx.c +++ b/net/ipx/sysctl_net_ipx.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Added /proc/sys/net/ipx/ipx_pprop_broadcasting - acme March 4, 2001 | 6 | * Added /proc/sys/net/ipx/ipx_pprop_broadcasting - acme March 4, 2001 |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 11 | #include <linux/sysctl.h> | 10 | #include <linux/sysctl.h> |
| 12 | 11 | ||
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 2f37c9f35e27..7fae48a53bff 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | * | 42 | * |
| 43 | ********************************************************************/ | 43 | ********************************************************************/ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/capability.h> | 45 | #include <linux/capability.h> |
| 47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 48 | #include <linux/types.h> | 47 | #include <linux/types.h> |
diff --git a/net/irda/ircomm/ircomm_core.c b/net/irda/ircomm/ircomm_core.c index 286881978858..9c4a902a9dba 100644 --- a/net/irda/ircomm/ircomm_core.c +++ b/net/irda/ircomm/ircomm_core.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * | 29 | * |
| 30 | ********************************************************************/ | 30 | ********************************************************************/ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
| 35 | #include <linux/proc_fs.h> | 34 | #include <linux/proc_fs.h> |
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index b592c4bc3331..b400f27851fc 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * | 30 | * |
| 31 | ********************************************************************/ | 31 | ********************************************************************/ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/fs.h> | 35 | #include <linux/fs.h> |
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index e3debbdb67f5..ba40e5495f58 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * | 29 | * |
| 30 | ********************************************************************/ | 30 | ********************************************************************/ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/string.h> | 32 | #include <linux/string.h> |
| 34 | #include <linux/proc_fs.h> | 33 | #include <linux/proc_fs.h> |
| 35 | #include <linux/skbuff.h> | 34 | #include <linux/skbuff.h> |
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index 2d2e2b1919f4..a0472652a44e 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | ********************************************************************/ | 25 | ********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 30 | #include <linux/skbuff.h> | 29 | #include <linux/skbuff.h> |
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c index f8e6cb0db04b..95cf1234ea17 100644 --- a/net/irda/irlan/irlan_client.c +++ b/net/irda/irlan/irlan_client.c | |||
| @@ -173,13 +173,14 @@ void irlan_client_discovery_indication(discinfo_t *discovery, | |||
| 173 | rcu_read_lock(); | 173 | rcu_read_lock(); |
| 174 | self = irlan_get_any(); | 174 | self = irlan_get_any(); |
| 175 | if (self) { | 175 | if (self) { |
| 176 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); | 176 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, goto out;); |
| 177 | 177 | ||
| 178 | IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ , | 178 | IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ , |
| 179 | daddr); | 179 | daddr); |
| 180 | 180 | ||
| 181 | irlan_client_wakeup(self, saddr, daddr); | 181 | irlan_client_wakeup(self, saddr, daddr); |
| 182 | } | 182 | } |
| 183 | IRDA_ASSERT_LABEL(out:) | ||
| 183 | rcu_read_unlock(); | 184 | rcu_read_unlock(); |
| 184 | } | 185 | } |
| 185 | 186 | ||
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c index 657d12210578..bd659dd545ac 100644 --- a/net/irda/irlan/irlan_common.c +++ b/net/irda/irlan/irlan_common.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | ********************************************************************/ | 24 | ********************************************************************/ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 28 | 27 | ||
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index 953e255d2bc8..b0ccc455b747 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | ********************************************************************/ | 26 | ********************************************************************/ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
| 30 | #include <linux/etherdevice.h> | 29 | #include <linux/etherdevice.h> |
| 31 | #include <linux/inetdevice.h> | 30 | #include <linux/inetdevice.h> |
diff --git a/net/irda/irlap.c b/net/irda/irlap.c index a16528657b4c..cade355ac8af 100644 --- a/net/irda/irlap.c +++ b/net/irda/irlap.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * | 29 | * |
| 30 | ********************************************************************/ | 30 | ********************************************************************/ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 34 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 35 | #include <linux/skbuff.h> | 34 | #include <linux/skbuff.h> |
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c index a505b5457608..99faff68c399 100644 --- a/net/irda/irlap_event.c +++ b/net/irda/irlap_event.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | ********************************************************************/ | 26 | ********************************************************************/ |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index 57ea160f470b..129ad64c15bb 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | ********************************************************************/ | 25 | ********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 30 | #include <linux/string.h> | 29 | #include <linux/string.h> |
diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c index 26649f6528e6..4c90dd1b4503 100644 --- a/net/irda/irlmp_event.c +++ b/net/irda/irlmp_event.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | ********************************************************************/ | 25 | ********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 29 | 28 | ||
| 30 | #include <net/irda/irda.h> | 29 | #include <net/irda/irda.h> |
diff --git a/net/irda/irlmp_frame.c b/net/irda/irlmp_frame.c index 91cd268172fa..39761a1d18f5 100644 --- a/net/irda/irlmp_frame.c +++ b/net/irda/irlmp_frame.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | ********************************************************************/ | 25 | ********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/skbuff.h> | 27 | #include <linux/skbuff.h> |
| 29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 30 | 29 | ||
diff --git a/net/irda/irmod.c b/net/irda/irmod.c index 634901dd156f..2869b16e417d 100644 --- a/net/irda/irmod.c +++ b/net/irda/irmod.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * Jean II | 31 | * Jean II |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/config.h> | ||
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 36 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 37 | 36 | ||
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index ad6caba02a7b..80887528e77e 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h | |||
| @@ -248,7 +248,6 @@ | |||
| 248 | #include <linux/miscdevice.h> | 248 | #include <linux/miscdevice.h> |
| 249 | #include <linux/poll.h> | 249 | #include <linux/poll.h> |
| 250 | #include <linux/capability.h> | 250 | #include <linux/capability.h> |
| 251 | #include <linux/config.h> | ||
| 252 | #include <linux/ctype.h> /* isspace() */ | 251 | #include <linux/ctype.h> /* isspace() */ |
| 253 | #include <asm/uaccess.h> | 252 | #include <asm/uaccess.h> |
| 254 | #include <linux/init.h> | 253 | #include <linux/init.h> |
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c index 1b1c4193359a..86805c3d8324 100644 --- a/net/irda/irsysctl.c +++ b/net/irda/irsysctl.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * | 23 | * |
| 24 | ********************************************************************/ | 24 | ********************************************************************/ |
| 25 | 25 | ||
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 28 | #include <linux/ctype.h> | 27 | #include <linux/ctype.h> |
| 29 | #include <linux/sysctl.h> | 28 | #include <linux/sysctl.h> |
diff --git a/net/irda/irttp.c b/net/irda/irttp.c index 8aff254cb418..49c51c5f1a86 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * | 24 | * |
| 25 | ********************************************************************/ | 25 | ********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/skbuff.h> | 27 | #include <linux/skbuff.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
diff --git a/net/irda/qos.c b/net/irda/qos.c index ddfb5c502a90..95a69c013ee8 100644 --- a/net/irda/qos.c +++ b/net/irda/qos.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | * | 30 | * |
| 31 | ********************************************************************/ | 31 | ********************************************************************/ |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | #include <asm/byteorder.h> | 33 | #include <asm/byteorder.h> |
| 35 | 34 | ||
| 36 | #include <net/irda/irda.h> | 35 | #include <net/irda/irda.h> |
diff --git a/net/irda/timer.c b/net/irda/timer.c index 0e17f976add6..3871a2b911f9 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | ********************************************************************/ | 25 | ********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 28 | #include <linux/config.h> | ||
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | 29 | ||
| 31 | #include <net/irda/timer.h> | 30 | #include <net/irda/timer.h> |
diff --git a/net/key/af_key.c b/net/key/af_key.c index d5e2121ea207..3a95b2ee4690 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Derek Atkins <derek@ihtfp.com> | 14 | * Derek Atkins <derek@ihtfp.com> |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/capability.h> | 17 | #include <linux/capability.h> |
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 75c9b1480801..d6cfe84d521b 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * | 20 | * |
| 21 | * See the GNU General Public License for more details. | 21 | * See the GNU General Public License for more details. |
| 22 | */ | 22 | */ |
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/compiler.h> | 23 | #include <linux/compiler.h> |
| 25 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c index 5ae47be7dde0..a89917130a7b 100644 --- a/net/llc/llc_if.c +++ b/net/llc/llc_if.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | * See the GNU General Public License for more details. | 12 | * See the GNU General Public License for more details. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/netdevice.h> | 16 | #include <linux/netdevice.h> |
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index bd531cb235a7..19308fece3ad 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * See the GNU General Public License for more details. | 12 | * See the GNU General Public License for more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c index f37dbf8ef126..8275bd33bd9d 100644 --- a/net/llc/llc_station.c +++ b/net/llc/llc_station.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | * See the GNU General Public License for more details. | 12 | * See the GNU General Public License for more details. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <net/llc.h> | 16 | #include <net/llc.h> |
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c index d1eaddb13633..45d7dd92a088 100644 --- a/net/llc/sysctl_net_llc.c +++ b/net/llc/sysctl_net_llc.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 4 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/sysctl.h> | 9 | #include <linux/sysctl.h> |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index b1622b7de1cf..42a178aa30f9 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
| @@ -411,7 +411,10 @@ config NETFILTER_XT_MATCH_STATISTIC | |||
| 411 | tristate '"statistic" match support' | 411 | tristate '"statistic" match support' |
| 412 | depends on NETFILTER_XTABLES | 412 | depends on NETFILTER_XTABLES |
| 413 | help | 413 | help |
| 414 | statistic module | 414 | This option adds a `statistic' match, which allows you to match |
| 415 | on packets periodically or randomly with a given percentage. | ||
| 416 | |||
| 417 | To compile it as a module, choose M here. If unsure, say N. | ||
| 415 | 418 | ||
| 416 | config NETFILTER_XT_MATCH_STRING | 419 | config NETFILTER_XT_MATCH_STRING |
| 417 | tristate '"string" match support' | 420 | tristate '"string" match support' |
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 8455a32ea5c4..5d29d5e23624 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * 15-Mar-2000: Added NF_REPEAT --RR. | 10 | * 15-Mar-2000: Added NF_REPEAT --RR. |
| 11 | * 08-May-2003: Internal logging interface added by Jozsef Kadlecsik. | 11 | * 08-May-2003: Internal logging interface added by Jozsef Kadlecsik. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/netfilter.h> | 14 | #include <linux/netfilter.h> |
| 16 | #include <net/protocol.h> | 15 | #include <net/protocol.h> |
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index cd299f4b7db1..8f2261965a68 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * Derived from net/ipv4/netfilter/ip_conntrack_core.c | 29 | * Derived from net/ipv4/netfilter/ip_conntrack_core.c |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 34 | #include <linux/netfilter.h> | 33 | #include <linux/netfilter.h> |
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index 11d3be243536..960972d225f9 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Derived from net/ipv4/netfilter/ip_conntrack_ftp.c | 15 | * Derived from net/ipv4/netfilter/ip_conntrack_ftp.c |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 21 | #include <linux/netfilter.h> | 20 | #include <linux/netfilter.h> |
diff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c index 3fc58e454d4e..21e0bc91cf23 100644 --- a/net/netfilter/nf_conntrack_l3proto_generic.c +++ b/net/netfilter/nf_conntrack_l3proto_generic.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp> | 15 | * Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp> |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/ip.h> | 19 | #include <linux/ip.h> |
| 21 | #include <linux/netfilter.h> | 20 | #include <linux/netfilter.h> |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index b8c7c567c9df..af4845971f70 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 30 | #include <linux/netlink.h> | 30 | #include <linux/netlink.h> |
| 31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
| 32 | #include <linux/interrupt.h> | ||
| 32 | #include <linux/notifier.h> | 33 | #include <linux/notifier.h> |
| 33 | 34 | ||
| 34 | #include <linux/netfilter.h> | 35 | #include <linux/netfilter.h> |
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c index 0c6da496cfa9..9bd8a7877fd5 100644 --- a/net/netfilter/nf_conntrack_proto_sctp.c +++ b/net/netfilter/nf_conntrack_proto_sctp.c | |||
| @@ -28,6 +28,8 @@ | |||
| 28 | #include <linux/sctp.h> | 28 | #include <linux/sctp.h> |
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/seq_file.h> | 30 | #include <linux/seq_file.h> |
| 31 | #include <linux/spinlock.h> | ||
| 32 | #include <linux/interrupt.h> | ||
| 31 | 33 | ||
| 32 | #include <net/netfilter/nf_conntrack.h> | 34 | #include <net/netfilter/nf_conntrack.h> |
| 33 | #include <net/netfilter/nf_conntrack_protocol.h> | 35 | #include <net/netfilter/nf_conntrack_protocol.h> |
| @@ -259,7 +261,7 @@ static int do_basic_checks(struct nf_conn *conntrack, | |||
| 259 | } | 261 | } |
| 260 | 262 | ||
| 261 | DEBUGP("Basic checks passed\n"); | 263 | DEBUGP("Basic checks passed\n"); |
| 262 | return 0; | 264 | return count == 0; |
| 263 | } | 265 | } |
| 264 | 266 | ||
| 265 | static int new_state(enum ip_conntrack_dir dir, | 267 | static int new_state(enum ip_conntrack_dir dir, |
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 12fb7c0a1509..af8adcba23a7 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * version 2.2 | 24 | * version 2.2 |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 30 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index e34c574f0351..5fcab2ef231f 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * Derived from net/ipv4/netfilter/ip_conntrack_standalone.c | 17 | * Derived from net/ipv4/netfilter/ip_conntrack_standalone.c |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 22 | #include <linux/netfilter.h> | 21 | #include <linux/netfilter.h> |
| 23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h index 6bdee2910617..86e392bfe833 100644 --- a/net/netfilter/nf_internals.h +++ b/net/netfilter/nf_internals.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _NF_INTERNALS_H | 1 | #ifndef _NF_INTERNALS_H |
| 2 | #define _NF_INTERNALS_H | 2 | #define _NF_INTERNALS_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/list.h> | 4 | #include <linux/list.h> |
| 6 | #include <linux/skbuff.h> | 5 | #include <linux/skbuff.h> |
| 7 | #include <linux/netdevice.h> | 6 | #include <linux/netdevice.h> |
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 3e76bd0824a2..8901b3a07f7e 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include <linux/module.h> | 3 | #include <linux/module.h> |
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index ee8f70889f47..bb6fcee452ca 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include <linux/module.h> | 3 | #include <linux/module.h> |
diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c index 0a63d7dac7be..c2e44e90e437 100644 --- a/net/netfilter/nf_sockopt.c +++ b/net/netfilter/nf_sockopt.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include <linux/module.h> | 3 | #include <linux/module.h> |
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index b88e82a1a987..52fdfa2686c9 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * of the GNU General Public License, incorporated herein by reference. | 14 | * of the GNU General Public License, incorporated herein by reference. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/socket.h> | 19 | #include <linux/socket.h> |
| @@ -229,7 +228,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, | |||
| 229 | NFNL_SUBSYS_ID(nlh->nlmsg_type), | 228 | NFNL_SUBSYS_ID(nlh->nlmsg_type), |
| 230 | NFNL_MSG_TYPE(nlh->nlmsg_type)); | 229 | NFNL_MSG_TYPE(nlh->nlmsg_type)); |
| 231 | 230 | ||
| 232 | if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN)) { | 231 | if (security_netlink_recv(skb, CAP_NET_ADMIN)) { |
| 233 | DEBUGP("missing CAP_NET_ADMIN\n"); | 232 | DEBUGP("missing CAP_NET_ADMIN\n"); |
| 234 | *errp = -EPERM; | 233 | *errp = -EPERM; |
| 235 | return -1; | 234 | return -1; |
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 86a4ac33de34..49ef41e34c48 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c | |||
| @@ -680,11 +680,19 @@ dev_cmp(struct nfqnl_queue_entry *entry, unsigned long ifindex) | |||
| 680 | if (entinf->indev) | 680 | if (entinf->indev) |
| 681 | if (entinf->indev->ifindex == ifindex) | 681 | if (entinf->indev->ifindex == ifindex) |
| 682 | return 1; | 682 | return 1; |
| 683 | |||
| 684 | if (entinf->outdev) | 683 | if (entinf->outdev) |
| 685 | if (entinf->outdev->ifindex == ifindex) | 684 | if (entinf->outdev->ifindex == ifindex) |
| 686 | return 1; | 685 | return 1; |
| 687 | 686 | #ifdef CONFIG_BRIDGE_NETFILTER | |
| 687 | if (entry->skb->nf_bridge) { | ||
| 688 | if (entry->skb->nf_bridge->physindev && | ||
| 689 | entry->skb->nf_bridge->physindev->ifindex == ifindex) | ||
| 690 | return 1; | ||
| 691 | if (entry->skb->nf_bridge->physoutdev && | ||
| 692 | entry->skb->nf_bridge->physoutdev->ifindex == ifindex) | ||
| 693 | return 1; | ||
| 694 | } | ||
| 695 | #endif | ||
| 688 | return 0; | 696 | return 0; |
| 689 | } | 697 | } |
| 690 | 698 | ||
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 99293c63ff73..174e8f970095 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/socket.h> | 17 | #include <linux/socket.h> |
| 19 | #include <linux/net.h> | 18 | #include <linux/net.h> |
diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c index a3aa62fbda6f..ba1ca03abad3 100644 --- a/net/netfilter/xt_policy.c +++ b/net/netfilter/xt_policy.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/skbuff.h> | 12 | #include <linux/skbuff.h> |
| 14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
diff --git a/net/netfilter/xt_sctp.c b/net/netfilter/xt_sctp.c index 9316c753692f..843383e01d41 100644 --- a/net/netfilter/xt_sctp.c +++ b/net/netfilter/xt_sctp.c | |||
| @@ -151,7 +151,7 @@ match(const struct sk_buff *skb, | |||
| 151 | && SCCHECK(((ntohs(sh->dest) >= info->dpts[0]) | 151 | && SCCHECK(((ntohs(sh->dest) >= info->dpts[0]) |
| 152 | && (ntohs(sh->dest) <= info->dpts[1])), | 152 | && (ntohs(sh->dest) <= info->dpts[1])), |
| 153 | XT_SCTP_DEST_PORTS, info->flags, info->invflags) | 153 | XT_SCTP_DEST_PORTS, info->flags, info->invflags) |
| 154 | && SCCHECK(match_packet(skb, protoff, | 154 | && SCCHECK(match_packet(skb, protoff + sizeof (sctp_sctphdr_t), |
| 155 | info->chunkmap, info->chunk_match_type, | 155 | info->chunkmap, info->chunk_match_type, |
| 156 | info->flag_info, info->flag_count, | 156 | info->flag_info, info->flag_count, |
| 157 | hotdrop), | 157 | hotdrop), |
diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c index 1b61dac9c873..a9a63aa68936 100644 --- a/net/netfilter/xt_tcpudp.c +++ b/net/netfilter/xt_tcpudp.c | |||
| @@ -260,7 +260,7 @@ static int __init xt_tcpudp_init(void) | |||
| 260 | return ret; | 260 | return ret; |
| 261 | 261 | ||
| 262 | out_unreg_udp: | 262 | out_unreg_udp: |
| 263 | xt_unregister_match(&tcp_matchstruct); | 263 | xt_unregister_match(&udp_matchstruct); |
| 264 | out_unreg_tcp6: | 264 | out_unreg_tcp6: |
| 265 | xt_unregister_match(&tcp6_matchstruct); | 265 | xt_unregister_match(&tcp6_matchstruct); |
| 266 | out_unreg_tcp: | 266 | out_unreg_tcp: |
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 3862e73d14d7..70cee82a98bf 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * mandatory if CONFIG_NET=y these days | 21 | * mandatory if CONFIG_NET=y these days |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | 25 | ||
| 27 | #include <linux/capability.h> | 26 | #include <linux/capability.h> |
diff --git a/net/netlink/attr.c b/net/netlink/attr.c index fffef4ab276f..dddbd15135a8 100644 --- a/net/netlink/attr.c +++ b/net/netlink/attr.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> | 5 | * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index f329b72578f5..a298f77cc3e3 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Thomas Graf <tgraf@suug.ch> | 5 | * Thomas Graf <tgraf@suug.ch> |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| @@ -320,7 +319,7 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
| 320 | goto errout; | 319 | goto errout; |
| 321 | } | 320 | } |
| 322 | 321 | ||
| 323 | if ((ops->flags & GENL_ADMIN_PERM) && security_netlink_recv(skb)) { | 322 | if ((ops->flags & GENL_ADMIN_PERM) && security_netlink_recv(skb, CAP_NET_ADMIN)) { |
| 324 | err = -EPERM; | 323 | err = -EPERM; |
| 325 | goto errout; | 324 | goto errout; |
| 326 | } | 325 | } |
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 3669cb953e6e..eba6df054b1f 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk) | 8 | * Copyright Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk) |
| 9 | * Copyright Darryl Miles G7LED (dlm@g7led.demon.co.uk) | 9 | * Copyright Darryl Miles G7LED (dlm@g7led.demon.co.uk) |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/moduleparam.h> | 12 | #include <linux/moduleparam.h> |
| 14 | #include <linux/capability.h> | 13 | #include <linux/capability.h> |
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 621e5586ab03..9b8eb54971ab 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) | 7 | * Copyright Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/proc_fs.h> | 10 | #include <linux/proc_fs.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 9db7dbdb16e6..f9cef3671593 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | * | 49 | * |
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <linux/config.h> | ||
| 53 | #include <linux/types.h> | 52 | #include <linux/types.h> |
| 54 | #include <linux/sched.h> | 53 | #include <linux/sched.h> |
| 55 | #include <linux/mm.h> | 54 | #include <linux/mm.h> |
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 55564efccf11..7799fe82aeb6 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Copyright (C) Tomi Manninen OH2BNS (oh2bns@sral.fi) | 10 | * Copyright (C) Tomi Manninen OH2BNS (oh2bns@sral.fi) |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/capability.h> | 13 | #include <linux/capability.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/moduleparam.h> | 15 | #include <linux/moduleparam.h> |
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c index 2a1bf8e119e5..9d0bf2a1ea3f 100644 --- a/net/rose/rose_dev.c +++ b/net/rose/rose_dev.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) | 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/proc_fs.h> | 10 | #include <linux/proc_fs.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/net/rxrpc/rxrpc_syms.c b/net/rxrpc/rxrpc_syms.c index 56adf16fed0c..9896fd87a4d4 100644 --- a/net/rxrpc/rxrpc_syms.c +++ b/net/rxrpc/rxrpc_syms.c | |||
| @@ -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/module.h> | 12 | #include <linux/module.h> |
| 14 | 13 | ||
| 15 | #include <rxrpc/transport.h> | 14 | #include <rxrpc/transport.h> |
diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c index fbf98729c748..6374df7e77d1 100644 --- a/net/rxrpc/sysctl.c +++ b/net/rxrpc/sysctl.c | |||
| @@ -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/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 13eeee582886..8298ea9ffe19 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
| @@ -305,7 +305,7 @@ config NET_CLS_U32 | |||
| 305 | tristate "Universal 32bit comparisons w/ hashing (U32)" | 305 | tristate "Universal 32bit comparisons w/ hashing (U32)" |
| 306 | select NET_CLS | 306 | select NET_CLS |
| 307 | ---help--- | 307 | ---help--- |
| 308 | Say Y here to be able to classify packetes using a universal | 308 | Say Y here to be able to classify packets using a universal |
| 309 | 32bit pieces based comparison scheme. | 309 | 32bit pieces based comparison scheme. |
| 310 | 310 | ||
| 311 | To compile this code as a module, choose M here: the | 311 | To compile this code as a module, choose M here: the |
| @@ -485,7 +485,7 @@ config NET_ACT_IPT | |||
| 485 | tristate "IPtables targets" | 485 | tristate "IPtables targets" |
| 486 | depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES | 486 | depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES |
| 487 | ---help--- | 487 | ---help--- |
| 488 | Say Y here to be able to invoke iptables targets after succesful | 488 | Say Y here to be able to invoke iptables targets after successful |
| 489 | classification. | 489 | classification. |
| 490 | 490 | ||
| 491 | To compile this code as a module, choose M here: the | 491 | To compile this code as a module, choose M here: the |
| @@ -537,8 +537,8 @@ config NET_ESTIMATOR | |||
| 537 | ---help--- | 537 | ---help--- |
| 538 | Say Y here to allow using rate estimators to estimate the current | 538 | Say Y here to allow using rate estimators to estimate the current |
| 539 | rate-of-flow for network devices, queues, etc. This module is | 539 | rate-of-flow for network devices, queues, etc. This module is |
| 540 | automaticaly selected if needed but can be selected manually for | 540 | automatically selected if needed but can be selected manually for |
| 541 | statstical purposes. | 541 | statistical purposes. |
| 542 | 542 | ||
| 543 | endif # NET_SCHED | 543 | endif # NET_SCHED |
| 544 | 544 | ||
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 2ffa11c6e8de..5b9397b33238 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
| 15 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index a1e68f78dcc2..e75a147ad60f 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 14 | #include <asm/system.h> | 14 | #include <asm/system.h> |
| 15 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
| 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 <linux/sched.h> | 18 | #include <linux/sched.h> |
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 37640c6fc014..d799e01248c4 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
| 15 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 16 | #include <asm/bitops.h> | 16 | #include <asm/bitops.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 4fcccbd50885..fc562047ecc5 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
| 16 | #include <asm/system.h> | 16 | #include <asm/system.h> |
| 17 | #include <asm/bitops.h> | 17 | #include <asm/bitops.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 1742a68e0122..58b3a8652042 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
| 13 | #include <asm/system.h> | 13 | #include <asm/system.h> |
| 14 | #include <asm/bitops.h> | 14 | #include <asm/bitops.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 24c348fa8922..47e00bd9625e 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 14 | #include <asm/system.h> | 14 | #include <asm/system.h> |
| 15 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c index e5f2e1f431e2..17105c82537f 100644 --- a/net/sched/act_simple.c +++ b/net/sched/act_simple.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index b4d89fbb3782..7e14f14058e9 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/uaccess.h> | 17 | #include <asm/uaccess.h> |
| 18 | #include <asm/system.h> | 18 | #include <asm/system.h> |
| 19 | #include <linux/bitops.h> | 19 | #include <linux/bitops.h> |
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index dfb300bb6baa..61507f006b11 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Authors: Thomas Graf <tgraf@suug.ch> | 9 | * Authors: Thomas Graf <tgraf@suug.ch> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index 75470486e405..d41de91fc4f6 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * | 18 | * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
| 24 | #include <asm/system.h> | 23 | #include <asm/system.h> |
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index 520ff716dab2..c2e71900f7bd 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/config.h> | ||
| 14 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 15 | #include <asm/system.h> | 14 | #include <asm/system.h> |
| 16 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h index 572f06be3b02..ba8741971629 100644 --- a/net/sched/cls_rsvp.h +++ b/net/sched/cls_rsvp.h | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | Well, as result, despite its simplicity, we get a pretty | 65 | Well, as result, despite its simplicity, we get a pretty |
| 66 | powerful classification engine. */ | 66 | powerful classification engine. */ |
| 67 | 67 | ||
| 68 | #include <linux/config.h> | ||
| 69 | 68 | ||
| 70 | struct rsvp_head | 69 | struct rsvp_head |
| 71 | { | 70 | { |
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c index 9f921174c8ab..7870e7bb0bac 100644 --- a/net/sched/cls_tcindex.c +++ b/net/sched/cls_tcindex.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Written 1998,1999 by Werner Almesberger, EPFL ICA | 4 | * Written 1998,1999 by Werner Almesberger, EPFL ICA |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 78e052591fa9..d712edcd1bcf 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
| 34 | #include <asm/system.h> | 34 | #include <asm/system.h> |
| 35 | #include <linux/bitops.h> | 35 | #include <linux/bitops.h> |
| 36 | #include <linux/config.h> | ||
| 37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 38 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
diff --git a/net/sched/em_cmp.c b/net/sched/em_cmp.c index bf1f00f8b1bf..8ed93c39b4ea 100644 --- a/net/sched/em_cmp.c +++ b/net/sched/em_cmp.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Authors: Thomas Graf <tgraf@suug.ch> | 9 | * Authors: Thomas Graf <tgraf@suug.ch> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 700844d49d79..698372954f4d 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | * only available if that subsytem is enabled in the kernel. | 58 | * only available if that subsytem is enabled in the kernel. |
| 59 | */ | 59 | */ |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 63 | #include <linux/types.h> | 62 | #include <linux/types.h> |
| 64 | #include <linux/kernel.h> | 63 | #include <linux/kernel.h> |
diff --git a/net/sched/em_nbyte.c b/net/sched/em_nbyte.c index 71ea926a9f09..cc80babfd79f 100644 --- a/net/sched/em_nbyte.c +++ b/net/sched/em_nbyte.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Authors: Thomas Graf <tgraf@suug.ch> | 9 | * Authors: Thomas Graf <tgraf@suug.ch> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/net/sched/em_text.c b/net/sched/em_text.c index 77beabc91fa3..aa17d8f7c4c8 100644 --- a/net/sched/em_text.c +++ b/net/sched/em_text.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Authors: Thomas Graf <tgraf@suug.ch> | 9 | * Authors: Thomas Graf <tgraf@suug.ch> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/net/sched/em_u32.c b/net/sched/em_u32.c index 34e7e51e601e..e3ddfce0ac8d 100644 --- a/net/sched/em_u32.c +++ b/net/sched/em_u32.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * Based on net/sched/cls_u32.c | 12 | * Based on net/sched/cls_u32.c |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
diff --git a/net/sched/ematch.c b/net/sched/ematch.c index 5cb956b721e8..2405a86093a2 100644 --- a/net/sched/ematch.c +++ b/net/sched/ematch.c | |||
| @@ -81,7 +81,6 @@ | |||
| 81 | * open up a beer to watch the compilation going. | 81 | * open up a beer to watch the compilation going. |
| 82 | */ | 82 | */ |
| 83 | 83 | ||
| 84 | #include <linux/config.h> | ||
| 85 | #include <linux/module.h> | 84 | #include <linux/module.h> |
| 86 | #include <linux/types.h> | 85 | #include <linux/types.h> |
| 87 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 31570b9a6e9a..c7844bacbbcb 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Jamal Hadi Salim <hadi@nortelnetworks.com>: 990601: ingress support | 15 | * Jamal Hadi Salim <hadi@nortelnetworks.com>: 990601: ingress support |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index ac7cb60d1e25..dbf44da0912f 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | /* Written 1998-2000 by Werner Almesberger, EPFL ICA */ | 3 | /* Written 1998-2000 by Werner Almesberger, EPFL ICA */ |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/string.h> | 8 | #include <linux/string.h> |
diff --git a/net/sched/sch_blackhole.c b/net/sched/sch_blackhole.c index 81f0b8346d17..cb0c456aa349 100644 --- a/net/sched/sch_blackhole.c +++ b/net/sched/sch_blackhole.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Note: Quantum tunneling is not supported. | 11 | * Note: Quantum tunneling is not supported. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 6cd81708bf71..80b7f6a8d008 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
| 16 | #include <asm/system.h> | 15 | #include <asm/system.h> |
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c index f6320ca70493..11c8a2119b96 100644 --- a/net/sched/sch_dsmark.c +++ b/net/sched/sch_dsmark.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | /* Written 1998-2000 by Werner Almesberger, EPFL ICA */ | 3 | /* Written 1998-2000 by Werner Almesberger, EPFL ICA */ |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
diff --git a/net/sched/sch_fifo.c b/net/sched/sch_fifo.c index 033083bf0e74..c2689f4ba8de 100644 --- a/net/sched/sch_fifo.c +++ b/net/sched/sch_fifo.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> | 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 74d4a1dceeec..d735f51686a1 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
| 15 | #include <asm/system.h> | 15 | #include <asm/system.h> |
| 16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index 29a2dd9f3029..0cafdd5feb1b 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * For all the glorious comments look at include/net/red.h | 18 | * For all the glorious comments look at include/net/red.h |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index f1c7bd29f2cd..6b1b4a981e88 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <linux/kernel.h> | 52 | #include <linux/kernel.h> |
| 53 | #include <linux/config.h> | ||
| 54 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 55 | #include <linux/types.h> | 54 | #include <linux/types.h> |
| 56 | #include <linux/errno.h> | 55 | #include <linux/errno.h> |
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 3ec95df4a85e..34afe41fa2f3 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * | 27 | * |
| 28 | * $Id: sch_htb.c,v 1.25 2003/12/07 11:08:25 devik Exp devik $ | 28 | * $Id: sch_htb.c,v 1.25 2003/12/07 11:08:25 devik Exp devik $ |
| 29 | */ | 29 | */ |
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 33 | #include <asm/system.h> | 32 | #include <asm/system.h> |
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 8edc32a6ad2f..c3242f727d41 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * Authors: Jamal Hadi Salim 1999 | 7 | * Authors: Jamal Hadi Salim 1999 |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/skbuff.h> | 12 | #include <linux/skbuff.h> |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 5a4a4d0ae502..c5bd8064e6d8 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Catalin(ux aka Dino) BOIE <catab at umbrella dot ro> | 13 | * Catalin(ux aka Dino) BOIE <catab at umbrella dot ro> |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/bitops.h> | 17 | #include <linux/bitops.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 3395ca7bcadf..a5fa03c0c19b 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * Init -- EINVAL when opt undefined | 11 | * Init -- EINVAL when opt undefined |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 16 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
| 17 | #include <asm/system.h> | 16 | #include <asm/system.h> |
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 2be563cba72b..d65cadddea69 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * J Hadi Salim 980816: ECN support | 14 | * J Hadi Salim 980816: ECN support |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index e057768f68b4..d0d6e595a78c 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> | 9 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 15 | #include <asm/system.h> | 14 | #include <asm/system.h> |
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index d8e03c74ca76..d9a5d298d755 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
| 18 | #include <asm/system.h> | 17 | #include <asm/system.h> |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index b811691c35bf..0a2c71d0d8aa 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | * be incorporated into the next SCTP release. | 57 | * be incorporated into the next SCTP release. |
| 58 | */ | 58 | */ |
| 59 | 59 | ||
| 60 | #include <linux/config.h> | ||
| 61 | #include <linux/types.h> | 60 | #include <linux/types.h> |
| 62 | #include <linux/kernel.h> | 61 | #include <linux/kernel.h> |
| 63 | #include <linux/wait.h> | 62 | #include <linux/wait.h> |
diff --git a/net/socket.c b/net/socket.c index 565f5e8d1191..b4848ce0d6ac 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | * Based upon Swansea University Computer Society NET3.039 | 58 | * Based upon Swansea University Computer Society NET3.039 |
| 59 | */ | 59 | */ |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | #include <linux/mm.h> | 61 | #include <linux/mm.h> |
| 63 | #include <linux/smp_lock.h> | 62 | #include <linux/smp_lock.h> |
| 64 | #include <linux/socket.h> | 63 | #include <linux/socket.h> |
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c index f8bac6ccd524..d88468d21c37 100644 --- a/net/sunrpc/auth_gss/gss_mech_switch.c +++ b/net/sunrpc/auth_gss/gss_mech_switch.c | |||
| @@ -224,7 +224,8 @@ EXPORT_SYMBOL(gss_service_to_auth_domain_name); | |||
| 224 | void | 224 | void |
| 225 | gss_mech_put(struct gss_api_mech * gm) | 225 | gss_mech_put(struct gss_api_mech * gm) |
| 226 | { | 226 | { |
| 227 | module_put(gm->gm_owner); | 227 | if (gm) |
| 228 | module_put(gm->gm_owner); | ||
| 228 | } | 229 | } |
| 229 | 230 | ||
| 230 | EXPORT_SYMBOL(gss_mech_put); | 231 | EXPORT_SYMBOL(gss_mech_put); |
| @@ -307,8 +308,7 @@ gss_delete_sec_context(struct gss_ctx **context_handle) | |||
| 307 | (*context_handle)->mech_type->gm_ops | 308 | (*context_handle)->mech_type->gm_ops |
| 308 | ->gss_delete_sec_context((*context_handle) | 309 | ->gss_delete_sec_context((*context_handle) |
| 309 | ->internal_ctx_id); | 310 | ->internal_ctx_id); |
| 310 | if ((*context_handle)->mech_type) | 311 | gss_mech_put((*context_handle)->mech_type); |
| 311 | gss_mech_put((*context_handle)->mech_type); | ||
| 312 | kfree(*context_handle); | 312 | kfree(*context_handle); |
| 313 | *context_handle=NULL; | 313 | *context_handle=NULL; |
| 314 | return GSS_S_COMPLETE; | 314 | return GSS_S_COMPLETE; |
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index d51e316c5821..94217ec9e2dd 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
| @@ -425,6 +425,7 @@ static int rsc_parse(struct cache_detail *cd, | |||
| 425 | struct rsc rsci, *rscp = NULL; | 425 | struct rsc rsci, *rscp = NULL; |
| 426 | time_t expiry; | 426 | time_t expiry; |
| 427 | int status = -EINVAL; | 427 | int status = -EINVAL; |
| 428 | struct gss_api_mech *gm = NULL; | ||
| 428 | 429 | ||
| 429 | memset(&rsci, 0, sizeof(rsci)); | 430 | memset(&rsci, 0, sizeof(rsci)); |
| 430 | /* context handle */ | 431 | /* context handle */ |
| @@ -453,7 +454,6 @@ static int rsc_parse(struct cache_detail *cd, | |||
| 453 | set_bit(CACHE_NEGATIVE, &rsci.h.flags); | 454 | set_bit(CACHE_NEGATIVE, &rsci.h.flags); |
| 454 | else { | 455 | else { |
| 455 | int N, i; | 456 | int N, i; |
| 456 | struct gss_api_mech *gm; | ||
| 457 | 457 | ||
| 458 | /* gid */ | 458 | /* gid */ |
| 459 | if (get_int(&mesg, &rsci.cred.cr_gid)) | 459 | if (get_int(&mesg, &rsci.cred.cr_gid)) |
| @@ -488,21 +488,17 @@ static int rsc_parse(struct cache_detail *cd, | |||
| 488 | status = -EINVAL; | 488 | status = -EINVAL; |
| 489 | /* mech-specific data: */ | 489 | /* mech-specific data: */ |
| 490 | len = qword_get(&mesg, buf, mlen); | 490 | len = qword_get(&mesg, buf, mlen); |
| 491 | if (len < 0) { | 491 | if (len < 0) |
| 492 | gss_mech_put(gm); | ||
| 493 | goto out; | 492 | goto out; |
| 494 | } | ||
| 495 | status = gss_import_sec_context(buf, len, gm, &rsci.mechctx); | 493 | status = gss_import_sec_context(buf, len, gm, &rsci.mechctx); |
| 496 | if (status) { | 494 | if (status) |
| 497 | gss_mech_put(gm); | ||
| 498 | goto out; | 495 | goto out; |
| 499 | } | ||
| 500 | gss_mech_put(gm); | ||
| 501 | } | 496 | } |
| 502 | rsci.h.expiry_time = expiry; | 497 | rsci.h.expiry_time = expiry; |
| 503 | rscp = rsc_update(&rsci, rscp); | 498 | rscp = rsc_update(&rsci, rscp); |
| 504 | status = 0; | 499 | status = 0; |
| 505 | out: | 500 | out: |
| 501 | gss_mech_put(gm); | ||
| 506 | rsc_free(&rsci); | 502 | rsc_free(&rsci); |
| 507 | if (rscp) | 503 | if (rscp) |
| 508 | cache_put(&rscp->h, &rsc_cache); | 504 | cache_put(&rscp->h, &rsc_cache); |
| @@ -836,6 +832,74 @@ out: | |||
| 836 | return stat; | 832 | return stat; |
| 837 | } | 833 | } |
| 838 | 834 | ||
| 835 | static inline int | ||
| 836 | total_buf_len(struct xdr_buf *buf) | ||
| 837 | { | ||
| 838 | return buf->head[0].iov_len + buf->page_len + buf->tail[0].iov_len; | ||
| 839 | } | ||
| 840 | |||
| 841 | static void | ||
| 842 | fix_priv_head(struct xdr_buf *buf, int pad) | ||
| 843 | { | ||
| 844 | if (buf->page_len == 0) { | ||
| 845 | /* We need to adjust head and buf->len in tandem in this | ||
| 846 | * case to make svc_defer() work--it finds the original | ||
| 847 | * buffer start using buf->len - buf->head[0].iov_len. */ | ||
| 848 | buf->head[0].iov_len -= pad; | ||
| 849 | } | ||
| 850 | } | ||
| 851 | |||
| 852 | static int | ||
| 853 | unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx) | ||
| 854 | { | ||
| 855 | u32 priv_len, maj_stat; | ||
| 856 | int pad, saved_len, remaining_len, offset; | ||
| 857 | |||
| 858 | rqstp->rq_sendfile_ok = 0; | ||
| 859 | |||
| 860 | priv_len = ntohl(svc_getu32(&buf->head[0])); | ||
| 861 | if (rqstp->rq_deferred) { | ||
| 862 | /* Already decrypted last time through! The sequence number | ||
| 863 | * check at out_seq is unnecessary but harmless: */ | ||
| 864 | goto out_seq; | ||
| 865 | } | ||
| 866 | /* buf->len is the number of bytes from the original start of the | ||
| 867 | * request to the end, where head[0].iov_len is just the bytes | ||
| 868 | * not yet read from the head, so these two values are different: */ | ||
| 869 | remaining_len = total_buf_len(buf); | ||
| 870 | if (priv_len > remaining_len) | ||
| 871 | return -EINVAL; | ||
| 872 | pad = remaining_len - priv_len; | ||
| 873 | buf->len -= pad; | ||
| 874 | fix_priv_head(buf, pad); | ||
| 875 | |||
| 876 | /* Maybe it would be better to give gss_unwrap a length parameter: */ | ||
| 877 | saved_len = buf->len; | ||
| 878 | buf->len = priv_len; | ||
| 879 | maj_stat = gss_unwrap(ctx, 0, buf); | ||
| 880 | pad = priv_len - buf->len; | ||
| 881 | buf->len = saved_len; | ||
| 882 | buf->len -= pad; | ||
| 883 | /* The upper layers assume the buffer is aligned on 4-byte boundaries. | ||
| 884 | * In the krb5p case, at least, the data ends up offset, so we need to | ||
| 885 | * move it around. */ | ||
| 886 | /* XXX: This is very inefficient. It would be better to either do | ||
| 887 | * this while we encrypt, or maybe in the receive code, if we can peak | ||
| 888 | * ahead and work out the service and mechanism there. */ | ||
| 889 | offset = buf->head[0].iov_len % 4; | ||
| 890 | if (offset) { | ||
| 891 | buf->buflen = RPCSVC_MAXPAYLOAD; | ||
| 892 | xdr_shift_buf(buf, offset); | ||
| 893 | fix_priv_head(buf, pad); | ||
| 894 | } | ||
| 895 | if (maj_stat != GSS_S_COMPLETE) | ||
| 896 | return -EINVAL; | ||
| 897 | out_seq: | ||
| 898 | if (ntohl(svc_getu32(&buf->head[0])) != seq) | ||
| 899 | return -EINVAL; | ||
| 900 | return 0; | ||
| 901 | } | ||
| 902 | |||
| 839 | struct gss_svc_data { | 903 | struct gss_svc_data { |
| 840 | /* decoded gss client cred: */ | 904 | /* decoded gss client cred: */ |
| 841 | struct rpc_gss_wire_cred clcred; | 905 | struct rpc_gss_wire_cred clcred; |
| @@ -1051,7 +1115,14 @@ svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp) | |||
| 1051 | svc_putu32(resv, 0); | 1115 | svc_putu32(resv, 0); |
| 1052 | break; | 1116 | break; |
| 1053 | case RPC_GSS_SVC_PRIVACY: | 1117 | case RPC_GSS_SVC_PRIVACY: |
| 1054 | /* currently unsupported */ | 1118 | if (unwrap_priv_data(rqstp, &rqstp->rq_arg, |
| 1119 | gc->gc_seq, rsci->mechctx)) | ||
| 1120 | goto auth_err; | ||
| 1121 | /* placeholders for length and seq. number: */ | ||
| 1122 | svcdata->body_start = resv->iov_base + resv->iov_len; | ||
| 1123 | svc_putu32(resv, 0); | ||
| 1124 | svc_putu32(resv, 0); | ||
| 1125 | break; | ||
| 1055 | default: | 1126 | default: |
| 1056 | goto auth_err; | 1127 | goto auth_err; |
| 1057 | } | 1128 | } |
| @@ -1076,8 +1147,8 @@ out: | |||
| 1076 | return ret; | 1147 | return ret; |
| 1077 | } | 1148 | } |
| 1078 | 1149 | ||
| 1079 | static int | 1150 | static inline int |
| 1080 | svcauth_gss_release(struct svc_rqst *rqstp) | 1151 | svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp) |
| 1081 | { | 1152 | { |
| 1082 | struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; | 1153 | struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; |
| 1083 | struct rpc_gss_wire_cred *gc = &gsd->clcred; | 1154 | struct rpc_gss_wire_cred *gc = &gsd->clcred; |
| @@ -1089,69 +1160,147 @@ svcauth_gss_release(struct svc_rqst *rqstp) | |||
| 1089 | int integ_offset, integ_len; | 1160 | int integ_offset, integ_len; |
| 1090 | int stat = -EINVAL; | 1161 | int stat = -EINVAL; |
| 1091 | 1162 | ||
| 1163 | p = gsd->body_start; | ||
| 1164 | gsd->body_start = NULL; | ||
| 1165 | /* move accept_stat to right place: */ | ||
| 1166 | memcpy(p, p + 2, 4); | ||
| 1167 | /* Don't wrap in failure case: */ | ||
| 1168 | /* Counting on not getting here if call was not even accepted! */ | ||
| 1169 | if (*p != rpc_success) { | ||
| 1170 | resbuf->head[0].iov_len -= 2 * 4; | ||
| 1171 | goto out; | ||
| 1172 | } | ||
| 1173 | p++; | ||
| 1174 | integ_offset = (u8 *)(p + 1) - (u8 *)resbuf->head[0].iov_base; | ||
| 1175 | integ_len = resbuf->len - integ_offset; | ||
| 1176 | BUG_ON(integ_len % 4); | ||
| 1177 | *p++ = htonl(integ_len); | ||
| 1178 | *p++ = htonl(gc->gc_seq); | ||
| 1179 | if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, | ||
| 1180 | integ_len)) | ||
| 1181 | BUG(); | ||
| 1182 | if (resbuf->page_len == 0 | ||
| 1183 | && resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE | ||
| 1184 | < PAGE_SIZE) { | ||
| 1185 | BUG_ON(resbuf->tail[0].iov_len); | ||
| 1186 | /* Use head for everything */ | ||
| 1187 | resv = &resbuf->head[0]; | ||
| 1188 | } else if (resbuf->tail[0].iov_base == NULL) { | ||
| 1189 | if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE) | ||
| 1190 | goto out_err; | ||
| 1191 | resbuf->tail[0].iov_base = resbuf->head[0].iov_base | ||
| 1192 | + resbuf->head[0].iov_len; | ||
| 1193 | resbuf->tail[0].iov_len = 0; | ||
| 1194 | rqstp->rq_restailpage = 0; | ||
| 1195 | resv = &resbuf->tail[0]; | ||
| 1196 | } else { | ||
| 1197 | resv = &resbuf->tail[0]; | ||
| 1198 | } | ||
| 1199 | mic.data = (u8 *)resv->iov_base + resv->iov_len + 4; | ||
| 1200 | if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic)) | ||
| 1201 | goto out_err; | ||
| 1202 | svc_putu32(resv, htonl(mic.len)); | ||
| 1203 | memset(mic.data + mic.len, 0, | ||
| 1204 | round_up_to_quad(mic.len) - mic.len); | ||
| 1205 | resv->iov_len += XDR_QUADLEN(mic.len) << 2; | ||
| 1206 | /* not strictly required: */ | ||
| 1207 | resbuf->len += XDR_QUADLEN(mic.len) << 2; | ||
| 1208 | BUG_ON(resv->iov_len > PAGE_SIZE); | ||
| 1209 | out: | ||
| 1210 | stat = 0; | ||
| 1211 | out_err: | ||
| 1212 | return stat; | ||
| 1213 | } | ||
| 1214 | |||
| 1215 | static inline int | ||
| 1216 | svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp) | ||
| 1217 | { | ||
| 1218 | struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; | ||
| 1219 | struct rpc_gss_wire_cred *gc = &gsd->clcred; | ||
| 1220 | struct xdr_buf *resbuf = &rqstp->rq_res; | ||
| 1221 | struct page **inpages = NULL; | ||
| 1222 | u32 *p; | ||
| 1223 | int offset, *len; | ||
| 1224 | int pad; | ||
| 1225 | |||
| 1226 | p = gsd->body_start; | ||
| 1227 | gsd->body_start = NULL; | ||
| 1228 | /* move accept_stat to right place: */ | ||
| 1229 | memcpy(p, p + 2, 4); | ||
| 1230 | /* Don't wrap in failure case: */ | ||
| 1231 | /* Counting on not getting here if call was not even accepted! */ | ||
| 1232 | if (*p != rpc_success) { | ||
| 1233 | resbuf->head[0].iov_len -= 2 * 4; | ||
| 1234 | return 0; | ||
| 1235 | } | ||
| 1236 | p++; | ||
| 1237 | len = p++; | ||
| 1238 | offset = (u8 *)p - (u8 *)resbuf->head[0].iov_base; | ||
| 1239 | *p++ = htonl(gc->gc_seq); | ||
| 1240 | inpages = resbuf->pages; | ||
| 1241 | /* XXX: Would be better to write some xdr helper functions for | ||
| 1242 | * nfs{2,3,4}xdr.c that place the data right, instead of copying: */ | ||
| 1243 | if (resbuf->tail[0].iov_base && rqstp->rq_restailpage == 0) { | ||
| 1244 | BUG_ON(resbuf->tail[0].iov_base >= resbuf->head[0].iov_base | ||
| 1245 | + PAGE_SIZE); | ||
| 1246 | BUG_ON(resbuf->tail[0].iov_base < resbuf->head[0].iov_base); | ||
| 1247 | if (resbuf->tail[0].iov_len + resbuf->head[0].iov_len | ||
| 1248 | + 2 * RPC_MAX_AUTH_SIZE > PAGE_SIZE) | ||
| 1249 | return -ENOMEM; | ||
| 1250 | memmove(resbuf->tail[0].iov_base + RPC_MAX_AUTH_SIZE, | ||
| 1251 | resbuf->tail[0].iov_base, | ||
| 1252 | resbuf->tail[0].iov_len); | ||
| 1253 | resbuf->tail[0].iov_base += RPC_MAX_AUTH_SIZE; | ||
| 1254 | } | ||
| 1255 | if (resbuf->tail[0].iov_base == NULL) { | ||
| 1256 | if (resbuf->head[0].iov_len + 2*RPC_MAX_AUTH_SIZE > PAGE_SIZE) | ||
| 1257 | return -ENOMEM; | ||
| 1258 | resbuf->tail[0].iov_base = resbuf->head[0].iov_base | ||
| 1259 | + resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE; | ||
| 1260 | resbuf->tail[0].iov_len = 0; | ||
| 1261 | rqstp->rq_restailpage = 0; | ||
| 1262 | } | ||
| 1263 | if (gss_wrap(gsd->rsci->mechctx, offset, resbuf, inpages)) | ||
| 1264 | return -ENOMEM; | ||
| 1265 | *len = htonl(resbuf->len - offset); | ||
| 1266 | pad = 3 - ((resbuf->len - offset - 1)&3); | ||
| 1267 | p = (u32 *)(resbuf->tail[0].iov_base + resbuf->tail[0].iov_len); | ||
| 1268 | memset(p, 0, pad); | ||
| 1269 | resbuf->tail[0].iov_len += pad; | ||
| 1270 | resbuf->len += pad; | ||
| 1271 | return 0; | ||
| 1272 | } | ||
| 1273 | |||
| 1274 | static int | ||
| 1275 | svcauth_gss_release(struct svc_rqst *rqstp) | ||
| 1276 | { | ||
| 1277 | struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; | ||
| 1278 | struct rpc_gss_wire_cred *gc = &gsd->clcred; | ||
| 1279 | struct xdr_buf *resbuf = &rqstp->rq_res; | ||
| 1280 | int stat = -EINVAL; | ||
| 1281 | |||
| 1092 | if (gc->gc_proc != RPC_GSS_PROC_DATA) | 1282 | if (gc->gc_proc != RPC_GSS_PROC_DATA) |
| 1093 | goto out; | 1283 | goto out; |
| 1094 | /* Release can be called twice, but we only wrap once. */ | 1284 | /* Release can be called twice, but we only wrap once. */ |
| 1095 | if (gsd->body_start == NULL) | 1285 | if (gsd->body_start == NULL) |
| 1096 | goto out; | 1286 | goto out; |
| 1097 | /* normally not set till svc_send, but we need it here: */ | 1287 | /* normally not set till svc_send, but we need it here: */ |
| 1098 | resbuf->len = resbuf->head[0].iov_len | 1288 | /* XXX: what for? Do we mess it up the moment we call svc_putu32 |
| 1099 | + resbuf->page_len + resbuf->tail[0].iov_len; | 1289 | * or whatever? */ |
| 1290 | resbuf->len = total_buf_len(resbuf); | ||
| 1100 | switch (gc->gc_svc) { | 1291 | switch (gc->gc_svc) { |
| 1101 | case RPC_GSS_SVC_NONE: | 1292 | case RPC_GSS_SVC_NONE: |
| 1102 | break; | 1293 | break; |
| 1103 | case RPC_GSS_SVC_INTEGRITY: | 1294 | case RPC_GSS_SVC_INTEGRITY: |
| 1104 | p = gsd->body_start; | 1295 | stat = svcauth_gss_wrap_resp_integ(rqstp); |
| 1105 | gsd->body_start = NULL; | 1296 | if (stat) |
| 1106 | /* move accept_stat to right place: */ | ||
| 1107 | memcpy(p, p + 2, 4); | ||
| 1108 | /* don't wrap in failure case: */ | ||
| 1109 | /* Note: counting on not getting here if call was not even | ||
| 1110 | * accepted! */ | ||
| 1111 | if (*p != rpc_success) { | ||
| 1112 | resbuf->head[0].iov_len -= 2 * 4; | ||
| 1113 | goto out; | ||
| 1114 | } | ||
| 1115 | p++; | ||
| 1116 | integ_offset = (u8 *)(p + 1) - (u8 *)resbuf->head[0].iov_base; | ||
| 1117 | integ_len = resbuf->len - integ_offset; | ||
| 1118 | BUG_ON(integ_len % 4); | ||
| 1119 | *p++ = htonl(integ_len); | ||
| 1120 | *p++ = htonl(gc->gc_seq); | ||
| 1121 | if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, | ||
| 1122 | integ_len)) | ||
| 1123 | BUG(); | ||
| 1124 | if (resbuf->page_len == 0 | ||
| 1125 | && resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE | ||
| 1126 | < PAGE_SIZE) { | ||
| 1127 | BUG_ON(resbuf->tail[0].iov_len); | ||
| 1128 | /* Use head for everything */ | ||
| 1129 | resv = &resbuf->head[0]; | ||
| 1130 | } else if (resbuf->tail[0].iov_base == NULL) { | ||
| 1131 | if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE | ||
| 1132 | > PAGE_SIZE) | ||
| 1133 | goto out_err; | ||
| 1134 | resbuf->tail[0].iov_base = | ||
| 1135 | resbuf->head[0].iov_base | ||
| 1136 | + resbuf->head[0].iov_len; | ||
| 1137 | resbuf->tail[0].iov_len = 0; | ||
| 1138 | rqstp->rq_restailpage = 0; | ||
| 1139 | resv = &resbuf->tail[0]; | ||
| 1140 | } else { | ||
| 1141 | resv = &resbuf->tail[0]; | ||
| 1142 | } | ||
| 1143 | mic.data = (u8 *)resv->iov_base + resv->iov_len + 4; | ||
| 1144 | if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic)) | ||
| 1145 | goto out_err; | 1297 | goto out_err; |
| 1146 | svc_putu32(resv, htonl(mic.len)); | ||
| 1147 | memset(mic.data + mic.len, 0, | ||
| 1148 | round_up_to_quad(mic.len) - mic.len); | ||
| 1149 | resv->iov_len += XDR_QUADLEN(mic.len) << 2; | ||
| 1150 | /* not strictly required: */ | ||
| 1151 | resbuf->len += XDR_QUADLEN(mic.len) << 2; | ||
| 1152 | BUG_ON(resv->iov_len > PAGE_SIZE); | ||
| 1153 | break; | 1298 | break; |
| 1154 | case RPC_GSS_SVC_PRIVACY: | 1299 | case RPC_GSS_SVC_PRIVACY: |
| 1300 | stat = svcauth_gss_wrap_resp_priv(rqstp); | ||
| 1301 | if (stat) | ||
| 1302 | goto out_err; | ||
| 1303 | break; | ||
| 1155 | default: | 1304 | default: |
| 1156 | goto out_err; | 1305 | goto out_err; |
| 1157 | } | 1306 | } |
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c index d25b054ec921..623180f224c9 100644 --- a/net/sunrpc/pmap_clnt.c +++ b/net/sunrpc/pmap_clnt.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/socket.h> | 10 | #include <linux/socket.h> |
| 12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index dafe793c774e..6db6006616c6 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (c) 2002, Trond Myklebust <trond.myklebust@fys.uio.no> | 8 | * Copyright (c) 2002, Trond Myklebust <trond.myklebust@fys.uio.no> |
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c index 769114f0f886..f38f939ce95f 100644 --- a/net/sunrpc/sunrpc_syms.c +++ b/net/sunrpc/sunrpc_syms.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * Copyright (C) 1997 Olaf Kirch <okir@monad.swb.de> | 6 | * Copyright (C) 1997 Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | 10 | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index b08419e1fc68..01ba60a49572 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
| @@ -280,7 +280,10 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp) | |||
| 280 | rqstp->rq_res.page_base = 0; | 280 | rqstp->rq_res.page_base = 0; |
| 281 | rqstp->rq_res.page_len = 0; | 281 | rqstp->rq_res.page_len = 0; |
| 282 | rqstp->rq_res.buflen = PAGE_SIZE; | 282 | rqstp->rq_res.buflen = PAGE_SIZE; |
| 283 | rqstp->rq_res.tail[0].iov_base = NULL; | ||
| 283 | rqstp->rq_res.tail[0].iov_len = 0; | 284 | rqstp->rq_res.tail[0].iov_len = 0; |
| 285 | /* Will be turned off only in gss privacy case: */ | ||
| 286 | rqstp->rq_sendfile_ok = 1; | ||
| 284 | /* tcp needs a space for the record length... */ | 287 | /* tcp needs a space for the record length... */ |
| 285 | if (rqstp->rq_prot == IPPROTO_TCP) | 288 | if (rqstp->rq_prot == IPPROTO_TCP) |
| 286 | svc_putu32(resv, 0); | 289 | svc_putu32(resv, 0); |
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index 1065904841fd..d89b048ad6bb 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * impossible at the moment. | 7 | * impossible at the moment. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
| 13 | #include <linux/ctype.h> | 12 | #include <linux/ctype.h> |
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 58a1b6b42ddd..cd4eafbab1b8 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 17 | #include <linux/sysctl.h> | 16 | #include <linux/sysctl.h> |
| 18 | 17 | ||
diff --git a/net/tipc/core.c b/net/tipc/core.c index 5003acb15919..0539a8362858 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
| @@ -191,7 +191,8 @@ static int __init tipc_init(void) | |||
| 191 | int res; | 191 | int res; |
| 192 | 192 | ||
| 193 | tipc_log_reinit(CONFIG_TIPC_LOG); | 193 | tipc_log_reinit(CONFIG_TIPC_LOG); |
| 194 | info("Activated (compiled " __DATE__ " " __TIME__ ")\n"); | 194 | info("Activated (version " TIPC_MOD_VER |
| 195 | " compiled " __DATE__ " " __TIME__ ")\n"); | ||
| 195 | 196 | ||
| 196 | tipc_own_addr = 0; | 197 | tipc_own_addr = 0; |
| 197 | tipc_remote_management = 1; | 198 | tipc_remote_management = 1; |
diff --git a/net/tipc/link.c b/net/tipc/link.c index d64658053746..c6831c75cfa4 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * net/tipc/link.c: TIPC link code | 2 | * net/tipc/link.c: TIPC link code |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1996-2006, Ericsson AB | 4 | * Copyright (c) 1996-2006, Ericsson AB |
| 5 | * Copyright (c) 2004-2005, Wind River Systems | 5 | * Copyright (c) 2004-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -988,17 +988,18 @@ static int link_bundle_buf(struct link *l_ptr, | |||
| 988 | struct tipc_msg *bundler_msg = buf_msg(bundler); | 988 | struct tipc_msg *bundler_msg = buf_msg(bundler); |
| 989 | struct tipc_msg *msg = buf_msg(buf); | 989 | struct tipc_msg *msg = buf_msg(buf); |
| 990 | u32 size = msg_size(msg); | 990 | u32 size = msg_size(msg); |
| 991 | u32 to_pos = align(msg_size(bundler_msg)); | 991 | u32 bundle_size = msg_size(bundler_msg); |
| 992 | u32 rest = link_max_pkt(l_ptr) - to_pos; | 992 | u32 to_pos = align(bundle_size); |
| 993 | u32 pad = to_pos - bundle_size; | ||
| 993 | 994 | ||
| 994 | if (msg_user(bundler_msg) != MSG_BUNDLER) | 995 | if (msg_user(bundler_msg) != MSG_BUNDLER) |
| 995 | return 0; | 996 | return 0; |
| 996 | if (msg_type(bundler_msg) != OPEN_MSG) | 997 | if (msg_type(bundler_msg) != OPEN_MSG) |
| 997 | return 0; | 998 | return 0; |
| 998 | if (rest < align(size)) | 999 | if (skb_tailroom(bundler) < (pad + size)) |
| 999 | return 0; | 1000 | return 0; |
| 1000 | 1001 | ||
| 1001 | skb_put(bundler, (to_pos - msg_size(bundler_msg)) + size); | 1002 | skb_put(bundler, pad + size); |
| 1002 | memcpy(bundler->data + to_pos, buf->data, size); | 1003 | memcpy(bundler->data + to_pos, buf->data, size); |
| 1003 | msg_set_size(bundler_msg, to_pos + size); | 1004 | msg_set_size(bundler_msg, to_pos + size); |
| 1004 | msg_set_msgcnt(bundler_msg, msg_msgcnt(bundler_msg) + 1); | 1005 | msg_set_msgcnt(bundler_msg, msg_msgcnt(bundler_msg) + 1); |
diff --git a/net/tipc/node.c b/net/tipc/node.c index 861322b935da..fc6d09630ccd 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * net/tipc/node.c: TIPC node management routines | 2 | * net/tipc/node.c: TIPC node management routines |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2000-2006, Ericsson AB | 4 | * Copyright (c) 2000-2006, Ericsson AB |
| 5 | * Copyright (c) 2005, Wind River Systems | 5 | * Copyright (c) 2005-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -592,6 +592,7 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space) | |||
| 592 | struct sk_buff *buf; | 592 | struct sk_buff *buf; |
| 593 | struct node *n_ptr; | 593 | struct node *n_ptr; |
| 594 | struct tipc_node_info node_info; | 594 | struct tipc_node_info node_info; |
| 595 | u32 payload_size; | ||
| 595 | 596 | ||
| 596 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR)) | 597 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR)) |
| 597 | return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); | 598 | return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); |
| @@ -608,8 +609,11 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space) | |||
| 608 | /* For now, get space for all other nodes | 609 | /* For now, get space for all other nodes |
| 609 | (will need to modify this when slave nodes are supported */ | 610 | (will need to modify this when slave nodes are supported */ |
| 610 | 611 | ||
| 611 | buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(node_info)) * | 612 | payload_size = TLV_SPACE(sizeof(node_info)) * (tipc_max_nodes - 1); |
| 612 | (tipc_max_nodes - 1)); | 613 | if (payload_size > 32768u) |
| 614 | return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED | ||
| 615 | " (too many nodes)"); | ||
| 616 | buf = tipc_cfg_reply_alloc(payload_size); | ||
| 613 | if (!buf) | 617 | if (!buf) |
| 614 | return NULL; | 618 | return NULL; |
| 615 | 619 | ||
| @@ -633,6 +637,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) | |||
| 633 | struct sk_buff *buf; | 637 | struct sk_buff *buf; |
| 634 | struct node *n_ptr; | 638 | struct node *n_ptr; |
| 635 | struct tipc_link_info link_info; | 639 | struct tipc_link_info link_info; |
| 640 | u32 payload_size; | ||
| 636 | 641 | ||
| 637 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR)) | 642 | if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR)) |
| 638 | return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); | 643 | return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); |
| @@ -645,12 +650,15 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) | |||
| 645 | 650 | ||
| 646 | if (!tipc_nodes) | 651 | if (!tipc_nodes) |
| 647 | return tipc_cfg_reply_none(); | 652 | return tipc_cfg_reply_none(); |
| 648 | 653 | ||
| 649 | /* For now, get space for 2 links to all other nodes + bcast link | 654 | /* Get space for all unicast links + multicast link */ |
| 650 | (will need to modify this when slave nodes are supported */ | 655 | |
| 651 | 656 | payload_size = TLV_SPACE(sizeof(link_info)) * | |
| 652 | buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(link_info)) * | 657 | (tipc_net.zones[tipc_zone(tipc_own_addr)]->links + 1); |
| 653 | (2 * (tipc_max_nodes - 1) + 1)); | 658 | if (payload_size > 32768u) |
| 659 | return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED | ||
| 660 | " (too many links)"); | ||
| 661 | buf = tipc_cfg_reply_alloc(payload_size); | ||
| 654 | if (!buf) | 662 | if (!buf) |
| 655 | return NULL; | 663 | return NULL; |
| 656 | 664 | ||
diff --git a/net/tipc/zone.h b/net/tipc/zone.h index 267999c5a240..5ab3d08602e2 100644 --- a/net/tipc/zone.h +++ b/net/tipc/zone.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * net/tipc/zone.h: Include file for TIPC zone management routines | 2 | * net/tipc/zone.h: Include file for TIPC zone management routines |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2000-2006, Ericsson AB | 4 | * Copyright (c) 2000-2006, Ericsson AB |
| 5 | * Copyright (c) 2005, Wind River Systems | 5 | * Copyright (c) 2005-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -45,7 +45,7 @@ | |||
| 45 | * struct _zone - TIPC zone structure | 45 | * struct _zone - TIPC zone structure |
| 46 | * @addr: network address of zone | 46 | * @addr: network address of zone |
| 47 | * @clusters: array of pointers to all clusters within zone | 47 | * @clusters: array of pointers to all clusters within zone |
| 48 | * @links: (used for inter-zone communication) | 48 | * @links: number of (unicast) links to zone |
| 49 | */ | 49 | */ |
| 50 | 50 | ||
| 51 | struct _zone { | 51 | struct _zone { |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index d901465ce013..aca650109425 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -83,7 +83,6 @@ | |||
| 83 | */ | 83 | */ |
| 84 | 84 | ||
| 85 | #include <linux/module.h> | 85 | #include <linux/module.h> |
| 86 | #include <linux/config.h> | ||
| 87 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
| 88 | #include <linux/signal.h> | 87 | #include <linux/signal.h> |
| 89 | #include <linux/sched.h> | 88 | #include <linux/sched.h> |
| @@ -128,6 +127,30 @@ static atomic_t unix_nr_socks = ATOMIC_INIT(0); | |||
| 128 | 127 | ||
| 129 | #define UNIX_ABSTRACT(sk) (unix_sk(sk)->addr->hash != UNIX_HASH_SIZE) | 128 | #define UNIX_ABSTRACT(sk) (unix_sk(sk)->addr->hash != UNIX_HASH_SIZE) |
| 130 | 129 | ||
| 130 | #ifdef CONFIG_SECURITY_NETWORK | ||
| 131 | static void unix_get_peersec_dgram(struct sk_buff *skb) | ||
| 132 | { | ||
| 133 | int err; | ||
| 134 | |||
| 135 | err = security_socket_getpeersec_dgram(skb, UNIXSECDATA(skb), | ||
| 136 | UNIXSECLEN(skb)); | ||
| 137 | if (err) | ||
| 138 | *(UNIXSECDATA(skb)) = NULL; | ||
| 139 | } | ||
| 140 | |||
| 141 | static inline void unix_set_secdata(struct scm_cookie *scm, struct sk_buff *skb) | ||
| 142 | { | ||
| 143 | scm->secdata = *UNIXSECDATA(skb); | ||
| 144 | scm->seclen = *UNIXSECLEN(skb); | ||
| 145 | } | ||
| 146 | #else | ||
| 147 | static void unix_get_peersec_dgram(struct sk_buff *skb) | ||
| 148 | { } | ||
| 149 | |||
| 150 | static inline void unix_set_secdata(struct scm_cookie *scm, struct sk_buff *skb) | ||
| 151 | { } | ||
| 152 | #endif /* CONFIG_SECURITY_NETWORK */ | ||
| 153 | |||
| 131 | /* | 154 | /* |
| 132 | * SMP locking strategy: | 155 | * SMP locking strategy: |
| 133 | * hash table is protected with spinlock unix_table_lock | 156 | * hash table is protected with spinlock unix_table_lock |
| @@ -1291,6 +1314,8 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 1291 | if (siocb->scm->fp) | 1314 | if (siocb->scm->fp) |
| 1292 | unix_attach_fds(siocb->scm, skb); | 1315 | unix_attach_fds(siocb->scm, skb); |
| 1293 | 1316 | ||
| 1317 | unix_get_peersec_dgram(skb); | ||
| 1318 | |||
| 1294 | skb->h.raw = skb->data; | 1319 | skb->h.raw = skb->data; |
| 1295 | err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len); | 1320 | err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len); |
| 1296 | if (err) | 1321 | if (err) |
| @@ -1570,6 +1595,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1570 | memset(&tmp_scm, 0, sizeof(tmp_scm)); | 1595 | memset(&tmp_scm, 0, sizeof(tmp_scm)); |
| 1571 | } | 1596 | } |
| 1572 | siocb->scm->creds = *UNIXCREDS(skb); | 1597 | siocb->scm->creds = *UNIXCREDS(skb); |
| 1598 | unix_set_secdata(siocb->scm, skb); | ||
| 1573 | 1599 | ||
| 1574 | if (!(flags & MSG_PEEK)) | 1600 | if (!(flags & MSG_PEEK)) |
| 1575 | { | 1601 | { |
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c index b1265187b4a8..a690cf773b6a 100644 --- a/net/wanrouter/af_wanpipe.c +++ b/net/wanrouter/af_wanpipe.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * | 32 | * |
| 33 | ******************************************************************************/ | 33 | ******************************************************************************/ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/types.h> | 35 | #include <linux/types.h> |
| 37 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
| 38 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index c34833dc7cc1..ad8e8a797790 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | * Jun 02, 1999 Gideon Hack Updates for Linux 2.0.X and 2.2.X kernels. | 42 | * Jun 02, 1999 Gideon Hack Updates for Linux 2.0.X and 2.2.X kernels. |
| 43 | *****************************************************************************/ | 43 | *****************************************************************************/ |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/stddef.h> /* offsetof(), etc. */ | 45 | #include <linux/stddef.h> /* offsetof(), etc. */ |
| 47 | #include <linux/capability.h> | 46 | #include <linux/capability.h> |
| 48 | #include <linux/errno.h> /* return codes */ | 47 | #include <linux/errno.h> /* return codes */ |
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c index c28ba5a47209..930ea59463ad 100644 --- a/net/wanrouter/wanproc.c +++ b/net/wanrouter/wanproc.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Dec 13, 1996 Gene Kozin Initial version (based on Sangoma's WANPIPE) | 20 | * Dec 13, 1996 Gene Kozin Initial version (based on Sangoma's WANPIPE) |
| 21 | *****************************************************************************/ | 21 | *****************************************************************************/ |
| 22 | 22 | ||
| 23 | #include <linux/config.h> | ||
| 24 | #include <linux/init.h> /* __initfunc et al. */ | 23 | #include <linux/init.h> /* __initfunc et al. */ |
| 25 | #include <linux/stddef.h> /* offsetof(), etc. */ | 24 | #include <linux/stddef.h> /* offsetof(), etc. */ |
| 26 | #include <linux/errno.h> /* return codes */ | 25 | #include <linux/errno.h> /* return codes */ |
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 282ce4e40d7b..52a2726d327f 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * response | 35 | * response |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 40 | #include <linux/capability.h> | 39 | #include <linux/capability.h> |
| 41 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index adfe7b8df355..47b68a301677 100644 --- a/net/x25/x25_dev.c +++ b/net/x25/x25_dev.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * 2000-09-04 Henner Eisen Prevent freeing a dangling skb. | 17 | * 2000-09-04 Henner Eisen Prevent freeing a dangling skb. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/netdevice.h> | 21 | #include <linux/netdevice.h> |
| 23 | #include <linux/skbuff.h> | 22 | #include <linux/skbuff.h> |
diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c index dfb80116c59f..a11837d361d2 100644 --- a/net/x25/x25_proc.c +++ b/net/x25/x25_proc.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * 2002/10/06 Arnaldo Carvalho de Melo seq_file support | 17 | * 2002/10/06 Arnaldo Carvalho de Melo seq_file support |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/proc_fs.h> | 21 | #include <linux/proc_fs.h> |
| 23 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c index 6c5d37517035..2a3fe986b245 100644 --- a/net/x25/x25_route.c +++ b/net/x25/x25_route.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * X.25 001 Jonathan Naylor Started coding. | 17 | * X.25 001 Jonathan Naylor Started coding. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/if_arp.h> | 20 | #include <linux/if_arp.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <net/x25.h> | 22 | #include <net/x25.h> |
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 6ed3302312fb..04e1aea58bc9 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * any later version. | 9 | * any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/pfkeyv2.h> | 14 | #include <linux/pfkeyv2.h> |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index b8936926c24b..405b741dff43 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 18 | #include <linux/kmod.h> | 17 | #include <linux/kmod.h> |
| 19 | #include <linux/list.h> | 18 | #include <linux/list.h> |
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 17b29ec3c417..43f00fc28a3d 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
| @@ -1164,8 +1164,6 @@ int xfrm_state_mtu(struct xfrm_state *x, int mtu) | |||
| 1164 | return res; | 1164 | return res; |
| 1165 | } | 1165 | } |
| 1166 | 1166 | ||
| 1167 | EXPORT_SYMBOL(xfrm_state_mtu); | ||
| 1168 | |||
| 1169 | int xfrm_init_state(struct xfrm_state *x) | 1167 | int xfrm_init_state(struct xfrm_state *x) |
| 1170 | { | 1168 | { |
| 1171 | struct xfrm_state_afinfo *afinfo; | 1169 | struct xfrm_state_afinfo *afinfo; |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index c21dc26141ea..3e6a722d072e 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
| @@ -1435,7 +1435,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *err | |||
| 1435 | link = &xfrm_dispatch[type]; | 1435 | link = &xfrm_dispatch[type]; |
| 1436 | 1436 | ||
| 1437 | /* All operations require privileges, even GET */ | 1437 | /* All operations require privileges, even GET */ |
| 1438 | if (security_netlink_recv(skb)) { | 1438 | if (security_netlink_recv(skb, CAP_NET_ADMIN)) { |
| 1439 | *errp = -EPERM; | 1439 | *errp = -EPERM; |
| 1440 | return -1; | 1440 | return -1; |
| 1441 | } | 1441 | } |
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index b0d067be7390..2180c88cfe89 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
| @@ -13,6 +13,10 @@ space := $(empty) $(empty) | |||
| 13 | depfile = $(subst $(comma),_,$(@D)/.$(@F).d) | 13 | depfile = $(subst $(comma),_,$(@D)/.$(@F).d) |
| 14 | 14 | ||
| 15 | ### | 15 | ### |
| 16 | # filename of target with directory and extension stripped | ||
| 17 | basetarget = $(basename $(notdir $@)) | ||
| 18 | |||
| 19 | ### | ||
| 16 | # Escape single quote for use in echo statements | 20 | # Escape single quote for use in echo statements |
| 17 | escsq = $(subst $(squote),'\$(squote)',$1) | 21 | escsq = $(subst $(squote),'\$(squote)',$1) |
| 18 | 22 | ||
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 02a7eea5fdbc..3cb445cc7432 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
| @@ -117,7 +117,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] | |||
| 117 | $(obj-m) : quiet_modtag := [M] | 117 | $(obj-m) : quiet_modtag := [M] |
| 118 | 118 | ||
| 119 | # Default for not multi-part modules | 119 | # Default for not multi-part modules |
| 120 | modname = $(*F) | 120 | modname = $(basetarget) |
| 121 | 121 | ||
| 122 | $(multi-objs-m) : modname = $(modname-multi) | 122 | $(multi-objs-m) : modname = $(modname-multi) |
| 123 | $(multi-objs-m:.o=.i) : modname = $(modname-multi) | 123 | $(multi-objs-m:.o=.i) : modname = $(modname-multi) |
diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 2b066d12af2c..18ecd4d5df7f 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host | |||
| @@ -80,8 +80,10 @@ obj-dirs += $(host-objdirs) | |||
| 80 | ##### | 80 | ##### |
| 81 | # Handle options to gcc. Support building with separate output directory | 81 | # Handle options to gcc. Support building with separate output directory |
| 82 | 82 | ||
| 83 | _hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS_$(*F).o) | 83 | _hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ |
| 84 | _hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) $(HOSTCXXFLAGS_$(*F).o) | 84 | $(HOSTCFLAGS_$(basetarget).o) |
| 85 | _hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ | ||
| 86 | $(HOSTCXXFLAGS_$(basetarget).o) | ||
| 85 | 87 | ||
| 86 | ifeq ($(KBUILD_SRC),) | 88 | ifeq ($(KBUILD_SRC),) |
| 87 | __hostc_flags = $(_hostc_flags) | 89 | __hostc_flags = $(_hostc_flags) |
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 2cb4935e85d1..fc498fee68ed 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
| @@ -82,12 +82,12 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) | |||
| 82 | # than one module. In that case KBUILD_MODNAME will be set to foo_bar, | 82 | # than one module. In that case KBUILD_MODNAME will be set to foo_bar, |
| 83 | # where foo and bar are the name of the modules. | 83 | # where foo and bar are the name of the modules. |
| 84 | name-fix = $(subst $(comma),_,$(subst -,_,$1)) | 84 | name-fix = $(subst $(comma),_,$(subst -,_,$1)) |
| 85 | basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))" | 85 | basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))" |
| 86 | modname_flags = $(if $(filter 1,$(words $(modname))),\ | 86 | modname_flags = $(if $(filter 1,$(words $(modname))),\ |
| 87 | -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") | 87 | -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") |
| 88 | 88 | ||
| 89 | _c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) | 89 | _c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o) |
| 90 | _a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) | 90 | _a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o) |
| 91 | _cpp_flags = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F)) | 91 | _cpp_flags = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F)) |
| 92 | 92 | ||
| 93 | # If building the kernel in a separate objtree expand all occurrences | 93 | # If building the kernel in a separate objtree expand all occurrences |
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 576cce5e387f..a49550205dcc 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost | |||
| @@ -72,7 +72,7 @@ $(modules:.ko=.mod.c): __modpost ; | |||
| 72 | # Step 5), compile all *.mod.c files | 72 | # Step 5), compile all *.mod.c files |
| 73 | 73 | ||
| 74 | # modname is set to make c_flags define KBUILD_MODNAME | 74 | # modname is set to make c_flags define KBUILD_MODNAME |
| 75 | modname = $(*F) | 75 | modname = $(notdir $(@:.mod.o=)) |
| 76 | 76 | ||
| 77 | quiet_cmd_cc_o_c = CC $@ | 77 | quiet_cmd_cc_o_c = CC $@ |
| 78 | cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ | 78 | cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ |
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c index be0200e9cdaf..79886413b6d5 100644 --- a/scripts/kconfig/lxdialog/checklist.c +++ b/scripts/kconfig/lxdialog/checklist.c | |||
| @@ -187,9 +187,12 @@ int dialog_checklist(const char *title, const char *prompt, int height, | |||
| 187 | 187 | ||
| 188 | /* Print the list */ | 188 | /* Print the list */ |
| 189 | for (i = 0; i < max_choice; i++) { | 189 | for (i = 0; i < max_choice; i++) { |
| 190 | print_item(list, items[(scroll + i) * 3 + 1], | 190 | if (i != choice) |
| 191 | status[i + scroll], i, i == choice); | 191 | print_item(list, items[(scroll + i) * 3 + 1], |
| 192 | status[i + scroll], i, 0); | ||
| 192 | } | 193 | } |
| 194 | print_item(list, items[(scroll + choice) * 3 + 1], | ||
| 195 | status[choice + scroll], choice, 1); | ||
| 193 | 196 | ||
| 194 | print_arrows(dialog, choice, item_no, scroll, | 197 | print_arrows(dialog, choice, item_no, scroll, |
| 195 | box_y, box_x + check_x + 5, list_height); | 198 | box_y, box_x + check_x + 5, list_height); |
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 00e21297aefe..f9460a6218de 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -1056,7 +1056,8 @@ sub output_struct_man(%) { | |||
| 1056 | # pointer-to-function | 1056 | # pointer-to-function |
| 1057 | print ".BI \" ".$1."\" ".$parameter." \") (".$2.")"."\"\n;\n"; | 1057 | print ".BI \" ".$1."\" ".$parameter." \") (".$2.")"."\"\n;\n"; |
| 1058 | } elsif ($type =~ m/^(.*?)\s*(:.*)/) { | 1058 | } elsif ($type =~ m/^(.*?)\s*(:.*)/) { |
| 1059 | print ".BI \" ".$1."\" ".$parameter.$2." \""."\"\n;\n"; | 1059 | # bitfield |
| 1060 | print ".BI \" ".$1."\ \" ".$parameter.$2." \""."\"\n;\n"; | ||
| 1060 | } else { | 1061 | } else { |
| 1061 | $type =~ s/([^\*])$/$1 /; | 1062 | $type =~ s/([^\*])$/$1 /; |
| 1062 | print ".BI \" ".$type."\" ".$parameter." \""."\"\n;\n"; | 1063 | print ".BI \" ".$type."\" ".$parameter." \""."\"\n;\n"; |
| @@ -1118,7 +1119,10 @@ sub output_function_text(%) { | |||
| 1118 | my %args = %{$_[0]}; | 1119 | my %args = %{$_[0]}; |
| 1119 | my ($parameter, $section); | 1120 | my ($parameter, $section); |
| 1120 | 1121 | ||
| 1121 | print "Function:\n\n"; | 1122 | print "Name:\n\n"; |
| 1123 | print $args{'function'}." - ".$args{'purpose'}."\n"; | ||
| 1124 | |||
| 1125 | print "\nSynopsis:\n\n"; | ||
| 1122 | my $start=$args{'functiontype'}." ".$args{'function'}." ("; | 1126 | my $start=$args{'functiontype'}." ".$args{'function'}." ("; |
| 1123 | print $start; | 1127 | print $start; |
| 1124 | my $count = 0; | 1128 | my $count = 0; |
| @@ -1169,6 +1173,7 @@ sub output_enum_text(%) { | |||
| 1169 | my $count; | 1173 | my $count; |
| 1170 | print "Enum:\n\n"; | 1174 | print "Enum:\n\n"; |
| 1171 | 1175 | ||
| 1176 | print "enum ".$args{'enum'}." - ".$args{'purpose'}."\n\n"; | ||
| 1172 | print "enum ".$args{'enum'}." {\n"; | 1177 | print "enum ".$args{'enum'}." {\n"; |
| 1173 | $count = 0; | 1178 | $count = 0; |
| 1174 | foreach $parameter (@{$args{'parameterlist'}}) { | 1179 | foreach $parameter (@{$args{'parameterlist'}}) { |
| @@ -1197,7 +1202,7 @@ sub output_typedef_text(%) { | |||
| 1197 | my $count; | 1202 | my $count; |
| 1198 | print "Typedef:\n\n"; | 1203 | print "Typedef:\n\n"; |
| 1199 | 1204 | ||
| 1200 | print "typedef ".$args{'typedef'}."\n"; | 1205 | print "typedef ".$args{'typedef'}." - ".$args{'purpose'}."\n"; |
| 1201 | output_section_text(@_); | 1206 | output_section_text(@_); |
| 1202 | } | 1207 | } |
| 1203 | 1208 | ||
| @@ -1206,7 +1211,7 @@ sub output_struct_text(%) { | |||
| 1206 | my %args = %{$_[0]}; | 1211 | my %args = %{$_[0]}; |
| 1207 | my ($parameter); | 1212 | my ($parameter); |
| 1208 | 1213 | ||
| 1209 | print $args{'type'}." ".$args{'struct'}.":\n\n"; | 1214 | print $args{'type'}." ".$args{'struct'}." - ".$args{'purpose'}."\n\n"; |
| 1210 | print $args{'type'}." ".$args{'struct'}." {\n"; | 1215 | print $args{'type'}." ".$args{'struct'}." {\n"; |
| 1211 | foreach $parameter (@{$args{'parameterlist'}}) { | 1216 | foreach $parameter (@{$args{'parameterlist'}}) { |
| 1212 | if ($parameter =~ /^#/) { | 1217 | if ($parameter =~ /^#/) { |
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 0dd16177642d..dfde0e87a765 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -24,7 +24,10 @@ static int all_versions = 0; | |||
| 24 | /* If we are modposting external module set to 1 */ | 24 | /* If we are modposting external module set to 1 */ |
| 25 | static int external_module = 0; | 25 | static int external_module = 0; |
| 26 | /* How a symbol is exported */ | 26 | /* How a symbol is exported */ |
| 27 | enum export {export_plain, export_gpl, export_gpl_future, export_unknown}; | 27 | enum export { |
| 28 | export_plain, export_unused, export_gpl, | ||
| 29 | export_unused_gpl, export_gpl_future, export_unknown | ||
| 30 | }; | ||
| 28 | 31 | ||
| 29 | void fatal(const char *fmt, ...) | 32 | void fatal(const char *fmt, ...) |
| 30 | { | 33 | { |
| @@ -191,7 +194,9 @@ static struct { | |||
| 191 | enum export export; | 194 | enum export export; |
| 192 | } export_list[] = { | 195 | } export_list[] = { |
| 193 | { .str = "EXPORT_SYMBOL", .export = export_plain }, | 196 | { .str = "EXPORT_SYMBOL", .export = export_plain }, |
| 197 | { .str = "EXPORT_UNUSED_SYMBOL", .export = export_unused }, | ||
| 194 | { .str = "EXPORT_SYMBOL_GPL", .export = export_gpl }, | 198 | { .str = "EXPORT_SYMBOL_GPL", .export = export_gpl }, |
| 199 | { .str = "EXPORT_UNUSED_SYMBOL_GPL", .export = export_unused_gpl }, | ||
| 195 | { .str = "EXPORT_SYMBOL_GPL_FUTURE", .export = export_gpl_future }, | 200 | { .str = "EXPORT_SYMBOL_GPL_FUTURE", .export = export_gpl_future }, |
| 196 | { .str = "(unknown)", .export = export_unknown }, | 201 | { .str = "(unknown)", .export = export_unknown }, |
| 197 | }; | 202 | }; |
| @@ -205,6 +210,8 @@ static const char *export_str(enum export ex) | |||
| 205 | static enum export export_no(const char * s) | 210 | static enum export export_no(const char * s) |
| 206 | { | 211 | { |
| 207 | int i; | 212 | int i; |
| 213 | if (!s) | ||
| 214 | return export_unknown; | ||
| 208 | for (i = 0; export_list[i].export != export_unknown; i++) { | 215 | for (i = 0; export_list[i].export != export_unknown; i++) { |
| 209 | if (strcmp(export_list[i].str, s) == 0) | 216 | if (strcmp(export_list[i].str, s) == 0) |
| 210 | return export_list[i].export; | 217 | return export_list[i].export; |
| @@ -216,8 +223,12 @@ static enum export export_from_sec(struct elf_info *elf, Elf_Section sec) | |||
| 216 | { | 223 | { |
| 217 | if (sec == elf->export_sec) | 224 | if (sec == elf->export_sec) |
| 218 | return export_plain; | 225 | return export_plain; |
| 226 | else if (sec == elf->export_unused_sec) | ||
| 227 | return export_unused; | ||
| 219 | else if (sec == elf->export_gpl_sec) | 228 | else if (sec == elf->export_gpl_sec) |
| 220 | return export_gpl; | 229 | return export_gpl; |
| 230 | else if (sec == elf->export_unused_gpl_sec) | ||
| 231 | return export_unused_gpl; | ||
| 221 | else if (sec == elf->export_gpl_future_sec) | 232 | else if (sec == elf->export_gpl_future_sec) |
| 222 | return export_gpl_future; | 233 | return export_gpl_future; |
| 223 | else | 234 | else |
| @@ -366,8 +377,12 @@ static void parse_elf(struct elf_info *info, const char *filename) | |||
| 366 | info->modinfo_len = sechdrs[i].sh_size; | 377 | info->modinfo_len = sechdrs[i].sh_size; |
| 367 | } else if (strcmp(secname, "__ksymtab") == 0) | 378 | } else if (strcmp(secname, "__ksymtab") == 0) |
| 368 | info->export_sec = i; | 379 | info->export_sec = i; |
| 380 | else if (strcmp(secname, "__ksymtab_unused") == 0) | ||
| 381 | info->export_unused_sec = i; | ||
| 369 | else if (strcmp(secname, "__ksymtab_gpl") == 0) | 382 | else if (strcmp(secname, "__ksymtab_gpl") == 0) |
| 370 | info->export_gpl_sec = i; | 383 | info->export_gpl_sec = i; |
| 384 | else if (strcmp(secname, "__ksymtab_unused_gpl") == 0) | ||
| 385 | info->export_unused_gpl_sec = i; | ||
| 371 | else if (strcmp(secname, "__ksymtab_gpl_future") == 0) | 386 | else if (strcmp(secname, "__ksymtab_gpl_future") == 0) |
| 372 | info->export_gpl_future_sec = i; | 387 | info->export_gpl_future_sec = i; |
| 373 | 388 | ||
| @@ -1085,38 +1100,64 @@ void buf_write(struct buffer *buf, const char *s, int len) | |||
| 1085 | buf->pos += len; | 1100 | buf->pos += len; |
| 1086 | } | 1101 | } |
| 1087 | 1102 | ||
| 1088 | void check_license(struct module *mod) | 1103 | static void check_for_gpl_usage(enum export exp, const char *m, const char *s) |
| 1104 | { | ||
| 1105 | const char *e = is_vmlinux(m) ?"":".ko"; | ||
| 1106 | |||
| 1107 | switch (exp) { | ||
| 1108 | case export_gpl: | ||
| 1109 | fatal("modpost: GPL-incompatible module %s%s " | ||
| 1110 | "uses GPL-only symbol '%s'\n", m, e, s); | ||
| 1111 | break; | ||
| 1112 | case export_unused_gpl: | ||
| 1113 | fatal("modpost: GPL-incompatible module %s%s " | ||
| 1114 | "uses GPL-only symbol marked UNUSED '%s'\n", m, e, s); | ||
| 1115 | break; | ||
| 1116 | case export_gpl_future: | ||
| 1117 | warn("modpost: GPL-incompatible module %s%s " | ||
| 1118 | "uses future GPL-only symbol '%s'\n", m, e, s); | ||
| 1119 | break; | ||
| 1120 | case export_plain: | ||
| 1121 | case export_unused: | ||
| 1122 | case export_unknown: | ||
| 1123 | /* ignore */ | ||
| 1124 | break; | ||
| 1125 | } | ||
| 1126 | } | ||
| 1127 | |||
| 1128 | static void check_for_unused(enum export exp, const char* m, const char* s) | ||
| 1129 | { | ||
| 1130 | const char *e = is_vmlinux(m) ?"":".ko"; | ||
| 1131 | |||
| 1132 | switch (exp) { | ||
| 1133 | case export_unused: | ||
| 1134 | case export_unused_gpl: | ||
| 1135 | warn("modpost: module %s%s " | ||
| 1136 | "uses symbol '%s' marked UNUSED\n", m, e, s); | ||
| 1137 | break; | ||
| 1138 | default: | ||
| 1139 | /* ignore */ | ||
| 1140 | break; | ||
| 1141 | } | ||
| 1142 | } | ||
| 1143 | |||
| 1144 | static void check_exports(struct module *mod) | ||
| 1089 | { | 1145 | { |
| 1090 | struct symbol *s, *exp; | 1146 | struct symbol *s, *exp; |
| 1091 | 1147 | ||
| 1092 | for (s = mod->unres; s; s = s->next) { | 1148 | for (s = mod->unres; s; s = s->next) { |
| 1093 | const char *basename; | 1149 | const char *basename; |
| 1094 | if (mod->gpl_compatible == 1) { | ||
| 1095 | /* GPL-compatible modules may use all symbols */ | ||
| 1096 | continue; | ||
| 1097 | } | ||
| 1098 | exp = find_symbol(s->name); | 1150 | exp = find_symbol(s->name); |
| 1099 | if (!exp || exp->module == mod) | 1151 | if (!exp || exp->module == mod) |
| 1100 | continue; | 1152 | continue; |
| 1101 | basename = strrchr(mod->name, '/'); | 1153 | basename = strrchr(mod->name, '/'); |
| 1102 | if (basename) | 1154 | if (basename) |
| 1103 | basename++; | 1155 | basename++; |
| 1104 | switch (exp->export) { | 1156 | else |
| 1105 | case export_gpl: | 1157 | basename = mod->name; |
| 1106 | fatal("modpost: GPL-incompatible module %s " | 1158 | if (!mod->gpl_compatible) |
| 1107 | "uses GPL-only symbol '%s'\n", | 1159 | check_for_gpl_usage(exp->export, basename, exp->name); |
| 1108 | basename ? basename : mod->name, | 1160 | check_for_unused(exp->export, basename, exp->name); |
| 1109 | exp->name); | ||
| 1110 | break; | ||
| 1111 | case export_gpl_future: | ||
| 1112 | warn("modpost: GPL-incompatible module %s " | ||
| 1113 | "uses future GPL-only symbol '%s'\n", | ||
| 1114 | basename ? basename : mod->name, | ||
| 1115 | exp->name); | ||
| 1116 | break; | ||
| 1117 | case export_plain: /* ignore */ break; | ||
| 1118 | case export_unknown: /* ignore */ break; | ||
| 1119 | } | ||
| 1120 | } | 1161 | } |
| 1121 | } | 1162 | } |
| 1122 | 1163 | ||
| @@ -1271,7 +1312,7 @@ static void write_if_changed(struct buffer *b, const char *fname) | |||
| 1271 | } | 1312 | } |
| 1272 | 1313 | ||
| 1273 | /* parse Module.symvers file. line format: | 1314 | /* parse Module.symvers file. line format: |
| 1274 | * 0x12345678<tab>symbol<tab>module[<tab>export] | 1315 | * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something] |
| 1275 | **/ | 1316 | **/ |
| 1276 | static void read_dump(const char *fname, unsigned int kernel) | 1317 | static void read_dump(const char *fname, unsigned int kernel) |
| 1277 | { | 1318 | { |
| @@ -1284,7 +1325,7 @@ static void read_dump(const char *fname, unsigned int kernel) | |||
| 1284 | return; | 1325 | return; |
| 1285 | 1326 | ||
| 1286 | while ((line = get_next_line(&pos, file, size))) { | 1327 | while ((line = get_next_line(&pos, file, size))) { |
| 1287 | char *symname, *modname, *d, *export; | 1328 | char *symname, *modname, *d, *export, *end; |
| 1288 | unsigned int crc; | 1329 | unsigned int crc; |
| 1289 | struct module *mod; | 1330 | struct module *mod; |
| 1290 | struct symbol *s; | 1331 | struct symbol *s; |
| @@ -1297,7 +1338,8 @@ static void read_dump(const char *fname, unsigned int kernel) | |||
| 1297 | *modname++ = '\0'; | 1338 | *modname++ = '\0'; |
| 1298 | if ((export = strchr(modname, '\t')) != NULL) | 1339 | if ((export = strchr(modname, '\t')) != NULL) |
| 1299 | *export++ = '\0'; | 1340 | *export++ = '\0'; |
| 1300 | 1341 | if (export && ((end = strchr(export, '\t')) != NULL)) | |
| 1342 | *end = '\0'; | ||
| 1301 | crc = strtoul(line, &d, 16); | 1343 | crc = strtoul(line, &d, 16); |
| 1302 | if (*symname == '\0' || *modname == '\0' || *d != '\0') | 1344 | if (*symname == '\0' || *modname == '\0' || *d != '\0') |
| 1303 | goto fail; | 1345 | goto fail; |
| @@ -1396,7 +1438,7 @@ int main(int argc, char **argv) | |||
| 1396 | for (mod = modules; mod; mod = mod->next) { | 1438 | for (mod = modules; mod; mod = mod->next) { |
| 1397 | if (mod->skip) | 1439 | if (mod->skip) |
| 1398 | continue; | 1440 | continue; |
| 1399 | check_license(mod); | 1441 | check_exports(mod); |
| 1400 | } | 1442 | } |
| 1401 | 1443 | ||
| 1402 | for (mod = modules; mod; mod = mod->next) { | 1444 | for (mod = modules; mod; mod = mod->next) { |
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 2b00c6062844..d398c61e55ef 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h | |||
| @@ -117,7 +117,9 @@ struct elf_info { | |||
| 117 | Elf_Sym *symtab_start; | 117 | Elf_Sym *symtab_start; |
| 118 | Elf_Sym *symtab_stop; | 118 | Elf_Sym *symtab_stop; |
| 119 | Elf_Section export_sec; | 119 | Elf_Section export_sec; |
| 120 | Elf_Section export_unused_sec; | ||
| 120 | Elf_Section export_gpl_sec; | 121 | Elf_Section export_gpl_sec; |
| 122 | Elf_Section export_unused_gpl_sec; | ||
| 121 | Elf_Section export_gpl_future_sec; | 123 | Elf_Section export_gpl_future_sec; |
| 122 | const char *strtab; | 124 | const char *strtab; |
| 123 | char *modinfo; | 125 | char *modinfo; |
diff --git a/security/capability.c b/security/capability.c index f9b35cc0b248..b868e7eda5f0 100644 --- a/security/capability.c +++ b/security/capability.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/security/commoncap.c b/security/commoncap.c index 841eb4e5c62b..f50fc298cf80 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/capability.h> | 10 | #include <linux/capability.h> |
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| @@ -33,9 +32,9 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb) | |||
| 33 | 32 | ||
| 34 | EXPORT_SYMBOL(cap_netlink_send); | 33 | EXPORT_SYMBOL(cap_netlink_send); |
| 35 | 34 | ||
| 36 | int cap_netlink_recv(struct sk_buff *skb) | 35 | int cap_netlink_recv(struct sk_buff *skb, int cap) |
| 37 | { | 36 | { |
| 38 | if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN)) | 37 | if (!cap_raised(NETLINK_CB(skb).eff_cap, cap)) |
| 39 | return -EPERM; | 38 | return -EPERM; |
| 40 | return 0; | 39 | return 0; |
| 41 | } | 40 | } |
diff --git a/security/dummy.c b/security/dummy.c index 310fcdf7b749..bbbfda70e131 100644 --- a/security/dummy.c +++ b/security/dummy.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #undef DEBUG | 15 | #undef DEBUG |
| 16 | 16 | ||
| 17 | #include <linux/capability.h> | 17 | #include <linux/capability.h> |
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/mman.h> | 20 | #include <linux/mman.h> |
| @@ -506,6 +505,9 @@ static int dummy_task_getsid (struct task_struct *p) | |||
| 506 | return 0; | 505 | return 0; |
| 507 | } | 506 | } |
| 508 | 507 | ||
| 508 | static void dummy_task_getsecid (struct task_struct *p, u32 *secid) | ||
| 509 | { } | ||
| 510 | |||
| 509 | static int dummy_task_setgroups (struct group_info *group_info) | 511 | static int dummy_task_setgroups (struct group_info *group_info) |
| 510 | { | 512 | { |
| 511 | return 0; | 513 | return 0; |
| @@ -521,6 +523,11 @@ static int dummy_task_setioprio (struct task_struct *p, int ioprio) | |||
| 521 | return 0; | 523 | return 0; |
| 522 | } | 524 | } |
| 523 | 525 | ||
| 526 | static int dummy_task_getioprio (struct task_struct *p) | ||
| 527 | { | ||
| 528 | return 0; | ||
| 529 | } | ||
| 530 | |||
| 524 | static int dummy_task_setrlimit (unsigned int resource, struct rlimit *new_rlim) | 531 | static int dummy_task_setrlimit (unsigned int resource, struct rlimit *new_rlim) |
| 525 | { | 532 | { |
| 526 | return 0; | 533 | return 0; |
| @@ -548,7 +555,7 @@ static int dummy_task_wait (struct task_struct *p) | |||
| 548 | } | 555 | } |
| 549 | 556 | ||
| 550 | static int dummy_task_kill (struct task_struct *p, struct siginfo *info, | 557 | static int dummy_task_kill (struct task_struct *p, struct siginfo *info, |
| 551 | int sig) | 558 | int sig, u32 secid) |
| 552 | { | 559 | { |
| 553 | return 0; | 560 | return 0; |
| 554 | } | 561 | } |
| @@ -675,9 +682,9 @@ static int dummy_netlink_send (struct sock *sk, struct sk_buff *skb) | |||
| 675 | return 0; | 682 | return 0; |
| 676 | } | 683 | } |
| 677 | 684 | ||
| 678 | static int dummy_netlink_recv (struct sk_buff *skb) | 685 | static int dummy_netlink_recv (struct sk_buff *skb, int cap) |
| 679 | { | 686 | { |
| 680 | if (!cap_raised (NETLINK_CB (skb).eff_cap, CAP_NET_ADMIN)) | 687 | if (!cap_raised (NETLINK_CB (skb).eff_cap, cap)) |
| 681 | return -EPERM; | 688 | return -EPERM; |
| 682 | return 0; | 689 | return 0; |
| 683 | } | 690 | } |
| @@ -981,9 +988,11 @@ void security_fixup_ops (struct security_operations *ops) | |||
| 981 | set_to_dummy_if_null(ops, task_setpgid); | 988 | set_to_dummy_if_null(ops, task_setpgid); |
| 982 | set_to_dummy_if_null(ops, task_getpgid); | 989 | set_to_dummy_if_null(ops, task_getpgid); |
| 983 | set_to_dummy_if_null(ops, task_getsid); | 990 | set_to_dummy_if_null(ops, task_getsid); |
| 991 | set_to_dummy_if_null(ops, task_getsecid); | ||
| 984 | set_to_dummy_if_null(ops, task_setgroups); | 992 | set_to_dummy_if_null(ops, task_setgroups); |
| 985 | set_to_dummy_if_null(ops, task_setnice); | 993 | set_to_dummy_if_null(ops, task_setnice); |
| 986 | set_to_dummy_if_null(ops, task_setioprio); | 994 | set_to_dummy_if_null(ops, task_setioprio); |
| 995 | set_to_dummy_if_null(ops, task_getioprio); | ||
| 987 | set_to_dummy_if_null(ops, task_setrlimit); | 996 | set_to_dummy_if_null(ops, task_setrlimit); |
| 988 | set_to_dummy_if_null(ops, task_setscheduler); | 997 | set_to_dummy_if_null(ops, task_setscheduler); |
| 989 | set_to_dummy_if_null(ops, task_getscheduler); | 998 | set_to_dummy_if_null(ops, task_getscheduler); |
diff --git a/security/inode.c b/security/inode.c index 98a0df500dc6..47eb63480dac 100644 --- a/security/inode.c +++ b/security/inode.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | /* #define DEBUG */ | 15 | /* #define DEBUG */ |
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 19 | #include <linux/mount.h> | 18 | #include <linux/mount.h> |
diff --git a/security/root_plug.c b/security/root_plug.c index 07651def2f78..38dd4f3e641f 100644 --- a/security/root_plug.c +++ b/security/root_plug.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * License. | 22 | * License. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/security/seclvl.c b/security/seclvl.c index 441beaf1bbc1..c26dd7de0471 100644 --- a/security/seclvl.c +++ b/security/seclvl.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | * (at your option) any later version. | 16 | * (at your option) any later version. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 21 | #include <linux/moduleparam.h> | 20 | #include <linux/moduleparam.h> |
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
diff --git a/security/security.c b/security/security.c index 51ef509710b9..ee4e0701b6e0 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/capability.h> | 14 | #include <linux/capability.h> |
| 15 | #include <linux/config.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 28832e689800..24caaeec8894 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | * as published by the Free Software Foundation. | 18 | * as published by the Free Software Foundation. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| @@ -69,6 +68,7 @@ | |||
| 69 | #include <linux/sysctl.h> | 68 | #include <linux/sysctl.h> |
| 70 | #include <linux/audit.h> | 69 | #include <linux/audit.h> |
| 71 | #include <linux/string.h> | 70 | #include <linux/string.h> |
| 71 | #include <linux/selinux.h> | ||
| 72 | 72 | ||
| 73 | #include "avc.h" | 73 | #include "avc.h" |
| 74 | #include "objsec.h" | 74 | #include "objsec.h" |
| @@ -2643,6 +2643,11 @@ static int selinux_task_getsid(struct task_struct *p) | |||
| 2643 | return task_has_perm(current, p, PROCESS__GETSESSION); | 2643 | return task_has_perm(current, p, PROCESS__GETSESSION); |
| 2644 | } | 2644 | } |
| 2645 | 2645 | ||
| 2646 | static void selinux_task_getsecid(struct task_struct *p, u32 *secid) | ||
| 2647 | { | ||
| 2648 | selinux_get_task_sid(p, secid); | ||
| 2649 | } | ||
| 2650 | |||
| 2646 | static int selinux_task_setgroups(struct group_info *group_info) | 2651 | static int selinux_task_setgroups(struct group_info *group_info) |
| 2647 | { | 2652 | { |
| 2648 | /* See the comment for setuid above. */ | 2653 | /* See the comment for setuid above. */ |
| @@ -2665,6 +2670,11 @@ static int selinux_task_setioprio(struct task_struct *p, int ioprio) | |||
| 2665 | return task_has_perm(current, p, PROCESS__SETSCHED); | 2670 | return task_has_perm(current, p, PROCESS__SETSCHED); |
| 2666 | } | 2671 | } |
| 2667 | 2672 | ||
| 2673 | static int selinux_task_getioprio(struct task_struct *p) | ||
| 2674 | { | ||
| 2675 | return task_has_perm(current, p, PROCESS__GETSCHED); | ||
| 2676 | } | ||
| 2677 | |||
| 2668 | static int selinux_task_setrlimit(unsigned int resource, struct rlimit *new_rlim) | 2678 | static int selinux_task_setrlimit(unsigned int resource, struct rlimit *new_rlim) |
| 2669 | { | 2679 | { |
| 2670 | struct rlimit *old_rlim = current->signal->rlim + resource; | 2680 | struct rlimit *old_rlim = current->signal->rlim + resource; |
| @@ -2699,12 +2709,14 @@ static int selinux_task_movememory(struct task_struct *p) | |||
| 2699 | return task_has_perm(current, p, PROCESS__SETSCHED); | 2709 | return task_has_perm(current, p, PROCESS__SETSCHED); |
| 2700 | } | 2710 | } |
| 2701 | 2711 | ||
| 2702 | static int selinux_task_kill(struct task_struct *p, struct siginfo *info, int sig) | 2712 | static int selinux_task_kill(struct task_struct *p, struct siginfo *info, |
| 2713 | int sig, u32 secid) | ||
| 2703 | { | 2714 | { |
| 2704 | u32 perm; | 2715 | u32 perm; |
| 2705 | int rc; | 2716 | int rc; |
| 2717 | struct task_security_struct *tsec; | ||
| 2706 | 2718 | ||
| 2707 | rc = secondary_ops->task_kill(p, info, sig); | 2719 | rc = secondary_ops->task_kill(p, info, sig, secid); |
| 2708 | if (rc) | 2720 | if (rc) |
| 2709 | return rc; | 2721 | return rc; |
| 2710 | 2722 | ||
| @@ -2715,8 +2727,12 @@ static int selinux_task_kill(struct task_struct *p, struct siginfo *info, int si | |||
| 2715 | perm = PROCESS__SIGNULL; /* null signal; existence test */ | 2727 | perm = PROCESS__SIGNULL; /* null signal; existence test */ |
| 2716 | else | 2728 | else |
| 2717 | perm = signal_to_av(sig); | 2729 | perm = signal_to_av(sig); |
| 2718 | 2730 | tsec = p->security; | |
| 2719 | return task_has_perm(current, p, perm); | 2731 | if (secid) |
| 2732 | rc = avc_has_perm(secid, tsec->sid, SECCLASS_PROCESS, perm, NULL); | ||
| 2733 | else | ||
| 2734 | rc = task_has_perm(current, p, perm); | ||
| 2735 | return rc; | ||
| 2720 | } | 2736 | } |
| 2721 | 2737 | ||
| 2722 | static int selinux_task_prctl(int option, | 2738 | static int selinux_task_prctl(int option, |
| @@ -3420,7 +3436,13 @@ out: | |||
| 3420 | static int selinux_socket_getpeersec_dgram(struct sk_buff *skb, char **secdata, u32 *seclen) | 3436 | static int selinux_socket_getpeersec_dgram(struct sk_buff *skb, char **secdata, u32 *seclen) |
| 3421 | { | 3437 | { |
| 3422 | int err = 0; | 3438 | int err = 0; |
| 3423 | u32 peer_sid = selinux_socket_getpeer_dgram(skb); | 3439 | u32 peer_sid; |
| 3440 | |||
| 3441 | if (skb->sk->sk_family == PF_UNIX) | ||
| 3442 | selinux_get_inode_sid(SOCK_INODE(skb->sk->sk_socket), | ||
| 3443 | &peer_sid); | ||
| 3444 | else | ||
| 3445 | peer_sid = selinux_socket_getpeer_dgram(skb); | ||
| 3424 | 3446 | ||
| 3425 | if (peer_sid == SECSID_NULL) | 3447 | if (peer_sid == SECSID_NULL) |
| 3426 | return -EINVAL; | 3448 | return -EINVAL; |
| @@ -3432,8 +3454,6 @@ static int selinux_socket_getpeersec_dgram(struct sk_buff *skb, char **secdata, | |||
| 3432 | return 0; | 3454 | return 0; |
| 3433 | } | 3455 | } |
| 3434 | 3456 | ||
| 3435 | |||
| 3436 | |||
| 3437 | static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority) | 3457 | static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority) |
| 3438 | { | 3458 | { |
| 3439 | return sk_alloc_security(sk, family, priority); | 3459 | return sk_alloc_security(sk, family, priority); |
| @@ -3641,32 +3661,32 @@ static unsigned int selinux_ipv6_postroute_last(unsigned int hooknum, | |||
| 3641 | 3661 | ||
| 3642 | static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb) | 3662 | static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb) |
| 3643 | { | 3663 | { |
| 3644 | struct task_security_struct *tsec; | ||
| 3645 | struct av_decision avd; | ||
| 3646 | int err; | 3664 | int err; |
| 3647 | 3665 | ||
| 3648 | err = secondary_ops->netlink_send(sk, skb); | 3666 | err = secondary_ops->netlink_send(sk, skb); |
| 3649 | if (err) | 3667 | if (err) |
| 3650 | return err; | 3668 | return err; |
| 3651 | 3669 | ||
| 3652 | tsec = current->security; | ||
| 3653 | |||
| 3654 | avd.allowed = 0; | ||
| 3655 | avc_has_perm_noaudit(tsec->sid, tsec->sid, | ||
| 3656 | SECCLASS_CAPABILITY, ~0, &avd); | ||
| 3657 | cap_mask(NETLINK_CB(skb).eff_cap, avd.allowed); | ||
| 3658 | |||
| 3659 | if (policydb_loaded_version >= POLICYDB_VERSION_NLCLASS) | 3670 | if (policydb_loaded_version >= POLICYDB_VERSION_NLCLASS) |
| 3660 | err = selinux_nlmsg_perm(sk, skb); | 3671 | err = selinux_nlmsg_perm(sk, skb); |
| 3661 | 3672 | ||
| 3662 | return err; | 3673 | return err; |
| 3663 | } | 3674 | } |
| 3664 | 3675 | ||
| 3665 | static int selinux_netlink_recv(struct sk_buff *skb) | 3676 | static int selinux_netlink_recv(struct sk_buff *skb, int capability) |
| 3666 | { | 3677 | { |
| 3667 | if (!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN)) | 3678 | int err; |
| 3668 | return -EPERM; | 3679 | struct avc_audit_data ad; |
| 3669 | return 0; | 3680 | |
| 3681 | err = secondary_ops->netlink_recv(skb, capability); | ||
| 3682 | if (err) | ||
| 3683 | return err; | ||
| 3684 | |||
| 3685 | AVC_AUDIT_DATA_INIT(&ad, CAP); | ||
| 3686 | ad.u.cap = capability; | ||
| 3687 | |||
| 3688 | return avc_has_perm(NETLINK_CB(skb).sid, NETLINK_CB(skb).sid, | ||
| 3689 | SECCLASS_CAPABILITY, CAP_TO_MASK(capability), &ad); | ||
| 3670 | } | 3690 | } |
| 3671 | 3691 | ||
| 3672 | static int ipc_alloc_security(struct task_struct *task, | 3692 | static int ipc_alloc_security(struct task_struct *task, |
| @@ -4429,9 +4449,11 @@ static struct security_operations selinux_ops = { | |||
| 4429 | .task_setpgid = selinux_task_setpgid, | 4449 | .task_setpgid = selinux_task_setpgid, |
| 4430 | .task_getpgid = selinux_task_getpgid, | 4450 | .task_getpgid = selinux_task_getpgid, |
| 4431 | .task_getsid = selinux_task_getsid, | 4451 | .task_getsid = selinux_task_getsid, |
| 4452 | .task_getsecid = selinux_task_getsecid, | ||
| 4432 | .task_setgroups = selinux_task_setgroups, | 4453 | .task_setgroups = selinux_task_setgroups, |
| 4433 | .task_setnice = selinux_task_setnice, | 4454 | .task_setnice = selinux_task_setnice, |
| 4434 | .task_setioprio = selinux_task_setioprio, | 4455 | .task_setioprio = selinux_task_setioprio, |
| 4456 | .task_getioprio = selinux_task_getioprio, | ||
| 4435 | .task_setrlimit = selinux_task_setrlimit, | 4457 | .task_setrlimit = selinux_task_setrlimit, |
| 4436 | .task_setscheduler = selinux_task_setscheduler, | 4458 | .task_setscheduler = selinux_task_setscheduler, |
| 4437 | .task_getscheduler = selinux_task_getscheduler, | 4459 | .task_getscheduler = selinux_task_getscheduler, |
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 7029bbc9bef8..00534c302ba2 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * the Free Software Foundation, version 2. | 9 | * the Free Software Foundation, version 2. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/pagemap.h> | 13 | #include <linux/pagemap.h> |
| 15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index e9548bc049e1..d2e80e62ff0c 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
| @@ -1845,15 +1845,20 @@ int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, | |||
| 1845 | return -ENOTSUPP; | 1845 | return -ENOTSUPP; |
| 1846 | 1846 | ||
| 1847 | switch (field) { | 1847 | switch (field) { |
| 1848 | case AUDIT_SE_USER: | 1848 | case AUDIT_SUBJ_USER: |
| 1849 | case AUDIT_SE_ROLE: | 1849 | case AUDIT_SUBJ_ROLE: |
| 1850 | case AUDIT_SE_TYPE: | 1850 | case AUDIT_SUBJ_TYPE: |
| 1851 | case AUDIT_OBJ_USER: | ||
| 1852 | case AUDIT_OBJ_ROLE: | ||
| 1853 | case AUDIT_OBJ_TYPE: | ||
| 1851 | /* only 'equals' and 'not equals' fit user, role, and type */ | 1854 | /* only 'equals' and 'not equals' fit user, role, and type */ |
| 1852 | if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL) | 1855 | if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL) |
| 1853 | return -EINVAL; | 1856 | return -EINVAL; |
| 1854 | break; | 1857 | break; |
| 1855 | case AUDIT_SE_SEN: | 1858 | case AUDIT_SUBJ_SEN: |
| 1856 | case AUDIT_SE_CLR: | 1859 | case AUDIT_SUBJ_CLR: |
| 1860 | case AUDIT_OBJ_LEV_LOW: | ||
| 1861 | case AUDIT_OBJ_LEV_HIGH: | ||
| 1857 | /* we do not allow a range, indicated by the presense of '-' */ | 1862 | /* we do not allow a range, indicated by the presense of '-' */ |
| 1858 | if (strchr(rulestr, '-')) | 1863 | if (strchr(rulestr, '-')) |
| 1859 | return -EINVAL; | 1864 | return -EINVAL; |
| @@ -1874,29 +1879,34 @@ int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, | |||
| 1874 | tmprule->au_seqno = latest_granting; | 1879 | tmprule->au_seqno = latest_granting; |
| 1875 | 1880 | ||
| 1876 | switch (field) { | 1881 | switch (field) { |
| 1877 | case AUDIT_SE_USER: | 1882 | case AUDIT_SUBJ_USER: |
| 1883 | case AUDIT_OBJ_USER: | ||
| 1878 | userdatum = hashtab_search(policydb.p_users.table, rulestr); | 1884 | userdatum = hashtab_search(policydb.p_users.table, rulestr); |
| 1879 | if (!userdatum) | 1885 | if (!userdatum) |
| 1880 | rc = -EINVAL; | 1886 | rc = -EINVAL; |
| 1881 | else | 1887 | else |
| 1882 | tmprule->au_ctxt.user = userdatum->value; | 1888 | tmprule->au_ctxt.user = userdatum->value; |
| 1883 | break; | 1889 | break; |
| 1884 | case AUDIT_SE_ROLE: | 1890 | case AUDIT_SUBJ_ROLE: |
| 1891 | case AUDIT_OBJ_ROLE: | ||
| 1885 | roledatum = hashtab_search(policydb.p_roles.table, rulestr); | 1892 | roledatum = hashtab_search(policydb.p_roles.table, rulestr); |
| 1886 | if (!roledatum) | 1893 | if (!roledatum) |
| 1887 | rc = -EINVAL; | 1894 | rc = -EINVAL; |
| 1888 | else | 1895 | else |
| 1889 | tmprule->au_ctxt.role = roledatum->value; | 1896 | tmprule->au_ctxt.role = roledatum->value; |
| 1890 | break; | 1897 | break; |
| 1891 | case AUDIT_SE_TYPE: | 1898 | case AUDIT_SUBJ_TYPE: |
| 1899 | case AUDIT_OBJ_TYPE: | ||
| 1892 | typedatum = hashtab_search(policydb.p_types.table, rulestr); | 1900 | typedatum = hashtab_search(policydb.p_types.table, rulestr); |
| 1893 | if (!typedatum) | 1901 | if (!typedatum) |
| 1894 | rc = -EINVAL; | 1902 | rc = -EINVAL; |
| 1895 | else | 1903 | else |
| 1896 | tmprule->au_ctxt.type = typedatum->value; | 1904 | tmprule->au_ctxt.type = typedatum->value; |
| 1897 | break; | 1905 | break; |
| 1898 | case AUDIT_SE_SEN: | 1906 | case AUDIT_SUBJ_SEN: |
| 1899 | case AUDIT_SE_CLR: | 1907 | case AUDIT_SUBJ_CLR: |
| 1908 | case AUDIT_OBJ_LEV_LOW: | ||
| 1909 | case AUDIT_OBJ_LEV_HIGH: | ||
| 1900 | rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC); | 1910 | rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC); |
| 1901 | break; | 1911 | break; |
| 1902 | } | 1912 | } |
| @@ -1948,7 +1958,8 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, | |||
| 1948 | /* a field/op pair that is not caught here will simply fall through | 1958 | /* a field/op pair that is not caught here will simply fall through |
| 1949 | without a match */ | 1959 | without a match */ |
| 1950 | switch (field) { | 1960 | switch (field) { |
| 1951 | case AUDIT_SE_USER: | 1961 | case AUDIT_SUBJ_USER: |
| 1962 | case AUDIT_OBJ_USER: | ||
| 1952 | switch (op) { | 1963 | switch (op) { |
| 1953 | case AUDIT_EQUAL: | 1964 | case AUDIT_EQUAL: |
| 1954 | match = (ctxt->user == rule->au_ctxt.user); | 1965 | match = (ctxt->user == rule->au_ctxt.user); |
| @@ -1958,7 +1969,8 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, | |||
| 1958 | break; | 1969 | break; |
| 1959 | } | 1970 | } |
| 1960 | break; | 1971 | break; |
| 1961 | case AUDIT_SE_ROLE: | 1972 | case AUDIT_SUBJ_ROLE: |
| 1973 | case AUDIT_OBJ_ROLE: | ||
| 1962 | switch (op) { | 1974 | switch (op) { |
| 1963 | case AUDIT_EQUAL: | 1975 | case AUDIT_EQUAL: |
| 1964 | match = (ctxt->role == rule->au_ctxt.role); | 1976 | match = (ctxt->role == rule->au_ctxt.role); |
| @@ -1968,7 +1980,8 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, | |||
| 1968 | break; | 1980 | break; |
| 1969 | } | 1981 | } |
| 1970 | break; | 1982 | break; |
| 1971 | case AUDIT_SE_TYPE: | 1983 | case AUDIT_SUBJ_TYPE: |
| 1984 | case AUDIT_OBJ_TYPE: | ||
| 1972 | switch (op) { | 1985 | switch (op) { |
| 1973 | case AUDIT_EQUAL: | 1986 | case AUDIT_EQUAL: |
| 1974 | match = (ctxt->type == rule->au_ctxt.type); | 1987 | match = (ctxt->type == rule->au_ctxt.type); |
| @@ -1978,9 +1991,12 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, | |||
| 1978 | break; | 1991 | break; |
| 1979 | } | 1992 | } |
| 1980 | break; | 1993 | break; |
| 1981 | case AUDIT_SE_SEN: | 1994 | case AUDIT_SUBJ_SEN: |
| 1982 | case AUDIT_SE_CLR: | 1995 | case AUDIT_SUBJ_CLR: |
| 1983 | level = (field == AUDIT_SE_SEN ? | 1996 | case AUDIT_OBJ_LEV_LOW: |
| 1997 | case AUDIT_OBJ_LEV_HIGH: | ||
| 1998 | level = ((field == AUDIT_SUBJ_SEN || | ||
| 1999 | field == AUDIT_OBJ_LEV_LOW) ? | ||
| 1984 | &ctxt->range.level[0] : &ctxt->range.level[1]); | 2000 | &ctxt->range.level[0] : &ctxt->range.level[1]); |
| 1985 | switch (op) { | 2001 | switch (op) { |
| 1986 | case AUDIT_EQUAL: | 2002 | case AUDIT_EQUAL: |
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index 6633fb059313..6c985ced8102 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * 2. Emulating a reasonable SO_PEERSEC across machines | 26 | * 2. Emulating a reasonable SO_PEERSEC across machines |
| 27 | * 3. Testing addition of sk_policy's with security context via setsockopt | 27 | * 3. Testing addition of sk_policy's with security context via setsockopt |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index b88fb0c5a68a..c79a9afd0955 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | * | 59 | * |
| 60 | ***************************************************************************************************/ | 60 | ***************************************************************************************************/ |
| 61 | 61 | ||
| 62 | #include <linux/config.h> | ||
| 63 | #include <sound/driver.h> | 62 | #include <sound/driver.h> |
| 64 | #include <linux/module.h> | 63 | #include <linux/module.h> |
| 65 | #include <linux/moduleparam.h> | 64 | #include <linux/moduleparam.h> |
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 3fc6f97075ed..bc0bd0910a62 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/config.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/proc_fs.h> | 25 | #include <linux/proc_fs.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c index 74745da9deb6..6e4d4ab34632 100644 --- a/sound/core/sgbuf.c +++ b/sound/core/sgbuf.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 24 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 25 | #include <linux/vmalloc.h> | 24 | #include <linux/vmalloc.h> |
diff --git a/sound/oss/ad1816.c b/sound/oss/ad1816.c index 95586de02028..29057836c644 100644 --- a/sound/oss/ad1816.c +++ b/sound/oss/ad1816.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | #include <linux/config.h> | ||
| 45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| 46 | #include <linux/init.h> | 45 | #include <linux/init.h> |
| 47 | #include <linux/interrupt.h> | 46 | #include <linux/interrupt.h> |
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index e04fa49b0dc8..3b45e11e5303 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | * Tested. Believed fully functional. | 41 | * Tested. Believed fully functional. |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <linux/config.h> | ||
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 46 | #include <linux/interrupt.h> | 45 | #include <linux/interrupt.h> |
| 47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c index a4ca7569e700..0b09b8b4ec7d 100644 --- a/sound/oss/ad1889.c +++ b/sound/oss/ad1889.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * | 26 | * |
| 27 | * $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $ | 27 | * $Id: ad1889.c,v 1.3 2002/10/19 21:31:44 grundler Exp $ |
| 28 | */ | 28 | */ |
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c index b556263a57f5..51e1fde62e8d 100644 --- a/sound/oss/aedsp16.c +++ b/sound/oss/aedsp16.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | * Include the main OSS Lite header file. It include all the os, OSS Lite, etc | 23 | * Include the main OSS Lite header file. It include all the os, OSS Lite, etc |
| 24 | * headers needed by this source. | 24 | * headers needed by this source. |
| 25 | */ | 25 | */ |
| 26 | #include <linux/config.h> | ||
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c index 80f6c08e26e7..b6924c7f1484 100644 --- a/sound/oss/cs4232.c +++ b/sound/oss/cs4232.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | * Marcus Meissner Added ISA PnP support. | 47 | * Marcus Meissner Added ISA PnP support. |
| 48 | */ | 48 | */ |
| 49 | 49 | ||
| 50 | #include <linux/config.h> | ||
| 51 | #include <linux/pnp.h> | 50 | #include <linux/pnp.h> |
| 52 | #include <linux/module.h> | 51 | #include <linux/module.h> |
| 53 | #include <linux/init.h> | 52 | #include <linux/init.h> |
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index baf4244a54f2..15ce7119c5f4 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c | |||
| @@ -547,7 +547,7 @@ int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap) | |||
| 547 | } | 547 | } |
| 548 | return 0; | 548 | return 0; |
| 549 | } | 549 | } |
| 550 | /* aquires lock */ | 550 | /* acquires lock */ |
| 551 | int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) | 551 | int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) |
| 552 | { | 552 | { |
| 553 | struct audio_operations *adev = audio_devs[dev]; | 553 | struct audio_operations *adev = audio_devs[dev]; |
| @@ -821,7 +821,7 @@ static int find_output_space(int dev, char **buf, int *size) | |||
| 821 | *size = len & ~SAMPLE_ROUNDUP; | 821 | *size = len & ~SAMPLE_ROUNDUP; |
| 822 | return (*size > 0); | 822 | return (*size > 0); |
| 823 | } | 823 | } |
| 824 | /* aquires lock */ | 824 | /* acquires lock */ |
| 825 | int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) | 825 | int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) |
| 826 | { | 826 | { |
| 827 | struct audio_operations *adev = audio_devs[dev]; | 827 | struct audio_operations *adev = audio_devs[dev]; |
| @@ -855,7 +855,7 @@ int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) | |||
| 855 | spin_unlock_irqrestore(&dmap->lock,flags); | 855 | spin_unlock_irqrestore(&dmap->lock,flags); |
| 856 | return 0; | 856 | return 0; |
| 857 | } | 857 | } |
| 858 | /* has to aquire dmap->lock */ | 858 | /* has to acquire dmap->lock */ |
| 859 | int DMAbuf_move_wrpointer(int dev, int l) | 859 | int DMAbuf_move_wrpointer(int dev, int l) |
| 860 | { | 860 | { |
| 861 | struct audio_operations *adev = audio_devs[dev]; | 861 | struct audio_operations *adev = audio_devs[dev]; |
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h index a1b0b92af4b5..25dd5a318eb4 100644 --- a/sound/oss/dmasound/dmasound.h +++ b/sound/oss/dmasound/dmasound.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define _dmasound_h_ | 13 | #define _dmasound_h_ |
| 14 | 14 | ||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/config.h> | ||
| 17 | 16 | ||
| 18 | #define SND_NDEVS 256 /* Number of supported devices */ | 17 | #define SND_NDEVS 256 /* Number of supported devices */ |
| 19 | #define SND_DEV_CTL 0 /* Control port /dev/mixer */ | 18 | #define SND_DEV_CTL 0 /* Control port /dev/mixer */ |
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index c8e210326893..de454ca39226 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
| @@ -67,7 +67,6 @@ | |||
| 67 | 67 | ||
| 68 | #include <linux/types.h> | 68 | #include <linux/types.h> |
| 69 | #include <linux/module.h> | 69 | #include <linux/module.h> |
| 70 | #include <linux/config.h> | ||
| 71 | #include <linux/slab.h> | 70 | #include <linux/slab.h> |
| 72 | #include <linux/init.h> | 71 | #include <linux/init.h> |
| 73 | #include <linux/delay.h> | 72 | #include <linux/delay.h> |
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 494070a3f870..68e1d8f6c359 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/config.h> | ||
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c index 2835a7c038ef..12e7b3038be2 100644 --- a/sound/oss/kahlua.c +++ b/sound/oss/kahlua.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * same manner. | 27 | * same manner. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
diff --git a/sound/oss/msnd_classic.h b/sound/oss/msnd_classic.h index 83c3c46ffffe..7ffea5267f96 100644 --- a/sound/oss/msnd_classic.h +++ b/sound/oss/msnd_classic.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #ifndef __MSND_CLASSIC_H | 30 | #ifndef __MSND_CLASSIC_H |
| 31 | #define __MSND_CLASSIC_H | 31 | #define __MSND_CLASSIC_H |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | 33 | ||
| 35 | #define DSP_NUMIO 0x10 | 34 | #define DSP_NUMIO 0x10 |
| 36 | 35 | ||
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index 0c2db657badd..6d7763dae895 100644 --- a/sound/oss/msnd_pinnacle.c +++ b/sound/oss/msnd_pinnacle.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | ********************************************************************/ | 39 | ********************************************************************/ |
| 40 | 40 | ||
| 41 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 44 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
| 45 | #include <linux/types.h> | 44 | #include <linux/types.h> |
diff --git a/sound/oss/msnd_pinnacle.h b/sound/oss/msnd_pinnacle.h index e85aef4a55e0..cce911487004 100644 --- a/sound/oss/msnd_pinnacle.h +++ b/sound/oss/msnd_pinnacle.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #ifndef __MSND_PINNACLE_H | 30 | #ifndef __MSND_PINNACLE_H |
| 31 | #define __MSND_PINNACLE_H | 31 | #define __MSND_PINNACLE_H |
| 32 | 32 | ||
| 33 | #include <linux/config.h> | ||
| 34 | 33 | ||
| 35 | #define DSP_NUMIO 0x08 | 34 | #define DSP_NUMIO 0x08 |
| 36 | 35 | ||
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c index 0e161c6a0477..aec05a2bfc87 100644 --- a/sound/oss/opl3sa2.c +++ b/sound/oss/opl3sa2.c | |||
| @@ -64,7 +64,6 @@ | |||
| 64 | * | 64 | * |
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/config.h> | ||
| 68 | #include <linux/pnp.h> | 67 | #include <linux/pnp.h> |
| 69 | #include <linux/init.h> | 68 | #include <linux/init.h> |
| 70 | #include <linux/module.h> | 69 | #include <linux/module.h> |
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index c9696dc9fdf9..97666007b274 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Detection routine for the Pro Audio Spectrum cards. | 4 | * Detection routine for the Pro Audio Spectrum cards. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
diff --git a/sound/oss/pss.c b/sound/oss/pss.c index a617ccb40e00..37ee234b587c 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | 59 | ||
| 60 | #include <linux/config.h> | ||
| 61 | #include <linux/init.h> | 60 | #include <linux/init.h> |
| 62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 63 | #include <linux/spinlock.h> | 62 | #include <linux/spinlock.h> |
diff --git a/sound/oss/sb_card.c b/sound/oss/sb_card.c index 4708cbdc3149..8666291c0052 100644 --- a/sound/oss/sb_card.c +++ b/sound/oss/sb_card.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * 02-07-2003 Bug made it into first release. Take two. | 22 | * 02-07-2003 Bug made it into first release. Take two. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/moduleparam.h> | 26 | #include <linux/moduleparam.h> |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c index 5f955e3d2e26..3e8ecac86a89 100644 --- a/sound/oss/sb_common.c +++ b/sound/oss/sb_common.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Chris Rankin <rankinc@zipworld.com.au> | 26 | * Chris Rankin <rankinc@zipworld.com.au> |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 31 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 32 | #include <linux/module.h> | 31 | #include <linux/module.h> |
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c index 3f7427cd195a..cbf745db4b10 100644 --- a/sound/oss/sh_dac_audio.c +++ b/sound/oss/sh_dac_audio.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 3 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 4 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h index 9f912b8a2969..1a00a3210616 100644 --- a/sound/oss/sound_config.h +++ b/sound/oss/sound_config.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _SOUND_CONFIG_H_ | 14 | #ifndef _SOUND_CONFIG_H_ |
| 15 | #define _SOUND_CONFIG_H_ | 15 | #define _SOUND_CONFIG_H_ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 19 | #include <linux/sound.h> | 18 | #include <linux/sound.h> |
| 20 | 19 | ||
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index a33289948902..0860d6789715 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Christoph Hellwig : Some cleanup work (2000/03/01) | 22 | * Christoph Hellwig : Some cleanup work (2000/03/01) |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | 25 | ||
| 27 | #include "sound_config.h" | 26 | #include "sound_config.h" |
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index e61a454a8150..420a866fb933 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c | |||
| @@ -194,7 +194,6 @@ | |||
| 194 | * sem - guard dmabuf, write re-entry etc | 194 | * sem - guard dmabuf, write re-entry etc |
| 195 | */ | 195 | */ |
| 196 | 196 | ||
| 197 | #include <linux/config.h> | ||
| 198 | #include <linux/module.h> | 197 | #include <linux/module.h> |
| 199 | #include <linux/string.h> | 198 | #include <linux/string.h> |
| 200 | #include <linux/ctype.h> | 199 | #include <linux/ctype.h> |
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index 29a6e0cff79f..3ada26b3fc7e 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #define VIA_VERSION "1.9.1-ac4-2.5" | 18 | #define VIA_VERSION "1.9.1-ac4-2.5" |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 24 | #include <linux/fs.h> | 23 | #include <linux/fs.h> |
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 00fe5cec9dc1..8932d89408ef 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | * We currently support a mixer device, but it is currently non-functional. | 17 | * We currently support a mixer device, but it is currently non-functional. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index afcb524a40eb..22d26624b34a 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/config.h> | ||
| 39 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 40 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 41 | #include <linux/delay.h> | 40 | #include <linux/delay.h> |
diff --git a/sound/sound_core.c b/sound/sound_core.c index 7535ec821dcf..62d4d0c81261 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | * locking at some point in 2.3.x. | 34 | * locking at some point in 2.3.x. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/config.h> | ||
| 38 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 40 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index d9d14c2707db..44ad9616bf63 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (c) by Jaroslav Kysela <perex@suse.cz> | 8 | * Copyright (c) by Jaroslav Kysela <perex@suse.cz> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index a7489a3dd75a..63bef0aadf1e 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | * | 46 | * |
| 47 | * I've tried to stick to the following function naming conventions: | 47 | * I've tried to stick to the following function naming conventions: |
| 48 | * snd_* ALSA stuff | 48 | * snd_* ALSA stuff |
| 49 | * cs4215_* CS4215 codec specfic stuff | 49 | * cs4215_* CS4215 codec specific stuff |
| 50 | * dbri_* DBRI high-level stuff | 50 | * dbri_* DBRI high-level stuff |
| 51 | * other DBRI low-level stuff | 51 | * other DBRI low-level stuff |
| 52 | */ | 52 | */ |