qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-08-20 19:42:25 +03:00
Code

ramips: refresh 2.6.34 patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21604 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2010-05-28 19:45:16 +00:00
parent 237bd79c54
commit 6c5721aff2
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.34/arch/mips/kernel/traps.c --- a/arch/mips/kernel/traps.c
=================================================================== +++ b/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
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
#include <asm/irq.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 void check_wait(void);
extern asmlinkage void r4k_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) { if (cpu_has_mips_r2) {
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7; 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; cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
if (cp0_perfcount_irq == cp0_compare_irq) if (cp0_perfcount_irq == cp0_compare_irq)
cp0_perfcount_irq = -1; cp0_perfcount_irq = -1;
Index: linux-2.6.34/arch/mips/include/asm/time.h --- a/arch/mips/include/asm/time.h
=================================================================== +++ b/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 @@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
+++ linux-2.6.34/arch/mips/include/asm/time.h 2010-05-21 11:32:22.000000000 +0400
@@ -52,6 +52,7 @@
*/ */
#ifdef CONFIG_CEVT_R4K_LIB #ifdef CONFIG_CEVT_R4K_LIB
extern unsigned int __weak get_c0_compare_int(void); extern unsigned int __weak get_c0_compare_int(void);

6
target/linux/ramips/patches-2.6.34/104-clsize.patch
View File

@ -1,5 +1,5 @@
--- linux-2.6.34.orig/arch/mips/include/asm/bootinfo.h 2010-05-21 09:54:15.000000000 +0400 --- a/arch/mips/include/asm/bootinfo.h
+++ linux-2.6.34/arch/mips/include/asm/bootinfo.h 2010-05-21 09:55:09.000000000 +0400 +++ b/arch/mips/include/asm/bootinfo.h
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
#ifndef _ASM_BOOTINFO_H #ifndef _ASM_BOOTINFO_H
#define _ASM_BOOTINFO_H #define _ASM_BOOTINFO_H
@ -8,4 +8,4 @@
+ +
#include <linux/types.h> #include <linux/types.h>
#include <asm/setup.h> #include <asm/setup.h>

9
target/linux/ramips/patches-2.6.34/105-slab.patch
View File

@ -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 --- a/arch/mips/ralink/common/dev-gpio-buttons.c
+++ linux-2.6.34/arch/mips/ralink/common/dev-gpio-buttons.c 2010-05-21 10:00:05.000000000 +0400 +++ b/arch/mips/ralink/common/dev-gpio-buttons.c
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include "linux/init.h" #include "linux/init.h"
@ -8,8 +8,8 @@
#include <asm/mach-ralink/dev-gpio-buttons.h> #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 --- a/arch/mips/ralink/common/dev-gpio-leds.c
+++ linux-2.6.34/arch/mips/ralink/common/dev-gpio-leds.c 2010-05-21 09:59:44.000000000 +0400 +++ b/arch/mips/ralink/common/dev-gpio-leds.c
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <linux/init.h> #include <linux/init.h>
@ -17,3 +17,4 @@
+#include <linux/slab.h> +#include <linux/slab.h>
#include <asm/mach-ralink/dev-gpio-leds.h> #include <asm/mach-ralink/dev-gpio-leds.h>

2
target/linux/ramips/patches-2.6.34/400-mips-multi-machine-update.patch
View File

@ -16,7 +16,7 @@
char *mips_machine_name = "Unknown"; 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 *
} }
} }