1032.gcc40x.patch

sm86xx内核源包括补丁（ GPL ）的

diff -Naur --exclude=CVS --exclude='*.o' --exclude='*.a' --exclude='*.so' --exclude='*.elf' --exclude=System.map --exclude=Makefile.d --exclude='*log' --exclude='*log2' --exclude='*~' --exclude='.*~' --exclude='.#*' --exclude='*.bak' --exclude='*.orig' --exclude='*.rej' --exclude='core.[0-9]*' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=vmlinux --exclude=vmlinux.bin --exclude=yamon-02.06-SIGMADESIGNS-01_el.bin linuxmips-2.4.30.ref/drivers/mtd/chips/cfi_cmdset_0002.c linuxmips-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c
--- linuxmips-2.4.30.ref/drivers/mtd/chips/cfi_cmdset_0002.c	2007-06-20 14:19:45.000000000 -0700
+++ linuxmips-2.4.30/drivers/mtd/chips/cfi_cmdset_0002.c	2007-06-20 14:21:18.000000000 -0700
@@ -656,10 +656,15 @@
 
 	/* Write data */
 	for (z = 0; z < len; z += CFIDEV_BUSWIDTH) {
-	    	if (cfi_buswidth_is_2())
-			map->write16 (map, datum = *((__u16*)buf)++, adr+z);
-		else if (cfi_buswidth_is_4())
-		    	map->write32 (map, datum = *((__u32*)buf)++, adr+z);
+	    	if (cfi_buswidth_is_2()) {
+			datum = *((__u16*)buf);
+			buf += sizeof(__u16);
+			map->write16 (map, datum, adr+z);
+		} else if (cfi_buswidth_is_4()) {
+		    	datum = *((__u32*)buf);
+			buf += sizeof(__u32);
+		    	map->write32 (map, datum, adr+z);
+		}
 	}
 
 	/* start program */
diff -Naur --exclude=CVS --exclude='*.o' --exclude='*.a' --exclude='*.so' --exclude='*.elf' --exclude=System.map --exclude=Makefile.d --exclude='*log' --exclude='*log2' --exclude='*~' --exclude='.*~' --exclude='.#*' --exclude='*.bak' --exclude='*.orig' --exclude='*.rej' --exclude='core.[0-9]*' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=vmlinux --exclude=vmlinux.bin --exclude=yamon-02.06-SIGMADESIGNS-01_el.bin linuxmips-2.4.30.ref/drivers/usb/host/ehci-q.c linuxmips-2.4.30/drivers/usb/host/ehci-q.c
--- linuxmips-2.4.30.ref/drivers/usb/host/ehci-q.c	2005-01-13 02:59:03.000000000 -0800
+++ linuxmips-2.4.30/drivers/usb/host/ehci-q.c	2007-06-20 14:21:18.000000000 -0700
@@ -193,14 +193,16 @@
 	}
 }
 
+#ifdef	INTR_AUTOMAGIC
+static int ehci_urb_enqueue (struct usb_hcd *, struct urb *, int);
+#endif
+
 static void
 ehci_urb_done (struct ehci_hcd *ehci, struct urb *urb, struct pt_regs *regs)
 {
 #ifdef	INTR_AUTOMAGIC
 	struct urb		*resubmit = 0;
 	struct usb_device	*dev = 0;
-
-	static int ehci_urb_enqueue (struct usb_hcd *, struct urb *, int);
 #endif
 
 	if (likely (urb->hcpriv != 0)) {
diff -Naur --exclude=CVS --exclude='*.o' --exclude='*.a' --exclude='*.so' --exclude='*.elf' --exclude=System.map --exclude=Makefile.d --exclude='*log' --exclude='*log2' --exclude='*~' --exclude='.*~' --exclude='.#*' --exclude='*.bak' --exclude='*.orig' --exclude='*.rej' --exclude='core.[0-9]*' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=vmlinux --exclude=vmlinux.bin --exclude=yamon-02.06-SIGMADESIGNS-01_el.bin linuxmips-2.4.30.ref/drivers/usb/inode.c linuxmips-2.4.30/drivers/usb/inode.c
--- linuxmips-2.4.30.ref/drivers/usb/inode.c	2004-02-19 17:22:18.000000000 -0800
+++ linuxmips-2.4.30/drivers/usb/inode.c	2007-06-20 14:21:21.000000000 -0700
@@ -495,11 +495,15 @@
 	lookup: usbdevfs_root_lookup,
 };
 
-static struct file_operations usbdevfs_bus_file_operations = {
+//static struct file_operations usbdevfs_bus_file_operations 
+struct file_operations usbdevfs_bus_file_operations 
+= {
 	readdir: usbdevfs_bus_readdir,
 };
 
-static struct inode_operations usbdevfs_bus_inode_operations = {
+//static struct inode_operations usbdevfs_bus_inode_operations 
+struct inode_operations usbdevfs_bus_inode_operations
+= {
 	lookup: usbdevfs_bus_lookup,
 };
 
diff -Naur --exclude=CVS --exclude='*.o' --exclude='*.a' --exclude='*.so' --exclude='*.elf' --exclude=System.map --exclude=Makefile.d --exclude='*log' --exclude='*log2' --exclude='*~' --exclude='.*~' --exclude='.#*' --exclude='*.bak' --exclude='*.orig' --exclude='*.rej' --exclude='core.[0-9]*' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=vmlinux --exclude=vmlinux.bin --exclude=yamon-02.06-SIGMADESIGNS-01_el.bin linuxmips-2.4.30.ref/include/asm-mips/checksum.h linuxmips-2.4.30/include/asm-mips/checksum.h
--- linuxmips-2.4.30.ref/include/asm-mips/checksum.h	2004-04-23 14:00:53.000000000 -0700
+++ linuxmips-2.4.30/include/asm-mips/checksum.h	2007-06-20 14:21:21.000000000 -0700
@@ -45,7 +45,7 @@
 						  int len, int sum,
 						  int *err_ptr)
 {
-	sum = csum_partial(src, len, sum);
+	sum = csum_partial((const unsigned char *)src, len, sum);
 
 	if (copy_to_user(dst, src, len)) {
 		*err_ptr = -EFAULT;
diff -Naur --exclude=CVS --exclude='*.o' --exclude='*.a' --exclude='*.so' --exclude='*.elf' --exclude=System.map --exclude=Makefile.d --exclude='*log' --exclude='*log2' --exclude='*~' --exclude='.*~' --exclude='.#*' --exclude='*.bak' --exclude='*.orig' --exclude='*.rej' --exclude='core.[0-9]*' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=vmlinux --exclude=vmlinux.bin --exclude=yamon-02.06-SIGMADESIGNS-01_el.bin linuxmips-2.4.30.ref/include/asm-mips/tango2/rmdefs.h linuxmips-2.4.30/include/asm-mips/tango2/rmdefs.h
--- linuxmips-2.4.30.ref/include/asm-mips/tango2/rmdefs.h	2007-06-20 14:19:45.000000000 -0700
+++ linuxmips-2.4.30/include/asm-mips/tango2/rmdefs.h	2007-06-20 14:21:21.000000000 -0700
@@ -5,10 +5,18 @@
 #ifndef __ASSEMBLY__
 
 #ifndef __RMBTYPES_H__
+#ifndef RMuint32
 typedef unsigned long RMuint32;
+#endif
+#ifndef RMuint16
 typedef unsigned short RMuint16;
+#endif
+#ifndef RMuint8
 typedef unsigned char RMuint8;
+#endif
+#ifndef RMascii
 typedef char RMascii;
+#endif
 struct gbus;
 #ifndef pGBus
 #define pGBus ((struct gbus *)1)
diff -Naur --exclude=CVS --exclude='*.o' --exclude='*.a' --exclude='*.so' --exclude='*.elf' --exclude=System.map --exclude=Makefile.d --exclude='*log' --exclude='*log2' --exclude='*~' --exclude='.*~' --exclude='.#*' --exclude='*.bak' --exclude='*.orig' --exclude='*.rej' --exclude='core.[0-9]*' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=vmlinux --exclude=vmlinux.bin --exclude=yamon-02.06-SIGMADESIGNS-01_el.bin linuxmips-2.4.30.ref/include/asm-mips/uaccess.h linuxmips-2.4.30/include/asm-mips/uaccess.h
--- linuxmips-2.4.30.ref/include/asm-mips/uaccess.h	2004-10-20 16:40:04.000000000 -0700
+++ linuxmips-2.4.30/include/asm-mips/uaccess.h	2007-06-20 14:21:21.000000000 -0700
@@ -168,8 +168,13 @@
  * Returns zero on success, or -EFAULT on error.
  * On error, the variable @x is set to zero.
  */
+#if 0
 #define get_user(x,ptr) \
 	__get_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+#else
+#define get_user(x,ptr) \
+	__get_user_check((x),(ptr),sizeof(*(ptr)))
+#endif
 
 /*
  * __put_user: - Write a simple value into user space, with less checking.
@@ -213,8 +218,13 @@
  * Returns zero on success, or -EFAULT on error.
  * On error, the variable @x is set to zero.
  */
+#if 0
 #define __get_user(x,ptr) \
 	__get_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+#else
+#define __get_user(x,ptr) \
+	__get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+#endif
 
 struct __large_struct { unsigned long buf[100]; };
 #define __m(x) (*(struct __large_struct *)(x))
diff -Naur --exclude=CVS --exclude='*.o' --exclude='*.a' --exclude='*.so' --exclude='*.elf' --exclude=System.map --exclude=Makefile.d --exclude='*log' --exclude='*log2' --exclude='*~' --exclude='.*~' --exclude='.#*' --exclude='*.bak' --exclude='*.orig' --exclude='*.rej' --exclude='core.[0-9]*' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=.depend --exclude='.*.o.flags' --exclude='*.gz' --exclude=vmlinux --exclude=vmlinux.bin --exclude=yamon-02.06-SIGMADESIGNS-01_el.bin linuxmips-2.4.30.ref/include/linux/byteorder/swab.h linuxmips-2.4.30/include/linux/byteorder/swab.h
--- linuxmips-2.4.30.ref/include/linux/byteorder/swab.h	2002-09-11 05:45:40.000000000 -0700
+++ linuxmips-2.4.30/include/linux/byteorder/swab.h	2007-06-20 14:21:21.000000000 -0700
@@ -156,7 +156,8 @@
 #endif /* OPTIMIZE */
 
 
-static __inline__ __const__ __u16 __fswab16(__u16 x)
+//static __inline__ __const__ __u16 __fswab16(__u16 x)
+static __inline__ __u16 __fswab16(__u16 x)
 {
 	return __arch__swab16(x);
 }
@@ -169,7 +170,8 @@
 	__arch__swab16s(addr);
 }
 
-static __inline__ __const__ __u32 __fswab24(__u32 x)
+//static __inline__ __const__ __u32 __fswab24(__u32 x)
+static __inline__ __u32 __fswab24(__u32 x)
 {
 	return __arch__swab24(x);
 }
@@ -182,7 +184,8 @@
 	__arch__swab24s(addr);
 }
 
-static __inline__ __const__ __u32 __fswab32(__u32 x)
+//static __inline__ __const__ __u32 __fswab32(__u32 x)