ia64/xen-unstable

changeset 13254:f3c3f9bd798e

[linux] Remove some gratuitous differences with plain 2.6.16.33.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu Jan 04 13:05:09 2007 +0000 (2007-01-04)
parents 338ceb7b1f09
children b071319927b6
files linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c linux-2.6-xen-sparse/net/core/dev.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c	Thu Jan 04 10:58:01 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c	Thu Jan 04 13:05:09 2007 +0000
     1.3 @@ -110,7 +110,6 @@ static struct irq_routing_table * __init
     1.4  		if (rt)
     1.5  			return rt;
     1.6  	}
     1.7 -	
     1.8  	return NULL;
     1.9  }
    1.10  
    1.11 @@ -261,13 +260,13 @@ static int pirq_via_set(struct pci_dev *
    1.12   */
    1.13  static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
    1.14  {
    1.15 -	static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
    1.16 +	static unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
    1.17  	return read_config_nybble(router, 0x55, pirqmap[pirq-1]);
    1.18  }
    1.19  
    1.20  static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
    1.21  {
    1.22 -	static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
    1.23 +	static unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
    1.24  	write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);
    1.25  	return 1;
    1.26  }
     2.1 --- a/linux-2.6-xen-sparse/net/core/dev.c	Thu Jan 04 10:58:01 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/net/core/dev.c	Thu Jan 04 13:05:09 2007 +0000
     2.3 @@ -1248,14 +1248,13 @@ static int dev_gso_segment(struct sk_buf
     2.4  	/* Verifying header integrity only. */
     2.5  	if (!segs)
     2.6  		return 0;
     2.7 -
     2.8 +  
     2.9  	if (unlikely(IS_ERR(segs)))
    2.10  		return PTR_ERR(segs);
    2.11  
    2.12  	skb->next = segs;
    2.13  	DEV_GSO_CB(skb)->destructor = skb->destructor;
    2.14  	skb->destructor = dev_gso_skb_destructor;
    2.15 -
    2.16  	return 0;
    2.17  }
    2.18