upgrade to 2.6.25.7, and refresh patches

SVN-Revision: 11523
This commit is contained in:
Gabor Juhos
2008-06-17 12:57:04 +00:00
parent 3415b8c044
commit 4af6ac74fb
61 changed files with 435 additions and 683 deletions

View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/Kconfig
===================================================================
--- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ linux-2.6.25.4/arch/mips/Kconfig
@@ -78,6 +78,21 @@ config MIPS_COBALT
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -78,6 +78,21 @@
select SYS_SUPPORTS_LITTLE_ENDIAN
select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -24,7 +22,7 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
config MACH_DECSTATION
bool "DECstations"
select BOOT_ELF32
@@ -693,6 +706,7 @@ source "arch/mips/sibyte/Kconfig"
@@ -693,6 +708,7 @@
source "arch/mips/tx4927/Kconfig"
source "arch/mips/tx4938/Kconfig"
source "arch/mips/vr41xx/Kconfig"
@@ -32,11 +30,9 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
endmenu
Index: linux-2.6.25.4/arch/mips/Makefile
===================================================================
--- linux-2.6.25.4.orig/arch/mips/Makefile
+++ linux-2.6.25.4/arch/mips/Makefile
@@ -282,6 +282,13 @@ core-$(CONFIG_MIPS_COBALT) += arch/mips/
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -282,6 +282,13 @@
cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt
load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000
@@ -50,10 +46,8 @@ Index: linux-2.6.25.4/arch/mips/Makefile
#
# DECstation family
#
Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
+++ linux-2.6.25.4/include/asm-mips/bootinfo.h
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -94,6 +94,12 @@
#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
@@ -67,11 +61,9 @@ Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
#define CL_SIZE COMMAND_LINE_SIZE
extern char *system_type;
Index: linux-2.6.25.4/arch/mips/kernel/traps.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/kernel/traps.c
+++ linux-2.6.25.4/arch/mips/kernel/traps.c
@@ -1379,6 +1379,7 @@ void __cpuinit per_cpu_trap_init(void)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1379,6 +1379,7 @@
*/
if (cpu_has_mips_r2) {
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;