diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:40:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:40:14 -0400 |
commit | 038a5008b2f395c85e6e71d6ddf3c684e7c405b0 (patch) | |
tree | 4735eab577e97e5a22c3141e3f60071c8065585e /arch | |
parent | dd6d1844af33acb4edd0a40b1770d091a22c94be (diff) | |
parent | 266918303226cceac7eca38ced30f15f277bd89c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
[SKY2]: status polling loop (post merge)
[NET]: Fix NAPI completion handling in some drivers.
[TCP]: Limit processing lost_retrans loop to work-to-do cases
[TCP]: Fix lost_retrans loop vs fastpath problems
[TCP]: No need to re-count fackets_out/sacked_out at RTO
[TCP]: Extract tcp_match_queue_to_sack from sacktag code
[TCP]: Kill almost unused variable pcount from sacktag
[TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
[TCP]: Add bytes_acked (ABC) clearing to FRTO too
[IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
[NETFILTER]: x_tables: add missing ip6t_modulename aliases
[NETFILTER]: nf_conntrack_tcp: fix connection reopening
[QETH]: fix qeth_main.c
[NETLINK]: fib_frontend build fixes
[IPv6]: Export userland ND options through netlink (RDNSS support)
[9P]: build fix with !CONFIG_SYSCTL
[NET]: Fix dev_put() and dev_hold() comments
[NET]: make netlink user -> kernel interface synchronious
[NET]: unify netlink kernel socket recognition
[NET]: cleanup 3rd argument in netlink_sendskb
...
Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.
(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/sim/simeth.c | 3 | ||||
-rw-r--r-- | arch/mips/configs/bigsur_defconfig | 2 | ||||
-rw-r--r-- | arch/mips/configs/sb1250-swarm_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/irq.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pasemi/Kconfig | 10 | ||||
-rw-r--r-- | arch/powerpc/platforms/pasemi/iommu.c | 15 | ||||
-rw-r--r-- | arch/s390/appldata/appldata_net_sum.c | 3 | ||||
-rw-r--r-- | arch/s390/crypto/aes_s390.c | 2 | ||||
-rw-r--r-- | arch/s390/crypto/sha1_s390.c | 16 | ||||
-rw-r--r-- | arch/s390/crypto/sha256_s390.c | 22 | ||||
-rw-r--r-- | arch/s390/kernel/irq.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/irq.c | 1 | ||||
-rw-r--r-- | arch/sparc64/solaris/ioctl.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/irq_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/irq_64.c | 1 |
17 files changed, 52 insertions, 39 deletions
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index 4017696ada63..08b117e2c54b 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c | |||
@@ -294,6 +294,9 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr) | |||
294 | return NOTIFY_DONE; | 294 | return NOTIFY_DONE; |
295 | } | 295 | } |
296 | 296 | ||
297 | if (dev->nd_net != &init_net) | ||
298 | return NOTIFY_DONE; | ||
299 | |||
297 | if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE; | 300 | if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE; |
298 | 301 | ||
299 | /* | 302 | /* |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 30f3e9a2466f..80b0c99c2cfb 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -573,7 +573,7 @@ CONFIG_MII=y | |||
573 | # CONFIG_HAMACHI is not set | 573 | # CONFIG_HAMACHI is not set |
574 | # CONFIG_YELLOWFIN is not set | 574 | # CONFIG_YELLOWFIN is not set |
575 | # CONFIG_R8169 is not set | 575 | # CONFIG_R8169 is not set |
576 | CONFIG_NET_SB1250_MAC=y | 576 | CONFIG_SB1250_MAC=y |
577 | # CONFIG_SIS190 is not set | 577 | # CONFIG_SIS190 is not set |
578 | # CONFIG_SKGE is not set | 578 | # CONFIG_SKGE is not set |
579 | # CONFIG_SKY2 is not set | 579 | # CONFIG_SKY2 is not set |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 3d1b6281d887..3ed991ae0ebe 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
@@ -565,7 +565,7 @@ CONFIG_MII=y | |||
565 | # CONFIG_HAMACHI is not set | 565 | # CONFIG_HAMACHI is not set |
566 | # CONFIG_YELLOWFIN is not set | 566 | # CONFIG_YELLOWFIN is not set |
567 | # CONFIG_R8169 is not set | 567 | # CONFIG_R8169 is not set |
568 | CONFIG_NET_SB1250_MAC=y | 568 | CONFIG_SB1250_MAC=y |
569 | # CONFIG_SIS190 is not set | 569 | # CONFIG_SIS190 is not set |
570 | # CONFIG_SKGE is not set | 570 | # CONFIG_SKGE is not set |
571 | # CONFIG_SKY2 is not set | 571 | # CONFIG_SKY2 is not set |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 24bea97c736c..9bf63d5256db 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -395,7 +395,6 @@ void do_softirq(void) | |||
395 | 395 | ||
396 | local_irq_restore(flags); | 396 | local_irq_restore(flags); |
397 | } | 397 | } |
398 | EXPORT_SYMBOL(do_softirq); | ||
399 | 398 | ||
400 | 399 | ||
401 | /* | 400 | /* |
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 1b3e008fd148..8e66949e7c67 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
@@ -38,8 +38,7 @@ config 440EP | |||
38 | 38 | ||
39 | config 440GP | 39 | config 440GP |
40 | bool | 40 | bool |
41 | # Disabled until the new EMAC Driver is merged. | 41 | select IBM_NEW_EMAC_ZMII |
42 | # select IBM_NEW_EMAC_ZMII | ||
43 | 42 | ||
44 | config 440GX | 43 | config 440GX |
45 | bool | 44 | bool |
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig index ac8032034fb8..e1e2f6a43019 100644 --- a/arch/powerpc/platforms/cell/Kconfig +++ b/arch/powerpc/platforms/cell/Kconfig | |||
@@ -10,6 +10,10 @@ config PPC_CELL_NATIVE | |||
10 | select PPC_INDIRECT_IO | 10 | select PPC_INDIRECT_IO |
11 | select PPC_NATIVE | 11 | select PPC_NATIVE |
12 | select MPIC | 12 | select MPIC |
13 | select IBM_NEW_EMAC_EMAC4 | ||
14 | select IBM_NEW_EMAC_RGMII | ||
15 | select IBM_NEW_EMAC_ZMII #test only | ||
16 | select IBM_NEW_EMAC_TAH #test only | ||
13 | default n | 17 | default n |
14 | 18 | ||
15 | config PPC_IBM_CELL_BLADE | 19 | config PPC_IBM_CELL_BLADE |
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig index 95cd90fd81c7..e95261ef6f98 100644 --- a/arch/powerpc/platforms/pasemi/Kconfig +++ b/arch/powerpc/platforms/pasemi/Kconfig | |||
@@ -18,6 +18,16 @@ config PPC_PASEMI_IOMMU | |||
18 | help | 18 | help |
19 | IOMMU support for PA6T-1682M | 19 | IOMMU support for PA6T-1682M |
20 | 20 | ||
21 | config PPC_PASEMI_IOMMU_DMA_FORCE | ||
22 | bool "Force DMA engine to use IOMMU" | ||
23 | depends on PPC_PASEMI_IOMMU | ||
24 | help | ||
25 | This option forces the use of the IOMMU also for the | ||
26 | DMA engine. Otherwise the kernel will use it only when | ||
27 | running under a hypervisor. | ||
28 | |||
29 | If in doubt, say "N". | ||
30 | |||
21 | config PPC_PASEMI_MDIO | 31 | config PPC_PASEMI_MDIO |
22 | depends on PHYLIB | 32 | depends on PHYLIB |
23 | tristate "MDIO support via GPIO" | 33 | tristate "MDIO support via GPIO" |
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c index 9014d55c717b..a1111b5c6cb4 100644 --- a/arch/powerpc/platforms/pasemi/iommu.c +++ b/arch/powerpc/platforms/pasemi/iommu.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <asm/iommu.h> | 25 | #include <asm/iommu.h> |
26 | #include <asm/machdep.h> | 26 | #include <asm/machdep.h> |
27 | #include <asm/abs_addr.h> | 27 | #include <asm/abs_addr.h> |
28 | #include <asm/firmware.h> | ||
28 | 29 | ||
29 | 30 | ||
30 | #define IOBMAP_PAGE_SHIFT 12 | 31 | #define IOBMAP_PAGE_SHIFT 12 |
@@ -175,13 +176,17 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev) | |||
175 | { | 176 | { |
176 | pr_debug("pci_dma_dev_setup, dev %p (%s)\n", dev, pci_name(dev)); | 177 | pr_debug("pci_dma_dev_setup, dev %p (%s)\n", dev, pci_name(dev)); |
177 | 178 | ||
178 | /* DMA device is untranslated, but all other PCI-e goes through | 179 | #if !defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE) |
179 | * the IOMMU | 180 | /* For non-LPAR environment, don't translate anything for the DMA |
181 | * engine. The exception to this is if the user has enabled | ||
182 | * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time. | ||
180 | */ | 183 | */ |
181 | if (dev->vendor == 0x1959 && dev->device == 0xa007) | 184 | if (dev->vendor == 0x1959 && dev->device == 0xa007 && |
185 | !firmware_has_feature(FW_FEATURE_LPAR)) | ||
182 | dev->dev.archdata.dma_ops = &dma_direct_ops; | 186 | dev->dev.archdata.dma_ops = &dma_direct_ops; |
183 | else | 187 | #endif |
184 | dev->dev.archdata.dma_data = &iommu_table_iobmap; | 188 | |
189 | dev->dev.archdata.dma_data = &iommu_table_iobmap; | ||
185 | } | 190 | } |
186 | 191 | ||
187 | static void pci_dma_bus_setup_null(struct pci_bus *b) { } | 192 | static void pci_dma_bus_setup_null(struct pci_bus *b) { } |
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c index 2180ac105b05..6c1815a47714 100644 --- a/arch/s390/appldata/appldata_net_sum.c +++ b/arch/s390/appldata/appldata_net_sum.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
17 | #include <linux/kernel_stat.h> | 17 | #include <linux/kernel_stat.h> |
18 | #include <linux/netdevice.h> | 18 | #include <linux/netdevice.h> |
19 | #include <net/net_namespace.h> | ||
19 | 20 | ||
20 | #include "appldata.h" | 21 | #include "appldata.h" |
21 | 22 | ||
@@ -107,7 +108,7 @@ static void appldata_get_net_sum_data(void *data) | |||
107 | tx_dropped = 0; | 108 | tx_dropped = 0; |
108 | collisions = 0; | 109 | collisions = 0; |
109 | read_lock(&dev_base_lock); | 110 | read_lock(&dev_base_lock); |
110 | for_each_netdev(dev) { | 111 | for_each_netdev(&init_net, dev) { |
111 | stats = dev->get_stats(dev); | 112 | stats = dev->get_stats(dev); |
112 | rx_packets += stats->rx_packets; | 113 | rx_packets += stats->rx_packets; |
113 | tx_packets += stats->tx_packets; | 114 | tx_packets += stats->tx_packets; |
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index 3660ca6a3306..512669691ad0 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright IBM Corp. 2005,2007 | 7 | * Copyright IBM Corp. 2005,2007 |
8 | * Author(s): Jan Glauber (jang@de.ibm.com) | 8 | * Author(s): Jan Glauber (jang@de.ibm.com) |
9 | * | 9 | * |
10 | * Derived from "crypto/aes.c" | 10 | * Derived from "crypto/aes_generic.c" |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or modify it | 12 | * This program is free software; you can redistribute it and/or modify it |
13 | * under the terms of the GNU General Public License as published by the Free | 13 | * under the terms of the GNU General Public License as published by the Free |
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c index af4460ec381f..5a834f6578ab 100644 --- a/arch/s390/crypto/sha1_s390.c +++ b/arch/s390/crypto/sha1_s390.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Author(s): Thomas Spatzier | 12 | * Author(s): Thomas Spatzier |
13 | * Jan Glauber (jan.glauber@de.ibm.com) | 13 | * Jan Glauber (jan.glauber@de.ibm.com) |
14 | * | 14 | * |
15 | * Derived from "crypto/sha1.c" | 15 | * Derived from "crypto/sha1_generic.c" |
16 | * Copyright (c) Alan Smithee. | 16 | * Copyright (c) Alan Smithee. |
17 | * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> | 17 | * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> |
18 | * Copyright (c) Jean-Francois Dive <jef@linuxbe.org> | 18 | * Copyright (c) Jean-Francois Dive <jef@linuxbe.org> |
@@ -26,12 +26,10 @@ | |||
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/crypto.h> | 28 | #include <linux/crypto.h> |
29 | #include <crypto/sha.h> | ||
29 | 30 | ||
30 | #include "crypt_s390.h" | 31 | #include "crypt_s390.h" |
31 | 32 | ||
32 | #define SHA1_DIGEST_SIZE 20 | ||
33 | #define SHA1_BLOCK_SIZE 64 | ||
34 | |||
35 | struct s390_sha1_ctx { | 33 | struct s390_sha1_ctx { |
36 | u64 count; /* message length */ | 34 | u64 count; /* message length */ |
37 | u32 state[5]; | 35 | u32 state[5]; |
@@ -42,11 +40,11 @@ static void sha1_init(struct crypto_tfm *tfm) | |||
42 | { | 40 | { |
43 | struct s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm); | 41 | struct s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm); |
44 | 42 | ||
45 | sctx->state[0] = 0x67452301; | 43 | sctx->state[0] = SHA1_H0; |
46 | sctx->state[1] = 0xEFCDAB89; | 44 | sctx->state[1] = SHA1_H1; |
47 | sctx->state[2] = 0x98BADCFE; | 45 | sctx->state[2] = SHA1_H2; |
48 | sctx->state[3] = 0x10325476; | 46 | sctx->state[3] = SHA1_H3; |
49 | sctx->state[4] = 0xC3D2E1F0; | 47 | sctx->state[4] = SHA1_H4; |
50 | sctx->count = 0; | 48 | sctx->count = 0; |
51 | } | 49 | } |
52 | 50 | ||
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c index 2ced3330bce0..ccf8633c4f65 100644 --- a/arch/s390/crypto/sha256_s390.c +++ b/arch/s390/crypto/sha256_s390.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright IBM Corp. 2005,2007 | 7 | * Copyright IBM Corp. 2005,2007 |
8 | * Author(s): Jan Glauber (jang@de.ibm.com) | 8 | * Author(s): Jan Glauber (jang@de.ibm.com) |
9 | * | 9 | * |
10 | * Derived from "crypto/sha256.c" | 10 | * Derived from "crypto/sha256_generic.c" |
11 | * and "arch/s390/crypto/sha1_s390.c" | 11 | * and "arch/s390/crypto/sha1_s390.c" |
12 | * | 12 | * |
13 | * This program is free software; you can redistribute it and/or modify it | 13 | * This program is free software; you can redistribute it and/or modify it |
@@ -19,12 +19,10 @@ | |||
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/crypto.h> | 21 | #include <linux/crypto.h> |
22 | #include <crypto/sha.h> | ||
22 | 23 | ||
23 | #include "crypt_s390.h" | 24 | #include "crypt_s390.h" |
24 | 25 | ||
25 | #define SHA256_DIGEST_SIZE 32 | ||
26 | #define SHA256_BLOCK_SIZE 64 | ||
27 | |||
28 | struct s390_sha256_ctx { | 26 | struct s390_sha256_ctx { |
29 | u64 count; /* message length */ | 27 | u64 count; /* message length */ |
30 | u32 state[8]; | 28 | u32 state[8]; |
@@ -35,14 +33,14 @@ static void sha256_init(struct crypto_tfm *tfm) | |||
35 | { | 33 | { |
36 | struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm); | 34 | struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm); |
37 | 35 | ||
38 | sctx->state[0] = 0x6a09e667; | 36 | sctx->state[0] = SHA256_H0; |
39 | sctx->state[1] = 0xbb67ae85; | 37 | sctx->state[1] = SHA256_H1; |
40 | sctx->state[2] = 0x3c6ef372; | 38 | sctx->state[2] = SHA256_H2; |
41 | sctx->state[3] = 0xa54ff53a; | 39 | sctx->state[3] = SHA256_H3; |
42 | sctx->state[4] = 0x510e527f; | 40 | sctx->state[4] = SHA256_H4; |
43 | sctx->state[5] = 0x9b05688c; | 41 | sctx->state[5] = SHA256_H5; |
44 | sctx->state[6] = 0x1f83d9ab; | 42 | sctx->state[6] = SHA256_H6; |
45 | sctx->state[7] = 0x5be0cd19; | 43 | sctx->state[7] = SHA256_H7; |
46 | sctx->count = 0; | 44 | sctx->count = 0; |
47 | } | 45 | } |
48 | 46 | ||
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index 8f0cbca31203..c36d8123ca14 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
@@ -95,7 +95,6 @@ asmlinkage void do_softirq(void) | |||
95 | 95 | ||
96 | local_irq_restore(flags); | 96 | local_irq_restore(flags); |
97 | } | 97 | } |
98 | EXPORT_SYMBOL(do_softirq); | ||
99 | 98 | ||
100 | void init_irq_proc(void) | 99 | void init_irq_proc(void) |
101 | { | 100 | { |
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 03404987528d..4b49d03ffbd2 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
@@ -245,7 +245,6 @@ asmlinkage void do_softirq(void) | |||
245 | 245 | ||
246 | local_irq_restore(flags); | 246 | local_irq_restore(flags); |
247 | } | 247 | } |
248 | EXPORT_SYMBOL(do_softirq); | ||
249 | #endif | 248 | #endif |
250 | 249 | ||
251 | void __init init_IRQ(void) | 250 | void __init init_IRQ(void) |
diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c index 18352a498628..8ad10a6d993b 100644 --- a/arch/sparc64/solaris/ioctl.c +++ b/arch/sparc64/solaris/ioctl.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/compat.h> | 28 | #include <linux/compat.h> |
29 | 29 | ||
30 | #include <net/sock.h> | 30 | #include <net/sock.h> |
31 | #include <net/net_namespace.h> | ||
31 | 32 | ||
32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
33 | #include <asm/termios.h> | 34 | #include <asm/termios.h> |
@@ -686,7 +687,7 @@ static inline int solaris_i(unsigned int fd, unsigned int cmd, u32 arg) | |||
686 | int i = 0; | 687 | int i = 0; |
687 | 688 | ||
688 | read_lock_bh(&dev_base_lock); | 689 | read_lock_bh(&dev_base_lock); |
689 | for_each_netdev(d) | 690 | for_each_netdev(&init_net, d) |
690 | i++; | 691 | i++; |
691 | read_unlock_bh(&dev_base_lock); | 692 | read_unlock_bh(&dev_base_lock); |
692 | 693 | ||
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index dd2b97fc00b2..4f681bcdb1fc 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
@@ -231,8 +231,6 @@ asmlinkage void do_softirq(void) | |||
231 | 231 | ||
232 | local_irq_restore(flags); | 232 | local_irq_restore(flags); |
233 | } | 233 | } |
234 | |||
235 | EXPORT_SYMBOL(do_softirq); | ||
236 | #endif | 234 | #endif |
237 | 235 | ||
238 | /* | 236 | /* |
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index 39cb3fa83ebb..bd11e42b22bf 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c | |||
@@ -210,4 +210,3 @@ asmlinkage void do_softirq(void) | |||
210 | } | 210 | } |
211 | local_irq_restore(flags); | 211 | local_irq_restore(flags); |
212 | } | 212 | } |
213 | EXPORT_SYMBOL(do_softirq); | ||