From 8323cd9b87785958b4ca538cca3c72be5bea2984 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 5 Oct 2009 20:50:27 +0200 Subject: kernel-headers: bump 2.6.27/30/31 stable versions Signed-off-by: Peter Korsgaard --- toolchain/kernel-headers/Config.in | 6 ++-- .../kernel-headers/linux-2.6.30.8-mips-delay.patch | 35 ---------------------- .../kernel-headers/linux-2.6.30.9-mips-delay.patch | 35 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-2.6.30.8-mips-delay.patch create mode 100644 toolchain/kernel-headers/linux-2.6.30.9-mips-delay.patch (limited to 'toolchain/kernel-headers') diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 4652a77b2..1141d8886 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -53,10 +53,10 @@ config BR2_KERNEL_HEADERS_RT config BR2_DEFAULT_KERNEL_HEADERS string default "2.6.26.8" if BR2_KERNEL_HEADERS_2_6_26 - default "2.6.27.35" if BR2_KERNEL_HEADERS_2_6_27 + default "2.6.27.36" if BR2_KERNEL_HEADERS_2_6_27 default "2.6.28.10" if BR2_KERNEL_HEADERS_2_6_28 default "2.6.29.6" if BR2_KERNEL_HEADERS_2_6_29 - default "2.6.30.8" if BR2_KERNEL_HEADERS_2_6_30 - default "2.6.31.1" if BR2_KERNEL_HEADERS_2_6_31 + default "2.6.30.9" if BR2_KERNEL_HEADERS_2_6_30 + default "2.6.31.2" if BR2_KERNEL_HEADERS_2_6_31 default "2.6" if BR2_KERNEL_HEADERS_SNAP diff --git a/toolchain/kernel-headers/linux-2.6.30.8-mips-delay.patch b/toolchain/kernel-headers/linux-2.6.30.8-mips-delay.patch deleted file mode 100644 index 9e13c2c06..000000000 --- a/toolchain/kernel-headers/linux-2.6.30.8-mips-delay.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3cb3a66cf7559d9c5d47ddf58481530b8943052f Mon Sep 17 00:00:00 2001 -From: Atsushi Nemoto -Date: Tue, 9 Jun 2009 11:12:48 +0900 -Subject: [PATCH] MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel - -Signed-off-by: Atsushi Nemoto -Signed-off-by: Ralf Baechle ---- - arch/mips/lib/delay.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -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); --- -1.6.3.3 - diff --git a/toolchain/kernel-headers/linux-2.6.30.9-mips-delay.patch b/toolchain/kernel-headers/linux-2.6.30.9-mips-delay.patch new file mode 100644 index 000000000..9e13c2c06 --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.30.9-mips-delay.patch @@ -0,0 +1,35 @@ +From 3cb3a66cf7559d9c5d47ddf58481530b8943052f Mon Sep 17 00:00:00 2001 +From: Atsushi Nemoto +Date: Tue, 9 Jun 2009 11:12:48 +0900 +Subject: [PATCH] MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel + +Signed-off-by: Atsushi Nemoto +Signed-off-by: Ralf Baechle +--- + arch/mips/lib/delay.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +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); +-- +1.6.3.3 + -- cgit v1.2.3