* [patch 1/2] [SPARC64]: Fix compile error in irq.c
2005-12-13 21:59 ` [patch 0/2] 2.6.13.5 review cycle Greg Kroah-Hartman
@ 2005-12-13 21:59 ` Greg Kroah-Hartman
2005-12-13 21:59 ` [patch 2/2] [PATCH] br: fix race on bridge del if Greg Kroah-Hartman
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2005-12-13 21:59 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Dave Jones, Chuck Wolber, torvalds, akpm, alan, davem, hartge
[-- Attachment #1: sparc64-build-fix.patch --]
[-- Type: text/plain, Size: 782 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: Sven Hartge <hartge@ds9.argh.org>
irq.c is missing the inclusion of asm/io.h, which causes
readb() and writeb() the be undefined.
Signed-off-by: Sven Hartge <hartge@ds9.argh.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/sparc64/kernel/irq.c | 1 +
1 file changed, 1 insertion(+)
--- linux-2.6.13.4.orig/arch/sparc64/kernel/irq.c
+++ linux-2.6.13.4/arch/sparc64/kernel/irq.c
@@ -27,6 +27,7 @@
#include <asm/atomic.h>
#include <asm/system.h>
#include <asm/irq.h>
+#include <asm/io.h>
#include <asm/sbus.h>
#include <asm/iommu.h>
#include <asm/upa.h>
--
^ permalink raw reply [flat|nested] 3+ messages in thread
* [patch 2/2] [PATCH] br: fix race on bridge del if
2005-12-13 21:59 ` [patch 0/2] 2.6.13.5 review cycle Greg Kroah-Hartman
2005-12-13 21:59 ` [patch 1/2] [SPARC64]: Fix compile error in irq.c Greg Kroah-Hartman
@ 2005-12-13 21:59 ` Greg Kroah-Hartman
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2005-12-13 21:59 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Dave Jones, Chuck Wolber, torvalds, akpm, alan, ryanh, davem,
netdev
[-- Attachment #1: br-fix-race-on-bridge-del-if.patch --]
[-- Type: text/plain, Size: 1234 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: Stephen Hemminger <shemminger@osdl.org>
This fixes the RCU race on bridge delete interface. Basically,
the network device has to be detached from the bridge in the first
step (pre-RCU), rather than later. At that point, no more bridge traffic
will come in, and the other code will not think that network device
is part of a bridge.
This should also fix the XEN test problems. If there is another
2.6.13-stable, add it as well.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
net/bridge/br_if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.13.4.orig/net/bridge/br_if.c
+++ linux-2.6.13.4/net/bridge/br_if.c
@@ -79,7 +79,6 @@ static void destroy_nbp(struct net_bridg
{
struct net_device *dev = p->dev;
- dev->br_port = NULL;
p->br = NULL;
p->dev = NULL;
dev_put(dev);
@@ -100,6 +99,7 @@ static void del_nbp(struct net_bridge_po
struct net_bridge *br = p->br;
struct net_device *dev = p->dev;
+ dev->br_port = NULL;
dev_set_promiscuity(dev, -1);
spin_lock_bh(&br->lock);
--
^ permalink raw reply [flat|nested] 3+ messages in thread