From d7b07dd5e93b44cb6ac3a2012886ed44314e4396 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 19 Feb 2009 16:11:07 +0000 Subject: [kernel] update to 2.6.28.6 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14565 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 3 -- target/linux/ar71xx/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- .../920-03-spi-gpio-fix-miso-bit.patch | 6 +-- .../920-04-spi-gpio-implement-spi-delay.patch | 6 +-- target/linux/ixp4xx/Makefile | 2 +- target/linux/orion/Makefile | 2 +- target/linux/ppc44x/Makefile | 2 +- target/linux/s3c24xx/Makefile | 2 +- target/linux/sibyte/Makefile | 2 +- target/linux/uml/Makefile | 2 +- .../002-syscall_define_fix_uml_compile_bug.patch | 54 ---------------------- target/linux/x86/Makefile | 2 +- 13 files changed, 13 insertions(+), 74 deletions(-) delete mode 100644 target/linux/uml/patches/002-syscall_define_fix_uml_compile_bug.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f739b92254..c7352fcc3f 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -31,9 +31,6 @@ endif ifeq ($(LINUX_VERSION),2.6.27.17) LINUX_KERNEL_MD5SUM:=56ceaa85d19f5f19ff7ec8139ad4ad2d endif -ifeq ($(LINUX_VERSION),2.6.28.5) - LINUX_KERNEL_MD5SUM:=677e020f785f57ac48576eacb565a489 -endif ifeq ($(LINUX_VERSION),2.6.28.6) LINUX_KERNEL_MD5SUM:=6bb4f553551033f29d55d78b49b31733 endif diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 78ecd47df1..64bbd35665 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -11,7 +11,7 @@ BOARD:=ar71xx BOARDNAME:=Atheros AR71xx FEATURES:=squashfs tgz -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index e38053204a..425eff3c37 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -10,7 +10,7 @@ ARCH:=avr32 BOARD:=avr32 BOARDNAME:=Atmel AVR32 FEATURES:=squashfs -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic-2.6/patches-2.6.28/920-03-spi-gpio-fix-miso-bit.patch b/target/linux/generic-2.6/patches-2.6.28/920-03-spi-gpio-fix-miso-bit.patch index f4dd67efee..acc7bed920 100644 --- a/target/linux/generic-2.6/patches-2.6.28/920-03-spi-gpio-fix-miso-bit.patch +++ b/target/linux/generic-2.6/patches-2.6.28/920-03-spi-gpio-fix-miso-bit.patch @@ -7,10 +7,8 @@ Sanitize the value to a 0/1 boolean. -Index: linux-2.6.28.5/drivers/spi/spi_gpio.c -=================================================================== ---- linux-2.6.28.5.orig/drivers/spi/spi_gpio.c 2009-02-15 16:21:11.000000000 +0100 -+++ linux-2.6.28.5/drivers/spi/spi_gpio.c 2009-02-15 16:21:47.000000000 +0100 +--- a/drivers/spi/spi_gpio.c ++++ b/drivers/spi/spi_gpio.c @@ -114,7 +114,7 @@ static inline void setmosi(const struct static inline int getmiso(const struct spi_device *spi) diff --git a/target/linux/generic-2.6/patches-2.6.28/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.28/920-04-spi-gpio-implement-spi-delay.patch index b224081935..19032881b8 100644 --- a/target/linux/generic-2.6/patches-2.6.28/920-04-spi-gpio-implement-spi-delay.patch +++ b/target/linux/generic-2.6/patches-2.6.28/920-04-spi-gpio-implement-spi-delay.patch @@ -4,10 +4,8 @@ Implement the SPI-GPIO delay function for busses that need speed limitation. -Index: linux-2.6.28.5/drivers/spi/spi_gpio.c -=================================================================== ---- linux-2.6.28.5.orig/drivers/spi/spi_gpio.c 2009-02-15 18:53:47.000000000 +0100 -+++ linux-2.6.28.5/drivers/spi/spi_gpio.c 2009-02-15 19:08:58.000000000 +0100 +--- a/drivers/spi/spi_gpio.c ++++ b/drivers/spi/spi_gpio.c @@ -21,6 +21,7 @@ #include #include diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index ab2f4b9a31..cfe76d8bce 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx FEATURES:=squashfs SUBTARGETS=generic harddisk -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index b375edfc46..43db0b9f73 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -11,7 +11,7 @@ BOARD:=orion BOARDNAME:=Marvell Orion FEATURES:=squashfs -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index a5ca07d0ec..1a2e1fb773 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -11,7 +11,7 @@ BOARD:=ppc44x BOARDNAME:=AMCC/IBM PPC44x FEATURES:=squashfs -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 LINUX_KARCH:=powerpc include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/s3c24xx/Makefile b/target/linux/s3c24xx/Makefile index aa7aac6187..12a38992c6 100644 --- a/target/linux/s3c24xx/Makefile +++ b/target/linux/s3c24xx/Makefile @@ -11,7 +11,7 @@ BOARD:=s3c24xx BOARDNAME:=s3c24xx FEATURES:=jffs2 -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 DEVICE_TYPE=phone diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index cbfe14191c..877bd8cde3 100644 --- a/target/linux/sibyte/Makefile +++ b/target/linux/sibyte/Makefile @@ -11,7 +11,7 @@ BOARD:=sibyte BOARDNAME:=Broadcom/SiByte SB-1 FEATURES:=broken -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 7b8f4fca2e..ed2b5f4556 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext2 LINUX_CONFIG:=$(CURDIR)/config/$(ARCH) -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/patches/002-syscall_define_fix_uml_compile_bug.patch b/target/linux/uml/patches/002-syscall_define_fix_uml_compile_bug.patch deleted file mode 100644 index 563294a958..0000000000 --- a/target/linux/uml/patches/002-syscall_define_fix_uml_compile_bug.patch +++ /dev/null @@ -1,54 +0,0 @@ -http://patchwork.kernel.org/patch/7166/ - ---- a/include/linux/syscalls.h -+++ b/include/linux/syscalls.h -@@ -95,13 +95,13 @@ struct old_linux_dirent; - #define __SC_TEST5(t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__) - #define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__) - --#define SYSCALL_DEFINE0(name) asmlinkage long sys_##name(void) --#define SYSCALL_DEFINE1(...) SYSCALL_DEFINEx(1, __VA_ARGS__) --#define SYSCALL_DEFINE2(...) SYSCALL_DEFINEx(2, __VA_ARGS__) --#define SYSCALL_DEFINE3(...) SYSCALL_DEFINEx(3, __VA_ARGS__) --#define SYSCALL_DEFINE4(...) SYSCALL_DEFINEx(4, __VA_ARGS__) --#define SYSCALL_DEFINE5(...) SYSCALL_DEFINEx(5, __VA_ARGS__) --#define SYSCALL_DEFINE6(...) SYSCALL_DEFINEx(6, __VA_ARGS__) -+#define SYSCALL_DEFINE0(name) asmlinkage long sys_##name(void) -+#define SYSCALL_DEFINE1(name, ...) SYSCALL_DEFINEx(1, _##name, __VA_ARGS__) -+#define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__) -+#define SYSCALL_DEFINE3(name, ...) SYSCALL_DEFINEx(3, _##name, __VA_ARGS__) -+#define SYSCALL_DEFINE4(name, ...) SYSCALL_DEFINEx(4, _##name, __VA_ARGS__) -+#define SYSCALL_DEFINE5(name, ...) SYSCALL_DEFINEx(5, _##name, __VA_ARGS__) -+#define SYSCALL_DEFINE6(name, ...) SYSCALL_DEFINEx(6, _##name, __VA_ARGS__) - - #ifdef CONFIG_PPC64 - #define SYSCALL_ALIAS(alias, name) \ -@@ -116,21 +116,21 @@ struct old_linux_dirent; - - #define SYSCALL_DEFINE(name) static inline long SYSC_##name - #define SYSCALL_DEFINEx(x, name, ...) \ -- asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__)); \ -- static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__)); \ -- asmlinkage long SyS_##name(__SC_LONG##x(__VA_ARGS__)) \ -+ asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__)); \ -+ static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__)); \ -+ asmlinkage long SyS##name(__SC_LONG##x(__VA_ARGS__)) \ - { \ - __SC_TEST##x(__VA_ARGS__); \ -- return (long) SYSC_##name(__SC_CAST##x(__VA_ARGS__)); \ -+ return (long) SYSC##name(__SC_CAST##x(__VA_ARGS__)); \ - } \ -- SYSCALL_ALIAS(sys_##name, SyS_##name); \ -- static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__)) -+ SYSCALL_ALIAS(sys##name, SyS##name); \ -+ static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__)) - - #else /* CONFIG_HAVE_SYSCALL_WRAPPERS */ - - #define SYSCALL_DEFINE(name) asmlinkage long sys_##name - #define SYSCALL_DEFINEx(x, name, ...) \ -- asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__)) -+ asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__)) - - #endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */ - diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 89d90782e9..0e793319d2 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext2 vdi vmdk SUBTARGETS=generic -LINUX_VERSION:=2.6.28.5 +LINUX_VERSION:=2.6.28.6 LINUX_KARCH:=x86 include $(INCLUDE_DIR)/target.mk -- cgit v1.2.3