[kernel] r7852 - dists/trunk/linux-2.6/debian/patches/bugfix/mips

[Martin Michlmayr]

Author: tbm
Date: Sun Nov 19 19:56:52 2006
New Revision: 7852

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/sb1-flush-cache-data-page.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/sgi-ioc3.patch
Log:
make patches applyable


Modified: dists/trunk/linux-2.6/debian/patches/bugfix/mips/sb1-flush-cache-data-page.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/mips/sb1-flush-cache-data-page.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/sb1-flush-cache-data-page.patch	Sun Nov 19 19:56:52 2006
@@ -41,14 +41,6 @@
  
  /*
   * Invalidate all caches on this CPU
-@@ -504,7 +524,6 @@ static __init void probe_cache_sizes(voi
- void sb1_cache_init(void)
- {
- 	extern char except_vec2_sb1;
--	extern char handle_vec2_sb1;
- 
- 	/* Special cache error handler for SB1 */
- 	set_uncached_handler (0x100, &except_vec2_sb1, 0x80);
 @@ -534,7 +553,7 @@ #endif
  
  	flush_cache_sigtramp = sb1_flush_cache_sigtramp;
@@ -58,10 +50,3 @@
  
  	/* Full flush */
  	__flush_cache_all = sb1___flush_cache_all;
-@@ -558,5 +577,5 @@ #endif
- 	:
- 	: "memory");
- 
--	flush_cache_all();
-+	local_sb1___flush_cache_all();
- }

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/mips/sgi-ioc3.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/mips/sgi-ioc3.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/sgi-ioc3.patch	Sun Nov 19 19:56:52 2006
@@ -2,11 +2,9 @@
 # scheduled for kernel.org mainline.
 
 
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index a2bd811..778fbae 100644
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -467,25 +471,6 @@ config SGI_IOC3_ETH
+--- a/drivers/net/Kconfig	2006-11-19 18:47:55.000000000 +0000
++++ b/drivers/net/Kconfig	2006-11-19 18:53:13.000000000 +0000
+@@ -464,25 +464,6 @@
  	  the Ethernet-HOWTO, available from
  	  <http://www.tldp.org/docs.html#howto>.
  
@@ -32,10 +30,8 @@
  
  config MIPS_SIM_NET
  	tristate "MIPS simulator Network device (EXPERIMENTAL)"
-diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
-index 68d8af7..9837213 100644
---- a/drivers/net/ioc3-eth.c
-+++ b/drivers/net/ioc3-eth.c
+--- a/drivers/net/ioc3-eth.c	2006-11-19 18:48:03.000000000 +0000
++++ b/drivers/net/ioc3-eth.c	2006-11-19 18:54:45.000000000 +0000
 @@ -5,7 +5,7 @@
   *
   * Driver for SGI's IOC3 based Ethernet cards as found in the PCI card.
@@ -45,7 +41,7 @@
   * Copyright (C) 1995, 1999, 2000, 2001 by Silicon Graphics, Inc.
   *
   * References:
-@@ -62,12 +62,7 @@ #include <asm/io.h>
+@@ -62,12 +62,7 @@
  #include <asm/pgtable.h>
  #include <asm/uaccess.h>
  #include <asm/sn/types.h>
@@ -58,7 +54,7 @@
  #include <asm/pci/bridge.h>
  
  /*
-@@ -95,6 +90,9 @@ struct ioc3_private {
+@@ -95,6 +90,9 @@
  	u32 emcr, ehar_h, ehar_l;
  	spinlock_t ioc3_lock;
  	struct mii_if_info mii;
@@ -68,7 +64,7 @@
  	struct pci_dev *pdev;
  
  	/* Members used by autonegotiation  */
-@@ -522,8 +520,6 @@ static struct net_device_stats *ioc3_get
+@@ -522,8 +520,6 @@
  	return &ip->stats;
  }
  
@@ -77,7 +73,7 @@
  static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
  {
  	struct ethhdr *eh = eth_hdr(skb);
-@@ -591,7 +587,6 @@ static void ioc3_tcpudp_checksum(struct 
+@@ -591,7 +587,6 @@
  	if (csum == 0xffff)
  		skb->ip_summed = CHECKSUM_UNNECESSARY;
  }
@@ -85,7 +81,7 @@
  
  static inline void ioc3_rx(struct ioc3_private *ip)
  {
-@@ -626,9 +621,9 @@ static inline void ioc3_rx(struct ioc3_p
+@@ -626,9 +621,9 @@
  				goto next;
  			}
  
@@ -98,7 +94,7 @@
  
  			netif_rx(skb);
  
-@@ -1289,9 +1284,7 @@ #endif
+@@ -1289,9 +1284,7 @@
  	dev->set_multicast_list	= ioc3_set_multicast_list;
  	dev->set_mac_address	= ioc3_set_mac_address;
  	dev->ethtool_ops	= &ioc3_ethtool_ops;
@@ -108,7 +104,7 @@
  
  	sw_physid1 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID1);
  	sw_physid2 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID2);
-@@ -1378,7 +1371,6 @@ static int ioc3_start_xmit(struct sk_buf
+@@ -1378,7 +1371,6 @@
  	uint32_t w0 = 0;
  	int produce;
  
@@ -116,7 +112,7 @@
  	/*
  	 * IOC3 has a fairly simple minded checksumming hardware which simply
  	 * adds up the 1's complement checksum for the entire packet and
-@@ -1426,7 +1418,6 @@ #ifdef CONFIG_SGI_IOC3_ETH_HW_TX_CSUM
+@@ -1426,7 +1418,6 @@
  
  		w0 = ETXD_DOCHECKSUM | (csoff << ETXD_CHKOFF_SHIFT);
  	}
@@ -124,7 +120,7 @@
  
  	spin_lock_irq(&ip->ioc3_lock);
  
-@@ -1580,12 +1571,37 @@ static u32 ioc3_get_link(struct net_devi
+@@ -1580,12 +1571,37 @@
  	return rc;
  }
  
@@ -149,7 +145,7 @@
 +	return 0;
 +}
 +
- static struct ethtool_ops ioc3_ethtool_ops = {
+ static const struct ethtool_ops ioc3_ethtool_ops = {
  	.get_drvinfo		= ioc3_get_drvinfo,
  	.get_settings		= ioc3_get_settings,
  	.set_settings		= ioc3_set_settings,