# HG changeset patch # User Rob Landley # Date 1253213568 18000 # Node ID e9f15e7a1896cf145788fd58cdacaa40ea886f19 # Parent 126be4c2f1d0b56a62ea452564d404c082f2eba7 Upgrade to 2.6.31 kernel. diff -r 126be4c2f1d0 -r e9f15e7a1896 download.sh --- a/download.sh Thu Sep 17 05:49:25 2009 -0500 +++ b/download.sh Thu Sep 17 13:52:48 2009 -0500 @@ -29,8 +29,8 @@ # Building a cross compile toolchain requires linux headers, uClibc, # binutils, and gcc. -URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.30.4.tar.bz2 \ -SHA1=44504009f86e88da419f593b009475f3255b9e13 \ +URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.tar.bz2 \ +SHA1=c6e0e6b473ba2b80d164e37cfabf294e783c03d9 \ UNSTABLE=http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.31-rc5.tar.bz2 \ download || dienow diff -r 126be4c2f1d0 -r e9f15e7a1896 sources/patches/linux-2.6.28-perl3.patch --- a/sources/patches/linux-2.6.28-perl3.patch Thu Sep 17 05:49:25 2009 -0500 +++ b/sources/patches/linux-2.6.28-perl3.patch Thu Sep 17 13:52:48 2009 -0500 @@ -20,7 +20,7 @@ --- linux-2.6.30.old/arch/x86/kernel/cpu/Makefile 2009-06-09 22:05:27.000000000 -0500 +++ linux-2.6.30/arch/x86/kernel/cpu/Makefile 2009-06-22 16:39:06.000000000 -0500 @@ -30,10 +30,10 @@ - obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o + obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o quiet_cmd_mkcapflags = MKCAP $@ - cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@ diff -r 126be4c2f1d0 -r e9f15e7a1896 sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch --- a/sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch Thu Sep 17 05:49:25 2009 -0500 +++ b/sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch Thu Sep 17 13:52:48 2009 -0500 @@ -42,8 +42,8 @@ # ARMv6 config CPU_V6 -- bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB -+ bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB +- bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX ++ bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB select CPU_32v6 select CPU_ABRT_EV6 select CPU_PABRT_NOIFAR @@ -51,8 +51,8 @@ # ARMv7 config CPU_V7 -- bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB -+ bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB +- bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX ++ bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB select CPU_32v6K select CPU_32v7 select CPU_ABRT_EV7 diff -r 126be4c2f1d0 -r e9f15e7a1896 sources/patches/linux-2.6.30-fixmips.patch --- a/sources/patches/linux-2.6.30-fixmips.patch Thu Sep 17 05:49:25 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -From: Ralf Baechle -Date: Fri, 12 Jun 2009 16:28:00 +0000 (+0100) -Subject: MIPS: Fix typo resulting in far too long ndelay times. -X-Git-Tag: linux-2.6.30~1 -X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=a7258465ba52a3e3bb38e8d30b5425fbd3e16386 - -MIPS: Fix typo resulting in far too long ndelay times. - -Signed-off-by: Ralf Baechle ---- - -diff --git a/arch/mips/include/asm/delay.h b/arch/mips/include/asm/delay.h -index a07e51b..d2d8949 100644 ---- a/arch/mips/include/asm/delay.h -+++ b/arch/mips/include/asm/delay.h -@@ -15,7 +15,7 @@ extern void __delay(unsigned int loops); - extern void __ndelay(unsigned int ns); - extern void __udelay(unsigned int us); - --#define ndelay(ns) __udelay(ns) -+#define ndelay(ns) __ndelay(ns) - #define udelay(us) __udelay(us) - - /* make sure "usecs *= ..." in udelay do not overflow. */ -From: Atsushi Nemoto -Date: Tue, 9 Jun 2009 02:12:48 +0000 (+0900) -Subject: MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel -X-Git-Tag: linux-2.6.30~2 -X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=60bd2aaf47ba20fd99901b8bcd2bebffe37b166d - -MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel - -Signed-off-by: Atsushi Nemoto -Signed-off-by: Ralf Baechle ---- - -diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c -index f69c6b5..6b3b1de 100644 ---- a/arch/mips/lib/delay.c -+++ b/arch/mips/lib/delay.c -@@ -43,7 +43,7 @@ void __udelay(unsigned long us) - { - unsigned int lpj = current_cpu_data.udelay_val; - -- __delay((us * 0x000010c7 * HZ * lpj) >> 32); -+ __delay((us * 0x000010c7ull * HZ * lpj) >> 32); - } - EXPORT_SYMBOL(__udelay); - -@@ -51,6 +51,6 @@ void __ndelay(unsigned long ns) - { - unsigned int lpj = current_cpu_data.udelay_val; - -- __delay((us * 0x00000005 * HZ * lpj) >> 32); -+ __delay((ns * 0x00000005ull * HZ * lpj) >> 32); - } - EXPORT_SYMBOL(__ndelay);