r971 - in trunk: . linux

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Jun 12 11:19:41 PDT 2005


Author: jim
Date: 2005-06-12 12:19:40 -0600 (Sun, 12 Jun 2005)
New Revision: 971

Added:
   trunk/linux/linux-2.6.11.12-mips_fix-1.patch
Modified:
   trunk/
   trunk/linux/linux-2.6.11.11-mips_fix-1.patch
Log:
Mirrored from jg555.com on Sun Jun 12 11:19:19 PDT 2005
----------------------------------------------------------------------
r980:  root  - Time based on mirror jg555.com - 2005-06-12 10:07:23 -0700
merged from linuxfromscratch.org at Sun Jun 12 10:06:29 PDT 2005
----------------------------------------------------------------------
r981:  jim  - Time based on mirror jg555.com - 2005-06-12 11:19:04 -0700
Added updates MIPS Patch
----------------------------------------------------------------------



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:967
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:981

Modified: trunk/linux/linux-2.6.11.11-mips_fix-1.patch
===================================================================
--- trunk/linux/linux-2.6.11.11-mips_fix-1.patch	2005-06-12 16:55:19 UTC (rev 970)
+++ trunk/linux/linux-2.6.11.11-mips_fix-1.patch	2005-06-12 18:19:40 UTC (rev 971)
@@ -1,15 +1,13 @@
 Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-04-01
-Initial Package Version: 2.6.11.6
-Origin: http://www.linux-mips.org and http://www.colonel-panic.org/cobalt-mips
-	http://www.parisc-linux.org
-Upstream Status: Not Applied to kernel.org
-Description: Adds various fixes to the Cobalt RaQ2
-             Added MIPS64 bit fixes
-
-diff -Naur linux-2.6.11.6/arch/mips/Kconfig linux-2.6.11.6/arch/mips/Kconfig
---- linux-2.6.11.6/arch/mips/Kconfig	2005-03-25 19:28:20 -0800
-+++ linux-2.6.11.6/arch/mips/Kconfig	2005-04-01 08:56:55 -0800
+Date: 2005-06-11
+Initial Package Version: 2.6.11.11
+Origin: linux-mips.org and LKML
+Upstream Status: N/A
+Description: Fixes issues with MIPS and MIPS64 build on MIPS
+ 
+diff -Naur linux-2.6.11.11.orig/arch/mips/Kconfig linux-2.6.11.11/arch/mips/Kconfig
+--- linux-2.6.11.11.orig/arch/mips/Kconfig	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/Kconfig	2005-06-09 15:32:58.000000000 +0000
 @@ -1371,7 +1371,7 @@
  
  config CPU_HAS_LLSC
@@ -28,9 +26,9 @@
  	help
  	  Say Y here if your CPU has the lld and scd instructions, the 64-bit
  	  equivalents of ll and sc.  Say Y here for better performance, N if
-diff -Naur linux-2.6.11.6/arch/mips/Makefile linux-2.6.11.6/arch/mips/Makefile
---- linux-2.6.11.6/arch/mips/Makefile	2005-03-25 19:28:14 -0800
-+++ linux-2.6.11.6/arch/mips/Makefile	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/Makefile linux-2.6.11.11/arch/mips/Makefile
+--- linux-2.6.11.11.orig/arch/mips/Makefile	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/Makefile	2005-06-09 15:32:58.000000000 +0000
 @@ -323,6 +323,7 @@
  # Cobalt Server
  #
@@ -39,9 +37,9 @@
  load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000
  
  #
-diff -Naur linux-2.6.11.6/arch/mips/cobalt/int-handler.S linux-2.6.11.6/arch/mips/cobalt/int-handler.S
---- linux-2.6.11.6/arch/mips/cobalt/int-handler.S	2005-03-25 19:28:36 -0800
-+++ linux-2.6.11.6/arch/mips/cobalt/int-handler.S	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/cobalt/int-handler.S linux-2.6.11.11/arch/mips/cobalt/int-handler.S
+--- linux-2.6.11.11.orig/arch/mips/cobalt/int-handler.S	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/cobalt/int-handler.S	2005-06-09 15:32:58.000000000 +0000
 @@ -18,8 +18,8 @@
  		SAVE_ALL
  		CLI
@@ -53,9 +51,9 @@
  		j	cobalt_irq
  
  		END(cobalt_handle_int)
-diff -Naur linux-2.6.11.6/arch/mips/cobalt/irq.c linux-2.6.11.6/arch/mips/cobalt/irq.c
---- linux-2.6.11.6/arch/mips/cobalt/irq.c	2005-03-25 19:28:23 -0800
-+++ linux-2.6.11.6/arch/mips/cobalt/irq.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/cobalt/irq.c linux-2.6.11.11/arch/mips/cobalt/irq.c
+--- linux-2.6.11.11.orig/arch/mips/cobalt/irq.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/cobalt/irq.c	2005-06-09 15:32:58.000000000 +0000
 @@ -10,6 +10,7 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
@@ -99,9 +97,9 @@
 +
 +	setup_irq(COBALT_VIA_IRQ, &irq_via);
  }
-diff -Naur linux-2.6.11.6/arch/mips/cobalt/reset.c linux-2.6.11.6/arch/mips/cobalt/reset.c
---- linux-2.6.11.6/arch/mips/cobalt/reset.c	2005-03-25 19:28:13 -0800
-+++ linux-2.6.11.6/arch/mips/cobalt/reset.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/cobalt/reset.c linux-2.6.11.11/arch/mips/cobalt/reset.c
+--- linux-2.6.11.11.orig/arch/mips/cobalt/reset.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/cobalt/reset.c	2005-06-09 15:32:58.000000000 +0000
 @@ -16,48 +16,45 @@
  #include <asm/reboot.h>
  #include <asm/system.h>
@@ -179,9 +177,9 @@
  /*
   * This triggers the luser mode device driver for the power switch ;-)
   */
-diff -Naur linux-2.6.11.6/arch/mips/cobalt/setup.c linux-2.6.11.6/arch/mips/cobalt/setup.c
---- linux-2.6.11.6/arch/mips/cobalt/setup.c	2005-03-25 19:28:14 -0800
-+++ linux-2.6.11.6/arch/mips/cobalt/setup.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/cobalt/setup.c linux-2.6.11.11/arch/mips/cobalt/setup.c
+--- linux-2.6.11.11.orig/arch/mips/cobalt/setup.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/cobalt/setup.c	2005-06-09 15:32:58.000000000 +0000
 @@ -30,27 +30,25 @@
  
  int cobalt_board_id;
@@ -324,9 +322,9 @@
  }
  
  unsigned long __init prom_free_prom_memory(void)
-diff -Naur linux-2.6.11.6/arch/mips/kernel/Makefile linux-2.6.11.6/arch/mips/kernel/Makefile
---- linux-2.6.11.6/arch/mips/kernel/Makefile	2005-03-25 19:28:19 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/Makefile	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/Makefile linux-2.6.11.11/arch/mips/kernel/Makefile
+--- linux-2.6.11.11.orig/arch/mips/kernel/Makefile	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/Makefile	2005-06-09 15:32:58.000000000 +0000
 @@ -11,11 +11,7 @@
  binfmt_irix-objs	:= irixelf.o irixinv.o irixioctl.o irixsig.o	\
  			   irix5sys.o sysirix.o
@@ -340,9 +338,9 @@
  
  obj-$(CONFIG_CPU_R3000)		+= r2300_fpu.o r2300_switch.o
  obj-$(CONFIG_CPU_TX39XX)	+= r2300_fpu.o r2300_switch.o
-diff -Naur linux-2.6.11.6/arch/mips/kernel/cpu-probe.c linux-2.6.11.6/arch/mips/kernel/cpu-probe.c
---- linux-2.6.11.6/arch/mips/kernel/cpu-probe.c	2005-03-25 19:28:18 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/cpu-probe.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/cpu-probe.c linux-2.6.11.11/arch/mips/kernel/cpu-probe.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/cpu-probe.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/cpu-probe.c	2005-06-09 15:32:58.000000000 +0000
 @@ -354,6 +354,17 @@
  		c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
  		             MIPS_CPU_DIVEC | MIPS_CPU_LLSC;
@@ -361,9 +359,9 @@
  		break;
  	case PRID_IMP_R6000:
  		c->cputype = CPU_R6000;
-diff -Naur linux-2.6.11.6/arch/mips/kernel/entry.S linux-2.6.11.6/arch/mips/kernel/entry.S
---- linux-2.6.11.6/arch/mips/kernel/entry.S	2005-03-25 19:28:16 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/entry.S	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/entry.S linux-2.6.11.11/arch/mips/kernel/entry.S
+--- linux-2.6.11.11.orig/arch/mips/kernel/entry.S	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/entry.S	2005-06-09 15:32:58.000000000 +0000
 @@ -19,11 +19,11 @@
  #include <asm/war.h>
  
@@ -485,9 +483,9 @@
  	j	ret_from_irq
  	END(spurious_interrupt)
 +
-diff -Naur linux-2.6.11.6/arch/mips/kernel/irq_cpu.c linux-2.6.11.6/arch/mips/kernel/irq_cpu.c
---- linux-2.6.11.6/arch/mips/kernel/irq_cpu.c	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/irq_cpu.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/irq_cpu.c linux-2.6.11.11/arch/mips/kernel/irq_cpu.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/irq_cpu.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/irq_cpu.c	2005-06-09 15:32:58.000000000 +0000
 @@ -3,6 +3,8 @@
   * Author: Jun Sun, jsun at mvista.com or jsun at junsun.net
   *
@@ -538,9 +536,9 @@
  	for (i = irq_base; i < irq_base + 8; i++) {
  		irq_desc[i].status = IRQ_DISABLED;
  		irq_desc[i].action = NULL;
-diff -Naur linux-2.6.11.6/arch/mips/kernel/linux32.c linux-2.6.11.6/arch/mips/kernel/linux32.c
---- linux-2.6.11.6/arch/mips/kernel/linux32.c	2005-03-25 19:28:23 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/linux32.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/linux32.c linux-2.6.11.11/arch/mips/kernel/linux32.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/linux32.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/linux32.c	2005-06-09 15:32:58.000000000 +0000
 @@ -215,81 +215,35 @@
  	return(n);
  }
@@ -698,9 +696,9 @@
 +	}
 +	return sys_rt_sigtimedwait(uthese, uinfo, uts, sigsetsize);
 +}
-diff -Naur linux-2.6.11.6/arch/mips/kernel/module-elf32.c linux-2.6.11.6/arch/mips/kernel/module-elf32.c
---- linux-2.6.11.6/arch/mips/kernel/module-elf32.c	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/module-elf32.c	1969-12-31 16:00:00 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/module-elf32.c linux-2.6.11.11/arch/mips/kernel/module-elf32.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/module-elf32.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/module-elf32.c	1970-01-01 00:00:00.000000000 +0000
 @@ -1,250 +0,0 @@
 -/*
 - *  This program is free software; you can redistribute it and/or modify
@@ -952,9 +950,9 @@
 -	       me->name);
 -	return -ENOEXEC;
 -}
-diff -Naur linux-2.6.11.6/arch/mips/kernel/module-elf64.c linux-2.6.11.6/arch/mips/kernel/module-elf64.c
---- linux-2.6.11.6/arch/mips/kernel/module-elf64.c	2005-03-25 19:28:24 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/module-elf64.c	1969-12-31 16:00:00 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/module-elf64.c linux-2.6.11.11/arch/mips/kernel/module-elf64.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/module-elf64.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/module-elf64.c	1970-01-01 00:00:00.000000000 +0000
 @@ -1,274 +0,0 @@
 -/*
 - *  This program is free software; you can redistribute it and/or modify
@@ -1230,9 +1228,9 @@
 -
 -	return 0;
 -}
-diff -Naur linux-2.6.11.6/arch/mips/kernel/module.c linux-2.6.11.6/arch/mips/kernel/module.c
---- linux-2.6.11.6/arch/mips/kernel/module.c	2005-03-25 19:28:17 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/module.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/module.c linux-2.6.11.11/arch/mips/kernel/module.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/module.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/module.c	2005-06-09 15:32:58.000000000 +0000
 @@ -1,9 +1,345 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify
@@ -1579,9 +1577,9 @@
  /* Given an address, look for it in the module exception tables. */
  const struct exception_table_entry *search_module_dbetables(unsigned long addr)
  {
-diff -Naur linux-2.6.11.6/arch/mips/kernel/proc.c linux-2.6.11.6/arch/mips/kernel/proc.c
---- linux-2.6.11.6/arch/mips/kernel/proc.c	2005-03-25 19:28:17 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/proc.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/proc.c linux-2.6.11.11/arch/mips/kernel/proc.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/proc.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/proc.c	2005-06-09 15:32:58.000000000 +0000
 @@ -19,63 +19,66 @@
  unsigned int vced_count, vcei_count;
  
@@ -1717,9 +1715,9 @@
  	seq_printf(m, "wait instruction\t: %s\n", cpu_wait ? "yes" : "no");
  	seq_printf(m, "microsecond timers\t: %s\n",
  	              cpu_has_counter ? "yes" : "no");
-diff -Naur linux-2.6.11.6/arch/mips/kernel/process.c linux-2.6.11.6/arch/mips/kernel/process.c
---- linux-2.6.11.6/arch/mips/kernel/process.c	2005-03-25 19:28:19 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/process.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/process.c linux-2.6.11.11/arch/mips/kernel/process.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/process.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/process.c	2005-06-09 15:32:58.000000000 +0000
 @@ -39,14 +39,6 @@
  #include <asm/inst.h>
  
@@ -1912,9 +1910,9 @@
  	return pc;
  }
  
-diff -Naur linux-2.6.11.6/arch/mips/kernel/ptrace.c linux-2.6.11.6/arch/mips/kernel/ptrace.c
---- linux-2.6.11.6/arch/mips/kernel/ptrace.c	2005-03-25 19:28:38 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/ptrace.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/ptrace.c linux-2.6.11.11/arch/mips/kernel/ptrace.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/ptrace.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/ptrace.c	2005-06-09 15:32:58.000000000 +0000
 @@ -101,7 +101,7 @@
  		ret = -EIO;
  		if (copied != sizeof(tmp))
@@ -1933,9 +1931,9 @@
  		break;
  	}
  
-diff -Naur linux-2.6.11.6/arch/mips/kernel/ptrace32.c linux-2.6.11.6/arch/mips/kernel/ptrace32.c
---- linux-2.6.11.6/arch/mips/kernel/ptrace32.c	2005-03-25 19:28:20 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/ptrace32.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/ptrace32.c linux-2.6.11.11/arch/mips/kernel/ptrace32.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/ptrace32.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/ptrace32.c	2005-06-09 15:32:58.000000000 +0000
 @@ -272,6 +272,11 @@
  		ret = ptrace_detach(child, data);
  		break;
@@ -1948,9 +1946,9 @@
  	default:
  		ret = ptrace_request(child, request, addr, data);
  		break;
-diff -Naur linux-2.6.11.6/arch/mips/kernel/scall32-o32.S linux-2.6.11.6/arch/mips/kernel/scall32-o32.S
---- linux-2.6.11.6/arch/mips/kernel/scall32-o32.S	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/scall32-o32.S	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/scall32-o32.S linux-2.6.11.11/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.11.11.orig/arch/mips/kernel/scall32-o32.S	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/scall32-o32.S	2005-06-09 15:32:58.000000000 +0000
 @@ -618,7 +618,7 @@
  	sys	sys_mq_notify		2	/* 4275 */
  	sys	sys_mq_getsetattr	3
@@ -1960,9 +1958,9 @@
  	sys	sys_ni_syscall		0	/* available, was setaltroot */
  	sys	sys_add_key		5
  	sys	sys_request_key		4
-diff -Naur linux-2.6.11.6/arch/mips/kernel/scall64-n32.S linux-2.6.11.6/arch/mips/kernel/scall64-n32.S
---- linux-2.6.11.6/arch/mips/kernel/scall64-n32.S	2005-03-25 19:28:36 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/scall64-n32.S	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/scall64-n32.S linux-2.6.11.11/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.11.11.orig/arch/mips/kernel/scall64-n32.S	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/scall64-n32.S	2005-06-09 15:32:58.000000000 +0000
 @@ -176,7 +176,7 @@
  	PTR	sys_fork
  	PTR	sys32_execve
@@ -2015,9 +2013,9 @@
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
  	PTR	sys_request_key
-diff -Naur linux-2.6.11.6/arch/mips/kernel/scall64-o32.S linux-2.6.11.6/arch/mips/kernel/scall64-o32.S
---- linux-2.6.11.6/arch/mips/kernel/scall64-o32.S	2005-03-25 19:28:13 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/scall64-o32.S	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/scall64-o32.S linux-2.6.11.11/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.11.11.orig/arch/mips/kernel/scall64-o32.S	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/scall64-o32.S	2005-06-09 15:32:58.000000000 +0000
 @@ -316,7 +316,7 @@
  	PTR	sys_vhangup
  	PTR	sys_ni_syscall			/* was sys_idle	 */
@@ -2045,9 +2043,9 @@
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key			/* 4280 */
  	PTR	sys_request_key
-diff -Naur linux-2.6.11.6/arch/mips/kernel/setup.c linux-2.6.11.6/arch/mips/kernel/setup.c
---- linux-2.6.11.6/arch/mips/kernel/setup.c	2005-03-25 19:28:16 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/setup.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/setup.c linux-2.6.11.11/arch/mips/kernel/setup.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/setup.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/setup.c	2005-06-09 15:32:58.000000000 +0000
 @@ -277,7 +277,12 @@
  	/* Board specific code should have set up initrd_start and initrd_end */
   	ROOT_DEV = Root_RAM0;
@@ -2061,9 +2059,9 @@
  		initrd_reserve_bootmem = 1;
  	} else {
  		unsigned long tmp;
-diff -Naur linux-2.6.11.6/arch/mips/kernel/signal-common.h linux-2.6.11.6/arch/mips/kernel/signal-common.h
---- linux-2.6.11.6/arch/mips/kernel/signal-common.h	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/signal-common.h	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/signal-common.h linux-2.6.11.11/arch/mips/kernel/signal-common.h
+--- linux-2.6.11.11.orig/arch/mips/kernel/signal-common.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/signal-common.h	2005-06-09 15:32:58.000000000 +0000
 @@ -61,8 +61,8 @@
  static inline int
  restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
@@ -2074,9 +2072,9 @@
  
  	/* Always make any pending restarted system calls return -EINTR */
  	current_thread_info()->restart_block.fn = do_no_restart_syscall;
-diff -Naur linux-2.6.11.6/arch/mips/kernel/signal.c linux-2.6.11.6/arch/mips/kernel/signal.c
---- linux-2.6.11.6/arch/mips/kernel/signal.c	2005-03-25 19:28:47 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/signal.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/signal.c linux-2.6.11.11/arch/mips/kernel/signal.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/signal.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/signal.c	2005-06-09 15:32:58.000000000 +0000
 @@ -47,9 +47,10 @@
  __attribute_used__ noinline static int
  _sys_sigsuspend(nabi_no_regargs struct pt_regs regs)
@@ -2120,9 +2118,9 @@
  	unsigned long usp = regs.regs[29];
  
  	return do_sigaltstack(uss, uoss, usp);
-diff -Naur linux-2.6.11.6/arch/mips/kernel/signal32.c linux-2.6.11.6/arch/mips/kernel/signal32.c
---- linux-2.6.11.6/arch/mips/kernel/signal32.c	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/signal32.c	2005-04-01 12:58:57 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/signal32.c linux-2.6.11.11/arch/mips/kernel/signal32.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/signal32.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/signal32.c	2005-06-09 15:32:58.000000000 +0000
 @@ -81,8 +81,10 @@
  
  		/* POSIX.1b timers */
@@ -2210,9 +2208,9 @@
 +	info.si_code |= __SI_CHLD;
 +	return copy_siginfo_to_user32(uinfo, &info);
 +}
-diff -Naur linux-2.6.11.6/arch/mips/kernel/smp.c linux-2.6.11.6/arch/mips/kernel/smp.c
---- linux-2.6.11.6/arch/mips/kernel/smp.c	2005-03-25 19:28:16 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/smp.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/smp.c linux-2.6.11.11/arch/mips/kernel/smp.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/smp.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/smp.c	2005-06-09 15:32:58.000000000 +0000
 @@ -139,7 +139,19 @@
   * or are or have executed.
   *
@@ -2295,9 +2293,9 @@
  /* Not really SMP stuff ... */
  int setup_profiling_timer(unsigned int multiplier)
  {
-diff -Naur linux-2.6.11.6/arch/mips/kernel/sysirix.c linux-2.6.11.6/arch/mips/kernel/sysirix.c
---- linux-2.6.11.6/arch/mips/kernel/sysirix.c	2005-03-25 19:28:36 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/sysirix.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/sysirix.c linux-2.6.11.11/arch/mips/kernel/sysirix.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/sysirix.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/sysirix.c	2005-06-09 15:32:58.000000000 +0000
 @@ -73,32 +73,30 @@
  }
  
@@ -2408,9 +2406,9 @@
  		ptep = pte_offset(pmdp, addr);
  		retval = -EINVAL;
  		if (ptep) {
-diff -Naur linux-2.6.11.6/arch/mips/kernel/traps.c linux-2.6.11.6/arch/mips/kernel/traps.c
---- linux-2.6.11.6/arch/mips/kernel/traps.c	2005-03-25 19:28:19 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/traps.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/traps.c linux-2.6.11.11/arch/mips/kernel/traps.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/traps.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/traps.c	2005-06-09 15:32:58.000000000 +0000
 @@ -339,9 +339,9 @@
  
  static inline int get_insn_opcode(struct pt_regs *regs, unsigned int *opcode)
@@ -2511,9 +2509,9 @@
  		break;
  	case CPU_20KC:
  	case CPU_25KF:
-diff -Naur linux-2.6.11.6/arch/mips/kernel/unaligned.c linux-2.6.11.6/arch/mips/kernel/unaligned.c
---- linux-2.6.11.6/arch/mips/kernel/unaligned.c	2005-03-25 19:28:44 -0800
-+++ linux-2.6.11.6/arch/mips/kernel/unaligned.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/unaligned.c linux-2.6.11.11/arch/mips/kernel/unaligned.c
+--- linux-2.6.11.11.orig/arch/mips/kernel/unaligned.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/unaligned.c	2005-06-09 15:32:58.000000000 +0000
 @@ -94,7 +94,7 @@
  #endif
  
@@ -2560,9 +2558,562 @@
  	                             &regptr, &newval)) {
  		compute_return_epc(regs);
  		/*
-diff -Naur linux-2.6.11.6/arch/mips/lib/Makefile linux-2.6.11.6/arch/mips/lib/Makefile
---- linux-2.6.11.6/arch/mips/lib/Makefile	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/arch/mips/lib/Makefile	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/kernel/vmlinux.lds linux-2.6.11.11/arch/mips/kernel/vmlinux.lds
+--- linux-2.6.11.11.orig/arch/mips/kernel/vmlinux.lds	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.11.11/arch/mips/kernel/vmlinux.lds	2005-06-09 15:44:29.000000000 +0000
+@@ -0,0 +1,549 @@
++/*
++ * Automatically generated C config: don't edit
++ * Linux kernel version: 2.6.11.11
++ * Thu Jun  9 08:42:17 2005
++ */
++
++
++
++
++
++/*
++ * Code maturity level options
++ */
++
++
++
++
++/*
++ * General setup
++ */
++/*
++ * Loadable module support
++ */
++
++
++/*
++ * Machine selection
++ */
++/*
++ * CPU selection
++ */
++/*
++ * Bus options (PCI, PCMCIA, EISA, ISA, TC)
++ */
++
++
++
++
++
++
++/*
++ * PCCARD (PCMCIA/CardBus) support
++ */
++
++
++/*
++ * PC-card bridges
++ */
++
++/*
++ * PCI Hotplug Support
++ */
++
++
++/*
++ * Executable file formats
++ */
++/*
++ * Device Drivers
++ */
++
++/*
++ * Generic Driver Options
++ */
++
++
++
++
++
++/*
++ * Memory Technology Devices (MTD)
++ */
++
++
++/*
++ * Parallel port support
++ */
++
++
++/*
++ * Plug and Play support
++ */
++
++/*
++ * Block devices
++ */
++/*
++ * IO Schedulers
++ */
++
++
++
++
++
++
++/*
++ * ATA/ATAPI/MFM/RLL support
++ */
++
++
++
++/*
++ * Please see Documentation/ide.txt for help/info on IDE drives
++ */
++/*
++ * IDE chipset support/bugfixes
++ */
++/*
++ * SCSI device support
++ */
++
++
++/*
++ * Multi-device support (RAID and LVM)
++ */
++
++
++/*
++ * Fusion MPT device support
++ */
++
++/*
++ * IEEE 1394 (FireWire) support
++ */
++
++
++/*
++ * I2O device support
++ */
++
++
++/*
++ * Networking support
++ */
++
++
++/*
++ * Networking options
++ */
++/*
++ * SCTP Configuration (EXPERIMENTAL)
++ */
++/*
++ * QoS and/or fair queueing
++ */
++
++
++
++
++
++
++/*
++ * Network testing
++ */
++/*
++ * ARCnet devices
++ */
++
++
++/*
++ * Ethernet (10 or 100Mbit)
++ */
++
++
++
++
++
++
++/*
++ * Tulip family network device support
++ */
++/*
++ * Ethernet (1000 Mbit)
++ */
++/*
++ * Ethernet (10000 Mbit)
++ */
++
++
++
++/*
++ * Token Ring devices
++ */
++
++
++/*
++ * Wireless LAN (non-hamradio)
++ */
++
++
++/*
++ * Wan interfaces
++ */
++/*
++ * ISDN subsystem
++ */
++
++
++/*
++ * Telephony Support
++ */
++
++
++/*
++ * Input device support
++ */
++
++
++/*
++ * Userland interfaces
++ */
++
++/*
++ * Input I/O drivers
++ */
++
++
++
++
++
++/*
++ * Input Device Drivers
++ */
++
++/*
++ * Character devices
++ */
++
++
++
++/*
++ * Serial drivers
++ */
++
++
++
++
++
++/*
++ * Non-8250 serial port support
++ */
++
++
++
++
++
++/*
++ * IPMI
++ */
++
++
++/*
++ * Watchdog Cards
++ */
++
++
++
++
++
++
++
++/*
++ * Ftape, the floppy tape device driver
++ */
++
++
++
++/*
++ * I2C support
++ */
++
++
++/*
++ * Dallas's 1-wire bus
++ */
++
++
++/*
++ * Misc devices
++ */
++
++/*
++ * Multimedia devices
++ */
++
++
++/*
++ * Digital Video Broadcasting Devices
++ */
++
++
++/*
++ * Graphics support
++ */
++
++/*
++ * Sound
++ */
++
++
++/*
++ * USB support
++ */
++
++
++
++
++/*
++ * NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
++ */
++
++/*
++ * USB Gadget Support
++ */
++
++
++/*
++ * MMC/SD Card support
++ */
++
++
++/*
++ * InfiniBand support
++ */
++
++
++/*
++ * File systems
++ */
++/*
++ * XFS support
++ */
++/*
++ * CD-ROM/DVD Filesystems
++ */
++
++
++
++/*
++ * DOS/FAT/NT Filesystems
++ */
++
++
++
++
++/*
++ * Pseudo filesystems
++ */
++/*
++ * Miscellaneous filesystems
++ */
++/*
++ * Network File Systems
++ */
++/*
++ * Partition Types
++ */
++
++
++
++/*
++ * Native Language Support
++ */
++
++
++/*
++ * Kernel hacking
++ */
++/*
++ * Security options
++ */
++
++
++
++/*
++ * Cryptographic options
++ */
++
++
++/*
++ * Hardware crypto devices
++ */
++
++/*
++ * Library routines
++ */
++OUTPUT_ARCH(mips)
++ENTRY(kernel_entry)
++jiffies = jiffies_64;
++SECTIONS
++{
++  . = 0xffffffff80080000;
++  /* read-only */
++  _text = .; /* Text and read-only data */
++  .text : {
++    *(.text)
++    __sched_text_start = .; *(.sched.text) __sched_text_end = .;
++    __lock_text_start = .; *(.spinlock.text) __lock_text_end = .;
++    *(.fixup)
++    *(.gnu.warning)
++  } =0
++
++  _etext = .; /* End of text section */
++
++  . = ALIGN(16); /* Exception table */
++  __start___ex_table = .;
++  __ex_table : { *(__ex_table) }
++  __stop___ex_table = .;
++
++  __start___dbe_table = .; /* Exception table for data bus errors */
++  __dbe_table : { *(__dbe_table) }
++  __stop___dbe_table = .;
++
++  .rodata : AT(ADDR(.rodata) - 0) { *(.rodata) *(.rodata.*) *(__vermagic) } .rodata1 : AT(ADDR(.rodata1) - 0) { *(.rodata1) } .pci_fixup : AT(ADDR(.pci_fixup) - 0) { __start_pci_fixups_early = .; *(.pci_fixup_early) __end_pci_fixups_early = .; __start_pci_fixups_header = .; *(.pci_fixup_header) __end_pci_fixups_header = .; __start_pci_fixups_final = .; *(.pci_fixup_final) __end_pci_fixups_final = .; __start_pci_fixups_enable = .; *(.pci_fixup_enable) __end_pci_fixups_enable = .; } __ksymtab : AT(ADDR(__ksymtab) - 0) { __start___ksymtab = .; *(__ksymtab) __stop___ksymtab = .; } __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - 0) { __start___ksymtab_gpl = .; *(__ksymtab_gpl) __stop___ksymtab_gpl = .; } __kcrctab : AT(ADDR(__kcrctab) - 0) { __start___kcrctab = .; *(__kcrctab) __stop___kcrctab = .; } __kcrctab_gpl : AT(ADDR(__kcrctab_gpl) - 0) { __start___kcrctab_gpl = .; *(__kcrctab_gpl) __stop___kcrctab_gpl = .; } __ksymtab_strings : AT(ADDR(__ksymtab_strings) - 0) { *(__ksymtab_strings) } __param : AT(ADDR(__param) - 0) { __start___param = .; *(__param) __stop___param = .; }
++
++  /* writeable */
++  .data : { /* Data */
++    . = . + 0; /* for CONFIG_MAPPED_KERNEL */
++    *(.data.init_task)
++
++    *(.data)
++
++   /* Align the initial ramdisk image (INITRD) on page boundaries. */
++   . = ALIGN(4096);
++   __rd_start = .;
++   *(.initrd)
++   . = ALIGN(4096);
++   __rd_end = .;
++
++    CONSTRUCTORS
++  }
++  _gp = . + 0x8000;
++  .lit8 : { *(.lit8) }
++  .lit4 : { *(.lit4) }
++  /* We want the small data sections together, so single-instruction offsets
++     can access them all, and initialized data all before uninitialized, so
++     we can shorten the on-disk segment size.  */
++  .sdata : { *(.sdata) }
++
++  . = ALIGN(4096);
++  __nosave_begin = .;
++  .data_nosave : { *(.data.nosave) }
++  . = ALIGN(4096);
++  __nosave_end = .;
++
++  . = ALIGN(32);
++  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
++
++  _edata = .; /* End of data section */
++
++  /* will be freed after init */
++  . = ALIGN(4096); /* Init code and data */
++  __init_begin = .;
++  .init.text : {
++ _sinittext = .;
++ *(.init.text)
++ _einittext = .;
++  }
++  .init.data : { *(.init.data) }
++  . = ALIGN(16);
++  __setup_start = .;
++  .init.setup : { *(.init.setup) }
++  __setup_end = .;
++
++  .early_initcall.init : {
++  __earlyinitcall_start = .;
++ *(.initcall.early1.init)
++  }
++  __earlyinitcall_end = .;
++
++  __initcall_start = .;
++  .initcall.init : {
++ *(.initcall1.init)
++ *(.initcall2.init)
++ *(.initcall3.init)
++ *(.initcall4.init)
++ *(.initcall5.init)
++ *(.initcall6.init)
++ *(.initcall7.init)
++  }
++  __initcall_end = .;
++
++  __con_initcall_start = .;
++  .con_initcall.init : { *(.con_initcall.init) }
++  __con_initcall_end = .;
++  .security_initcall.init : { __security_initcall_start = .; *(.security_initcall.init) __security_initcall_end = .; }
++  . = ALIGN(4096);
++  __initramfs_start = .;
++  .init.ramfs : { *(.init.ramfs) }
++  __initramfs_end = .;
++  . = ALIGN(32);
++  __per_cpu_start = .;
++  .data.percpu : { *(.data.percpu) }
++  __per_cpu_end = .;
++  . = ALIGN(4096);
++  __init_end = .;
++  /* freed after init ends here */
++
++  __bss_start = .; /* BSS */
++  .sbss : {
++    *(.sbss)
++    *(.scommon)
++  }
++  .bss : {
++    *(.bss)
++    *(COMMON)
++  }
++  __bss_stop = .;
++
++  _end = . ;
++
++  /* Sections to be discarded */
++  /DISCARD/ : {
++        *(.exit.text)
++        *(.exit.data)
++        *(.exitcall.exit)
++
++ /* ABI crap starts here */
++ *(.comment)
++ *(.MIPS.options)
++ *(.note)
++ *(.options)
++ *(.pdr)
++ *(.reginfo)
++ *(.mdebug*)
++  }
++
++  /* This is the MIPS specific mdebug section.  */
++  .mdebug : { *(.mdebug) }
++  /* These are needed for ELF backends which have not yet been
++     converted to the new style linker.  */
++  .stab 0 : { *(.stab) }
++  .stabstr 0 : { *(.stabstr) }
++  /* DWARF debug sections.
++     Symbols in the .debug DWARF section are relative to the beginning of the
++     section so we begin .debug at 0.  It's not clear yet what needs to happen
++     for the others.   */
++  .debug 0 : { *(.debug) }
++  .debug_srcinfo 0 : { *(.debug_srcinfo) }
++  .debug_aranges 0 : { *(.debug_aranges) }
++  .debug_pubnames 0 : { *(.debug_pubnames) }
++  .debug_sfnames 0 : { *(.debug_sfnames) }
++  .line 0 : { *(.line) }
++  /* These must appear regardless of  .  */
++  .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
++  .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
++  .comment : { *(.comment) }
++  .note : { *(.note) }
++}
+diff -Naur linux-2.6.11.11.orig/arch/mips/lib/Makefile linux-2.6.11.11/arch/mips/lib/Makefile
+--- linux-2.6.11.11.orig/arch/mips/lib/Makefile	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/lib/Makefile	2005-06-09 15:32:58.000000000 +0000
 @@ -2,7 +2,9 @@
  # Makefile for MIPS-specific library files..
  #
@@ -2574,9 +3125,9 @@
 +obj-y	+= iomap.o
 +
  EXTRA_AFLAGS := $(CFLAGS)
-diff -Naur linux-2.6.11.6/arch/mips/lib/csum_partial_copy.c linux-2.6.11.6/arch/mips/lib/csum_partial_copy.c
---- linux-2.6.11.6/arch/mips/lib/csum_partial_copy.c	2005-03-25 19:28:39 -0800
-+++ linux-2.6.11.6/arch/mips/lib/csum_partial_copy.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/lib/csum_partial_copy.c linux-2.6.11.11/arch/mips/lib/csum_partial_copy.c
+--- linux-2.6.11.11.orig/arch/mips/lib/csum_partial_copy.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/lib/csum_partial_copy.c	2005-06-09 15:32:58.000000000 +0000
 @@ -16,8 +16,8 @@
  /*
   * copy while checksumming, otherwise like csum_partial
@@ -2599,9 +3150,9 @@
  {
  	int missing;
  
-diff -Naur linux-2.6.11.6/arch/mips/lib/iomap.c linux-2.6.11.6/arch/mips/lib/iomap.c
---- linux-2.6.11.6/arch/mips/lib/iomap.c	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/arch/mips/lib/iomap.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/lib/iomap.c linux-2.6.11.11/arch/mips/lib/iomap.c
+--- linux-2.6.11.11.orig/arch/mips/lib/iomap.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/lib/iomap.c	2005-06-09 15:32:58.000000000 +0000
 @@ -27,9 +27,7 @@
  
  void __iomem *ioport_map(unsigned long port, unsigned int nr)
@@ -2644,9 +3195,9 @@
  	}
  
  	return NULL;
-diff -Naur linux-2.6.11.6/arch/mips/lib-32/dump_tlb.c linux-2.6.11.6/arch/mips/lib-32/dump_tlb.c
---- linux-2.6.11.6/arch/mips/lib-32/dump_tlb.c	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/arch/mips/lib-32/dump_tlb.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/lib-32/dump_tlb.c linux-2.6.11.11/arch/mips/lib-32/dump_tlb.c
+--- linux-2.6.11.11.orig/arch/mips/lib-32/dump_tlb.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/lib-32/dump_tlb.c	2005-06-09 15:32:58.000000000 +0000
 @@ -32,8 +32,6 @@
  	case PM_256M:	return "256Mb";
  #endif
@@ -2693,9 +3244,9 @@
  	pte = pte_offset(pmd, addr);
  	paddr = (KSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK;
  	paddr |= (addr & ~PAGE_MASK);
-diff -Naur linux-2.6.11.6/arch/mips/lib-32/r3k_dump_tlb.c linux-2.6.11.6/arch/mips/lib-32/r3k_dump_tlb.c
---- linux-2.6.11.6/arch/mips/lib-32/r3k_dump_tlb.c	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/arch/mips/lib-32/r3k_dump_tlb.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/lib-32/r3k_dump_tlb.c linux-2.6.11.11/arch/mips/lib-32/r3k_dump_tlb.c
+--- linux-2.6.11.11.orig/arch/mips/lib-32/r3k_dump_tlb.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/lib-32/r3k_dump_tlb.c	2005-06-09 15:32:58.000000000 +0000
 @@ -105,6 +105,7 @@
  void dump_list_process(struct task_struct *t, void *address)
  {
@@ -2733,9 +3284,9 @@
  	pte = pte_offset(pmd, addr);
  	paddr = (KSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK;
  	paddr |= (addr & ~PAGE_MASK);
-diff -Naur linux-2.6.11.6/arch/mips/lib-64/dump_tlb.c linux-2.6.11.6/arch/mips/lib-64/dump_tlb.c
---- linux-2.6.11.6/arch/mips/lib-64/dump_tlb.c	2005-03-25 19:28:47 -0800
-+++ linux-2.6.11.6/arch/mips/lib-64/dump_tlb.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/lib-64/dump_tlb.c linux-2.6.11.11/arch/mips/lib-64/dump_tlb.c
+--- linux-2.6.11.11.orig/arch/mips/lib-64/dump_tlb.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/lib-64/dump_tlb.c	2005-06-09 15:32:58.000000000 +0000
 @@ -32,8 +32,6 @@
  	case PM_256M:	return "256Mb";
  #endif
@@ -2782,9 +3333,9 @@
  	pte = pte_offset(pmd, addr);
  	paddr = (CKSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK;
  	paddr |= (addr & ~PAGE_MASK);
-diff -Naur linux-2.6.11.6/arch/mips/math-emu/cp1emu.c linux-2.6.11.6/arch/mips/math-emu/cp1emu.c
---- linux-2.6.11.6/arch/mips/math-emu/cp1emu.c	2005-03-25 19:28:36 -0800
-+++ linux-2.6.11.6/arch/mips/math-emu/cp1emu.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/math-emu/cp1emu.c linux-2.6.11.11/arch/mips/math-emu/cp1emu.c
+--- linux-2.6.11.11.orig/arch/mips/math-emu/cp1emu.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/math-emu/cp1emu.c	2005-06-09 15:32:58.000000000 +0000
 @@ -196,7 +196,7 @@
  static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx)
  {
@@ -2962,9 +3513,9 @@
  	mips_instruction insn;
  	int sig = 0;
  
-diff -Naur linux-2.6.11.6/arch/mips/math-emu/dsemul.c linux-2.6.11.6/arch/mips/math-emu/dsemul.c
---- linux-2.6.11.6/arch/mips/math-emu/dsemul.c	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/arch/mips/math-emu/dsemul.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/math-emu/dsemul.c linux-2.6.11.11/arch/mips/math-emu/dsemul.c
+--- linux-2.6.11.11.orig/arch/mips/math-emu/dsemul.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/math-emu/dsemul.c	2005-06-09 15:32:58.000000000 +0000
 @@ -28,9 +28,6 @@
  #endif
  #define __mips 4
@@ -3015,9 +3566,9 @@
  	u32 insn, cookie;
  	int err = 0;
  
-diff -Naur linux-2.6.11.6/arch/mips/math-emu/dsemul.h linux-2.6.11.6/arch/mips/math-emu/dsemul.h
---- linux-2.6.11.6/arch/mips/math-emu/dsemul.h	2005-03-25 19:28:23 -0800
-+++ linux-2.6.11.6/arch/mips/math-emu/dsemul.h	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/math-emu/dsemul.h linux-2.6.11.11/arch/mips/math-emu/dsemul.h
+--- linux-2.6.11.11.orig/arch/mips/math-emu/dsemul.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/math-emu/dsemul.h	2005-06-09 15:32:58.000000000 +0000
 @@ -1,11 +1,5 @@
 -typedef long gpreg_t;
 -typedef void *vaddr_t;
@@ -3032,9 +3583,9 @@
  
  /* Instruction which will always cause an address error */
  #define AdELOAD 0x8c000001	/* lw $0,1($0) */
-diff -Naur linux-2.6.11.6/arch/mips/math-emu/kernel_linkage.c linux-2.6.11.6/arch/mips/math-emu/kernel_linkage.c
---- linux-2.6.11.6/arch/mips/math-emu/kernel_linkage.c	2005-03-25 19:28:14 -0800
-+++ linux-2.6.11.6/arch/mips/math-emu/kernel_linkage.c	2005-04-01 08:56:55 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/math-emu/kernel_linkage.c linux-2.6.11.11/arch/mips/math-emu/kernel_linkage.c
+--- linux-2.6.11.11.orig/arch/mips/math-emu/kernel_linkage.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/math-emu/kernel_linkage.c	2005-06-09 15:32:58.000000000 +0000
 @@ -27,8 +27,6 @@
  
  #include <asm/fpu_emulator.h>
@@ -3044,9 +3595,9 @@
  #define SIGNALLING_NAN 0x7ff800007ff80000LL
  
  void fpu_emulator_init_fpu(void)
-diff -Naur linux-2.6.11.6/arch/mips/mm/c-r4k.c linux-2.6.11.6/arch/mips/mm/c-r4k.c
---- linux-2.6.11.6/arch/mips/mm/c-r4k.c	2005-03-25 19:28:37 -0800
-+++ linux-2.6.11.6/arch/mips/mm/c-r4k.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/c-r4k.c linux-2.6.11.11/arch/mips/mm/c-r4k.c
+--- linux-2.6.11.11.orig/arch/mips/mm/c-r4k.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/c-r4k.c	2005-06-09 15:32:58.000000000 +0000
 @@ -372,12 +372,21 @@
  	int exec = vma->vm_flags & VM_EXEC;
  	struct mm_struct *mm = vma->vm_mm;
@@ -3161,9 +3712,9 @@
  	r4k_blast_dcache_page_setup();
  	r4k_blast_dcache_page_indexed_setup();
  	r4k_blast_dcache_setup();
-diff -Naur linux-2.6.11.6/arch/mips/mm/cache.c linux-2.6.11.6/arch/mips/mm/cache.c
---- linux-2.6.11.6/arch/mips/mm/cache.c	2005-03-25 19:28:19 -0800
-+++ linux-2.6.11.6/arch/mips/mm/cache.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/cache.c linux-2.6.11.11/arch/mips/mm/cache.c
+--- linux-2.6.11.11.orig/arch/mips/mm/cache.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/cache.c	2005-06-09 15:32:58.000000000 +0000
 @@ -24,7 +24,8 @@
  void (*flush_cache_range)(struct vm_area_struct *vma, unsigned long start,
  	unsigned long end);
@@ -3188,9 +3739,9 @@
  		return -EFAULT;
  
  	flush_icache_range(addr, addr + bytes);
-diff -Naur linux-2.6.11.6/arch/mips/mm/fault.c linux-2.6.11.6/arch/mips/mm/fault.c
---- linux-2.6.11.6/arch/mips/mm/fault.c	2005-03-25 19:28:17 -0800
-+++ linux-2.6.11.6/arch/mips/mm/fault.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/fault.c linux-2.6.11.11/arch/mips/mm/fault.c
+--- linux-2.6.11.11.orig/arch/mips/mm/fault.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/fault.c	2005-06-09 15:32:58.000000000 +0000
 @@ -25,6 +25,7 @@
  #include <asm/system.h>
  #include <asm/uaccess.h>
@@ -3250,9 +3801,9 @@
  		if (!pmd_present(*pmd_k))
  			goto no_context;
  		set_pmd(pmd, *pmd_k);
-diff -Naur linux-2.6.11.6/arch/mips/mm/init.c linux-2.6.11.6/arch/mips/mm/init.c
---- linux-2.6.11.6/arch/mips/mm/init.c	2005-03-25 19:28:25 -0800
-+++ linux-2.6.11.6/arch/mips/mm/init.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/init.c linux-2.6.11.11/arch/mips/mm/init.c
+--- linux-2.6.11.11.orig/arch/mips/mm/init.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/init.c	2005-06-09 15:32:58.000000000 +0000
 @@ -86,7 +86,7 @@
  EXPORT_SYMBOL(kmap_pte);
  
@@ -3318,9 +3869,9 @@
  #endif /* CONFIG_HIGHMEM */
  
  #ifndef CONFIG_DISCONTIGMEM
-diff -Naur linux-2.6.11.6/arch/mips/mm/ioremap.c linux-2.6.11.6/arch/mips/mm/ioremap.c
---- linux-2.6.11.6/arch/mips/mm/ioremap.c	2005-03-25 19:28:20 -0800
-+++ linux-2.6.11.6/arch/mips/mm/ioremap.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/ioremap.c linux-2.6.11.11/arch/mips/mm/ioremap.c
+--- linux-2.6.11.11.orig/arch/mips/mm/ioremap.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/ioremap.c	2005-06-09 15:32:58.000000000 +0000
 @@ -79,9 +79,14 @@
  		BUG();
  	spin_lock(&init_mm.page_table_lock);
@@ -3355,9 +3906,9 @@
  
  void __iounmap(volatile void __iomem *addr)
  {
-diff -Naur linux-2.6.11.6/arch/mips/mm/pgtable-32.c linux-2.6.11.6/arch/mips/mm/pgtable-32.c
---- linux-2.6.11.6/arch/mips/mm/pgtable-32.c	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/arch/mips/mm/pgtable-32.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/pgtable-32.c linux-2.6.11.11/arch/mips/mm/pgtable-32.c
+--- linux-2.6.11.11.orig/arch/mips/mm/pgtable-32.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/pgtable-32.c	2005-06-09 15:32:58.000000000 +0000
 @@ -10,6 +10,7 @@
  #include <linux/mm.h>
  #include <linux/bootmem.h>
@@ -3420,9 +3971,9 @@
  	pte = pte_offset_kernel(pmd, vaddr);
  	pkmap_page_table = pte;
  #endif
-diff -Naur linux-2.6.11.6/arch/mips/mm/tlb-r4k.c linux-2.6.11.6/arch/mips/mm/tlb-r4k.c
---- linux-2.6.11.6/arch/mips/mm/tlb-r4k.c	2005-03-25 19:28:17 -0800
-+++ linux-2.6.11.6/arch/mips/mm/tlb-r4k.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/tlb-r4k.c linux-2.6.11.11/arch/mips/mm/tlb-r4k.c
+--- linux-2.6.11.11.orig/arch/mips/mm/tlb-r4k.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/tlb-r4k.c	2005-06-09 15:32:58.000000000 +0000
 @@ -100,7 +100,7 @@
  					continue;
  				/* Make sure all entries differ. */
@@ -3485,9 +4036,9 @@
  		return;
  
  	reg = read_c0_config1();
-diff -Naur linux-2.6.11.6/arch/mips/mm/tlbex.c linux-2.6.11.6/arch/mips/mm/tlbex.c
---- linux-2.6.11.6/arch/mips/mm/tlbex.c	2005-03-25 19:28:16 -0800
-+++ linux-2.6.11.6/arch/mips/mm/tlbex.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/mm/tlbex.c linux-2.6.11.11/arch/mips/mm/tlbex.c
+--- linux-2.6.11.11.orig/arch/mips/mm/tlbex.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/mm/tlbex.c	2005-06-09 15:32:58.000000000 +0000
 @@ -840,6 +840,7 @@
  	case CPU_AU1100:
  	case CPU_AU1500:
@@ -3505,9 +4056,9 @@
   * Only the fastpath gets synthesized at runtime, the slowpath for
   * do_page_fault remains normal asm.
   */
-diff -Naur linux-2.6.11.6/arch/mips/pci/fixup-cobalt.c linux-2.6.11.6/arch/mips/pci/fixup-cobalt.c
---- linux-2.6.11.6/arch/mips/pci/fixup-cobalt.c	2005-03-25 19:28:20 -0800
-+++ linux-2.6.11.6/arch/mips/pci/fixup-cobalt.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/arch/mips/pci/fixup-cobalt.c linux-2.6.11.11/arch/mips/pci/fixup-cobalt.c
+--- linux-2.6.11.11.orig/arch/mips/pci/fixup-cobalt.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/arch/mips/pci/fixup-cobalt.c	2005-06-09 15:32:58.000000000 +0000
 @@ -47,6 +47,7 @@
  static void qube_raq_galileo_fixup(struct pci_dev *dev)
  {
@@ -3567,9 +4118,9 @@
  	 qube_raq_galileo_fixup);
  
  static char irq_tab_cobalt[] __initdata = {
-diff -Naur linux-2.6.11.6/drivers/char/lcd.c linux-2.6.11.6/drivers/char/lcd.c
---- linux-2.6.11.6/drivers/char/lcd.c	2005-03-25 19:28:19 -0800
-+++ linux-2.6.11.6/drivers/char/lcd.c	2005-04-01 14:36:35 -0800
+diff -Naur linux-2.6.11.11.orig/drivers/char/lcd.c linux-2.6.11.11/drivers/char/lcd.c
+--- linux-2.6.11.11.orig/drivers/char/lcd.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/char/lcd.c	2005-06-09 15:32:58.000000000 +0000
 @@ -575,8 +575,8 @@
  
  static int lcd_waiters = 0;
@@ -3581,9 +4132,9 @@
  {
  	long buttons_now;
  
-diff -Naur linux-2.6.11.6/drivers/char/lcd.h linux-2.6.11.6/drivers/char/lcd.h
---- linux-2.6.11.6/drivers/char/lcd.h	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/drivers/char/lcd.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/drivers/char/lcd.h linux-2.6.11.11/drivers/char/lcd.h
+--- linux-2.6.11.11.orig/drivers/char/lcd.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/char/lcd.h	2005-06-09 15:32:58.000000000 +0000
 @@ -22,7 +22,7 @@
  #define MAX_IDLE_TIME 120
  
@@ -3593,9 +4144,9 @@
          int size1;
          int size2;
          unsigned char line1[LCD_CHARS_PER_LINE];
-diff -Naur linux-2.6.11.6/drivers/char/rtc.c linux-2.6.11.6/drivers/char/rtc.c
---- linux-2.6.11.6/drivers/char/rtc.c	2005-03-25 19:28:42 -0800
-+++ linux-2.6.11.6/drivers/char/rtc.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/drivers/char/rtc.c linux-2.6.11.11/drivers/char/rtc.c
+--- linux-2.6.11.11.orig/drivers/char/rtc.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/char/rtc.c	2005-06-09 15:32:58.000000000 +0000
 @@ -35,23 +35,21 @@
   *	1.09a	Pete Zaitcev: Sun SPARC
   *	1.09b	Jeff Garzik: Modularize, init cleanup
@@ -3707,9 +4258,56 @@
  #ifdef RTC_IRQ
  	if (rtc_has_irq)
  		free_irq (RTC_IRQ, NULL);
-diff -Naur linux-2.6.11.6/drivers/net/tulip/eeprom.c linux-2.6.11.6/drivers/net/tulip/eeprom.c
---- linux-2.6.11.6/drivers/net/tulip/eeprom.c	2005-03-25 19:28:37 -0800
-+++ linux-2.6.11.6/drivers/net/tulip/eeprom.c	2005-04-01 09:13:39 -0800
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/21142.c linux-2.6.11.11/drivers/net/tulip/21142.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/21142.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/21142.c	2005-06-09 23:56:48.000000000 +0000
+@@ -26,9 +26,9 @@
+ 
+ /* Handle the 21143 uniquely: do autoselect with NWay, not the EEPROM list
+    of available transceivers.  */
+-void t21142_timer(unsigned long data)
++void t21142_media_task(void *data)
+ {
+-	struct net_device *dev = (struct net_device *)data;
++	struct net_device *dev = data;
+ 	struct tulip_private *tp = netdev_priv(dev);
+ 	void __iomem *ioaddr = tp->base_addr;
+ 	int csr12 = ioread32(ioaddr + CSR12);
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/de2104x.c linux-2.6.11.11/drivers/net/tulip/de2104x.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/de2104x.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/de2104x.c	2005-06-09 23:56:48.000000000 +0000
+@@ -1927,7 +1927,7 @@
+ 	goto fill_defaults;
+ }
+ 
+-static int __devinit de_init_one (struct pci_dev *pdev,
++static int __init de_init_one (struct pci_dev *pdev,
+ 				  const struct pci_device_id *ent)
+ {
+ 	struct net_device *dev;
+@@ -2102,7 +2102,7 @@
+ 
+ #ifdef CONFIG_PM
+ 
+-static int de_suspend (struct pci_dev *pdev, u32 state)
++static int de_suspend (struct pci_dev *pdev, pm_message_t state)
+ {
+ 	struct net_device *dev = pci_get_drvdata (pdev);
+ 	struct de_private *de = dev->priv;
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/de4x5.c linux-2.6.11.11/drivers/net/tulip/de4x5.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/de4x5.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/de4x5.c	2005-06-09 23:56:48.000000000 +0000
+@@ -2124,6 +2124,7 @@
+                 .remove  = __devexit_p (de4x5_eisa_remove),
+         }
+ };
++MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
+ #endif
+ 
+ #ifdef CONFIG_PCI
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/eeprom.c linux-2.6.11.11/drivers/net/tulip/eeprom.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/eeprom.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/eeprom.c	2005-06-10 01:58:27.000000000 +0000
 @@ -63,6 +63,22 @@
  	 */
  	{ 0x1e00, 0x0000, 0x000b, 0x8f01, 0x0103, 0x0300, 0x0821, 0x000, 0x0001, 0x0000, 0x01e1 }
@@ -3733,9 +4331,9 @@
    {NULL}};
  
  
-diff -Naur linux-2.6.11.6/drivers/net/tulip/interrupt.c linux-2.6.11.6/drivers/net/tulip/interrupt.c
---- linux-2.6.11.6/drivers/net/tulip/interrupt.c	2005-03-25 19:28:40 -0800
-+++ linux-2.6.11.6/drivers/net/tulip/interrupt.c	2005-04-01 08:59:41 -0800
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/interrupt.c linux-2.6.11.11/drivers/net/tulip/interrupt.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/interrupt.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/interrupt.c	2005-06-09 23:56:48.000000000 +0000
 @@ -26,7 +26,7 @@
  #define MIT_SIZE 15
  #define MIT_TABLE 15 /* We use 0 or max */
@@ -3745,23 +4343,10 @@
  {
          /*  CRS11 21143 hardware Mitigation Control Interrupt
              We use only RX mitigation we other techniques for
-diff -Naur linux-2.6.11.6/drivers/net/tulip/media.c linux-2.6.11.6/drivers/net/tulip/media.c
---- linux-2.6.11.6/drivers/net/tulip/media.c	2005-03-25 19:28:17 -0800
-+++ linux-2.6.11.6/drivers/net/tulip/media.c	2005-04-01 08:57:20 -0800
-@@ -44,8 +44,10 @@
- 
- /* MII transceiver control section.
-    Read and write the MII registers using software-generated serial
--   MDIO protocol.  See the MII specifications or DP83840A data sheet
--   for details. */
-+   MDIO protocol.
-+   See IEEE 802.3-2002.pdf (Section 2, Chapter "22.2.4 Management functions")
-+   or DP83840A data sheet for more details.
-+   */
- 
- int tulip_mdio_read(struct net_device *dev, int phy_id, int location)
- {
-@@ -88,7 +90,7 @@
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/media.c linux-2.6.11.11/drivers/net/tulip/media.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/media.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/media.c	2005-06-09 23:56:48.000000000 +0000
+@@ -88,7 +88,7 @@
  		value = ioread32(ioaddr + CSR9);
  		iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
  		
@@ -3770,7 +4355,7 @@
  		iowrite32(value, ioaddr + CSR10);
  		
  		while(--i > 0) {
-@@ -166,7 +168,7 @@
+@@ -166,7 +166,7 @@
  		value = ioread32(ioaddr + CSR9);
  		iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
  		
@@ -3779,66 +4364,278 @@
  		iowrite32(value, ioaddr + CSR10);
  		
  		while(--i > 0) {
-@@ -307,13 +309,29 @@
- 				int reset_length = p[2 + init_length];
- 				misc_info = (u16*)(reset_sequence + reset_length);
- 				if (startup) {
-+					int timeout = 10;	/* max 1 ms */
- 					iowrite32(mtable->csr12dir | 0x100, ioaddr + CSR12);
- 					for (i = 0; i < reset_length; i++)
- 						iowrite32(reset_sequence[i], ioaddr + CSR12);
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/timer.c linux-2.6.11.11/drivers/net/tulip/timer.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/timer.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/timer.c	2005-06-09 23:56:48.000000000 +0000
+@@ -18,13 +18,14 @@
+ #include "tulip.h"
+ 
+ 
+-void tulip_timer(unsigned long data)
++void tulip_media_task(void *data)
+ {
+-	struct net_device *dev = (struct net_device *)data;
++	struct net_device *dev = data;
+ 	struct tulip_private *tp = netdev_priv(dev);
+ 	void __iomem *ioaddr = tp->base_addr;
+ 	u32 csr12 = ioread32(ioaddr + CSR12);
+ 	int next_tick = 2*HZ;
++	unsigned long flags;
+ 
+ 	if (tulip_debug > 2) {
+ 		printk(KERN_DEBUG "%s: Media selection tick, %s, status %8.8x mode"
+@@ -127,6 +128,14 @@
+ 	}
+ 	break;
+ 	}
 +
-+					/* flush posted writes */
-+					ioread32(ioaddr + CSR12);
++	spin_lock_irqsave (&tp->lock, flags);
++	if (tp->timeout_recovery) {
++		tp->timeout_recovery = 0;
++		tulip_tx_timeout_complete(tp, ioaddr);
++	}
++	spin_unlock_irqrestore (&tp->lock, flags);
 +
-+					/* Sect 3.10.3 in DP83840A.pdf (p39) */
-+					udelay(500);
-+
-+					/* Section 4.2 in DP83840A.pdf (p43) */
-+					/* and IEEE 802.3 "22.2.4.1.1 Reset" */
-+					while (timeout-- &&
-+						(tulip_mdio_read (dev, phy_num, MII_BMCR) & BMCR_RESET))
-+						udelay(100);
- 				}
- 				for (i = 0; i < init_length; i++)
- 					iowrite32(init_sequence[i], ioaddr + CSR12);
-+
-+				ioread32(ioaddr + CSR12);	/* flush posted writes */
- 			}
-+
- 			tmp_info = get_u16(&misc_info[1]);
- 			if (tmp_info)
- 				tp->advertising[phy_num] = tmp_info | 1;
-diff -Naur linux-2.6.11.6/drivers/net/tulip/tulip.h linux-2.6.11.6/drivers/net/tulip/tulip.h
---- linux-2.6.11.6/drivers/net/tulip/tulip.h	2005-03-25 19:28:36 -0800
-+++ linux-2.6.11.6/drivers/net/tulip/tulip.h	2005-04-01 09:01:07 -0800
-@@ -475,8 +475,11 @@
- 			udelay(10);
+ 	/* mod_timer synchronizes us with potential add_timer calls
+ 	 * from interrupts.
+ 	 */
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/tulip.h linux-2.6.11.11/drivers/net/tulip/tulip.h
+--- linux-2.6.11.11.orig/drivers/net/tulip/tulip.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/tulip.h	2005-06-09 23:56:48.000000000 +0000
+@@ -46,6 +46,7 @@
+ 	int valid_intrs;	/* CSR7 interrupt enable settings */
+ 	int flags;
+ 	void (*media_timer) (unsigned long data);
++	void (*media_task) (void *);
+ };
  
+ 
+@@ -368,6 +369,7 @@
+ 	unsigned int medialock:1;	/* Don't sense media type. */
+ 	unsigned int mediasense:1;	/* Media sensing in progress. */
+ 	unsigned int nway:1, nwayset:1;		/* 21143 internal NWay. */
++	unsigned int timeout_recovery: 1;
+ 	unsigned int csr0;	/* CSR0 setting. */
+ 	unsigned int csr6;	/* Current CSR6 control settings. */
+ 	unsigned char eeprom[EEPROM_SIZE];	/* Serial EEPROM contents. */
+@@ -386,6 +388,7 @@
+ 	void __iomem *base_addr;
+ 	int csr12_shadow;
+ 	int pad0;		/* Used for 8-byte alignment */
++	struct work_struct media_work;                          
+ };
+ 
+ 
+@@ -400,7 +403,7 @@
+ 
+ /* 21142.c */
+ extern u16 t21142_csr14[];
+-void t21142_timer(unsigned long data);
++void t21142_media_task(void *data);
+ void t21142_start_nway(struct net_device *dev);
+ void t21142_lnk_change(struct net_device *dev, int csr5);
+ 
+@@ -438,7 +441,7 @@
+ void pnic_timer(unsigned long data);
+ 
+ /* timer.c */
+-void tulip_timer(unsigned long data);
++void tulip_media_task(void *data);
+ void mxic_timer(unsigned long data);
+ void comet_timer(unsigned long data);
+ 
+@@ -476,7 +479,7 @@
+ 
  		if (!i)
--			printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n",
+ 			printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n",
 -					tp->pdev->slot_name);
-+			printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
-+					" (CSR5 0x%x CSR6 0x%x)\n",
-+					pci_name(tp->pdev),
-+					ioread32(ioaddr + CSR5),
-+					ioread32(ioaddr + CSR6));
++					pci_name(tp->pdev));
  	}
  }
  
-diff -Naur linux-2.6.11.6/drivers/net/tulip/tulip_core.c linux-2.6.11.6/drivers/net/tulip/tulip_core.c
---- linux-2.6.11.6/drivers/net/tulip/tulip_core.c	2005-03-25 19:28:22 -0800
-+++ linux-2.6.11.6/drivers/net/tulip/tulip_core.c	2005-04-01 09:01:54 -0800
-@@ -22,7 +22,7 @@
- #else
- #define DRV_VERSION	"1.1.13"
+@@ -490,4 +493,13 @@
+ 	tulip_start_rxtx(tp);
+ }
+ 
++static inline void tulip_tx_timeout_complete(struct tulip_private *tp, void __iomem *ioaddr)
++{
++        /* Stop and restart the chip's Tx processes. */
++        tulip_restart_rxtx(tp);
++        /* Trigger an immediate transmit demand. */
++        iowrite32(0, ioaddr + CSR1);
++                 
++        tp->stats.tx_errors++;
++}
+ #endif /* __NET_TULIP_H__ */
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/tulip_core.c linux-2.6.11.11/drivers/net/tulip/tulip_core.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/tulip_core.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/tulip_core.c	2005-06-09 23:56:48.000000000 +0000
+@@ -132,6 +132,16 @@
  #endif
--#define DRV_RELDATE	"May 11, 2002"
-+#define DRV_RELDATE	"December 15, 2004"
  
  
- #include <linux/module.h>
-@@ -1102,15 +1102,18 @@
++static struct workqueue_struct *ktulipd_workqueue;
++
++static void tulip_timer(unsigned long data)
++{
++	struct net_device *dev = (struct net_device *)data;
++	struct tulip_private *tp = netdev_priv(dev);
++
++	if (likely(netif_running(dev)))
++		queue_work(ktulipd_workqueue, &tp->media_work);
++}
+ 
+ /*
+  * This table use during operation for capabilities and media timer.
+@@ -145,63 +155,65 @@
+ 
+   /* DC21140 */
+   { "Digital DS21140 Tulip", 128, 0x0001ebef,
+-	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_PCI_MWI, tulip_timer },
++	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_PCI_MWI, tulip_timer,
++	tulip_media_task },
+ 
+   /* DC21142, DC21143 */
+   { "Digital DS21143 Tulip", 128, 0x0801fbff,
+ 	HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI | HAS_NWAY
+-	| HAS_INTR_MITIGATION | HAS_PCI_MWI, t21142_timer },
++	| HAS_INTR_MITIGATION | HAS_PCI_MWI, tulip_timer, t21142_media_task },
+ 
+   /* LC82C168 */
+   { "Lite-On 82c168 PNIC", 256, 0x0001fbef,
+-	HAS_MII | HAS_PNICNWAY, pnic_timer },
++	HAS_MII | HAS_PNICNWAY, pnic_timer, },
+ 
+   /* MX98713 */
+   { "Macronix 98713 PMAC", 128, 0x0001ebef,
+-	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM, mxic_timer },
++	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM, mxic_timer, },
+ 
+   /* MX98715 */
+   { "Macronix 98715 PMAC", 256, 0x0001ebef,
+-	HAS_MEDIA_TABLE, mxic_timer },
++	HAS_MEDIA_TABLE, mxic_timer, },
+ 
+   /* MX98725 */
+   { "Macronix 98725 PMAC", 256, 0x0001ebef,
+-	HAS_MEDIA_TABLE, mxic_timer },
++	HAS_MEDIA_TABLE, mxic_timer, },
+ 
+   /* AX88140 */
+   { "ASIX AX88140", 128, 0x0001fbff,
+ 	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | MC_HASH_ONLY
+-	| IS_ASIX, tulip_timer },
++	| IS_ASIX, tulip_timer, tulip_media_task },
+ 
+   /* PNIC2 */
+   { "Lite-On PNIC-II", 256, 0x0801fbff,
+-	HAS_MII | HAS_NWAY | HAS_8023X | HAS_PCI_MWI, pnic2_timer },
++	HAS_MII | HAS_NWAY | HAS_8023X | HAS_PCI_MWI, pnic2_timer, },
+ 
+   /* COMET */
+   { "ADMtek Comet", 256, 0x0001abef,
+-	HAS_MII | MC_HASH_ONLY | COMET_MAC_ADDR, comet_timer },
++	HAS_MII | MC_HASH_ONLY | COMET_MAC_ADDR, comet_timer, },
+ 
+   /* COMPEX9881 */
+   { "Compex 9881 PMAC", 128, 0x0001ebef,
+-	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM, mxic_timer },
++	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM, mxic_timer, },
+ 
+   /* I21145 */
+   { "Intel DS21145 Tulip", 128, 0x0801fbff,
+ 	HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI
+-	| HAS_NWAY | HAS_PCI_MWI, t21142_timer },
++	| HAS_NWAY | HAS_PCI_MWI, tulip_timer, t21142_media_task },
+ 
+   /* DM910X */
+   { "Davicom DM9102/DM9102A", 128, 0x0001ebef,
+ 	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_ACPI,
+-	tulip_timer },
++	tulip_timer, tulip_media_task },
+ 
+   /* RS7112 */
+   { "Conexant LANfinity", 256, 0x0001ebef,
+-	HAS_MII | HAS_ACPI, tulip_timer },
++	HAS_MII | HAS_ACPI, tulip_timer, tulip_media_task },
+ 
+    /* ULi526X */
+    { "ULi M5261/M5263", 128, 0x0001ebef,
+-        HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_ACPI, tulip_timer },
++	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_ACPI, tulip_timer,
++	tulip_media_task },
+ };
+ 
+ 
+@@ -265,6 +277,17 @@
+ static void poll_tulip(struct net_device *dev);
+ #endif
+ 
++static inline int tulip_create_workqueue(void)
++{
++	ktulipd_workqueue = create_workqueue("ktulipd");
++	return ktulipd_workqueue ? 0 : -ENOMEM;
++}
++
++static inline void tulip_destroy_workqueue(void)
++{
++	destroy_workqueue(ktulipd_workqueue);
++}
++
+ static void tulip_set_power_state (struct tulip_private *tp,
+ 				   int sleep, int snooze)
+ {
+@@ -526,20 +549,9 @@
+ 			   "SIA %8.8x %8.8x %8.8x %8.8x, resetting...\n",
+ 			   dev->name, ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR12),
+ 			   ioread32(ioaddr + CSR13), ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
+-		if ( ! tp->medialock  &&  tp->mtable) {
+-			do
+-				--tp->cur_index;
+-			while (tp->cur_index >= 0
+-				   && (tulip_media_cap[tp->mtable->mleaf[tp->cur_index].media]
+-					   & MediaIsFD));
+-			if (--tp->cur_index < 0) {
+-				/* We start again, but should instead look for default. */
+-				tp->cur_index = tp->mtable->leafcount - 1;
+-			}
+-			tulip_select_media(dev, 0);
+-			printk(KERN_WARNING "%s: transmit timed out, switching to %s "
+-				   "media.\n", dev->name, medianame[dev->if_port]);
+-		}
++		tp->timeout_recovery = 1;
++		queue_work(ktulipd_workqueue, &tp->media_work);
++		goto out_unlock;
+ 	} else if (tp->chip_id == PNIC2) {
+ 		printk(KERN_WARNING "%s: PNIC2 transmit timed out, status %8.8x, "
+ 		       "CSR6/7 %8.8x / %8.8x CSR12 %8.8x, resetting...\n",
+@@ -579,14 +591,9 @@
+ 	}
+ #endif
+ 
+-	/* Stop and restart the chip's Tx processes . */
+-
+-	tulip_restart_rxtx(tp);
+-	/* Trigger an immediate transmit demand. */
+-	iowrite32(0, ioaddr + CSR1);
+-
+-	tp->stats.tx_errors++;
++	tulip_tx_timeout_complete(tp, ioaddr);
+ 
++out_unlock:
+ 	spin_unlock_irqrestore (&tp->lock, flags);
+ 	dev->trans_start = jiffies;
+ 	netif_wake_queue (dev);
+@@ -736,6 +743,8 @@
+ 	void __iomem *ioaddr = tp->base_addr;
+ 	unsigned long flags;
+ 
++	flush_workqueue(ktulipd_workqueue);
++
+ 	del_timer_sync (&tp->timer);
+ #ifdef CONFIG_TULIP_NAPI
+ 	del_timer_sync (&tp->oom_timer);
+@@ -1102,15 +1111,18 @@
  			entry = tp->cur_tx++ % TX_RING_SIZE;
  
  			if (entry != 0) {
@@ -3866,8 +4663,17 @@
  			}
  
  			tp->tx_buffers[entry].skb = NULL;
-@@ -1749,7 +1752,7 @@
+@@ -1405,6 +1417,8 @@
+ 	tp->timer.data = (unsigned long)dev;
+ 	tp->timer.function = tulip_tbl[tp->chip_id].media_timer;
  
++	INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task, dev);
++
+ 	dev->base_addr = (unsigned long)ioaddr;
+ 
+ #ifdef CONFIG_TULIP_MWI
+@@ -1749,7 +1763,7 @@
+ 
  #ifdef CONFIG_PM
  
 -static int tulip_suspend (struct pci_dev *pdev, u32 state)
@@ -3875,9 +4681,67 @@
  {
  	struct net_device *dev = pci_get_drvdata(pdev);
  
-diff -Naur linux-2.6.11.6/include/asm-mips/break.h linux-2.6.11.6/include/asm-mips/break.h
---- linux-2.6.11.6/include/asm-mips/break.h	2005-03-25 19:28:25 -0800
-+++ linux-2.6.11.6/include/asm-mips/break.h	2005-04-01 08:56:56 -0800
+@@ -1835,6 +1849,8 @@
+ 
+ static int __init tulip_init (void)
+ {
++	int ret;
++
+ #ifdef MODULE
+ 	printk (KERN_INFO "%s", version);
+ #endif
+@@ -1843,14 +1859,23 @@
+ 	tulip_rx_copybreak = rx_copybreak;
+ 	tulip_max_interrupt_work = max_interrupt_work;
+ 
++	ret = tulip_create_workqueue();
++	if (ret < 0)
++		goto out;
++
+ 	/* probe for and init boards */
+-	return pci_module_init (&tulip_driver);
++	ret = pci_module_init(&tulip_driver);
++	if (ret < 0)
++		tulip_destroy_workqueue();
++out:
++	return ret;
+ }
+ 
+ 
+ static void __exit tulip_cleanup (void)
+ {
+ 	pci_unregister_driver (&tulip_driver);
++	tulip_destroy_workqueue();
+ }
+ 
+ 
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/winbond-840.c linux-2.6.11.11/drivers/net/tulip/winbond-840.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/winbond-840.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/winbond-840.c	2005-06-09 23:56:48.000000000 +0000
+@@ -1620,7 +1620,7 @@
+  * Detach must occur under spin_unlock_irq(), interrupts from a detached
+  * device would cause an irq storm.
+  */
+-static int w840_suspend (struct pci_dev *pdev, u32 state)
++static int w840_suspend (struct pci_dev *pdev, pm_message_t state)
+ {
+ 	struct net_device *dev = pci_get_drvdata (pdev);
+ 	struct netdev_private *np = netdev_priv(dev);
+diff -Naur linux-2.6.11.11.orig/drivers/net/tulip/xircom_tulip_cb.c linux-2.6.11.11/drivers/net/tulip/xircom_tulip_cb.c
+--- linux-2.6.11.11.orig/drivers/net/tulip/xircom_tulip_cb.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/drivers/net/tulip/xircom_tulip_cb.c	2005-06-09 23:56:48.000000000 +0000
+@@ -1655,7 +1655,7 @@
+ 
+ 
+ #ifdef CONFIG_PM
+-static int xircom_suspend(struct pci_dev *pdev, u32 state)
++static int xircom_suspend(struct pci_dev *pdev, pm_message_t state)
+ {
+ 	struct net_device *dev = pci_get_drvdata(pdev);
+ 	struct xircom_private *tp = netdev_priv(dev);
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/break.h linux-2.6.11.11/include/asm-mips/break.h
+--- linux-2.6.11.11.orig/include/asm-mips/break.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/break.h	2005-06-09 15:32:58.000000000 +0000
 @@ -28,6 +28,7 @@
  #define BRK_NORLD	10	/* No rld found - not used by Linux/MIPS */
  #define _BRK_THREADBP	11	/* For threads, user bp (used by debuggers) */
@@ -3886,9 +4750,9 @@
  #define BRK_MULOVF	1023	/* Multiply overflow */
  
  #endif /* __ASM_BREAK_H */
-diff -Naur linux-2.6.11.6/include/asm-mips/cacheflush.h linux-2.6.11.6/include/asm-mips/cacheflush.h
---- linux-2.6.11.6/include/asm-mips/cacheflush.h	2005-03-25 19:28:26 -0800
-+++ linux-2.6.11.6/include/asm-mips/cacheflush.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/cacheflush.h linux-2.6.11.11/include/asm-mips/cacheflush.h
+--- linux-2.6.11.11.orig/include/asm-mips/cacheflush.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/cacheflush.h	2005-06-09 15:32:58.000000000 +0000
 @@ -50,17 +50,24 @@
  
  extern void (*flush_icache_page)(struct vm_area_struct *vma,
@@ -3916,9 +4780,9 @@
  
  extern void (*flush_cache_sigtramp)(unsigned long addr);
  extern void (*flush_icache_all)(void);
-diff -Naur linux-2.6.11.6/include/asm-mips/cobalt/cobalt.h linux-2.6.11.6/include/asm-mips/cobalt/cobalt.h
---- linux-2.6.11.6/include/asm-mips/cobalt/cobalt.h	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/include/asm-mips/cobalt/cobalt.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/cobalt/cobalt.h linux-2.6.11.11/include/asm-mips/cobalt/cobalt.h
+--- linux-2.6.11.11.orig/include/asm-mips/cobalt/cobalt.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/cobalt/cobalt.h	2005-06-09 15:32:58.000000000 +0000
 @@ -19,7 +19,10 @@
   *     9  - PCI
   *    14  - IDE0
@@ -3980,9 +4844,9 @@
 +# define COBALT_KEY_MASK	0xfe
  
  #endif /* __ASM_COBALT_H */
-diff -Naur linux-2.6.11.6/include/asm-mips/cobalt/ide.h linux-2.6.11.6/include/asm-mips/cobalt/ide.h
---- linux-2.6.11.6/include/asm-mips/cobalt/ide.h	1969-12-31 16:00:00 -0800
-+++ linux-2.6.11.6/include/asm-mips/cobalt/ide.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/cobalt/ide.h linux-2.6.11.11/include/asm-mips/cobalt/ide.h
+--- linux-2.6.11.11.orig/include/asm-mips/cobalt/ide.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/cobalt/ide.h	2005-06-09 15:32:58.000000000 +0000
 @@ -0,0 +1,83 @@
 +
 +/*
@@ -4067,15 +4931,15 @@
 +
 +#define __ide_mm_outsw		writesw
 +#define __ide_mm_outsl		writesl
-diff -Naur linux-2.6.11.6/include/asm-mips/cobalt/mach-gt64120.h linux-2.6.11.6/include/asm-mips/cobalt/mach-gt64120.h
---- linux-2.6.11.6/include/asm-mips/cobalt/mach-gt64120.h	1969-12-31 16:00:00 -0800
-+++ linux-2.6.11.6/include/asm-mips/cobalt/mach-gt64120.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/cobalt/mach-gt64120.h linux-2.6.11.11/include/asm-mips/cobalt/mach-gt64120.h
+--- linux-2.6.11.11.orig/include/asm-mips/cobalt/mach-gt64120.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/cobalt/mach-gt64120.h	2005-06-09 15:32:58.000000000 +0000
 @@ -0,0 +1,2 @@
 +/* there's something here ... in the dark */
 +
-diff -Naur linux-2.6.11.6/include/asm-mips/cpu.h linux-2.6.11.6/include/asm-mips/cpu.h
---- linux-2.6.11.6/include/asm-mips/cpu.h	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/include/asm-mips/cpu.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/cpu.h linux-2.6.11.11/include/asm-mips/cpu.h
+--- linux-2.6.11.11.orig/include/asm-mips/cpu.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/cpu.h	2005-06-09 15:32:58.000000000 +0000
 @@ -22,12 +22,17 @@
     spec.
  */
@@ -4118,9 +4982,9 @@
  
  /*
   * ISA Level encodings
-diff -Naur linux-2.6.11.6/include/asm-mips/elf.h linux-2.6.11.6/include/asm-mips/elf.h
---- linux-2.6.11.6/include/asm-mips/elf.h	2005-03-25 19:28:19 -0800
-+++ linux-2.6.11.6/include/asm-mips/elf.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/elf.h linux-2.6.11.11/include/asm-mips/elf.h
+--- linux-2.6.11.11.orig/include/asm-mips/elf.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/elf.h	2005-06-09 15:32:58.000000000 +0000
 @@ -234,9 +234,6 @@
  
  #endif /* __KERNEL__ */
@@ -4131,9 +4995,9 @@
  #define USE_ELF_CORE_DUMP
  #define ELF_EXEC_PAGESIZE	PAGE_SIZE
  
-diff -Naur linux-2.6.11.6/include/asm-mips/fixmap.h linux-2.6.11.6/include/asm-mips/fixmap.h
---- linux-2.6.11.6/include/asm-mips/fixmap.h	2005-03-25 19:28:18 -0800
-+++ linux-2.6.11.6/include/asm-mips/fixmap.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/fixmap.h linux-2.6.11.11/include/asm-mips/fixmap.h
+--- linux-2.6.11.11.orig/include/asm-mips/fixmap.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/fixmap.h	2005-06-09 15:32:58.000000000 +0000
 @@ -107,4 +107,11 @@
  	return __virt_to_fix(vaddr);
  }
@@ -4146,9 +5010,9 @@
 +
 +
  #endif
-diff -Naur linux-2.6.11.6/include/asm-mips/fpu_emulator.h linux-2.6.11.6/include/asm-mips/fpu_emulator.h
---- linux-2.6.11.6/include/asm-mips/fpu_emulator.h	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/include/asm-mips/fpu_emulator.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/fpu_emulator.h linux-2.6.11.11/include/asm-mips/fpu_emulator.h
+--- linux-2.6.11.11.orig/include/asm-mips/fpu_emulator.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/fpu_emulator.h	2005-06-09 15:32:58.000000000 +0000
 @@ -35,4 +35,6 @@
  	} stats;
  };
@@ -4156,9 +5020,9 @@
 +extern struct mips_fpu_emulator_private fpuemuprivate;
 +
  #endif /* _ASM_FPU_EMULATOR_H */
-diff -Naur linux-2.6.11.6/include/asm-mips/hazards.h linux-2.6.11.6/include/asm-mips/hazards.h
---- linux-2.6.11.6/include/asm-mips/hazards.h	2005-03-25 19:28:25 -0800
-+++ linux-2.6.11.6/include/asm-mips/hazards.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/hazards.h linux-2.6.11.11/include/asm-mips/hazards.h
+--- linux-2.6.11.11.orig/include/asm-mips/hazards.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/hazards.h	2005-06-09 15:32:58.000000000 +0000
 @@ -107,6 +107,7 @@
  	"	.endm						\n\t");
  
@@ -4210,9 +5074,9 @@
  #endif
  
  #endif /* __ASSEMBLY__ */
-diff -Naur linux-2.6.11.6/include/asm-mips/io.h linux-2.6.11.6/include/asm-mips/io.h
---- linux-2.6.11.6/include/asm-mips/io.h	2005-03-25 19:28:19 -0800
-+++ linux-2.6.11.6/include/asm-mips/io.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/io.h linux-2.6.11.11/include/asm-mips/io.h
+--- linux-2.6.11.11.orig/include/asm-mips/io.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/io.h	2005-06-09 15:32:58.000000000 +0000
 @@ -34,7 +34,7 @@
  #undef CONF_SLOWDOWN_IO
  
@@ -4362,9 +5226,9 @@
  		__addr++;						\
  	}								\
  }
-diff -Naur linux-2.6.11.6/include/asm-mips/irq.h linux-2.6.11.6/include/asm-mips/irq.h
---- linux-2.6.11.6/include/asm-mips/irq.h	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/include/asm-mips/irq.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/irq.h linux-2.6.11.11/include/asm-mips/irq.h
+--- linux-2.6.11.11.orig/include/asm-mips/irq.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/irq.h	2005-06-09 15:32:58.000000000 +0000
 @@ -24,11 +24,9 @@
  
  struct pt_regs;
@@ -4378,9 +5242,9 @@
  
  /*
   * do_IRQ handles all normal device IRQ's (the special
-diff -Naur linux-2.6.11.6/include/asm-mips/mipsregs.h linux-2.6.11.6/include/asm-mips/mipsregs.h
---- linux-2.6.11.6/include/asm-mips/mipsregs.h	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/include/asm-mips/mipsregs.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/mipsregs.h linux-2.6.11.11/include/asm-mips/mipsregs.h
+--- linux-2.6.11.11.orig/include/asm-mips/mipsregs.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/mipsregs.h	2005-06-09 15:32:58.000000000 +0000
 @@ -790,10 +790,18 @@
  #define read_c0_config1()	__read_32bit_c0_register($16, 1)
  #define read_c0_config2()	__read_32bit_c0_register($16, 2)
@@ -4400,9 +5264,9 @@
  
  /*
   * The WatchLo register.  There may be upto 8 of them.
-diff -Naur linux-2.6.11.6/include/asm-mips/module.h linux-2.6.11.6/include/asm-mips/module.h
---- linux-2.6.11.6/include/asm-mips/module.h	2005-03-25 19:28:17 -0800
-+++ linux-2.6.11.6/include/asm-mips/module.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/module.h linux-2.6.11.11/include/asm-mips/module.h
+--- linux-2.6.11.11.orig/include/asm-mips/module.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/module.h	2005-06-09 15:32:58.000000000 +0000
 @@ -14,15 +14,23 @@
  
  typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
@@ -4464,9 +5328,225 @@
  
  #endif
  
-diff -Naur linux-2.6.11.6/include/asm-mips/page.h linux-2.6.11.6/include/asm-mips/page.h
---- linux-2.6.11.6/include/asm-mips/page.h	2005-03-25 19:28:18 -0800
-+++ linux-2.6.11.6/include/asm-mips/page.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/offset.h linux-2.6.11.11/include/asm-mips/offset.h
+--- linux-2.6.11.11.orig/include/asm-mips/offset.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/offset.h	2005-06-09 15:42:31.000000000 +0000
+@@ -0,0 +1,212 @@
++#ifndef _ASM_OFFSET_H
++#define _ASM_OFFSET_H
++/*
++ * DO NOT MODIFY.
++ *
++ * This file was generated by arch/mips/Makefile
++ *
++ */
++
++/* MIPS pt_regs offsets. */
++#define PT_R0     0
++#define PT_R1     8
++#define PT_R2     16
++#define PT_R3     24
++#define PT_R4     32
++#define PT_R5     40
++#define PT_R6     48
++#define PT_R7     56
++#define PT_R8     64
++#define PT_R9     72
++#define PT_R10    80
++#define PT_R11    88
++#define PT_R12    96
++#define PT_R13    104
++#define PT_R14    112
++#define PT_R15    120
++#define PT_R16    128
++#define PT_R17    136
++#define PT_R18    144
++#define PT_R19    152
++#define PT_R20    160
++#define PT_R21    168
++#define PT_R22    176
++#define PT_R23    184
++#define PT_R24    192
++#define PT_R25    200
++#define PT_R26    208
++#define PT_R27    216
++#define PT_R28    224
++#define PT_R29    232
++#define PT_R30    240
++#define PT_R31    248
++#define PT_LO     264
++#define PT_HI     272
++#define PT_EPC    296
++#define PT_BVADDR 280
++#define PT_STATUS 256
++#define PT_CAUSE  288
++#define PT_SIZE   304
++
++/* MIPS task_struct offsets. */
++#define TASK_STATE         0
++#define TASK_THREAD_INFO   8
++#define TASK_FLAGS         24
++#define TASK_MM            184
++#define TASK_PID           244
++#define TASK_STRUCT_SIZE   1456
++
++/* MIPS thread_info offsets. */
++#define TI_TASK            0
++#define TI_EXEC_DOMAIN     8
++#define TI_FLAGS           16
++#define TI_CPU             24
++#define TI_PRE_COUNT       28
++#define TI_ADDR_LIMIT      32
++#define TI_RESTART_BLOCK   40
++#define _THREAD_SIZE_ORDER 0x2
++#define _THREAD_SIZE       0x4000
++#define _THREAD_MASK       0x3fff
++
++/* MIPS specific thread_struct offsets. */
++#define THREAD_REG16   776
++#define THREAD_REG17   784
++#define THREAD_REG18   792
++#define THREAD_REG19   800
++#define THREAD_REG20   808
++#define THREAD_REG21   816
++#define THREAD_REG22   824
++#define THREAD_REG23   832
++#define THREAD_REG29   840
++#define THREAD_REG30   848
++#define THREAD_REG31   856
++#define THREAD_STATUS  864
++#define THREAD_FPU     872
++#define THREAD_BVADDR  1136
++#define THREAD_BUADDR  1144
++#define THREAD_ECODE   1152
++#define THREAD_TRAPNO  1160
++#define THREAD_MFLAGS  1168
++#define THREAD_TRAMP   1176
++#define THREAD_OLDCTX  1184
++
++#define THREAD_FPR0    872
++#define THREAD_FPR1    880
++#define THREAD_FPR2    888
++#define THREAD_FPR3    896
++#define THREAD_FPR4    904
++#define THREAD_FPR5    912
++#define THREAD_FPR6    920
++#define THREAD_FPR7    928
++#define THREAD_FPR8    936
++#define THREAD_FPR9    944
++#define THREAD_FPR10   952
++#define THREAD_FPR11   960
++#define THREAD_FPR12   968
++#define THREAD_FPR13   976
++#define THREAD_FPR14   984
++#define THREAD_FPR15   992
++#define THREAD_FPR16   1000
++#define THREAD_FPR17   1008
++#define THREAD_FPR18   1016
++#define THREAD_FPR19   1024
++#define THREAD_FPR20   1032
++#define THREAD_FPR21   1040
++#define THREAD_FPR22   1048
++#define THREAD_FPR23   1056
++#define THREAD_FPR24   1064
++#define THREAD_FPR25   1072
++#define THREAD_FPR26   1080
++#define THREAD_FPR27   1088
++#define THREAD_FPR28   1096
++#define THREAD_FPR29   1104
++#define THREAD_FPR30   1112
++#define THREAD_FPR31   1120
++#define THREAD_FCR31   1128
++
++/* Size of struct page  */
++#define STRUCT_PAGE_SIZE   56
++
++/* Linux mm_struct offsets. */
++#define MM_USERS      64
++#define MM_PGD        56
++#define MM_CONTEXT    640
++
++#define _PAGE_SIZE     0x1000
++#define _PAGE_SHIFT    0xc
++
++#define _PGD_T_SIZE    0x8
++#define _PMD_T_SIZE    0x8
++#define _PTE_T_SIZE    0x8
++
++#define _PGD_T_LOG2    0x3
++#define _PMD_T_LOG2    0x3
++#define _PTE_T_LOG2    0x3
++
++#define _PMD_SHIFT     0x15
++#define _PGDIR_SHIFT   0x1e
++
++#define _PGD_ORDER     0x1
++#define _PMD_ORDER     0x0
++#define _PTE_ORDER     0x0
++
++#define _PTRS_PER_PGD  0x400
++#define _PTRS_PER_PMD  0x200
++#define _PTRS_PER_PTE  0x200
++
++/* Linux sigcontext offsets. */
++#define SC_REGS       0
++#define SC_FPREGS     256
++#define SC_MDHI       512
++#define SC_MDLO       520
++#define SC_PC         528
++#define SC_STATUS     544
++#define SC_FPC_CSR    548
++#define SC_FPC_EIR    552
++#define SC_CAUSE      560
++#define SC_BADVADDR   536
++
++/* Linux 32-bit sigcontext offsets. */
++#define SC32_FPREGS     272
++#define SC32_FPC_CSR    532
++#define SC32_FPC_EIR    536
++
++/* Linux signal numbers. */
++#define _SIGHUP     0x1
++#define _SIGINT     0x2
++#define _SIGQUIT    0x3
++#define _SIGILL     0x4
++#define _SIGTRAP    0x5
++#define _SIGIOT     0x6
++#define _SIGABRT    0x6
++#define _SIGEMT     0x7
++#define _SIGFPE     0x8
++#define _SIGKILL    0x9
++#define _SIGBUS     0xa
++#define _SIGSEGV    0xb
++#define _SIGSYS     0xc
++#define _SIGPIPE    0xd
++#define _SIGALRM    0xe
++#define _SIGTERM    0xf
++#define _SIGUSR1    0x10
++#define _SIGUSR2    0x11
++#define _SIGCHLD    0x12
++#define _SIGPWR     0x13
++#define _SIGWINCH   0x14
++#define _SIGURG     0x15
++#define _SIGIO      0x16
++#define _SIGSTOP    0x17
++#define _SIGTSTP    0x18
++#define _SIGCONT    0x19
++#define _SIGTTIN    0x1a
++#define _SIGTTOU    0x1b
++#define _SIGVTALRM  0x1c
++#define _SIGPROF    0x1d
++#define _SIGXCPU    0x1e
++#define _SIGXFSZ    0x1f
++
++/* Linux irq_cpustat_t offsets. */
++#define IC_SOFTIRQ_PENDING 0
++#define IC_IRQ_CPUSTAT_T   32
++
++#endif /* _ASM_OFFSET_H */
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/page.h linux-2.6.11.11/include/asm-mips/page.h
+--- linux-2.6.11.11.orig/include/asm-mips/page.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/page.h	2005-06-09 15:32:58.000000000 +0000
 @@ -87,21 +87,48 @@
  typedef struct { unsigned long pte; } pte_t;
  #define pte_val(x)	((x).pte)
@@ -4523,9 +5603,9 @@
  
  /* Pure 2^n version of get_order */
  static __inline__ int get_order(unsigned long size)
-diff -Naur linux-2.6.11.6/include/asm-mips/pgalloc.h linux-2.6.11.6/include/asm-mips/pgalloc.h
---- linux-2.6.11.6/include/asm-mips/pgalloc.h	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/include/asm-mips/pgalloc.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/pgalloc.h linux-2.6.11.11/include/asm-mips/pgalloc.h
+--- linux-2.6.11.11.orig/include/asm-mips/pgalloc.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/pgalloc.h	2005-06-09 15:32:58.000000000 +0000
 @@ -26,10 +26,22 @@
  }
  
@@ -4573,9 +5653,9 @@
  static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
  {
  	pmd_t *pmd;
-diff -Naur linux-2.6.11.6/include/asm-mips/pgtable-32.h linux-2.6.11.6/include/asm-mips/pgtable-32.h
---- linux-2.6.11.6/include/asm-mips/pgtable-32.h	2005-03-25 19:28:21 -0800
-+++ linux-2.6.11.6/include/asm-mips/pgtable-32.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/pgtable-32.h linux-2.6.11.11/include/asm-mips/pgtable-32.h
+--- linux-2.6.11.11.orig/include/asm-mips/pgtable-32.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/pgtable-32.h	2005-06-09 15:32:58.000000000 +0000
 @@ -17,6 +17,8 @@
  #include <asm/cachectl.h>
  #include <asm/fixmap.h>
@@ -4688,9 +5768,9 @@
  /* Find an entry in the third-level page table.. */
  #define __pte_offset(address)						\
  	(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-diff -Naur linux-2.6.11.6/include/asm-mips/pgtable-64.h linux-2.6.11.6/include/asm-mips/pgtable-64.h
---- linux-2.6.11.6/include/asm-mips/pgtable-64.h	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/include/asm-mips/pgtable-64.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/pgtable-64.h linux-2.6.11.11/include/asm-mips/pgtable-64.h
+--- linux-2.6.11.11.orig/include/asm-mips/pgtable-64.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/pgtable-64.h	2005-06-09 15:32:58.000000000 +0000
 @@ -16,13 +16,15 @@
  #include <asm/page.h>
  #include <asm/cachectl.h>
@@ -4858,9 +5938,9 @@
  	       ((address >> PMD_SHIFT) & (PTRS_PER_PMD - 1));
  }
  
-diff -Naur linux-2.6.11.6/include/asm-mips/pgtable.h linux-2.6.11.6/include/asm-mips/pgtable.h
---- linux-2.6.11.6/include/asm-mips/pgtable.h	2005-03-25 19:28:17 -0800
-+++ linux-2.6.11.6/include/asm-mips/pgtable.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/pgtable.h linux-2.6.11.11/include/asm-mips/pgtable.h
+--- linux-2.6.11.11.orig/include/asm-mips/pgtable.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/pgtable.h	2005-06-09 15:32:58.000000000 +0000
 @@ -8,8 +8,6 @@
  #ifndef _ASM_PGTABLE_H
  #define _ASM_PGTABLE_H
@@ -4891,9 +5971,9 @@
  
  #define PGD_T_LOG2	ffz(~sizeof(pgd_t))
  #define PMD_T_LOG2	ffz(~sizeof(pmd_t))
-diff -Naur linux-2.6.11.6/include/asm-mips/serial.h linux-2.6.11.6/include/asm-mips/serial.h
---- linux-2.6.11.6/include/asm-mips/serial.h	2005-03-25 19:28:39 -0800
-+++ linux-2.6.11.6/include/asm-mips/serial.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/serial.h linux-2.6.11.11/include/asm-mips/serial.h
+--- linux-2.6.11.11.orig/include/asm-mips/serial.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/serial.h	2005-06-09 15:32:58.000000000 +0000
 @@ -309,9 +309,9 @@
  #define JAGUAR_ATX_SERIAL1_BASE	0xfd000023L
  
@@ -4920,9 +6000,9 @@
  	  io_type: SERIAL_IO_MEM }
  
  #define MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS				\
-diff -Naur linux-2.6.11.6/include/asm-mips/signal.h linux-2.6.11.6/include/asm-mips/signal.h
---- linux-2.6.11.6/include/asm-mips/signal.h	2005-03-25 19:28:18 -0800
-+++ linux-2.6.11.6/include/asm-mips/signal.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/signal.h linux-2.6.11.11/include/asm-mips/signal.h
+--- linux-2.6.11.11.orig/include/asm-mips/signal.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/signal.h	2005-06-09 15:32:58.000000000 +0000
 @@ -120,7 +120,8 @@
  				   set only the low 32 bit of the sigset.  */
  
@@ -4933,9 +6013,9 @@
  
  /* Fake signal functions */
  #define SIG_DFL	((__sighandler_t)0)	/* default signal handling */
-diff -Naur linux-2.6.11.6/include/asm-mips/spinlock.h linux-2.6.11.6/include/asm-mips/spinlock.h
---- linux-2.6.11.6/include/asm-mips/spinlock.h	2005-03-25 19:28:37 -0800
-+++ linux-2.6.11.6/include/asm-mips/spinlock.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/spinlock.h linux-2.6.11.11/include/asm-mips/spinlock.h
+--- linux-2.6.11.11.orig/include/asm-mips/spinlock.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/spinlock.h	2005-06-09 15:32:58.000000000 +0000
 @@ -140,6 +140,18 @@
  
  #define rwlock_init(x)  do { *(x) = RW_LOCK_UNLOCKED; } while(0)
@@ -4955,9 +6035,9 @@
  static inline void _raw_read_lock(rwlock_t *rw)
  {
  	unsigned int tmp;
-diff -Naur linux-2.6.11.6/include/asm-mips/stackframe.h linux-2.6.11.6/include/asm-mips/stackframe.h
---- linux-2.6.11.6/include/asm-mips/stackframe.h	2005-03-25 19:28:13 -0800
-+++ linux-2.6.11.6/include/asm-mips/stackframe.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/stackframe.h linux-2.6.11.11/include/asm-mips/stackframe.h
+--- linux-2.6.11.11.orig/include/asm-mips/stackframe.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/stackframe.h	2005-06-09 15:32:58.000000000 +0000
 @@ -78,7 +78,12 @@
  		MFC0	k1, CP0_CONTEXT
  		dsrl	k1, 23
@@ -4972,9 +6052,9 @@
  #endif
  		.endm
  
-diff -Naur linux-2.6.11.6/include/asm-mips/uaccess.h linux-2.6.11.6/include/asm-mips/uaccess.h
---- linux-2.6.11.6/include/asm-mips/uaccess.h	2005-03-25 19:28:14 -0800
-+++ linux-2.6.11.6/include/asm-mips/uaccess.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/asm-mips/uaccess.h linux-2.6.11.11/include/asm-mips/uaccess.h
+--- linux-2.6.11.11.orig/include/asm-mips/uaccess.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/asm-mips/uaccess.h	2005-06-09 15:32:58.000000000 +0000
 @@ -128,7 +128,8 @@
   *
   * See access_ok() for more details.
@@ -5328,9 +6408,9 @@
  {
  	long res;
  
-diff -Naur linux-2.6.11.6/include/linux/init.h linux-2.6.11.6/include/linux/init.h
---- linux-2.6.11.6/include/linux/init.h	2005-03-25 19:28:14 -0800
-+++ linux-2.6.11.6/include/linux/init.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/linux/init.h linux-2.6.11.11/include/linux/init.h
+--- linux-2.6.11.11.orig/include/linux/init.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/linux/init.h	2005-06-09 15:32:58.000000000 +0000
 @@ -86,6 +86,8 @@
  	static initcall_t __initcall_##fn __attribute_used__ \
  	__attribute__((__section__(".initcall" level ".init"))) = fn
@@ -5340,9 +6420,9 @@
  #define core_initcall(fn)		__define_initcall("1",fn)
  #define postcore_initcall(fn)		__define_initcall("2",fn)
  #define arch_initcall(fn)		__define_initcall("3",fn)
-diff -Naur linux-2.6.11.6/include/linux/mc146818rtc.h linux-2.6.11.6/include/linux/mc146818rtc.h
---- linux-2.6.11.6/include/linux/mc146818rtc.h	2005-03-25 19:28:26 -0800
-+++ linux-2.6.11.6/include/linux/mc146818rtc.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/linux/mc146818rtc.h linux-2.6.11.11/include/linux/mc146818rtc.h
+--- linux-2.6.11.11.orig/include/linux/mc146818rtc.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/linux/mc146818rtc.h	2005-06-09 15:32:58.000000000 +0000
 @@ -89,4 +89,12 @@
  # define RTC_VRT 0x80		/* valid RAM and time */
  /**********************************************************************/
@@ -5356,9 +6436,9 @@
 +#endif
 +
  #endif /* _MC146818RTC_H */
-diff -Naur linux-2.6.11.6/include/linux/pci.h linux-2.6.11.6/include/linux/pci.h
---- linux-2.6.11.6/include/linux/pci.h	2005-03-25 19:28:20 -0800
-+++ linux-2.6.11.6/include/linux/pci.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/linux/pci.h linux-2.6.11.11/include/linux/pci.h
+--- linux-2.6.11.11.orig/include/linux/pci.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/linux/pci.h	2005-06-09 15:32:58.000000000 +0000
 @@ -1038,7 +1038,7 @@
  
  /* Anonymous variables would be nice... */
@@ -5368,9 +6448,9 @@
  	__attribute__((__section__(#section))) = { vendor, device, hook };
  #define DECLARE_PCI_FIXUP_EARLY(vendor, device, hook)			\
  	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early,			\
-diff -Naur linux-2.6.11.6/include/linux/serial.h linux-2.6.11.6/include/linux/serial.h
---- linux-2.6.11.6/include/linux/serial.h	2005-03-25 19:28:16 -0800
-+++ linux-2.6.11.6/include/linux/serial.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/linux/serial.h linux-2.6.11.11/include/linux/serial.h
+--- linux-2.6.11.11.orig/include/linux/serial.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/linux/serial.h	2005-06-09 15:32:58.000000000 +0000
 @@ -75,7 +75,8 @@
  #define PORT_16654	11
  #define PORT_16850	12
@@ -5381,9 +6461,9 @@
  
  #define SERIAL_IO_PORT	0
  #define SERIAL_IO_HUB6	1
-diff -Naur linux-2.6.11.6/include/linux/serial_core.h linux-2.6.11.6/include/linux/serial_core.h
---- linux-2.6.11.6/include/linux/serial_core.h	2005-03-25 19:28:15 -0800
-+++ linux-2.6.11.6/include/linux/serial_core.h	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/include/linux/serial_core.h linux-2.6.11.11/include/linux/serial_core.h
+--- linux-2.6.11.11.orig/include/linux/serial_core.h	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/include/linux/serial_core.h	2005-06-09 15:32:58.000000000 +0000
 @@ -103,9 +103,6 @@
  /* Marvell MPSC */
  #define PORT_MPSC	63
@@ -5394,9 +6474,9 @@
  #ifdef __KERNEL__
  
  #include <linux/config.h>
-diff -Naur linux-2.6.11.6/scripts/kallsyms.c linux-2.6.11.6/scripts/kallsyms.c
---- linux-2.6.11.6/scripts/kallsyms.c	2005-03-25 19:28:38 -0800
-+++ linux-2.6.11.6/scripts/kallsyms.c	2005-04-01 08:56:56 -0800
+diff -Naur linux-2.6.11.11.orig/scripts/kallsyms.c linux-2.6.11.11/scripts/kallsyms.c
+--- linux-2.6.11.11.orig/scripts/kallsyms.c	2005-05-27 05:06:46.000000000 +0000
++++ linux-2.6.11.11/scripts/kallsyms.c	2005-06-09 15:32:58.000000000 +0000
 @@ -145,6 +145,9 @@
  	else if (toupper(s->type) == 'U' ||
  		 is_arm_mapping_symbol(str))

Added: trunk/linux/linux-2.6.11.12-mips_fix-1.patch
===================================================================
--- trunk/linux/linux-2.6.11.12-mips_fix-1.patch	2005-06-12 16:55:19 UTC (rev 970)
+++ trunk/linux/linux-2.6.11.12-mips_fix-1.patch	2005-06-12 18:19:40 UTC (rev 971)
@@ -0,0 +1 @@
+link linux-2.6.11.11-mips_fix-1.patch
\ No newline at end of file


Property changes on: trunk/linux/linux-2.6.11.12-mips_fix-1.patch
___________________________________________________________________
Name: svn:special
   + *




More information about the patches mailing list