aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-05-28 19:45:16 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-05-28 19:45:16 +0000
commitb86455a7ecdc73ca757c99c9276025ffa3470446 (patch)
treeabdccee0aa9d72291223c6c85903f623d17fd266 /target
parentfdf1561386f4ef52c32b0e7719e7cd76ee118a7c (diff)
downloadupstream-b86455a7ecdc73ca757c99c9276025ffa3470446.tar.gz
upstream-b86455a7ecdc73ca757c99c9276025ffa3470446.tar.bz2
upstream-b86455a7ecdc73ca757c99c9276025ffa3470446.zip
ramips: refresh 2.6.34 patches
SVN-Revision: 21604
Diffstat (limited to 'target')
-rw-r--r--target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch16
-rw-r--r--target/linux/ramips/patches-2.6.34/104-clsize.patch6
-rw-r--r--target/linux/ramips/patches-2.6.34/105-slab.patch9
-rw-r--r--target/linux/ramips/patches-2.6.34/400-mips-multi-machine-update.patch2
4 files changed, 15 insertions, 18 deletions
diff --git a/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch
index 1eff47b56d..6618a5d4c4 100644
--- a/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch
+++ b/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.34/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.34.orig/arch/mips/kernel/traps.c 2010-05-17 01:17:36.000000000 +0400
-+++ linux-2.6.34/arch/mips/kernel/traps.c 2010-05-22 14:22:35.000000000 +0400
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
@@ -51,6 +51,7 @@
#include <asm/stacktrace.h>
#include <asm/irq.h>
@@ -10,7 +8,7 @@ Index: linux-2.6.34/arch/mips/kernel/traps.c
extern void check_wait(void);
extern asmlinkage void r4k_wait(void);
-@@ -1506,6 +1507,8 @@
+@@ -1506,6 +1507,8 @@ void __cpuinit per_cpu_trap_init(void)
if (cpu_has_mips_r2) {
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
@@ -19,11 +17,9 @@ Index: linux-2.6.34/arch/mips/kernel/traps.c
cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
if (cp0_perfcount_irq == cp0_compare_irq)
cp0_perfcount_irq = -1;
-Index: linux-2.6.34/arch/mips/include/asm/time.h
-===================================================================
---- linux-2.6.34.orig/arch/mips/include/asm/time.h 2010-05-17 01:17:36.000000000 +0400
-+++ linux-2.6.34/arch/mips/include/asm/time.h 2010-05-21 11:32:22.000000000 +0400
-@@ -52,6 +52,7 @@
+--- a/arch/mips/include/asm/time.h
++++ b/arch/mips/include/asm/time.h
+@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
*/
#ifdef CONFIG_CEVT_R4K_LIB
extern unsigned int __weak get_c0_compare_int(void);
diff --git a/target/linux/ramips/patches-2.6.34/104-clsize.patch b/target/linux/ramips/patches-2.6.34/104-clsize.patch
index 96465b22e9..34942332b7 100644
--- a/target/linux/ramips/patches-2.6.34/104-clsize.patch
+++ b/target/linux/ramips/patches-2.6.34/104-clsize.patch
@@ -1,5 +1,5 @@
---- linux-2.6.34.orig/arch/mips/include/asm/bootinfo.h 2010-05-21 09:54:15.000000000 +0400
-+++ linux-2.6.34/arch/mips/include/asm/bootinfo.h 2010-05-21 09:55:09.000000000 +0400
+--- a/arch/mips/include/asm/bootinfo.h
++++ b/arch/mips/include/asm/bootinfo.h
@@ -12,6 +12,8 @@
#ifndef _ASM_BOOTINFO_H
#define _ASM_BOOTINFO_H
@@ -8,4 +8,4 @@
+
#include <linux/types.h>
#include <asm/setup.h>
-
+
diff --git a/target/linux/ramips/patches-2.6.34/105-slab.patch b/target/linux/ramips/patches-2.6.34/105-slab.patch
index 8b4c8dc9b0..3ee300db5b 100644
--- a/target/linux/ramips/patches-2.6.34/105-slab.patch
+++ b/target/linux/ramips/patches-2.6.34/105-slab.patch
@@ -1,5 +1,5 @@
---- linux-2.6.34.orig/arch/mips/ralink/common/dev-gpio-buttons.c 2010-05-21 09:59:26.000000000 +0400
-+++ linux-2.6.34/arch/mips/ralink/common/dev-gpio-buttons.c 2010-05-21 10:00:05.000000000 +0400
+--- a/arch/mips/ralink/common/dev-gpio-buttons.c
++++ b/arch/mips/ralink/common/dev-gpio-buttons.c
@@ -10,6 +10,7 @@
#include "linux/init.h"
@@ -8,8 +8,8 @@
#include <asm/mach-ralink/dev-gpio-buttons.h>
---- linux-2.6.34.orig/arch/mips/ralink/common/dev-gpio-leds.c 2010-05-21 09:59:22.000000000 +0400
-+++ linux-2.6.34/arch/mips/ralink/common/dev-gpio-leds.c 2010-05-21 09:59:44.000000000 +0400
+--- a/arch/mips/ralink/common/dev-gpio-leds.c
++++ b/arch/mips/ralink/common/dev-gpio-leds.c
@@ -10,6 +10,7 @@
#include <linux/init.h>
@@ -17,3 +17,4 @@
+#include <linux/slab.h>
#include <asm/mach-ralink/dev-gpio-leds.h>
+
diff --git a/target/linux/ramips/patches-2.6.34/400-mips-multi-machine-update.patch b/target/linux/ramips/patches-2.6.34/400-mips-multi-machine-update.patch
index 60fe04fdcc..aeee89d337 100644
--- a/target/linux/ramips/patches-2.6.34/400-mips-multi-machine-update.patch
+++ b/target/linux/ramips/patches-2.6.34/400-mips-multi-machine-update.patch
@@ -16,7 +16,7 @@
char *mips_machine_name = "Unknown";
-@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
+@@ -55,20 +57,65 @@ void __init mips_machine_set_name(char *
}
}