# HG changeset patch # User Rob Landley # Date 1325978416 21600 # Node ID 62dd9695d82522a200adbffc03fc4474a2a84c53 # Parent 54db423b7fef0873aa1c2d1c5078d5a0efd29c38 Upgrade to 3.2 kernel. diff -r 54db423b7fef -r 62dd9695d825 download.sh --- a/download.sh Sun Jan 01 13:51:04 2012 -0600 +++ b/download.sh Sat Jan 07 17:20:16 2012 -0600 @@ -21,8 +21,8 @@ # Building a cross compile toolchain requires linux headers, uClibc, # binutils, and gcc. -URL=http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.1.tar.bz2 \ -SHA1=ac792701561b1cd4279302b8bb8f474731762ad1 \ +URL=http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.bz2 \ +SHA1=3460afa971049aa79b8f914e1bfd619eedd19f55 \ ALT=http://kernel.org/pub/linux/kernel/v3.0/testing/linux-3.0-rc1.tar.bz2 \ maybe_fork "download || dienow" diff -r 54db423b7fef -r 62dd9695d825 sources/patches/linux-fixarm.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/linux-fixarm.patch Sat Jan 07 17:20:16 2012 -0600 @@ -0,0 +1,23 @@ +Commit 5ffb04f6690d71fab used the host "size" instead of the target "size". + +The people who didn't catch it are: + + Signed-off-by: Nicolas Pitre + Acked-by: Tony Lindgren + Tested-by: Shawn Guo + Tested-by: Dave Martin + Tested-by: Thomas Abraham + +diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile +index 21f56ff..efb0172 100644 +--- a/arch/arm/boot/compressed/Makefile ++++ b/arch/arm/boot/compressed/Makefile +@@ -126,7 +126,7 @@ ccflags-y := -fpic -fno-builtin -I$(obj) + asflags-y := -Wa,-march=all + + # Supply kernel BSS size to the decompressor via a linker symbol. +-KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}') ++KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | awk 'END{print $$3}') + LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ) + # Supply ZRELADDR to the decompressor via a linker symbol. + ifneq ($(CONFIG_AUTO_ZRELADDR),y) diff -r 54db423b7fef -r 62dd9695d825 sources/patches/linux-noperl-capflags.patch --- a/sources/patches/linux-noperl-capflags.patch Sun Jan 01 13:51:04 2012 -0600 +++ b/sources/patches/linux-noperl-capflags.patch Sat Jan 07 17:20:16 2012 -0600 @@ -5,29 +5,13 @@ Signed-off-by: Rob Landley --- -This patch hasn't changed since 2009. +This patch hasn't changed since 2009, just rediffed to eliminate fuzz. arch/x86/kernel/cpu/Makefile | 4 +-- arch/x86/kernel/cpu/mkcapflags.pl | 32 ---------------------------- arch/x86/kernel/cpu/mkcapflags.sh | 28 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 34 deletions(-) -diff -ruN linux-2.6.30.old/arch/x86/kernel/cpu/Makefile linux-2.6.30/arch/x86/kernel/cpu/Makefile ---- 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 -@@ -36,10 +36,10 @@ - obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o - - quiet_cmd_mkcapflags = MKCAP $@ -- cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@ -+ cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@ - - cpufeature = $(src)/../../include/asm/cpufeature.h - - targets += capflags.c --$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE -+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE - $(call if_changed,mkcapflags) diff -ruN linux-2.6.30.old/arch/x86/kernel/cpu/mkcapflags.pl linux-2.6.30/arch/x86/kernel/cpu/mkcapflags.pl --- linux-2.6.30.old/arch/x86/kernel/cpu/mkcapflags.pl 2009-06-09 22:05:27.000000000 -0500 +++ linux-2.6.30/arch/x86/kernel/cpu/mkcapflags.pl 1969-12-31 18:00:00.000000000 -0600 @@ -96,3 +80,20 @@ + done + echo "};" +) > $OUT +diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile +index 25f24dc..9edf7e7 100644 +--- a/arch/x86/kernel/cpu/Makefile ++++ b/arch/x86/kernel/cpu/Makefile +@@ -40,10 +40,10 @@ obj-$(CONFIG_MTRR) += mtrr/ + obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o + + quiet_cmd_mkcapflags = MKCAP $@ +- cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@ ++ cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@ + + cpufeature = $(src)/../../include/asm/cpufeature.h + + targets += capflags.c +-$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE ++$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE + $(call if_changed,mkcapflags) diff -r 54db423b7fef -r 62dd9695d825 sources/patches/linux-sparc.patch --- a/sources/patches/linux-sparc.patch Sun Jan 01 13:51:04 2012 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -Subject: Re: Sparc-32 doesn't work in 3.1. -From: David Miller -Date: Wed, 14 Dec 2011 12:54:43 -0500 (EST) - -> The right fix is to simply teach btfixup to be able to patch -> the 'restore' just as equally as it would patch an 'or'. - -Try this: - --------------------- -sparc32: Be less strict in matching %lo part of relocation. - -The "(insn & 0x01800000) != 0x01800000" test matches 'restore' -but that is a legitimate place to see the %lo() part of a 32-bit -symbol relocation, particularly in tail calls. - -Signed-off-by: David S. Miller ---- - arch/sparc/mm/btfixup.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c -index 5175ac2..8a7f817 100644 ---- a/arch/sparc/mm/btfixup.c -+++ b/arch/sparc/mm/btfixup.c -@@ -302,8 +302,7 @@ void __init btfixup(void) - case 'i': /* INT */ - if ((insn & 0xc1c00000) == 0x01000000) /* %HI */ - set_addr(addr, q[1], fmangled, (insn & 0xffc00000) | (p[1] >> 10)); -- else if ((insn & 0x80002000) == 0x80002000 && -- (insn & 0x01800000) != 0x01800000) /* %LO */ -+ else if ((insn & 0x80002000) == 0x80002000) /* %LO */ - set_addr(addr, q[1], fmangled, (insn & 0xffffe000) | (p[1] & 0x3ff)); - else { - prom_printf(insn_i, p, addr, insn); --- -1.7.6.401.g6a319 - -