Re: [linuxsh-dev] Sync to mainline (2.5)

[NIIBE Y. <gn...@m1...>]

2.5.2 has been released.  Sync to that. 

The update patch has not been included, I'll try next.

2002-01-15  NIIBE Yutaka  <gn...@m1...>

	Updated to 2.5.2.
	* init/main.c (rest_init): Remove call of init_idle().
	* drivers/net/8139too.c: Include <linux/crc32.h>, remove
	ether_crc and ethernet_polynomial.
	* arch/sh/config.in: souce lib/Config.in.

	* AGAINST-2.5.2: New file.
	* AGAINST-2.5.1: Removed.

Index: arch/sh/config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/config.in,v
retrieving revision 1.2
diff -u -3 -p -r1.2 config.in
--- arch/sh/config.in	2001/11/03 00:54:51	1.2
+++ arch/sh/config.in	2002/01/15 08:12:44
@@ -386,3 +386,5 @@ if [ "$CONFIG_SH_STANDARD_BIOS" = "y" ];
    bool 'Early printk support' CONFIG_SH_EARLY_PRINTK
 fi
 endmenu
+
+source lib/Config.in
Index: drivers/net/8139too.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/8139too.c,v
retrieving revision 1.4
diff -u -3 -p -r1.4 8139too.c
--- drivers/net/8139too.c	2002/01/07 03:57:48	1.4
+++ drivers/net/8139too.c	2002/01/15 08:12:44
@@ -108,6 +108,7 @@
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/crc32.h>
 #include <linux/completion.h>
 
 #include <asm/io.h>
@@ -602,7 +603,6 @@ static void rtl8139_interrupt (int irq, 
 static int rtl8139_close (struct net_device *dev);
 static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);
 static struct net_device_stats *rtl8139_get_stats (struct net_device *dev);
-static inline u32 ether_crc (int length, unsigned char *data);
 static void rtl8139_set_rx_mode (struct net_device *dev);
 static void __set_rx_mode (struct net_device *dev);
 static void rtl8139_hw_start (struct net_device *dev);
@@ -2393,23 +2393,6 @@ static struct net_device_stats *rtl8139_
 
 /* Set or clear the multicast filter for this adaptor.
    This routine is not state sensitive and need not be SMP locked. */
-
-static unsigned const ethernet_polynomial = 0x04c11db7U;
-static inline u32 ether_crc (int length, unsigned char *data)
-{
-	int crc = -1;
-
-	while (--length >= 0) {
-		unsigned char current_octet = *data++;
-		int bit;
-		for (bit = 0; bit < 8; bit++, current_octet >>= 1)
-			crc = (crc << 1) ^ ((crc < 0) ^ (current_octet & 1) ?
-			     ethernet_polynomial : 0);
-	}
-
-	return crc;
-}
-
 
 static void __set_rx_mode (struct net_device *dev)
 {
Index: init/main.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/init/main.c,v
retrieving revision 1.4
diff -u -3 -p -r1.4 main.c
--- init/main.c	2002/01/15 07:59:52	1.4
+++ init/main.c	2002/01/15 08:12:44
@@ -330,7 +330,6 @@ static void rest_init(void)
 {
 	kernel_thread(init, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
 	unlock_kernel();
-	init_idle();	/* This will also wait for all other CPUs */
  	cpu_idle();
 } 
 
--