upgrade to 2.6.30-rc6, refresh patches

SVN-Revision: 15912

6 files changed, 6 insertions, 178 deletions

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 201cd9f..147a654 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1370,6 +1370,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_P54_COMMON is not set
 CONFIG_PACKET_MMAP=y
 CONFIG_PACKET=y
+# CONFIG_PAGE_SIZE_32KB is not set
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PARPORT_PC is not set
diff --git a/target/linux/generic-2.6/patches-2.6.30/022-mips_div64_gcc4.4.0.patch b/target/linux/generic-2.6/patches-2.6.30/022-mips_div64_gcc4.4.0.patch
deleted file mode 100644
index a116cf4..0000000
--- a/target/linux/generic-2.6/patches-2.6.30/022-mips_div64_gcc4.4.0.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From: Ralf Baechle <ralf@linux-mips.org>
-Date: Thu, 30 Apr 2009 16:14:56 +0000 (+0200)
-Subject: MIPS: Rewrite <asm/div64.h> to work with gcc 4.4.0.
-X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=a1b68289997030df64cba8478d5767fe10e42a58
-
-MIPS: Rewrite <asm/div64.h> to work with gcc 4.4.0.
-
-The inline assembler used on 32-bit kernels was using the "h" constraint
-which was considered dangerous and removed for gcc 4.4.0.
-
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
-
-diff --git a/arch/mips/include/asm/div64.h b/arch/mips/include/asm/div64.h
-index d1d6991..dc5ea57 100644
---- a/arch/mips/include/asm/div64.h
-+++ b/arch/mips/include/asm/div64.h
-@@ -6,105 +6,63 @@
-  * License.  See the file "COPYING" in the main directory of this archive
-  * for more details.
-  */
--#ifndef _ASM_DIV64_H
--#define _ASM_DIV64_H
-+#ifndef __ASM_DIV64_H
-+#define __ASM_DIV64_H
- 
--#include <linux/types.h>
-+#include <asm-generic/div64.h>
- 
--#if (_MIPS_SZLONG == 32)
-+#if BITS_PER_LONG == 64
- 
--#include <asm/compiler.h>
-+#include <linux/types.h>
- 
- /*
-  * No traps on overflows for any of these...
-  */
- 
--#define do_div64_32(res, high, low, base) ({ \
--	unsigned long __quot32, __mod32; \
--	unsigned long __cf, __tmp, __tmp2, __i; \
--	\
--	__asm__(".set	push\n\t" \
--		".set	noat\n\t" \
--		".set	noreorder\n\t" \
--		"move	%2, $0\n\t" \
--		"move	%3, $0\n\t" \
--		"b	1f\n\t" \
--		" li	%4, 0x21\n" \
--		"0:\n\t" \
--		"sll	$1, %0, 0x1\n\t" \
--		"srl	%3, %0, 0x1f\n\t" \
--		"or	%0, $1, %5\n\t" \
--		"sll	%1, %1, 0x1\n\t" \
--		"sll	%2, %2, 0x1\n" \
--		"1:\n\t" \
--		"bnez	%3, 2f\n\t" \
--		" sltu	%5, %0, %z6\n\t" \
--		"bnez	%5, 3f\n" \
--		"2:\n\t" \
--		" addiu	%4, %4, -1\n\t" \
--		"subu	%0, %0, %z6\n\t" \
--		"addiu	%2, %2, 1\n" \
--		"3:\n\t" \
--		"bnez	%4, 0b\n\t" \
--		" srl	%5, %1, 0x1f\n\t" \
--		".set	pop" \
--		: "=&r" (__mod32), "=&r" (__tmp), \
--		  "=&r" (__quot32), "=&r" (__cf), \
--		  "=&r" (__i), "=&r" (__tmp2) \
--		: "Jr" (base), "0" (high), "1" (low)); \
--	\
--	(res) = __quot32; \
--	__mod32; })
--
--#define do_div(n, base) ({ \
--	unsigned long long __quot; \
--	unsigned long __mod; \
--	unsigned long long __div; \
--	unsigned long __upper, __low, __high, __base; \
--	\
--	__div = (n); \
--	__base = (base); \
--	\
--	__high = __div >> 32; \
--	__low = __div; \
--	__upper = __high; \
--	\
--	if (__high) \
--		__asm__("divu	$0, %z2, %z3" \
--			: "=h" (__upper), "=l" (__high) \
--			: "Jr" (__high), "Jr" (__base) \
--			: GCC_REG_ACCUM); \
--	\
--	__mod = do_div64_32(__low, __upper, __low, __base); \
--	\
--	__quot = __high; \
--	__quot = __quot << 32 | __low; \
--	(n) = __quot; \
--	__mod; })
--
--#endif /* (_MIPS_SZLONG == 32) */
--
--#if (_MIPS_SZLONG == 64)
--
--/*
-- * Hey, we're already 64-bit, no
-- * need to play games..
-- */
--#define do_div(n, base) ({ \
--	unsigned long __quot; \
--	unsigned int __mod; \
--	unsigned long __div; \
--	unsigned int __base; \
--	\
--	__div = (n); \
--	__base = (base); \
--	\
--	__mod = __div % __base; \
--	__quot = __div / __base; \
--	\
--	(n) = __quot; \
--	__mod; })
-+#define __div64_32(n, base)						\
-+({									\
-+	unsigned long __cf, __tmp, __tmp2, __i;				\
-+	unsigned long __quot32, __mod32;				\
-+	unsigned long __high, __low;					\
-+	unsigned long long __n;						\
-+									\
-+	__high = *__n >> 32;						\
-+	__low = __n;							\
-+	__asm__(							\
-+	"	.set	push					\n"	\
-+	"	.set	noat					\n"	\
-+	"	.set	noreorder				\n"	\
-+	"	move	%2, $0					\n"	\
-+	"	move	%3, $0					\n"	\
-+	"	b	1f					\n"	\
-+	"	 li	%4, 0x21				\n"	\
-+	"0:							\n"	\
-+	"	sll	$1, %0, 0x1				\n"	\
-+	"	srl	%3, %0, 0x1f				\n"	\
-+	"	or	%0, $1, %5				\n"	\
-+	"	sll	%1, %1, 0x1				\n"	\
-+	"	sll	%2, %2, 0x1				\n"	\
-+	"1:							\n"	\
-+	"	bnez	%3, 2f					\n"	\
-+	"	 sltu	%5, %0, %z6				\n"	\
-+	"	bnez	%5, 3f					\n"	\
-+	"2:							\n"	\
-+	"	 addiu	%4, %4, -1				\n"	\
-+	"	subu	%0, %0, %z6				\n"	\
-+	"	addiu	%2, %2, 1				\n"	\
-+	"3:							\n"	\
-+	"	bnez	%4, 0b\n\t"					\
-+	"	 srl	%5, %1, 0x1f\n\t"				\
-+	"	.set	pop"						\
-+	: "=&r" (__mod32), "=&r" (__tmp),				\
-+	  "=&r" (__quot32), "=&r" (__cf),				\
-+	  "=&r" (__i), "=&r" (__tmp2)					\
-+	: "Jr" (base), "0" (__high), "1" (__low));			\
-+									\
-+	(__n) = __quot32;						\
-+	__mod32;							\
-+})
- 
--#endif /* (_MIPS_SZLONG == 64) */
-+#endif /* BITS_PER_LONG == 64 */
- 
--#endif /* _ASM_DIV64_H */
-+#endif /* __ASM_DIV64_H */
diff --git a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
index 8424a7a..3bd7a8f 100644
--- a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
@@ -1023,7 +1023,7 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
  	nf_conntrack_put(skb->nfct);
  	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -524,6 +610,9 @@ static void __copy_skb_header(struct sk_
+@@ -526,6 +612,9 @@ static void __copy_skb_header(struct sk_
  	new->sp			= secpath_get(old->sp);
  #endif
  	memcpy(new->cb, old->cb, sizeof(old->cb));
@@ -1033,7 +1033,7 @@
  	new->csum_start		= old->csum_start;
  	new->csum_offset	= old->csum_offset;
  	new->local_df		= old->local_df;
-@@ -2767,6 +2856,13 @@ void __init skb_init(void)
+@@ -2769,6 +2858,13 @@ void __init skb_init(void)
  						0,
  						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
  						NULL);
diff --git a/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch
index 739e972..dc6a14f 100644
--- a/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
-@@ -602,6 +602,9 @@ else
+@@ -603,6 +603,9 @@ else
  load-$(CONFIG_CPU_CAVIUM_OCTEON) 	+= 0xffffffff81100000
  endif
  
diff --git a/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
index f55ce34..fa891e0 100644
--- a/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
@@ -1,6 +1,6 @@
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -1211,7 +1211,7 @@ static unsigned long vma_dump_size(struc
+@@ -1193,7 +1193,7 @@ static unsigned long vma_dump_size(struc
  	if (FILTER(ELF_HEADERS) &&
  	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
  		u32 __user *header = (u32 __user *) vma->vm_start;
diff --git a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
index 85fa0d6..869323f 100644
--- a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
@@ -88,7 +88,7 @@
  /*********************************************************************
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -140,6 +140,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
+@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
  	}
  	return ret;
  }