# HG changeset patch
# User Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
# Date 1167915909 0
# Node ID f3c3f9bd798eaf9d72c9ac5799e1f2e52f076e59
# Parent 338ceb7b1f0993bf9735c0c1c5d21e39c381cf2f
[linux] Remove some gratuitous differences with plain 2.6.16.33.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c | 5 ++---
linux-2.6-xen-sparse/net/core/dev.c | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff -r 338ceb7b1f09 -r f3c3f9bd798e
linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c Thu Jan 04 10:58:01
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c Thu Jan 04 13:05:09
2007 +0000
@@ -110,7 +110,6 @@ static struct irq_routing_table * __init
if (rt)
return rt;
}
-
return NULL;
}
@@ -261,13 +260,13 @@ static int pirq_via_set(struct pci_dev *
*/
static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int
pirq)
{
- static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
+ static unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
return read_config_nybble(router, 0x55, pirqmap[pirq-1]);
}
static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int
pirq, int irq)
{
- static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
+ static unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);
return 1;
}
diff -r 338ceb7b1f09 -r f3c3f9bd798e linux-2.6-xen-sparse/net/core/dev.c
--- a/linux-2.6-xen-sparse/net/core/dev.c Thu Jan 04 10:58:01 2007 +0000
+++ b/linux-2.6-xen-sparse/net/core/dev.c Thu Jan 04 13:05:09 2007 +0000
@@ -1248,14 +1248,13 @@ static int dev_gso_segment(struct sk_buf
/* Verifying header integrity only. */
if (!segs)
return 0;
-
+
if (unlikely(IS_ERR(segs)))
return PTR_ERR(segs);
skb->next = segs;
DEV_GSO_CB(skb)->destructor = skb->destructor;
skb->destructor = dev_gso_skb_destructor;
-
return 0;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home