Changeset d15a80a for patches


Ignore:
Timestamp:
Nov 5, 2006, 9:32:06 AM (18 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
47bc41b
Parents:
efca81a
Message:

Linux 2.6.18.2 patches

Location:
patches
Files:
4 moved

Legend:

Unmodified
Added
Removed

  • patches/linux-2.6.18.2-mips-1.patch

    refca81a rd15a80a  
    11Submitted By: Jim Gifford (patches at jg555 dot com)
    2 Date: 2006-10-22
    3 Initial Package Version: 2.6.18.1
     2Date: 2006-11-05
     3Initial Package Version: 2.6.18.2
    44Origin: Linux-MIPS
    55Upstream Status: http://www.linux-mips.org/pub/linux/mips/kernel/v2.6/
    66
    7 diff -Naur linux-2.6.18.1/arch/mips/Kconfig linux-mips-2.6.18.1/arch/mips/Kconfig
    8 --- linux-2.6.18.1/arch/mips/Kconfig    2006-10-13 20:34:03.000000000 -0700
    9 +++ linux-mips-2.6.18.1/arch/mips/Kconfig       2006-10-17 06:23:28.000000000 -0700
     7diff -Naur linux-2.6.18.2/Documentation/mips/time.README linux-mips-2.6.18.2/Documentation/mips/time.README
     8--- linux-2.6.18.2/Documentation/mips/time.README       2006-11-03 17:33:58.000000000 -0800
     9+++ linux-mips-2.6.18.2/Documentation/mips/time.README  2006-11-04 14:51:12.000000000 -0800
     10@@ -63,7 +63,7 @@
     11   a) board_time_init - a function pointer.  Invoked at the beginnig of
     12      time_init().  It is optional.
     13        1. (optional) set up RTC routines
     14-       2. (optional) calibrate and set the mips_counter_frequency
     15+       2. (optional) calibrate and set the mips_hpt_frequency
     16 
     17   b) plat_timer_setup - a function pointer.  Invoked at the end of time_init()
     18        1. (optional) over-ride any decisions made in time_init()
     19@@ -72,7 +72,7 @@
     20 
     21   c) (optional) board-specific RTC routines.
     22 
     23-  d) (optional) mips_counter_frequency - It must be definied if the board
     24+  d) (optional) mips_hpt_frequency - It must be definied if the board
     25      is using CPU counter for timer interrupt or it is using fixed rate
     26      gettimeoffset().
     27 
     28@@ -104,7 +104,7 @@
     29      or use an exnternal timer?
     30 
     31      In order to use CPU counter register as the timer interrupt source, you
     32-     must know the counter speed (mips_counter_frequency).  It is usually the
     33+     must know the counter speed (mips_hpt_frequency).  It is usually the
     34      same as the CPU speed or an integral divisor of it.
     35 
     36   d) decide on whether you want to use high-level or low-level timer
     37@@ -122,7 +122,7 @@
     38 
     39   board_time_init() -
     40        a) (optional) set up RTC routines,
     41-        b) (optional) calibrate and set the mips_counter_frequency
     42+        b) (optional) calibrate and set the mips_hpt_frequency
     43            (only needed if you intended to use fixed_rate_gettimeoffset
     44             or use cpu counter as timer interrupt source)
     45 
     46diff -Naur linux-2.6.18.2/Makefile linux-mips-2.6.18.2/Makefile
     47--- linux-2.6.18.2/Makefile     2006-11-03 17:33:58.000000000 -0800
     48+++ linux-mips-2.6.18.2/Makefile        2006-11-04 14:51:12.000000000 -0800
     49@@ -149,10 +149,7 @@
     50 # then ARCH is assigned, getting whatever value it gets normally, and
     51 # SUBARCH is subsequently ignored.
     52 
     53-SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
     54-                                 -e s/arm.*/arm/ -e s/sa110/arm/ \
     55-                                 -e s/s390x/s390/ -e s/parisc64/parisc/ \
     56-                                 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
     57+SUBARCH := mips
     58 
     59 # Cross compiling and selecting different set of gcc/bin-utils
     60 # ---------------------------------------------------------------------------
     61diff -Naur linux-2.6.18.2/arch/mips/Kconfig linux-mips-2.6.18.2/arch/mips/Kconfig
     62--- linux-2.6.18.2/arch/mips/Kconfig    2006-11-03 17:33:58.000000000 -0800
     63+++ linux-mips-2.6.18.2/arch/mips/Kconfig       2006-11-04 14:51:12.000000000 -0800
    1064@@ -126,7 +126,6 @@
    1165        select IRQ_CPU
    … …  
    94148          This enables support for systems with more than one CPU. If you have
    95149          a system with only one CPU, like most personal computers, say N. If
    96 diff -Naur linux-2.6.18.1/arch/mips/Makefile linux-mips-2.6.18.1/arch/mips/Makefile
    97 --- linux-2.6.18.1/arch/mips/Makefile   2006-10-13 20:34:03.000000000 -0700
    98 +++ linux-mips-2.6.18.1/arch/mips/Makefile      2006-10-17 06:23:28.000000000 -0700
     150diff -Naur linux-2.6.18.2/arch/mips/Makefile linux-mips-2.6.18.2/arch/mips/Makefile
     151--- linux-2.6.18.2/arch/mips/Makefile   2006-11-03 17:33:58.000000000 -0800
     152+++ linux-mips-2.6.18.2/arch/mips/Makefile      2006-11-04 14:51:12.000000000 -0800
    99153@@ -63,7 +63,9 @@
    100154 ifdef CONFIG_BUILD_ELF64
    … …  
    136190 
    137191 #
    138 diff -Naur linux-2.6.18.1/arch/mips/au1000/db1x00/Makefile linux-mips-2.6.18.1/arch/mips/au1000/db1x00/Makefile
    139 --- linux-2.6.18.1/arch/mips/au1000/db1x00/Makefile     2006-10-13 20:34:03.000000000 -0700
    140 +++ linux-mips-2.6.18.1/arch/mips/au1000/db1x00/Makefile        2006-10-17 06:23:28.000000000 -0700
     192diff -Naur linux-2.6.18.2/arch/mips/au1000/db1x00/Makefile linux-mips-2.6.18.2/arch/mips/au1000/db1x00/Makefile
     193--- linux-2.6.18.2/arch/mips/au1000/db1x00/Makefile     2006-11-03 17:33:58.000000000 -0800
     194+++ linux-mips-2.6.18.2/arch/mips/au1000/db1x00/Makefile        2006-11-04 14:51:12.000000000 -0800
    141195@@ -6,4 +6,3 @@
    142196 # Makefile for the Alchemy Semiconductor Db1x00 board.
    … …  
    144198 lib-y := init.o board_setup.o irqmap.o
    145199-obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o
    146 diff -Naur linux-2.6.18.1/arch/mips/au1000/db1x00/mirage_ts.c linux-mips-2.6.18.1/arch/mips/au1000/db1x00/mirage_ts.c
    147 --- linux-2.6.18.1/arch/mips/au1000/db1x00/mirage_ts.c  2006-10-13 20:34:03.000000000 -0700
    148 +++ linux-mips-2.6.18.1/arch/mips/au1000/db1x00/mirage_ts.c     1969-12-31 16:00:00.000000000 -0800
     200diff -Naur linux-2.6.18.2/arch/mips/au1000/db1x00/mirage_ts.c linux-mips-2.6.18.2/arch/mips/au1000/db1x00/mirage_ts.c
     201--- linux-2.6.18.2/arch/mips/au1000/db1x00/mirage_ts.c  2006-11-03 17:33:58.000000000 -0800
     202+++ linux-mips-2.6.18.2/arch/mips/au1000/db1x00/mirage_ts.c     1969-12-31 16:00:00.000000000 -0800
    149203@@ -1,260 +0,0 @@
    150204-/*
    … …  
    408462-module_exit(ts_mirage_exit);
    409463-
    410 diff -Naur linux-2.6.18.1/arch/mips/cobalt/setup.c linux-mips-2.6.18.1/arch/mips/cobalt/setup.c
    411 --- linux-2.6.18.1/arch/mips/cobalt/setup.c     2006-10-13 20:34:03.000000000 -0700
    412 +++ linux-mips-2.6.18.1/arch/mips/cobalt/setup.c        2006-10-17 06:23:28.000000000 -0700
     464diff -Naur linux-2.6.18.2/arch/mips/cobalt/setup.c linux-mips-2.6.18.2/arch/mips/cobalt/setup.c
     465--- linux-2.6.18.2/arch/mips/cobalt/setup.c     2006-11-03 17:33:58.000000000 -0800
     466+++ linux-mips-2.6.18.2/arch/mips/cobalt/setup.c        2006-11-04 14:51:12.000000000 -0800
    413467@@ -51,8 +51,8 @@
    414468 
    … …  
    422476        /* Enable timer */
    423477        GALILEO_OUTL(GALILEO_ENTC0 | GALILEO_SELTC0, GT_TC_CONTROL_OFS);
    424 diff -Naur linux-2.6.18.1/arch/mips/configs/e55_defconfig linux-mips-2.6.18.1/arch/mips/configs/e55_defconfig
    425 --- linux-2.6.18.1/arch/mips/configs/e55_defconfig      2006-10-13 20:34:03.000000000 -0700
    426 +++ linux-mips-2.6.18.1/arch/mips/configs/e55_defconfig 2006-10-17 06:23:28.000000000 -0700
     478diff -Naur linux-2.6.18.2/arch/mips/configs/e55_defconfig linux-mips-2.6.18.2/arch/mips/configs/e55_defconfig
     479--- linux-2.6.18.2/arch/mips/configs/e55_defconfig      2006-11-03 17:33:58.000000000 -0800
     480+++ linux-mips-2.6.18.2/arch/mips/configs/e55_defconfig 2006-11-04 14:51:12.000000000 -0800
    427481@@ -1,7 +1,7 @@
    428482 #
    … …  
    476530 #
    477531 # Security options
    478 diff -Naur linux-2.6.18.1/arch/mips/configs/mpc30x_defconfig linux-mips-2.6.18.1/arch/mips/configs/mpc30x_defconfig
    479 --- linux-2.6.18.1/arch/mips/configs/mpc30x_defconfig   2006-10-13 20:34:03.000000000 -0700
    480 +++ linux-mips-2.6.18.1/arch/mips/configs/mpc30x_defconfig      2006-10-17 06:23:28.000000000 -0700
     532diff -Naur linux-2.6.18.2/arch/mips/configs/mpc30x_defconfig linux-mips-2.6.18.2/arch/mips/configs/mpc30x_defconfig
     533--- linux-2.6.18.2/arch/mips/configs/mpc30x_defconfig   2006-11-03 17:33:58.000000000 -0800
     534+++ linux-mips-2.6.18.2/arch/mips/configs/mpc30x_defconfig      2006-11-04 14:51:12.000000000 -0800
    481535@@ -1,7 +1,7 @@
    482536 #
    … …  
    539593 #
    540594 # Security options
    541 diff -Naur linux-2.6.18.1/arch/mips/configs/workpad_defconfig linux-mips-2.6.18.1/arch/mips/configs/workpad_defconfig
    542 --- linux-2.6.18.1/arch/mips/configs/workpad_defconfig  2006-10-13 20:34:03.000000000 -0700
    543 +++ linux-mips-2.6.18.1/arch/mips/configs/workpad_defconfig     2006-10-17 06:23:28.000000000 -0700
     595diff -Naur linux-2.6.18.2/arch/mips/configs/workpad_defconfig linux-mips-2.6.18.2/arch/mips/configs/workpad_defconfig
     596--- linux-2.6.18.2/arch/mips/configs/workpad_defconfig  2006-11-03 17:33:58.000000000 -0800
     597+++ linux-mips-2.6.18.2/arch/mips/configs/workpad_defconfig     2006-11-04 14:51:12.000000000 -0800
    544598@@ -1,7 +1,7 @@
    545599 #
    … …  
    593647 #
    594648 # Security options
    595 diff -Naur linux-2.6.18.1/arch/mips/kernel/cpu-probe.c linux-mips-2.6.18.1/arch/mips/kernel/cpu-probe.c
    596 --- linux-2.6.18.1/arch/mips/kernel/cpu-probe.c 2006-10-13 20:34:03.000000000 -0700
    597 +++ linux-mips-2.6.18.1/arch/mips/kernel/cpu-probe.c    2006-10-17 06:23:28.000000000 -0700
     649diff -Naur linux-2.6.18.2/arch/mips/kernel/asm-offsets.c linux-mips-2.6.18.2/arch/mips/kernel/asm-offsets.c
     650--- linux-2.6.18.2/arch/mips/kernel/asm-offsets.c       2006-11-03 17:33:58.000000000 -0800
     651+++ linux-mips-2.6.18.2/arch/mips/kernel/asm-offsets.c  2006-11-04 14:51:12.000000000 -0800
     652@@ -22,7 +22,7 @@
     653 #define offset(string, ptr, member) \
     654        __asm__("\n@@@" string "%0" : : "i" (_offset(ptr, member)))
     655 #define constant(string, member) \
     656-       __asm__("\n@@@" string "%x0" : : "ri" (member))
     657+       __asm__("\n@@@" string "%X0" : : "ri" (member))
     658 #define size(string, size) \
     659        __asm__("\n@@@" string "%0" : : "i" (sizeof(size)))
     660 #define linefeed text("")
     661diff -Naur linux-2.6.18.2/arch/mips/kernel/cpu-probe.c linux-mips-2.6.18.2/arch/mips/kernel/cpu-probe.c
     662--- linux-2.6.18.2/arch/mips/kernel/cpu-probe.c 2006-11-03 17:33:58.000000000 -0800
     663+++ linux-mips-2.6.18.2/arch/mips/kernel/cpu-probe.c    2006-11-04 14:51:12.000000000 -0800
    598664@@ -38,15 +38,40 @@
    599665 
    … …  
    706772                printk(" unavailable.\n");
    707773                break;
    708 diff -Naur linux-2.6.18.1/arch/mips/kernel/irixsig.c linux-mips-2.6.18.1/arch/mips/kernel/irixsig.c
    709 --- linux-2.6.18.1/arch/mips/kernel/irixsig.c   2006-10-13 20:34:03.000000000 -0700
    710 +++ linux-mips-2.6.18.1/arch/mips/kernel/irixsig.c      2006-10-17 06:23:28.000000000 -0700
     774diff -Naur linux-2.6.18.2/arch/mips/kernel/head.S linux-mips-2.6.18.2/arch/mips/kernel/head.S
     775--- linux-2.6.18.2/arch/mips/kernel/head.S      2006-11-03 17:33:58.000000000 -0800
     776+++ linux-mips-2.6.18.2/arch/mips/kernel/head.S 2006-11-04 14:51:12.000000000 -0800
     777@@ -189,7 +189,8 @@
     778 
     779        MTC0            zero, CP0_CONTEXT       # clear context register
     780        PTR_LA          $28, init_thread_union
     781-       PTR_ADDIU       sp, $28, _THREAD_SIZE - 32
     782+       PTR_LI          sp, _THREAD_SIZE - 32
     783+       PTR_ADDU        sp, $28
     784        set_saved_sp    sp, t0, t1
     785        PTR_SUBU        sp, 4 * SZREG           # init stack pointer
     786 
     787diff -Naur linux-2.6.18.2/arch/mips/kernel/irixsig.c linux-mips-2.6.18.2/arch/mips/kernel/irixsig.c
     788--- linux-2.6.18.2/arch/mips/kernel/irixsig.c   2006-11-03 17:33:58.000000000 -0800
     789+++ linux-mips-2.6.18.2/arch/mips/kernel/irixsig.c      2006-11-04 14:51:12.000000000 -0800
    711790@@ -17,6 +17,7 @@
    712791 
    … …  
    825904 
    826905 /* hate hate hate... */
    827 diff -Naur linux-2.6.18.1/arch/mips/kernel/linux32.c linux-mips-2.6.18.1/arch/mips/kernel/linux32.c
    828 --- linux-2.6.18.1/arch/mips/kernel/linux32.c   2006-10-13 20:34:03.000000000 -0700
    829 +++ linux-mips-2.6.18.1/arch/mips/kernel/linux32.c      2006-10-17 06:23:28.000000000 -0700
     906diff -Naur linux-2.6.18.2/arch/mips/kernel/linux32.c linux-mips-2.6.18.2/arch/mips/kernel/linux32.c
     907--- linux-2.6.18.2/arch/mips/kernel/linux32.c   2006-11-03 17:33:58.000000000 -0800
     908+++ linux-mips-2.6.18.2/arch/mips/kernel/linux32.c      2006-11-04 14:51:12.000000000 -0800
    830909@@ -1053,7 +1053,9 @@
    831910 asmlinkage int sys32_personality(unsigned long personality)
    … …  
    849928-       sys_set_thread_area(AA(addr));
    850929-}
    851 diff -Naur linux-2.6.18.1/arch/mips/kernel/mips-mt.c linux-mips-2.6.18.1/arch/mips/kernel/mips-mt.c
    852 --- linux-2.6.18.1/arch/mips/kernel/mips-mt.c   2006-10-13 20:34:03.000000000 -0700
    853 +++ linux-mips-2.6.18.1/arch/mips/kernel/mips-mt.c      2006-10-17 06:23:28.000000000 -0700
     930diff -Naur linux-2.6.18.2/arch/mips/kernel/mips-mt.c linux-mips-2.6.18.2/arch/mips/kernel/mips-mt.c
     931--- linux-2.6.18.2/arch/mips/kernel/mips-mt.c   2006-11-03 17:33:58.000000000 -0800
     932+++ linux-mips-2.6.18.2/arch/mips/kernel/mips-mt.c      2006-11-04 14:51:12.000000000 -0800
    854933@@ -96,6 +96,10 @@
    855934                goto out_unlock;
    … …  
    875954        cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);
    876955 
    877 diff -Naur linux-2.6.18.1/arch/mips/kernel/proc.c linux-mips-2.6.18.1/arch/mips/kernel/proc.c
    878 --- linux-2.6.18.1/arch/mips/kernel/proc.c      2006-10-13 20:34:03.000000000 -0700
    879 +++ linux-mips-2.6.18.1/arch/mips/kernel/proc.c 2006-10-17 06:23:28.000000000 -0700
     956diff -Naur linux-2.6.18.2/arch/mips/kernel/proc.c linux-mips-2.6.18.2/arch/mips/kernel/proc.c
     957--- linux-2.6.18.2/arch/mips/kernel/proc.c      2006-11-03 17:33:58.000000000 -0800
     958+++ linux-mips-2.6.18.2/arch/mips/kernel/proc.c 2006-11-04 14:51:12.000000000 -0800
    880959@@ -89,9 +89,9 @@
    881960 
    … …  
    912991                      cpu_has_divec ? "yes" : "no");
    913992        seq_printf(m, "hardware watchpoint\t: %s\n",
    914 diff -Naur linux-2.6.18.1/arch/mips/kernel/process.c linux-mips-2.6.18.1/arch/mips/kernel/process.c
    915 --- linux-2.6.18.1/arch/mips/kernel/process.c   2006-10-13 20:34:03.000000000 -0700
    916 +++ linux-mips-2.6.18.1/arch/mips/kernel/process.c      2006-10-17 06:23:28.000000000 -0700
     993diff -Naur linux-2.6.18.2/arch/mips/kernel/process.c linux-mips-2.6.18.2/arch/mips/kernel/process.c
     994--- linux-2.6.18.2/arch/mips/kernel/process.c   2006-11-03 17:33:58.000000000 -0800
     995+++ linux-mips-2.6.18.2/arch/mips/kernel/process.c      2006-11-04 14:51:12.000000000 -0800
    917996@@ -114,7 +114,7 @@
    918997        status |= KU_USER;
    … …  
    11091188+}
    11101189+#endif
    1111 diff -Naur linux-2.6.18.1/arch/mips/kernel/ptrace.c linux-mips-2.6.18.1/arch/mips/kernel/ptrace.c
    1112 --- linux-2.6.18.1/arch/mips/kernel/ptrace.c    2006-10-13 20:34:03.000000000 -0700
    1113 +++ linux-mips-2.6.18.1/arch/mips/kernel/ptrace.c       2006-10-17 06:23:28.000000000 -0700
     1190diff -Naur linux-2.6.18.2/arch/mips/kernel/ptrace.c linux-mips-2.6.18.2/arch/mips/kernel/ptrace.c
     1191--- linux-2.6.18.2/arch/mips/kernel/ptrace.c    2006-11-03 17:33:58.000000000 -0800
     1192+++ linux-mips-2.6.18.2/arch/mips/kernel/ptrace.c       2006-11-04 14:51:12.000000000 -0800
    11141193@@ -20,12 +20,12 @@
    11151194 #include <linux/mm.h>
    … …  
    12201299+                                   regs->regs[6], regs->regs[7]);
    12211300 }
    1222 diff -Naur linux-2.6.18.1/arch/mips/kernel/ptrace32.c linux-mips-2.6.18.1/arch/mips/kernel/ptrace32.c
    1223 --- linux-2.6.18.1/arch/mips/kernel/ptrace32.c  2006-10-13 20:34:03.000000000 -0700
    1224 +++ linux-mips-2.6.18.1/arch/mips/kernel/ptrace32.c     2006-10-17 06:23:28.000000000 -0700
     1301diff -Naur linux-2.6.18.2/arch/mips/kernel/ptrace32.c linux-mips-2.6.18.2/arch/mips/kernel/ptrace32.c
     1302--- linux-2.6.18.2/arch/mips/kernel/ptrace32.c  2006-11-03 17:33:58.000000000 -0800
     1303+++ linux-mips-2.6.18.2/arch/mips/kernel/ptrace32.c     2006-11-04 14:51:12.000000000 -0800
    12251304@@ -175,7 +175,9 @@
    12261305                        unsigned int mtflags;
    … …  
    12411320                                unsigned int vpflags = dvpe();
    12421321                                flags = read_c0_status();
    1243 diff -Naur linux-2.6.18.1/arch/mips/kernel/scall32-o32.S linux-mips-2.6.18.1/arch/mips/kernel/scall32-o32.S
    1244 --- linux-2.6.18.1/arch/mips/kernel/scall32-o32.S       2006-10-13 20:34:03.000000000 -0700
    1245 +++ linux-mips-2.6.18.1/arch/mips/kernel/scall32-o32.S  2006-10-17 06:23:28.000000000 -0700
     1322diff -Naur linux-2.6.18.2/arch/mips/kernel/r4k_switch.S linux-mips-2.6.18.2/arch/mips/kernel/r4k_switch.S
     1323--- linux-2.6.18.2/arch/mips/kernel/r4k_switch.S        2006-11-03 17:33:58.000000000 -0800
     1324+++ linux-mips-2.6.18.2/arch/mips/kernel/r4k_switch.S   2006-11-04 14:51:12.000000000 -0800
     1325@@ -85,7 +85,12 @@
     1326        move    $28, a2
     1327        cpu_restore_nonscratch a1
     1328 
     1329+#if (_THREAD_SIZE - 32) < 0x10000
     1330        PTR_ADDIU       t0, $28, _THREAD_SIZE - 32
     1331+#else
     1332+       PTR_LI          t0, _THREAD_SIZE - 32
     1333+       PTR_ADDU        t0, $28
     1334+#endif
     1335        set_saved_sp    t0, t1, t2
     1336 #ifdef CONFIG_MIPS_MT_SMTC
     1337        /* Read-modify-writes of Status must be atomic on a VPE */
     1338diff -Naur linux-2.6.18.2/arch/mips/kernel/scall32-o32.S linux-mips-2.6.18.2/arch/mips/kernel/scall32-o32.S
     1339--- linux-2.6.18.2/arch/mips/kernel/scall32-o32.S       2006-11-03 17:33:58.000000000 -0800
     1340+++ linux-mips-2.6.18.2/arch/mips/kernel/scall32-o32.S  2006-11-04 14:51:12.000000000 -0800
    12461341@@ -662,6 +662,8 @@
    12471342        sys     sys_tee                 4
    … …  
    12531348 
    12541349        /* We pre-compute the number of _instruction_ bytes needed to
    1255 diff -Naur linux-2.6.18.1/arch/mips/kernel/scall64-64.S linux-mips-2.6.18.1/arch/mips/kernel/scall64-64.S
    1256 --- linux-2.6.18.1/arch/mips/kernel/scall64-64.S        2006-10-13 20:34:03.000000000 -0700
    1257 +++ linux-mips-2.6.18.1/arch/mips/kernel/scall64-64.S   2006-10-17 06:23:28.000000000 -0700
     1350diff -Naur linux-2.6.18.2/arch/mips/kernel/scall64-64.S linux-mips-2.6.18.2/arch/mips/kernel/scall64-64.S
     1351--- linux-2.6.18.2/arch/mips/kernel/scall64-64.S        2006-11-03 17:33:58.000000000 -0800
     1352+++ linux-mips-2.6.18.2/arch/mips/kernel/scall64-64.S   2006-11-04 14:51:12.000000000 -0800
    12581353@@ -466,3 +466,5 @@
    12591354        PTR     sys_tee                         /* 5265 */
    … …  
    12621357+       PTR     sys_set_robust_list
    12631358+       PTR     sys_get_robust_list
    1264 diff -Naur linux-2.6.18.1/arch/mips/kernel/scall64-n32.S linux-mips-2.6.18.1/arch/mips/kernel/scall64-n32.S
    1265 --- linux-2.6.18.1/arch/mips/kernel/scall64-n32.S       2006-10-13 20:34:03.000000000 -0700
    1266 +++ linux-mips-2.6.18.1/arch/mips/kernel/scall64-n32.S  2006-10-17 06:23:28.000000000 -0700
     1359diff -Naur linux-2.6.18.2/arch/mips/kernel/scall64-n32.S linux-mips-2.6.18.2/arch/mips/kernel/scall64-n32.S
     1360--- linux-2.6.18.2/arch/mips/kernel/scall64-n32.S       2006-11-03 17:33:58.000000000 -0800
     1361+++ linux-mips-2.6.18.2/arch/mips/kernel/scall64-n32.S  2006-11-04 14:51:12.000000000 -0800
    12671362@@ -247,7 +247,7 @@
    12681363        PTR     sys_capset
    … …  
    12921387+       PTR     compat_sys_set_robust_list
    12931388+       PTR     compat_sys_get_robust_list
    1294 diff -Naur linux-2.6.18.1/arch/mips/kernel/scall64-o32.S linux-mips-2.6.18.1/arch/mips/kernel/scall64-o32.S
    1295 --- linux-2.6.18.1/arch/mips/kernel/scall64-o32.S       2006-10-13 20:34:03.000000000 -0700
    1296 +++ linux-mips-2.6.18.1/arch/mips/kernel/scall64-o32.S  2006-10-17 06:23:28.000000000 -0700
     1389diff -Naur linux-2.6.18.2/arch/mips/kernel/scall64-o32.S linux-mips-2.6.18.2/arch/mips/kernel/scall64-o32.S
     1390--- linux-2.6.18.2/arch/mips/kernel/scall64-o32.S       2006-11-03 17:33:58.000000000 -0800
     1391+++ linux-mips-2.6.18.2/arch/mips/kernel/scall64-o32.S  2006-11-04 14:51:12.000000000 -0800
    12971392@@ -226,7 +226,7 @@
    12981393        PTR     sys_ni_syscall                  /* was sys_stat */
    … …  
    13201415+       PTR     compat_sys_get_robust_list      /* 4310 */
    13211416        .size   sys_call_table,.-sys_call_table
    1322 diff -Naur linux-2.6.18.1/arch/mips/kernel/signal.c linux-mips-2.6.18.1/arch/mips/kernel/signal.c
    1323 --- linux-2.6.18.1/arch/mips/kernel/signal.c    2006-10-13 20:34:03.000000000 -0700
    1324 +++ linux-mips-2.6.18.1/arch/mips/kernel/signal.c       2006-10-17 06:23:28.000000000 -0700
     1417diff -Naur linux-2.6.18.2/arch/mips/kernel/signal.c linux-mips-2.6.18.2/arch/mips/kernel/signal.c
     1418--- linux-2.6.18.2/arch/mips/kernel/signal.c    2006-11-03 17:33:58.000000000 -0800
     1419+++ linux-mips-2.6.18.2/arch/mips/kernel/signal.c       2006-11-04 14:51:12.000000000 -0800
    13251420@@ -424,15 +424,11 @@
    13261421        if (!user_mode(regs))
    … …  
    13591454 
    13601455        /*
    1361 diff -Naur linux-2.6.18.1/arch/mips/kernel/signal32.c linux-mips-2.6.18.1/arch/mips/kernel/signal32.c
    1362 --- linux-2.6.18.1/arch/mips/kernel/signal32.c  2006-10-13 20:34:03.000000000 -0700
    1363 +++ linux-mips-2.6.18.1/arch/mips/kernel/signal32.c     2006-10-17 06:23:28.000000000 -0700
     1456diff -Naur linux-2.6.18.2/arch/mips/kernel/signal32.c linux-mips-2.6.18.2/arch/mips/kernel/signal32.c
     1457--- linux-2.6.18.2/arch/mips/kernel/signal32.c  2006-11-03 17:33:58.000000000 -0800
     1458+++ linux-mips-2.6.18.2/arch/mips/kernel/signal32.c     2006-11-04 14:51:12.000000000 -0800
    13641459@@ -815,9 +815,6 @@
    13651460        if (!user_mode(regs))
    … …  
    13921487 
    13931488        /*
    1394 diff -Naur linux-2.6.18.1/arch/mips/kernel/smp-mt.c linux-mips-2.6.18.1/arch/mips/kernel/smp-mt.c
    1395 --- linux-2.6.18.1/arch/mips/kernel/smp-mt.c    2006-10-13 20:34:03.000000000 -0700
    1396 +++ linux-mips-2.6.18.1/arch/mips/kernel/smp-mt.c       2006-10-17 06:23:28.000000000 -0700
     1489diff -Naur linux-2.6.18.2/arch/mips/kernel/smp-mt.c linux-mips-2.6.18.2/arch/mips/kernel/smp-mt.c
     1490--- linux-2.6.18.2/arch/mips/kernel/smp-mt.c    2006-11-03 17:33:58.000000000 -0800
     1491+++ linux-mips-2.6.18.2/arch/mips/kernel/smp-mt.c       2006-11-04 14:51:12.000000000 -0800
    13971492@@ -203,7 +203,7 @@
    13981493                                write_vpe_c0_config( read_c0_config());
    … …  
    14041499                                /* Propagate Config7 */
    14051500                                write_vpe_c0_config7(read_c0_config7());
    1406 diff -Naur linux-2.6.18.1/arch/mips/kernel/smp.c linux-mips-2.6.18.1/arch/mips/kernel/smp.c
    1407 --- linux-2.6.18.1/arch/mips/kernel/smp.c       2006-10-13 20:34:03.000000000 -0700
    1408 +++ linux-mips-2.6.18.1/arch/mips/kernel/smp.c  2006-10-17 06:23:28.000000000 -0700
     1501diff -Naur linux-2.6.18.2/arch/mips/kernel/smp.c linux-mips-2.6.18.2/arch/mips/kernel/smp.c
     1502--- linux-2.6.18.2/arch/mips/kernel/smp.c       2006-11-03 17:33:58.000000000 -0800
     1503+++ linux-mips-2.6.18.2/arch/mips/kernel/smp.c  2006-11-04 14:51:12.000000000 -0800
    14091504@@ -467,14 +467,18 @@
    14101505 
    … …  
    14311526 
    14321527        return 0;
    1433 diff -Naur linux-2.6.18.1/arch/mips/kernel/smtc-asm.S linux-mips-2.6.18.1/arch/mips/kernel/smtc-asm.S
    1434 --- linux-2.6.18.1/arch/mips/kernel/smtc-asm.S  2006-10-13 20:34:03.000000000 -0700
    1435 +++ linux-mips-2.6.18.1/arch/mips/kernel/smtc-asm.S     2006-10-17 06:23:28.000000000 -0700
     1528diff -Naur linux-2.6.18.2/arch/mips/kernel/smtc-asm.S linux-mips-2.6.18.2/arch/mips/kernel/smtc-asm.S
     1529--- linux-2.6.18.2/arch/mips/kernel/smtc-asm.S  2006-11-03 17:33:58.000000000 -0800
     1530+++ linux-mips-2.6.18.2/arch/mips/kernel/smtc-asm.S     2006-11-04 14:51:12.000000000 -0800
    14361531@@ -8,7 +8,7 @@
    14371532 #include <asm/regdef.h>
    … …  
    14431538 /*
    14441539  * "Software Interrupt" linkage.
    1445 diff -Naur linux-2.6.18.1/arch/mips/kernel/syscall.c linux-mips-2.6.18.1/arch/mips/kernel/syscall.c
    1446 --- linux-2.6.18.1/arch/mips/kernel/syscall.c   2006-10-13 20:34:03.000000000 -0700
    1447 +++ linux-mips-2.6.18.1/arch/mips/kernel/syscall.c      2006-10-17 06:23:28.000000000 -0700
     1540diff -Naur linux-2.6.18.2/arch/mips/kernel/syscall.c linux-mips-2.6.18.2/arch/mips/kernel/syscall.c
     1541--- linux-2.6.18.2/arch/mips/kernel/syscall.c   2006-11-03 17:33:58.000000000 -0800
     1542+++ linux-mips-2.6.18.2/arch/mips/kernel/syscall.c      2006-11-04 14:51:12.000000000 -0800
    14481543@@ -263,7 +263,7 @@
    14491544        return error;
    … …  
    14641559 
    14651560 asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
    1466 diff -Naur linux-2.6.18.1/arch/mips/kernel/traps.c linux-mips-2.6.18.1/arch/mips/kernel/traps.c
    1467 --- linux-2.6.18.1/arch/mips/kernel/traps.c     2006-10-13 20:34:03.000000000 -0700
    1468 +++ linux-mips-2.6.18.1/arch/mips/kernel/traps.c        2006-10-17 06:23:28.000000000 -0700
     1561diff -Naur linux-2.6.18.2/arch/mips/kernel/traps.c linux-mips-2.6.18.2/arch/mips/kernel/traps.c
     1562--- linux-2.6.18.2/arch/mips/kernel/traps.c     2006-11-03 17:33:58.000000000 -0800
     1563+++ linux-mips-2.6.18.2/arch/mips/kernel/traps.c        2006-11-04 14:51:12.000000000 -0800
    14691564@@ -20,6 +20,7 @@
    14701565 #include <linux/spinlock.h>
    … …  
    17081803                                force_sig(sig, current);
    17091804 #ifdef CONFIG_MIPS_MT_FPAFF
    1710 diff -Naur linux-2.6.18.1/arch/mips/kernel/vpe.c linux-mips-2.6.18.1/arch/mips/kernel/vpe.c
    1711 --- linux-2.6.18.1/arch/mips/kernel/vpe.c       2006-10-13 20:34:03.000000000 -0700
    1712 +++ linux-mips-2.6.18.1/arch/mips/kernel/vpe.c  2006-10-17 06:23:28.000000000 -0700
     1805diff -Naur linux-2.6.18.2/arch/mips/kernel/vmlinux.lds.S linux-mips-2.6.18.2/arch/mips/kernel/vmlinux.lds.S
     1806--- linux-2.6.18.2/arch/mips/kernel/vmlinux.lds.S       2006-11-03 17:33:58.000000000 -0800
     1807+++ linux-mips-2.6.18.2/arch/mips/kernel/vmlinux.lds.S  2006-11-04 14:51:12.000000000 -0800
     1808@@ -50,6 +50,16 @@
     1809   /* writeable */
     1810   .data : {                    /* Data */
     1811     . = . + DATAOFFSET;                /* for CONFIG_MAPPED_KERNEL */
     1812+    /*
     1813+     * This ALIGN is needed as a workaround for a bug a gcc bug upto 4.1 which
     1814+     * limits the maximum alignment to at most 32kB and results in the following
     1815+     * warning:
     1816+     *
     1817+     *  CC      arch/mips/kernel/init_task.o
     1818+     * arch/mips/kernel/init_task.c:30: warning: alignment of ‘init_thread_union’
     1819+     * is greater than maximum object file alignment.  Using 32768
     1820+     */
     1821+    . = ALIGN(_PAGE_SIZE);
     1822     *(.data.init_task)
     1823 
     1824     *(.data)
     1825diff -Naur linux-2.6.18.2/arch/mips/kernel/vpe.c linux-mips-2.6.18.2/arch/mips/kernel/vpe.c
     1826--- linux-2.6.18.2/arch/mips/kernel/vpe.c       2006-11-03 17:33:58.000000000 -0800
     1827+++ linux-mips-2.6.18.2/arch/mips/kernel/vpe.c  2006-11-04 14:51:12.000000000 -0800
    17131828@@ -768,10 +768,16 @@
    17141829         */
    … …  
    17281843         write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_VPA);
    17291844 
    1730 diff -Naur linux-2.6.18.1/arch/mips/lib/Makefile linux-mips-2.6.18.1/arch/mips/lib/Makefile
    1731 --- linux-2.6.18.1/arch/mips/lib/Makefile       2006-10-13 20:34:03.000000000 -0700
    1732 +++ linux-mips-2.6.18.1/arch/mips/lib/Makefile  2006-10-17 06:23:28.000000000 -0700
     1845diff -Naur linux-2.6.18.2/arch/mips/lib/Makefile linux-mips-2.6.18.2/arch/mips/lib/Makefile
     1846--- linux-2.6.18.2/arch/mips/lib/Makefile       2006-11-03 17:33:58.000000000 -0800
     1847+++ linux-mips-2.6.18.2/arch/mips/lib/Makefile  2006-11-04 14:51:12.000000000 -0800
    17331848@@ -5,8 +5,6 @@
    17341849 lib-y  += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
    … …  
    17401855 lib-y += ashldi3.o ashrdi3.o lshrdi3.o
    17411856 
    1742 diff -Naur linux-2.6.18.1/arch/mips/lib/iomap.c linux-mips-2.6.18.1/arch/mips/lib/iomap.c
    1743 --- linux-2.6.18.1/arch/mips/lib/iomap.c        2006-10-13 20:34:03.000000000 -0700
    1744 +++ linux-mips-2.6.18.1/arch/mips/lib/iomap.c   1969-12-31 16:00:00.000000000 -0800
     1857diff -Naur linux-2.6.18.2/arch/mips/lib/iomap.c linux-mips-2.6.18.2/arch/mips/lib/iomap.c
     1858--- linux-2.6.18.2/arch/mips/lib/iomap.c        2006-11-03 17:33:58.000000000 -0800
     1859+++ linux-mips-2.6.18.2/arch/mips/lib/iomap.c   1969-12-31 16:00:00.000000000 -0800
    17451860@@ -1,78 +0,0 @@
    17461861-/*
    … …  
    18221937-EXPORT_SYMBOL(pci_iomap);
    18231938-EXPORT_SYMBOL(pci_iounmap);
    1824 diff -Naur linux-2.6.18.1/arch/mips/lib-32/dump_tlb.c linux-mips-2.6.18.1/arch/mips/lib-32/dump_tlb.c
    1825 --- linux-2.6.18.1/arch/mips/lib-32/dump_tlb.c  2006-10-13 20:34:03.000000000 -0700
    1826 +++ linux-mips-2.6.18.1/arch/mips/lib-32/dump_tlb.c     2006-10-17 06:23:28.000000000 -0700
     1939diff -Naur linux-2.6.18.2/arch/mips/lib-32/dump_tlb.c linux-mips-2.6.18.2/arch/mips/lib-32/dump_tlb.c
     1940--- linux-2.6.18.2/arch/mips/lib-32/dump_tlb.c  2006-11-03 17:33:58.000000000 -0800
     1941+++ linux-mips-2.6.18.2/arch/mips/lib-32/dump_tlb.c     2006-11-04 14:51:12.000000000 -0800
    18271942@@ -40,8 +40,6 @@
    18281943                return "256Mb";
    … …  
    18341949 
    18351950 #define BARRIER()                                      \
    1836 diff -Naur linux-2.6.18.1/arch/mips/lib-64/dump_tlb.c linux-mips-2.6.18.1/arch/mips/lib-64/dump_tlb.c
    1837 --- linux-2.6.18.1/arch/mips/lib-64/dump_tlb.c  2006-10-13 20:34:03.000000000 -0700
    1838 +++ linux-mips-2.6.18.1/arch/mips/lib-64/dump_tlb.c     2006-10-17 06:23:28.000000000 -0700
     1951diff -Naur linux-2.6.18.2/arch/mips/lib-64/dump_tlb.c linux-mips-2.6.18.2/arch/mips/lib-64/dump_tlb.c
     1952--- linux-2.6.18.2/arch/mips/lib-64/dump_tlb.c  2006-11-03 17:33:58.000000000 -0800
     1953+++ linux-mips-2.6.18.2/arch/mips/lib-64/dump_tlb.c     2006-11-04 14:51:12.000000000 -0800
    18391954@@ -31,8 +31,6 @@
    18401955        case PM_256M:   return "256Mb";
    … …  
    18461961 
    18471962 #define BARRIER()                                      \
    1848 diff -Naur linux-2.6.18.1/arch/mips/math-emu/cp1emu.c linux-mips-2.6.18.1/arch/mips/math-emu/cp1emu.c
    1849 --- linux-2.6.18.1/arch/mips/math-emu/cp1emu.c  2006-10-13 20:34:03.000000000 -0700
    1850 +++ linux-mips-2.6.18.1/arch/mips/math-emu/cp1emu.c     2006-10-17 06:23:28.000000000 -0700
     1963@@ -149,7 +147,7 @@
     1964        printk("Addr                 == %08lx\n", addr);
     1965        printk("tasks->mm.pgd        == %08lx\n", (unsigned long) t->mm->pgd);
     1966 
     1967-       page_dir = pgd_offset(t->mm, 0);
     1968+       page_dir = pgd_offset(t->mm, 0UL);
     1969        printk("page_dir == %016lx\n", (unsigned long) page_dir);
     1970 
     1971        pgd = pgd_offset(t->mm, addr);
     1972@@ -184,13 +182,13 @@
     1973        dump_list_process(current, address);
     1974 }
     1975 
     1976-unsigned int vtop(void *address)
     1977+unsigned long vtop(void *address)
     1978 {
     1979        pgd_t   *pgd;
     1980        pud_t   *pud;
     1981        pmd_t   *pmd;
     1982        pte_t   *pte;
     1983-       unsigned int addr, paddr;
     1984+       unsigned long addr, paddr;
     1985 
     1986        addr = (unsigned long) address;
     1987        pgd = pgd_offset(current->mm, addr);
     1988diff -Naur linux-2.6.18.2/arch/mips/math-emu/cp1emu.c linux-mips-2.6.18.2/arch/mips/math-emu/cp1emu.c
     1989--- linux-2.6.18.2/arch/mips/math-emu/cp1emu.c  2006-11-03 17:33:58.000000000 -0800
     1990+++ linux-mips-2.6.18.2/arch/mips/math-emu/cp1emu.c     2006-11-04 14:51:12.000000000 -0800
    18511991@@ -38,8 +38,6 @@
    18521992 
    … …  
    18772017                if (sig)
    18782018                        break;
    1879 diff -Naur linux-2.6.18.1/arch/mips/mips-boards/atlas/atlas_int.c linux-mips-2.6.18.1/arch/mips/mips-boards/atlas/atlas_int.c
    1880 --- linux-2.6.18.1/arch/mips/mips-boards/atlas/atlas_int.c      2006-10-13 20:34:03.000000000 -0700
    1881 +++ linux-mips-2.6.18.1/arch/mips/mips-boards/atlas/atlas_int.c 2006-10-17 06:23:28.000000000 -0700
     2019diff -Naur linux-2.6.18.2/arch/mips/mips-boards/atlas/atlas_int.c linux-mips-2.6.18.2/arch/mips/mips-boards/atlas/atlas_int.c
     2020--- linux-2.6.18.2/arch/mips/mips-boards/atlas/atlas_int.c      2006-11-03 17:33:58.000000000 -0800
     2021+++ linux-mips-2.6.18.2/arch/mips/mips-boards/atlas/atlas_int.c 2006-11-04 14:51:12.000000000 -0800
    18822022@@ -1,6 +1,8 @@
    18832023 /*
    … …  
    20662206+               setup_irq(MIPSCPU_INT_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
    20672207+}
    2068 diff -Naur linux-2.6.18.1/arch/mips/mips-boards/atlas/atlas_setup.c linux-mips-2.6.18.1/arch/mips/mips-boards/atlas/atlas_setup.c
    2069 --- linux-2.6.18.1/arch/mips/mips-boards/atlas/atlas_setup.c    2006-10-13 20:34:03.000000000 -0700
    2070 +++ linux-mips-2.6.18.1/arch/mips/mips-boards/atlas/atlas_setup.c       2006-10-17 06:23:28.000000000 -0700
     2208diff -Naur linux-2.6.18.2/arch/mips/mips-boards/atlas/atlas_setup.c linux-mips-2.6.18.2/arch/mips/mips-boards/atlas/atlas_setup.c
     2209--- linux-2.6.18.2/arch/mips/mips-boards/atlas/atlas_setup.c    2006-11-03 17:33:58.000000000 -0800
     2210+++ linux-mips-2.6.18.2/arch/mips/mips-boards/atlas/atlas_setup.c       2006-11-04 14:51:12.000000000 -0800
    20712211@@ -77,7 +77,7 @@
    20722212 #else
    … …  
    20782218        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
    20792219        s.iotype = UPIO_PORT;
    2080 diff -Naur linux-2.6.18.1/arch/mips/mips-boards/generic/time.c linux-mips-2.6.18.1/arch/mips/mips-boards/generic/time.c
    2081 --- linux-2.6.18.1/arch/mips/mips-boards/generic/time.c 2006-10-13 20:34:03.000000000 -0700
    2082 +++ linux-mips-2.6.18.1/arch/mips/mips-boards/generic/time.c    2006-10-17 06:23:28.000000000 -0700
     2220diff -Naur linux-2.6.18.2/arch/mips/mips-boards/generic/memory.c linux-mips-2.6.18.2/arch/mips/mips-boards/generic/memory.c
     2221--- linux-2.6.18.2/arch/mips/mips-boards/generic/memory.c       2006-11-03 17:33:58.000000000 -0800
     2222+++ linux-mips-2.6.18.2/arch/mips/mips-boards/generic/memory.c  2006-11-04 14:51:12.000000000 -0800
     2223@@ -176,7 +176,7 @@
     2224                if (boot_mem_map.map[i].type != BOOT_MEM_ROM_DATA)
     2225                        continue;
     2226 
     2227-               addr = boot_mem_map.map[i].addr;
     2228+               addr = PAGE_ALIGN(boot_mem_map.map[i].addr);
     2229                while (addr < boot_mem_map.map[i].addr
     2230                              + boot_mem_map.map[i].size) {
     2231                        ClearPageReserved(virt_to_page(__va(addr)));
     2232diff -Naur linux-2.6.18.2/arch/mips/mips-boards/generic/time.c linux-mips-2.6.18.2/arch/mips/mips-boards/generic/time.c
     2233--- linux-2.6.18.2/arch/mips/mips-boards/generic/time.c 2006-11-03 17:33:58.000000000 -0800
     2234+++ linux-mips-2.6.18.2/arch/mips/mips-boards/generic/time.c    2006-11-04 14:51:12.000000000 -0800
    20832235@@ -41,8 +41,13 @@
    20842236 
    … …  
    21722324                /*
    21732325                 * CPU 0 handles the global timer interrupt job and process
    2174 @@ -161,9 +182,8 @@
     2326@@ -161,14 +182,13 @@
    21752327                 */
    21762328                local_timer_interrupt(irq, dev_id, regs);
    … …  
    21832335 }
    21842336 
    2185 diff -Naur linux-2.6.18.1/arch/mips/mips-boards/malta/malta_int.c linux-mips-2.6.18.1/arch/mips/mips-boards/malta/malta_int.c
    2186 --- linux-2.6.18.1/arch/mips/mips-boards/malta/malta_int.c      2006-10-13 20:34:03.000000000 -0700
    2187 +++ linux-mips-2.6.18.1/arch/mips/mips-boards/malta/malta_int.c 2006-10-17 06:23:28.000000000 -0700
     2337 /*
     2338- * Estimate CPU frequency.  Sets mips_counter_frequency as a side-effect
     2339+ * Estimate CPU frequency.  Sets mips_hpt_frequency as a side-effect
     2340  */
     2341 static unsigned int __init estimate_cpu_frequency(void)
     2342 {
     2343diff -Naur linux-2.6.18.2/arch/mips/mips-boards/malta/malta_int.c linux-mips-2.6.18.2/arch/mips/mips-boards/malta/malta_int.c
     2344--- linux-2.6.18.2/arch/mips/mips-boards/malta/malta_int.c      2006-11-03 17:33:58.000000000 -0800
     2345+++ linux-mips-2.6.18.2/arch/mips/mips-boards/malta/malta_int.c 2006-11-04 14:51:12.000000000 -0800
    21882346@@ -208,23 +208,23 @@
    21892347        unsigned int a0 = 7;
    … …  
    22162374        return a0;
    22172375 #endif
    2218 diff -Naur linux-2.6.18.1/arch/mips/mm/c-r3k.c linux-mips-2.6.18.1/arch/mips/mm/c-r3k.c
    2219 --- linux-2.6.18.1/arch/mips/mm/c-r3k.c 2006-10-13 20:34:03.000000000 -0700
    2220 +++ linux-mips-2.6.18.1/arch/mips/mm/c-r3k.c    2006-10-17 06:23:28.000000000 -0700
     2376diff -Naur linux-2.6.18.2/arch/mips/mips-boards/sim/sim_time.c linux-mips-2.6.18.2/arch/mips/mips-boards/sim/sim_time.c
     2377--- linux-2.6.18.2/arch/mips/mips-boards/sim/sim_time.c 2006-11-03 17:33:58.000000000 -0800
     2378+++ linux-mips-2.6.18.2/arch/mips/mips-boards/sim/sim_time.c    2006-11-04 14:51:12.000000000 -0800
     2379@@ -103,7 +103,7 @@
     2380 
     2381 
     2382 /*
     2383- * Estimate CPU frequency.  Sets mips_counter_frequency as a side-effect
     2384+ * Estimate CPU frequency.  Sets mips_hpt_frequency as a side-effect
     2385  */
     2386 static unsigned int __init estimate_cpu_frequency(void)
     2387 {
     2388diff -Naur linux-2.6.18.2/arch/mips/mm/c-r3k.c linux-mips-2.6.18.2/arch/mips/mm/c-r3k.c
     2389--- linux-2.6.18.2/arch/mips/mm/c-r3k.c 2006-11-03 17:33:58.000000000 -0800
     2390+++ linux-mips-2.6.18.2/arch/mips/mm/c-r3k.c    2006-11-04 14:51:12.000000000 -0800
    22212391@@ -335,7 +335,7 @@
    22222392        flush_cache_mm = r3k_flush_cache_mm;
    … …  
    22282398 
    22292399        flush_cache_sigtramp = r3k_flush_cache_sigtramp;
    2230 diff -Naur linux-2.6.18.1/arch/mips/mm/c-r4k.c linux-mips-2.6.18.1/arch/mips/mm/c-r4k.c
    2231 --- linux-2.6.18.1/arch/mips/mm/c-r4k.c 2006-10-13 20:34:03.000000000 -0700
    2232 +++ linux-mips-2.6.18.1/arch/mips/mm/c-r4k.c    2006-10-17 06:23:28.000000000 -0700
     2400diff -Naur linux-2.6.18.2/arch/mips/mm/c-r4k.c linux-mips-2.6.18.2/arch/mips/mm/c-r4k.c
     2401--- linux-2.6.18.2/arch/mips/mm/c-r4k.c 2006-11-03 17:33:58.000000000 -0800
     2402+++ linux-mips-2.6.18.2/arch/mips/mm/c-r4k.c    2006-11-04 14:51:12.000000000 -0800
    22332403@@ -475,7 +475,7 @@
    22342404                }
    … …  
    22672437 
    22682438        flush_cache_sigtramp    = r4k_flush_cache_sigtramp;
    2269 diff -Naur linux-2.6.18.1/arch/mips/mm/c-sb1.c linux-mips-2.6.18.1/arch/mips/mm/c-sb1.c
    2270 --- linux-2.6.18.1/arch/mips/mm/c-sb1.c 2006-10-13 20:34:03.000000000 -0700
    2271 +++ linux-mips-2.6.18.1/arch/mips/mm/c-sb1.c    2006-10-17 06:23:28.000000000 -0700
     2439diff -Naur linux-2.6.18.2/arch/mips/mm/c-sb1.c linux-mips-2.6.18.2/arch/mips/mm/c-sb1.c
     2440--- linux-2.6.18.2/arch/mips/mm/c-sb1.c 2006-11-03 17:33:58.000000000 -0800
     2441+++ linux-mips-2.6.18.2/arch/mips/mm/c-sb1.c    2006-11-04 14:51:12.000000000 -0800
    22722442@@ -155,6 +155,26 @@
    22732443 }
    … …  
    23632533 
    23642534        /* This implies an Icache flush too, so can't be nop'ed */
    2365 diff -Naur linux-2.6.18.1/arch/mips/mm/c-tx39.c linux-mips-2.6.18.1/arch/mips/mm/c-tx39.c
    2366 --- linux-2.6.18.1/arch/mips/mm/c-tx39.c        2006-10-13 20:34:03.000000000 -0700
    2367 +++ linux-mips-2.6.18.1/arch/mips/mm/c-tx39.c   2006-10-17 06:23:28.000000000 -0700
     2535diff -Naur linux-2.6.18.2/arch/mips/mm/c-tx39.c linux-mips-2.6.18.2/arch/mips/mm/c-tx39.c
     2536--- linux-2.6.18.2/arch/mips/mm/c-tx39.c        2006-11-03 17:33:58.000000000 -0800
     2537+++ linux-mips-2.6.18.2/arch/mips/mm/c-tx39.c   2006-11-04 14:51:12.000000000 -0800
    23682538@@ -382,7 +382,7 @@
    23692539                flush_cache_mm          = (void *) tx39h_flush_icache_all;
    … …  
    23842554 
    23852555                flush_cache_sigtramp = tx39_flush_cache_sigtramp;
    2386 diff -Naur linux-2.6.18.1/arch/mips/mm/cache.c linux-mips-2.6.18.1/arch/mips/mm/cache.c
    2387 --- linux-2.6.18.1/arch/mips/mm/cache.c 2006-10-13 20:34:03.000000000 -0700
    2388 +++ linux-mips-2.6.18.1/arch/mips/mm/cache.c    2006-10-17 06:23:28.000000000 -0700
     2556diff -Naur linux-2.6.18.2/arch/mips/mm/cache.c linux-mips-2.6.18.2/arch/mips/mm/cache.c
     2557--- linux-2.6.18.2/arch/mips/mm/cache.c 2006-11-03 17:33:58.000000000 -0800
     2558+++ linux-mips-2.6.18.2/arch/mips/mm/cache.c    2006-11-04 14:51:12.000000000 -0800
    23892559@@ -25,7 +25,7 @@
    23902560 void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
    … …  
    24292599        }
    24302600 }
    2431 diff -Naur linux-2.6.18.1/arch/mips/mm/fault.c linux-mips-2.6.18.1/arch/mips/mm/fault.c
    2432 --- linux-2.6.18.1/arch/mips/mm/fault.c 2006-10-13 20:34:03.000000000 -0700
    2433 +++ linux-mips-2.6.18.1/arch/mips/mm/fault.c    2006-10-17 06:23:28.000000000 -0700
     2601diff -Naur linux-2.6.18.2/arch/mips/mm/fault.c linux-mips-2.6.18.2/arch/mips/mm/fault.c
     2602--- linux-2.6.18.2/arch/mips/mm/fault.c 2006-11-03 17:33:58.000000000 -0800
     2603+++ linux-mips-2.6.18.2/arch/mips/mm/fault.c    2006-11-04 14:51:12.000000000 -0800
    24342604@@ -89,7 +89,7 @@
    24352605                if (!(vma->vm_flags & VM_WRITE))
    … …  
    24412611        }
    24422612 
    2443 diff -Naur linux-2.6.18.1/arch/mips/mm/init.c linux-mips-2.6.18.1/arch/mips/mm/init.c
    2444 --- linux-2.6.18.1/arch/mips/mm/init.c  2006-10-13 20:34:03.000000000 -0700
    2445 +++ linux-mips-2.6.18.1/arch/mips/mm/init.c     2006-10-17 06:23:28.000000000 -0700
     2613diff -Naur linux-2.6.18.2/arch/mips/mm/init.c linux-mips-2.6.18.2/arch/mips/mm/init.c
     2614--- linux-2.6.18.2/arch/mips/mm/init.c  2006-11-03 17:33:58.000000000 -0800
     2615+++ linux-mips-2.6.18.2/arch/mips/mm/init.c     2006-11-04 14:51:12.000000000 -0800
    24462616@@ -30,11 +30,39 @@
    24472617 #include <asm/cachectl.h>
    … …  
    27142884        max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
    27152885        low = max_low_pfn;
    2716 diff -Naur linux-2.6.18.1/arch/mips/mm/pgtable-32.c linux-mips-2.6.18.1/arch/mips/mm/pgtable-32.c
    2717 --- linux-2.6.18.1/arch/mips/mm/pgtable-32.c    2006-10-13 20:34:03.000000000 -0700
    2718 +++ linux-mips-2.6.18.1/arch/mips/mm/pgtable-32.c       2006-10-17 06:23:28.000000000 -0700
     2886diff -Naur linux-2.6.18.2/arch/mips/mm/ioremap.c linux-mips-2.6.18.2/arch/mips/mm/ioremap.c
     2887--- linux-2.6.18.2/arch/mips/mm/ioremap.c       2006-11-03 17:33:58.000000000 -0800
     2888+++ linux-mips-2.6.18.2/arch/mips/mm/ioremap.c  2006-11-04 14:51:12.000000000 -0800
     2889@@ -176,7 +176,7 @@
     2890 
     2891 #define IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1)
     2892 
     2893-void __iounmap(volatile void __iomem *addr)
     2894+void __iounmap(const volatile void __iomem *addr)
     2895 {
     2896        struct vm_struct *p;
     2897 
     2898diff -Naur linux-2.6.18.2/arch/mips/mm/pg-r4k.c linux-mips-2.6.18.2/arch/mips/mm/pg-r4k.c
     2899--- linux-2.6.18.2/arch/mips/mm/pg-r4k.c        2006-11-03 17:33:58.000000000 -0800
     2900+++ linux-mips-2.6.18.2/arch/mips/mm/pg-r4k.c   2006-11-04 14:51:12.000000000 -0800
     2901@@ -270,6 +270,20 @@
     2902        emit_instruction(mi);
     2903 }
     2904 
     2905+static inline void build_addiu_a2(unsigned long offset)
     2906+{
     2907+       union mips_instruction mi;
     2908+
     2909+       BUG_ON(offset > 0x7fff);
     2910+
     2911+       mi.i_format.opcode     = cpu_has_64bit_gp_regs ? daddiu_op : addiu_op;
     2912+       mi.i_format.rs         = 6;             /* $a2 */
     2913+       mi.i_format.rt         = 6;             /* $a2 */
     2914+       mi.i_format.simmediate = offset;
     2915+
     2916+       emit_instruction(mi);
     2917+}
     2918+
     2919 static inline void build_addiu_a1(unsigned long offset)
     2920 {
     2921        union mips_instruction mi;
     2922@@ -333,6 +347,7 @@
     2923 void __init build_clear_page(void)
     2924 {
     2925        unsigned int loop_start;
     2926+       unsigned long off;
     2927 
     2928        epc = (unsigned int *) &clear_page_array;
     2929        instruction_pending = 0;
     2930@@ -369,7 +384,12 @@
     2931                }
     2932        }
     2933 
     2934-       build_addiu_a2_a0(PAGE_SIZE - (cpu_has_prefetch ? pref_offset_clear : 0));
     2935+        off = PAGE_SIZE - (cpu_has_prefetch ? pref_offset_clear : 0);
     2936+       if (off > 0x7fff) {
     2937+               build_addiu_a2_a0(off >> 1);
     2938+               build_addiu_a2(off >> 1);
     2939+       } else
     2940+               build_addiu_a2_a0(off);
     2941 
     2942        if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x())
     2943                build_insn_word(0x3c01a000);    /* lui     $at, 0xa000  */
     2944@@ -420,12 +440,18 @@
     2945 void __init build_copy_page(void)
     2946 {
     2947        unsigned int loop_start;
     2948+       unsigned long off;
     2949 
     2950        epc = (unsigned int *) &copy_page_array;
     2951        store_offset = load_offset = 0;
     2952        instruction_pending = 0;
     2953 
     2954-       build_addiu_a2_a0(PAGE_SIZE - (cpu_has_prefetch ? pref_offset_copy : 0));
     2955+       off = PAGE_SIZE - (cpu_has_prefetch ? pref_offset_copy : 0);
     2956+       if (off > 0x7fff) {
     2957+               build_addiu_a2_a0(off >> 1);
     2958+               build_addiu_a2(off >> 1);
     2959+       } else
     2960+               build_addiu_a2_a0(off);
     2961 
     2962        if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x())
     2963                build_insn_word(0x3c01a000);    /* lui     $at, 0xa000  */
     2964diff -Naur linux-2.6.18.2/arch/mips/mm/pgtable-32.c linux-mips-2.6.18.2/arch/mips/mm/pgtable-32.c
     2965--- linux-2.6.18.2/arch/mips/mm/pgtable-32.c    2006-11-03 17:33:58.000000000 -0800
     2966+++ linux-mips-2.6.18.2/arch/mips/mm/pgtable-32.c       2006-11-04 14:51:12.000000000 -0800
    27192967@@ -31,9 +31,10 @@
    27202968 
    … …  
    27462994         * Permanent kmaps:
    27472995         */
    2748 diff -Naur linux-2.6.18.1/arch/mips/mm/pgtable-64.c linux-mips-2.6.18.1/arch/mips/mm/pgtable-64.c
    2749 --- linux-2.6.18.1/arch/mips/mm/pgtable-64.c    2006-10-13 20:34:03.000000000 -0700
    2750 +++ linux-mips-2.6.18.1/arch/mips/mm/pgtable-64.c       2006-10-17 06:23:28.000000000 -0700
     2996diff -Naur linux-2.6.18.2/arch/mips/mm/pgtable-64.c linux-mips-2.6.18.2/arch/mips/mm/pgtable-64.c
     2997--- linux-2.6.18.2/arch/mips/mm/pgtable-64.c    2006-11-03 17:33:58.000000000 -0800
     2998+++ linux-mips-2.6.18.2/arch/mips/mm/pgtable-64.c       2006-11-04 14:51:12.000000000 -0800
    27512999@@ -8,6 +8,7 @@
    27523000  */
    … …  
    27753023+       fixrange_init(vaddr, 0, pgd_base);
    27763024 }
    2777 diff -Naur linux-2.6.18.1/arch/mips/pci/Makefile linux-mips-2.6.18.1/arch/mips/pci/Makefile
    2778 --- linux-2.6.18.1/arch/mips/pci/Makefile       2006-10-13 20:34:03.000000000 -0700
    2779 +++ linux-mips-2.6.18.1/arch/mips/pci/Makefile  2006-10-17 06:23:28.000000000 -0700
     3025diff -Naur linux-2.6.18.2/arch/mips/mm/tlbex.c linux-mips-2.6.18.2/arch/mips/mm/tlbex.c
     3026--- linux-2.6.18.2/arch/mips/mm/tlbex.c 2006-11-03 17:33:58.000000000 -0800
     3027+++ linux-mips-2.6.18.2/arch/mips/mm/tlbex.c    2006-11-04 14:51:12.000000000 -0800
     3028@@ -102,7 +102,7 @@
     3029        insn_addu, insn_addiu, insn_and, insn_andi, insn_beq,
     3030        insn_beql, insn_bgez, insn_bgezl, insn_bltz, insn_bltzl,
     3031        insn_bne, insn_daddu, insn_daddiu, insn_dmfc0, insn_dmtc0,
     3032-       insn_dsll, insn_dsll32, insn_dsra, insn_dsrl,
     3033+       insn_dsll, insn_dsll32, insn_dsra, insn_dsrl, insn_dsrl32,
     3034        insn_dsubu, insn_eret, insn_j, insn_jal, insn_jr, insn_ld,
     3035        insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0, insn_mtc0,
     3036        insn_ori, insn_rfe, insn_sc, insn_scd, insn_sd, insn_sll,
     3037@@ -145,6 +145,7 @@
     3038        { insn_dsll32, M(spec_op,0,0,0,0,dsll32_op), RT | RD | RE },
     3039        { insn_dsra, M(spec_op,0,0,0,0,dsra_op), RT | RD | RE },
     3040        { insn_dsrl, M(spec_op,0,0,0,0,dsrl_op), RT | RD | RE },
     3041+       { insn_dsrl32, M(spec_op,0,0,0,0,dsrl32_op), RT | RD | RE },
     3042        { insn_dsubu, M(spec_op,0,0,0,0,dsubu_op), RS | RT | RD },
     3043        { insn_eret, M(cop0_op,cop_op,0,0,0,eret_op), 0 },
     3044        { insn_j, M(j_op,0,0,0,0,0), JIMM },
     3045@@ -385,6 +386,7 @@
     3046 I_u2u1u3(_dsll32);
     3047 I_u2u1u3(_dsra);
     3048 I_u2u1u3(_dsrl);
     3049+I_u2u1u3(_dsrl32);
     3050 I_u3u1u2(_dsubu);
     3051 I_0(_eret);
     3052 I_u1(_j);
     3053@@ -996,7 +998,12 @@
     3054 #endif
     3055 
     3056        l_vmalloc_done(l, *p);
     3057-       i_dsrl(p, tmp, tmp, PGDIR_SHIFT-3); /* get pgd offset in bytes */
     3058+
     3059+       if (PGDIR_SHIFT - 3 < 32)               /* get pgd offset in bytes */
     3060+               i_dsrl(p, tmp, tmp, PGDIR_SHIFT-3);
     3061+       else
     3062+               i_dsrl32(p, tmp, tmp, PGDIR_SHIFT - 3 - 32);
     3063+
     3064        i_andi(p, tmp, tmp, (PTRS_PER_PGD - 1)<<3);
     3065        i_daddu(p, ptr, ptr, tmp); /* add in pgd offset */
     3066        i_dmfc0(p, tmp, C0_BADVADDR); /* get faulting address */
     3067@@ -1073,7 +1080,7 @@
     3068 
     3069 static __init void build_adjust_context(u32 **p, unsigned int ctx)
     3070 {
     3071-       unsigned int shift = 4 - (PTE_T_LOG2 + 1);
     3072+       unsigned int shift = 4 - (PTE_T_LOG2 + 1) + PAGE_SHIFT - 12;
     3073        unsigned int mask = (PTRS_PER_PTE / 2 - 1) << (PTE_T_LOG2 + 1);
     3074 
     3075        switch (current_cpu_data.cputype) {
     3076diff -Naur linux-2.6.18.2/arch/mips/oprofile/op_model_mipsxx.c linux-mips-2.6.18.2/arch/mips/oprofile/op_model_mipsxx.c
     3077--- linux-2.6.18.2/arch/mips/oprofile/op_model_mipsxx.c 2006-11-03 17:33:58.000000000 -0800
     3078+++ linux-mips-2.6.18.2/arch/mips/oprofile/op_model_mipsxx.c    2006-11-04 14:51:12.000000000 -0800
     3079@@ -30,16 +30,18 @@
     3080 #define M_COUNTER_OVERFLOW             (1UL      << 31)
     3081 
     3082 #ifdef CONFIG_MIPS_MT_SMP
     3083-#define WHAT   (M_TC_EN_VPE | M_PERFCTL_VPEID(smp_processor_id()))
     3084+#define WHAT           (M_TC_EN_VPE | M_PERFCTL_VPEID(smp_processor_id()))
     3085+#define vpe_id()       smp_processor_id()
     3086 #else
     3087-#define WHAT   0
     3088+#define WHAT           0
     3089+#define vpe_id()       smp_processor_id()
     3090 #endif
     3091 
     3092 #define __define_perf_accessors(r, n, np)                              \
     3093                                                                        \
     3094 static inline unsigned int r_c0_ ## r ## n(void)                       \
     3095 {                                                                      \
     3096-       unsigned int cpu = smp_processor_id();                          \
     3097+       unsigned int cpu = vpe_id();                                    \
     3098                                                                        \
     3099        switch (cpu) {                                                  \
     3100        case 0:                                                         \
     3101@@ -54,7 +56,7 @@
     3102                                                                        \
     3103 static inline void w_c0_ ## r ## n(unsigned int value)                 \
     3104 {                                                                      \
     3105-       unsigned int cpu = smp_processor_id();                          \
     3106+       unsigned int cpu = vpe_id();                                    \
     3107                                                                        \
     3108        switch (cpu) {                                                  \
     3109        case 0:                                                         \
     3110@@ -217,7 +219,7 @@
     3111 {
     3112        int counters = __n_counters();
     3113 
     3114-#ifndef CONFIG_SMP
     3115+#ifdef CONFIG_MIPS_MT_SMP
     3116        if (current_cpu_data.cputype == CPU_34K)
     3117                return counters >> 1;
     3118 #endif
     3119diff -Naur linux-2.6.18.2/arch/mips/pci/Makefile linux-mips-2.6.18.2/arch/mips/pci/Makefile
     3120--- linux-2.6.18.2/arch/mips/pci/Makefile       2006-11-03 17:33:58.000000000 -0800
     3121+++ linux-mips-2.6.18.2/arch/mips/pci/Makefile  2006-11-04 14:51:12.000000000 -0800
    27803122@@ -28,7 +28,7 @@
    27813123 obj-$(CONFIG_LASAT)            += pci-lasat.o
    … …  
    27873129 obj-$(CONFIG_MIPS_ITE8172)     += fixup-ite8172g.o
    27883130 obj-$(CONFIG_MIPS_IVR)         += fixup-ivr.o
    2789 diff -Naur linux-2.6.18.1/arch/mips/pci/fixup-atlas.c linux-mips-2.6.18.1/arch/mips/pci/fixup-atlas.c
    2790 --- linux-2.6.18.1/arch/mips/pci/fixup-atlas.c  2006-10-13 20:34:03.000000000 -0700
    2791 +++ linux-mips-2.6.18.1/arch/mips/pci/fixup-atlas.c     2006-10-17 06:23:28.000000000 -0700
     3131diff -Naur linux-2.6.18.2/arch/mips/pci/fixup-atlas.c linux-mips-2.6.18.2/arch/mips/pci/fixup-atlas.c
     3132--- linux-2.6.18.2/arch/mips/pci/fixup-atlas.c  2006-11-03 17:33:58.000000000 -0800
     3133+++ linux-mips-2.6.18.2/arch/mips/pci/fixup-atlas.c     2006-11-04 14:51:12.000000000 -0800
    27923134@@ -21,16 +21,16 @@
    27933135 
    … …  
    28173159 static char irq_tab[][5] __initdata = {
    28183160        /*      INTA    INTB    INTC    INTD */
    2819 diff -Naur linux-2.6.18.1/arch/mips/pci/fixup-tb0219.c linux-mips-2.6.18.1/arch/mips/pci/fixup-tb0219.c
    2820 --- linux-2.6.18.1/arch/mips/pci/fixup-tb0219.c 2006-10-13 20:34:03.000000000 -0700
    2821 +++ linux-mips-2.6.18.1/arch/mips/pci/fixup-tb0219.c    2006-10-17 06:23:28.000000000 -0700
     3161diff -Naur linux-2.6.18.2/arch/mips/pci/fixup-tb0219.c linux-mips-2.6.18.2/arch/mips/pci/fixup-tb0219.c
     3162--- linux-2.6.18.2/arch/mips/pci/fixup-tb0219.c 2006-11-03 17:33:58.000000000 -0800
     3163+++ linux-mips-2.6.18.2/arch/mips/pci/fixup-tb0219.c    2006-11-04 14:51:12.000000000 -0800
    28223164@@ -2,7 +2,7 @@
    28233165  *  fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups.
    … …  
    28293171  *  This program is free software; you can redistribute it and/or modify
    28303172  *  it under the terms of the GNU General Public License as published by
    2831 diff -Naur linux-2.6.18.1/arch/mips/pci/ops-au1000.c linux-mips-2.6.18.1/arch/mips/pci/ops-au1000.c
    2832 --- linux-2.6.18.1/arch/mips/pci/ops-au1000.c   2006-10-13 20:34:03.000000000 -0700
    2833 +++ linux-mips-2.6.18.1/arch/mips/pci/ops-au1000.c      2006-10-17 06:23:28.000000000 -0700
     3173diff -Naur linux-2.6.18.2/arch/mips/pci/ops-au1000.c linux-mips-2.6.18.2/arch/mips/pci/ops-au1000.c
     3174--- linux-2.6.18.2/arch/mips/pci/ops-au1000.c   2006-11-03 17:33:58.000000000 -0800
     3175+++ linux-mips-2.6.18.2/arch/mips/pci/ops-au1000.c      2006-11-04 14:51:12.000000000 -0800
    28343176@@ -110,7 +110,7 @@
    28353177        if (first_cfg) {
    … …  
    28413183                        panic (KERN_ERR "PCI unable to get vm area\n");
    28423184                pci_cfg_wired_entry = read_c0_wired();
    2843 diff -Naur linux-2.6.18.1/arch/mips/qemu/Makefile linux-mips-2.6.18.1/arch/mips/qemu/Makefile
    2844 --- linux-2.6.18.1/arch/mips/qemu/Makefile      2006-10-13 20:34:03.000000000 -0700
    2845 +++ linux-mips-2.6.18.1/arch/mips/qemu/Makefile 2006-10-17 06:23:28.000000000 -0700
     3185diff -Naur linux-2.6.18.2/arch/mips/qemu/Makefile linux-mips-2.6.18.2/arch/mips/qemu/Makefile
     3186--- linux-2.6.18.2/arch/mips/qemu/Makefile      2006-11-03 17:33:58.000000000 -0800
     3187+++ linux-mips-2.6.18.2/arch/mips/qemu/Makefile 2006-11-04 14:51:12.000000000 -0800
    28463188@@ -4,4 +4,5 @@
    28473189 
    … …  
    28503192+obj-$(CONFIG_VT) += q-vga.o
    28513193 obj-$(CONFIG_SMP) += q-smp.o
    2852 diff -Naur linux-2.6.18.1/arch/mips/qemu/q-setup.c linux-mips-2.6.18.1/arch/mips/qemu/q-setup.c
    2853 --- linux-2.6.18.1/arch/mips/qemu/q-setup.c     2006-10-13 20:34:03.000000000 -0700
    2854 +++ linux-mips-2.6.18.1/arch/mips/qemu/q-setup.c        2006-10-17 06:23:28.000000000 -0700
     3194diff -Naur linux-2.6.18.2/arch/mips/qemu/q-setup.c linux-mips-2.6.18.2/arch/mips/qemu/q-setup.c
     3195--- linux-2.6.18.2/arch/mips/qemu/q-setup.c     2006-11-03 17:33:58.000000000 -0800
     3196+++ linux-mips-2.6.18.2/arch/mips/qemu/q-setup.c        2006-11-04 14:51:12.000000000 -0800
    28553197@@ -2,6 +2,7 @@
    28563198 #include <asm/io.h>
    … …  
    28713213        qemu_reboot_setup();
    28723214 }
    2873 diff -Naur linux-2.6.18.1/arch/mips/qemu/q-vga.c linux-mips-2.6.18.1/arch/mips/qemu/q-vga.c
    2874 --- linux-2.6.18.1/arch/mips/qemu/q-vga.c       1969-12-31 16:00:00.000000000 -0800
    2875 +++ linux-mips-2.6.18.1/arch/mips/qemu/q-vga.c  2006-10-17 06:23:28.000000000 -0700
     3215diff -Naur linux-2.6.18.2/arch/mips/qemu/q-vga.c linux-mips-2.6.18.2/arch/mips/qemu/q-vga.c
     3216--- linux-2.6.18.2/arch/mips/qemu/q-vga.c       1969-12-31 16:00:00.000000000 -0800
     3217+++ linux-mips-2.6.18.2/arch/mips/qemu/q-vga.c  2006-11-04 14:51:12.000000000 -0800
    28763218@@ -0,0 +1,189 @@
    28773219+/*
    … …  
    30643406+#endif
    30653407+}
    3066 diff -Naur linux-2.6.18.1/arch/mips/sibyte/bcm1480/irq.c linux-mips-2.6.18.1/arch/mips/sibyte/bcm1480/irq.c
    3067 --- linux-2.6.18.1/arch/mips/sibyte/bcm1480/irq.c       2006-10-13 20:34:03.000000000 -0700
    3068 +++ linux-mips-2.6.18.1/arch/mips/sibyte/bcm1480/irq.c  2006-10-17 06:23:28.000000000 -0700
     3408diff -Naur linux-2.6.18.2/arch/mips/sibyte/bcm1480/irq.c linux-mips-2.6.18.2/arch/mips/sibyte/bcm1480/irq.c
     3409--- linux-2.6.18.2/arch/mips/sibyte/bcm1480/irq.c       2006-11-03 17:33:58.000000000 -0800
     3410+++ linux-mips-2.6.18.2/arch/mips/sibyte/bcm1480/irq.c  2006-11-04 14:51:12.000000000 -0800
    30693411@@ -469,21 +469,6 @@
    30703412 
    … …  
    31103452        }
    31113453 }
    3112 diff -Naur linux-2.6.18.1/arch/mips/sibyte/bcm1480/smp.c linux-mips-2.6.18.1/arch/mips/sibyte/bcm1480/smp.c
    3113 --- linux-2.6.18.1/arch/mips/sibyte/bcm1480/smp.c       2006-10-13 20:34:03.000000000 -0700
    3114 +++ linux-mips-2.6.18.1/arch/mips/sibyte/bcm1480/smp.c  2006-10-17 06:23:28.000000000 -0700
     3454diff -Naur linux-2.6.18.2/arch/mips/sibyte/bcm1480/smp.c linux-mips-2.6.18.2/arch/mips/sibyte/bcm1480/smp.c
     3455--- linux-2.6.18.2/arch/mips/sibyte/bcm1480/smp.c       2006-11-03 17:33:58.000000000 -0800
     3456+++ linux-mips-2.6.18.2/arch/mips/sibyte/bcm1480/smp.c  2006-11-04 14:51:12.000000000 -0800
    31153457@@ -34,21 +34,21 @@
    31163458  * independent of board/firmware
    … …  
    31383480        IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
    31393481        IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
    3140 diff -Naur linux-2.6.18.1/arch/mips/sibyte/sb1250/irq.c linux-mips-2.6.18.1/arch/mips/sibyte/sb1250/irq.c
    3141 --- linux-2.6.18.1/arch/mips/sibyte/sb1250/irq.c        2006-10-13 20:34:03.000000000 -0700
    3142 +++ linux-mips-2.6.18.1/arch/mips/sibyte/sb1250/irq.c   2006-10-17 06:23:28.000000000 -0700
     3482diff -Naur linux-2.6.18.2/arch/mips/sibyte/sb1250/irq.c linux-mips-2.6.18.2/arch/mips/sibyte/sb1250/irq.c
     3483--- linux-2.6.18.2/arch/mips/sibyte/sb1250/irq.c        2006-11-03 17:33:58.000000000 -0800
     3484+++ linux-mips-2.6.18.2/arch/mips/sibyte/sb1250/irq.c   2006-11-04 14:51:12.000000000 -0800
    31433485@@ -419,21 +419,6 @@
    31443486 
    … …  
    31843526+               spurious_interrupt(regs);
    31853527 }
    3186 diff -Naur linux-2.6.18.1/arch/mips/tx4927/common/tx4927_setup.c linux-mips-2.6.18.1/arch/mips/tx4927/common/tx4927_setup.c
    3187 --- linux-2.6.18.1/arch/mips/tx4927/common/tx4927_setup.c       2006-10-13 20:34:03.000000000 -0700
    3188 +++ linux-mips-2.6.18.1/arch/mips/tx4927/common/tx4927_setup.c  2006-10-17 06:23:28.000000000 -0700
     3528diff -Naur linux-2.6.18.2/arch/mips/tx4927/common/tx4927_setup.c linux-mips-2.6.18.2/arch/mips/tx4927/common/tx4927_setup.c
     3529--- linux-2.6.18.2/arch/mips/tx4927/common/tx4927_setup.c       2006-11-03 17:33:58.000000000 -0800
     3530+++ linux-mips-2.6.18.2/arch/mips/tx4927/common/tx4927_setup.c  2006-11-04 14:51:12.000000000 -0800
    31893531@@ -53,19 +53,9 @@
    31903532 void dump_cp0(char *key);
    … …  
    32073549 #ifdef CONFIG_TOSHIBA_RBTX4927
    32083550        {
    3209 diff -Naur linux-2.6.18.1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c linux-mips-2.6.18.1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
    3210 --- linux-2.6.18.1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c     2006-10-13 20:34:03.000000000 -0700
    3211 +++ linux-mips-2.6.18.1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c        2006-10-17 06:23:28.000000000 -0700
     3551diff -Naur linux-2.6.18.2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c linux-mips-2.6.18.2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
     3552--- linux-2.6.18.2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c     2006-11-03 17:33:58.000000000 -0800
     3553+++ linux-mips-2.6.18.2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c        2006-11-04 14:51:12.000000000 -0800
    32123554@@ -130,6 +130,7 @@
    32133555 #include <asm/ptrace.h>
    … …  
    32183560 #include <linux/blkdev.h>
    32193561 #ifdef CONFIG_RTC_DS1742
    3220 diff -Naur linux-2.6.18.1/arch/mips/tx4938/common/irq.c linux-mips-2.6.18.1/arch/mips/tx4938/common/irq.c
    3221 --- linux-2.6.18.1/arch/mips/tx4938/common/irq.c        2006-10-13 20:34:03.000000000 -0700
    3222 +++ linux-mips-2.6.18.1/arch/mips/tx4938/common/irq.c   2006-10-17 06:23:28.000000000 -0700
     3562diff -Naur linux-2.6.18.2/arch/mips/tx4938/common/irq.c linux-mips-2.6.18.2/arch/mips/tx4938/common/irq.c
     3563--- linux-2.6.18.2/arch/mips/tx4938/common/irq.c        2006-11-03 17:33:58.000000000 -0800
     3564+++ linux-mips-2.6.18.2/arch/mips/tx4938/common/irq.c   2006-11-04 14:51:12.000000000 -0800
    32233565@@ -30,6 +30,7 @@
    32243566 #include <asm/irq.h>
    … …  
    32293571 
    32303572 /**********************************************************************************/
    3231 diff -Naur linux-2.6.18.1/arch/mips/tx4938/common/setup.c linux-mips-2.6.18.1/arch/mips/tx4938/common/setup.c
    3232 --- linux-2.6.18.1/arch/mips/tx4938/common/setup.c      2006-10-13 20:34:03.000000000 -0700
    3233 +++ linux-mips-2.6.18.1/arch/mips/tx4938/common/setup.c 2006-10-17 06:23:28.000000000 -0700
     3573diff -Naur linux-2.6.18.2/arch/mips/tx4938/common/setup.c linux-mips-2.6.18.2/arch/mips/tx4938/common/setup.c
     3574--- linux-2.6.18.2/arch/mips/tx4938/common/setup.c      2006-11-03 17:33:58.000000000 -0800
     3575+++ linux-mips-2.6.18.2/arch/mips/tx4938/common/setup.c 2006-11-04 14:51:12.000000000 -0800
    32343576@@ -41,29 +41,10 @@
    32353577 void __init tx4938_time_init(void);
    … …  
    32623604 }
    32633605 
    3264 diff -Naur linux-2.6.18.1/arch/mips/tx4938/toshiba_rbtx4938/irq.c linux-mips-2.6.18.1/arch/mips/tx4938/toshiba_rbtx4938/irq.c
    3265 --- linux-2.6.18.1/arch/mips/tx4938/toshiba_rbtx4938/irq.c      2006-10-13 20:34:03.000000000 -0700
    3266 +++ linux-mips-2.6.18.1/arch/mips/tx4938/toshiba_rbtx4938/irq.c 2006-10-17 06:23:28.000000000 -0700
     3606diff -Naur linux-2.6.18.2/arch/mips/tx4938/toshiba_rbtx4938/irq.c linux-mips-2.6.18.2/arch/mips/tx4938/toshiba_rbtx4938/irq.c
     3607--- linux-2.6.18.2/arch/mips/tx4938/toshiba_rbtx4938/irq.c      2006-11-03 17:33:58.000000000 -0800
     3608+++ linux-mips-2.6.18.2/arch/mips/tx4938/toshiba_rbtx4938/irq.c 2006-11-04 14:51:12.000000000 -0800
    32673609@@ -84,6 +84,7 @@
    32683610 #include <asm/ptrace.h>
    … …  
    32733615 #include <asm/tx4938/rbtx4938.h>
    32743616 
    3275 diff -Naur linux-2.6.18.1/drivers/char/Kconfig linux-mips-2.6.18.1/drivers/char/Kconfig
    3276 --- linux-2.6.18.1/drivers/char/Kconfig 2006-10-13 20:34:03.000000000 -0700
    3277 +++ linux-mips-2.6.18.1/drivers/char/Kconfig    2006-10-17 06:23:28.000000000 -0700
     3617diff -Naur linux-2.6.18.2/drivers/char/Kconfig linux-mips-2.6.18.2/drivers/char/Kconfig
     3618--- linux-2.6.18.2/drivers/char/Kconfig 2006-11-03 17:33:58.000000000 -0800
     3619+++ linux-mips-2.6.18.2/drivers/char/Kconfig    2006-11-04 14:51:12.000000000 -0800
    32783620@@ -357,23 +357,68 @@
    32793621          To compile this driver as a module, choose M here: the
    … …  
    33863728        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
    33873729        depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP
    3388 diff -Naur linux-2.6.18.1/drivers/char/Makefile linux-mips-2.6.18.1/drivers/char/Makefile
    3389 --- linux-2.6.18.1/drivers/char/Makefile        2006-10-13 20:34:03.000000000 -0700
    3390 +++ linux-mips-2.6.18.1/drivers/char/Makefile   2006-10-17 06:23:28.000000000 -0700
     3730diff -Naur linux-2.6.18.2/drivers/char/Makefile linux-mips-2.6.18.2/drivers/char/Makefile
     3731--- linux-2.6.18.2/drivers/char/Makefile        2006-11-03 17:33:58.000000000 -0800
     3732+++ linux-mips-2.6.18.2/drivers/char/Makefile   2006-11-04 14:51:12.000000000 -0800
    33913733@@ -31,6 +31,7 @@
    33923734 obj-$(CONFIG_A2232)            += ser_a2232.o generic_serial.o
    … …  
    34163758 obj-$(CONFIG_NWBUTTON)         += nwbutton.o
    34173759 obj-$(CONFIG_NWFLASH)          += nwflash.o
    3418 diff -Naur linux-2.6.18.1/drivers/char/au1000_gpio.c linux-mips-2.6.18.1/drivers/char/au1000_gpio.c
    3419 --- linux-2.6.18.1/drivers/char/au1000_gpio.c   1969-12-31 16:00:00.000000000 -0800
    3420 +++ linux-mips-2.6.18.1/drivers/char/au1000_gpio.c      2006-10-17 06:23:28.000000000 -0700
     3760diff -Naur linux-2.6.18.2/drivers/char/au1000_gpio.c linux-mips-2.6.18.2/drivers/char/au1000_gpio.c
     3761--- linux-2.6.18.2/drivers/char/au1000_gpio.c   1969-12-31 16:00:00.000000000 -0800
     3762+++ linux-mips-2.6.18.2/drivers/char/au1000_gpio.c      2006-11-04 14:51:12.000000000 -0800
    34213763@@ -0,0 +1,266 @@
    34223764+/*
    … …  
    36864028+module_init(au1000gpio_init);
    36874029+module_exit(au1000gpio_exit);
    3688 diff -Naur linux-2.6.18.1/drivers/char/au1000_ts.c linux-mips-2.6.18.1/drivers/char/au1000_ts.c
    3689 --- linux-2.6.18.1/drivers/char/au1000_ts.c     1969-12-31 16:00:00.000000000 -0800
    3690 +++ linux-mips-2.6.18.1/drivers/char/au1000_ts.c        2006-10-17 06:23:28.000000000 -0700
     4030diff -Naur linux-2.6.18.2/drivers/char/au1000_ts.c linux-mips-2.6.18.2/drivers/char/au1000_ts.c
     4031--- linux-2.6.18.2/drivers/char/au1000_ts.c     1969-12-31 16:00:00.000000000 -0800
     4032+++ linux-mips-2.6.18.2/drivers/char/au1000_ts.c        2006-11-04 14:51:12.000000000 -0800
    36914033@@ -0,0 +1,677 @@
    36924034+/*
    … …  
    43674709+module_init(au1000ts_init_module);
    43684710+module_exit(au1000ts_cleanup_module);
    4369 diff -Naur linux-2.6.18.1/drivers/char/au1000_usbraw.c linux-mips-2.6.18.1/drivers/char/au1000_usbraw.c
    4370 --- linux-2.6.18.1/drivers/char/au1000_usbraw.c 1969-12-31 16:00:00.000000000 -0800
    4371 +++ linux-mips-2.6.18.1/drivers/char/au1000_usbraw.c    2006-10-17 06:23:28.000000000 -0700
     4711diff -Naur linux-2.6.18.2/drivers/char/au1000_usbraw.c linux-mips-2.6.18.2/drivers/char/au1000_usbraw.c
     4712--- linux-2.6.18.2/drivers/char/au1000_usbraw.c 1969-12-31 16:00:00.000000000 -0800
     4713+++ linux-mips-2.6.18.2/drivers/char/au1000_usbraw.c    2006-11-04 14:51:12.000000000 -0800
    43724714@@ -0,0 +1,573 @@
    43734715+/*
    … …  
    49445286+module_init(usbfn_raw_init);
    49455287+module_exit(usbfn_raw_exit);
    4946 diff -Naur linux-2.6.18.1/drivers/char/au1000_usbtty.c linux-mips-2.6.18.1/drivers/char/au1000_usbtty.c
    4947 --- linux-2.6.18.1/drivers/char/au1000_usbtty.c 1969-12-31 16:00:00.000000000 -0800
    4948 +++ linux-mips-2.6.18.1/drivers/char/au1000_usbtty.c    2006-10-17 06:23:28.000000000 -0700
     5288diff -Naur linux-2.6.18.2/drivers/char/au1000_usbtty.c linux-mips-2.6.18.2/drivers/char/au1000_usbtty.c
     5289--- linux-2.6.18.2/drivers/char/au1000_usbtty.c 1969-12-31 16:00:00.000000000 -0800
     5290+++ linux-mips-2.6.18.2/drivers/char/au1000_usbtty.c    2006-11-04 14:51:12.000000000 -0800
    49495291@@ -0,0 +1,761 @@
    49505292+/*
    … …  
    57096051+module_init(usbfn_tty_init);
    57106052+module_exit(usbfn_tty_exit);
    5711 diff -Naur linux-2.6.18.1/drivers/char/decserial.c linux-mips-2.6.18.1/drivers/char/decserial.c
    5712 --- linux-2.6.18.1/drivers/char/decserial.c     2006-10-13 20:34:03.000000000 -0700
    5713 +++ linux-mips-2.6.18.1/drivers/char/decserial.c        2006-10-17 06:23:28.000000000 -0700
     6053diff -Naur linux-2.6.18.2/drivers/char/decserial.c linux-mips-2.6.18.2/drivers/char/decserial.c
     6054--- linux-2.6.18.2/drivers/char/decserial.c     2006-11-03 17:33:58.000000000 -0800
     6055+++ linux-mips-2.6.18.2/drivers/char/decserial.c        2006-11-04 14:51:12.000000000 -0800
    57146056@@ -14,86 +14,84 @@
    57156057  *      device. Added support for PROM console in drivers/char/tty_io.c
    … …  
    58456187 
    58466188 #endif
    5847 diff -Naur linux-2.6.18.1/drivers/char/qtronix.c linux-mips-2.6.18.1/drivers/char/qtronix.c
    5848 --- linux-2.6.18.1/drivers/char/qtronix.c       2006-10-13 20:34:03.000000000 -0700
    5849 +++ linux-mips-2.6.18.1/drivers/char/qtronix.c  2006-10-17 06:23:28.000000000 -0700
     6189diff -Naur linux-2.6.18.2/drivers/char/qtronix.c linux-mips-2.6.18.2/drivers/char/qtronix.c
     6190--- linux-2.6.18.2/drivers/char/qtronix.c       2006-11-03 17:33:58.000000000 -0800
     6191+++ linux-mips-2.6.18.2/drivers/char/qtronix.c  2006-11-04 14:51:12.000000000 -0800
    58506192@@ -534,8 +534,7 @@
    58516193                i--;
    … …  
    58586200        }
    58596201        if (signal_pending(current))
    5860 diff -Naur linux-2.6.18.1/drivers/char/rtc.c linux-mips-2.6.18.1/drivers/char/rtc.c
    5861 --- linux-2.6.18.1/drivers/char/rtc.c   2006-10-13 20:34:03.000000000 -0700
    5862 +++ linux-mips-2.6.18.1/drivers/char/rtc.c      2006-10-17 06:23:28.000000000 -0700
     6202diff -Naur linux-2.6.18.2/drivers/char/rtc.c linux-mips-2.6.18.2/drivers/char/rtc.c
     6203--- linux-2.6.18.2/drivers/char/rtc.c   2006-11-03 17:33:58.000000000 -0800
     6204+++ linux-mips-2.6.18.2/drivers/char/rtc.c      2006-11-04 14:51:12.000000000 -0800
    58636205@@ -35,16 +35,16 @@
    58646206  *     1.09a   Pete Zaitcev: Sun SPARC
    … …  
    58816223  *     1.12a   Maciej W. Rozycki: Handle memory-mapped chips properly.
    58826224  *     1.12ac  Alan Cox: Allow read access to the day of week register
    5883 diff -Naur linux-2.6.18.1/drivers/char/sb1250_duart.c linux-mips-2.6.18.1/drivers/char/sb1250_duart.c
    5884 --- linux-2.6.18.1/drivers/char/sb1250_duart.c  1969-12-31 16:00:00.000000000 -0800
    5885 +++ linux-mips-2.6.18.1/drivers/char/sb1250_duart.c     2006-10-17 06:23:28.000000000 -0700
     6225diff -Naur linux-2.6.18.2/drivers/char/sb1250_duart.c linux-mips-2.6.18.2/drivers/char/sb1250_duart.c
     6226--- linux-2.6.18.2/drivers/char/sb1250_duart.c  1969-12-31 16:00:00.000000000 -0800
     6227+++ linux-mips-2.6.18.2/drivers/char/sb1250_duart.c     2006-11-04 14:51:12.000000000 -0800
    58866228@@ -0,0 +1,910 @@
    58876229+/*
    … …  
    67957137+
    67967138+#endif /* CONFIG_SIBYTE_SB1250_DUART_CONSOLE */
    6797 diff -Naur linux-2.6.18.1/drivers/ide/mips/Makefile linux-mips-2.6.18.1/drivers/ide/mips/Makefile
    6798 --- linux-2.6.18.1/drivers/ide/mips/Makefile    2006-10-13 20:34:03.000000000 -0700
    6799 +++ linux-mips-2.6.18.1/drivers/ide/mips/Makefile       2006-10-17 06:23:28.000000000 -0700
     7139diff -Naur linux-2.6.18.2/drivers/ide/mips/Makefile linux-mips-2.6.18.2/drivers/ide/mips/Makefile
     7140--- linux-2.6.18.2/drivers/ide/mips/Makefile    2006-11-03 17:33:58.000000000 -0800
     7141+++ linux-mips-2.6.18.2/drivers/ide/mips/Makefile       2006-11-04 14:51:12.000000000 -0800
    68007142@@ -1,4 +1,4 @@
    68017143 obj-$(CONFIG_BLK_DEV_IDE_SWARM)                += swarm.o
    … …  
    68047146-EXTRA_CFLAGS    := -Idrivers/ide
    68057147+CFLAGS_au1xxx-ide.o := -Idrivers/ide
    6806 diff -Naur linux-2.6.18.1/drivers/mtd/devices/docprobe.c linux-mips-2.6.18.1/drivers/mtd/devices/docprobe.c
    6807 --- linux-2.6.18.1/drivers/mtd/devices/docprobe.c       2006-10-13 20:34:03.000000000 -0700
    6808 +++ linux-mips-2.6.18.1/drivers/mtd/devices/docprobe.c  2006-10-17 06:23:28.000000000 -0700
     7148diff -Naur linux-2.6.18.2/drivers/mtd/devices/docprobe.c linux-mips-2.6.18.2/drivers/mtd/devices/docprobe.c
     7149--- linux-2.6.18.2/drivers/mtd/devices/docprobe.c       2006-11-03 17:33:58.000000000 -0800
     7150+++ linux-mips-2.6.18.2/drivers/mtd/devices/docprobe.c  2006-11-04 14:51:12.000000000 -0800
    68097151@@ -83,10 +83,10 @@
    68107152        0xe4000000,
    … …  
    68217163 #endif
    68227164        0xffffffff };
    6823 diff -Naur linux-2.6.18.1/drivers/mtd/maps/Kconfig linux-mips-2.6.18.1/drivers/mtd/maps/Kconfig
    6824 --- linux-2.6.18.1/drivers/mtd/maps/Kconfig     2006-10-13 20:34:03.000000000 -0700
    6825 +++ linux-mips-2.6.18.1/drivers/mtd/maps/Kconfig        2006-10-17 06:23:28.000000000 -0700
     7165diff -Naur linux-2.6.18.2/drivers/mtd/maps/Kconfig linux-mips-2.6.18.2/drivers/mtd/maps/Kconfig
     7166--- linux-2.6.18.2/drivers/mtd/maps/Kconfig     2006-11-03 17:33:58.000000000 -0800
     7167+++ linux-mips-2.6.18.2/drivers/mtd/maps/Kconfig        2006-11-04 14:51:12.000000000 -0800
    68267168@@ -299,6 +299,18 @@
    68277169          Mapping for the Flaga digital module. If you don't have one, ignore
    … …  
    68437185        tristate "CFI Flash device mapped on IBM 405LP Beech"
    68447186        depends on MTD_CFI && BEECH
    6845 diff -Naur linux-2.6.18.1/drivers/mtd/maps/lasat.c linux-mips-2.6.18.1/drivers/mtd/maps/lasat.c
    6846 --- linux-2.6.18.1/drivers/mtd/maps/lasat.c     2006-10-13 20:34:03.000000000 -0700
    6847 +++ linux-mips-2.6.18.1/drivers/mtd/maps/lasat.c        2006-10-17 06:23:28.000000000 -0700
     7187diff -Naur linux-2.6.18.2/drivers/mtd/maps/lasat.c linux-mips-2.6.18.2/drivers/mtd/maps/lasat.c
     7188--- linux-2.6.18.2/drivers/mtd/maps/lasat.c     2006-11-03 17:33:58.000000000 -0800
     7189+++ linux-mips-2.6.18.2/drivers/mtd/maps/lasat.c        2006-11-04 14:51:12.000000000 -0800
    68487190@@ -7,7 +7,7 @@
    68497191  * modify it under the terms of the GNU General Public License version
    … …  
    68647206        lasat_map.size = lasat_board_info.li_flash_size;
    68657207 
    6866 diff -Naur linux-2.6.18.1/drivers/net/Kconfig linux-mips-2.6.18.1/drivers/net/Kconfig
    6867 --- linux-2.6.18.1/drivers/net/Kconfig  2006-10-13 20:34:03.000000000 -0700
    6868 +++ linux-mips-2.6.18.1/drivers/net/Kconfig     2006-10-17 06:23:28.000000000 -0700
     7208diff -Naur linux-2.6.18.2/drivers/net/Kconfig linux-mips-2.6.18.2/drivers/net/Kconfig
     7209--- linux-2.6.18.2/drivers/net/Kconfig  2006-11-03 17:33:58.000000000 -0800
     7210+++ linux-mips-2.6.18.2/drivers/net/Kconfig     2006-11-04 14:51:12.000000000 -0800
    68697211@@ -438,6 +438,14 @@
    68707212          This is the driver for the onboard card of MIPS Magnum 4000,
    … …  
    69687310 
    69697311 #
    6970 diff -Naur linux-2.6.18.1/drivers/net/Makefile linux-mips-2.6.18.1/drivers/net/Makefile
    6971 --- linux-2.6.18.1/drivers/net/Makefile 2006-10-13 20:34:03.000000000 -0700
    6972 +++ linux-mips-2.6.18.1/drivers/net/Makefile    2006-10-17 06:23:28.000000000 -0700
     7312diff -Naur linux-2.6.18.2/drivers/net/Makefile linux-mips-2.6.18.2/drivers/net/Makefile
     7313--- linux-2.6.18.2/drivers/net/Makefile 2006-11-03 17:33:58.000000000 -0800
     7314+++ linux-mips-2.6.18.2/drivers/net/Makefile    2006-11-04 14:51:12.000000000 -0800
    69737315@@ -114,6 +114,11 @@
    69747316 
    … …  
    69837325 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
    69847326 obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
    6985 diff -Naur linux-2.6.18.1/drivers/net/big_sur_ge.c linux-mips-2.6.18.1/drivers/net/big_sur_ge.c
    6986 --- linux-2.6.18.1/drivers/net/big_sur_ge.c     1969-12-31 16:00:00.000000000 -0800
    6987 +++ linux-mips-2.6.18.1/drivers/net/big_sur_ge.c        2006-10-17 06:23:28.000000000 -0700
     7327diff -Naur linux-2.6.18.2/drivers/net/big_sur_ge.c linux-mips-2.6.18.2/drivers/net/big_sur_ge.c
     7328--- linux-2.6.18.2/drivers/net/big_sur_ge.c     1969-12-31 16:00:00.000000000 -0800
     7329+++ linux-mips-2.6.18.2/drivers/net/big_sur_ge.c        2006-11-04 14:51:12.000000000 -0800
    69887330@@ -0,0 +1,2005 @@
    69897331+/*
    … …  
    89929334+MODULE_DESCRIPTION("PMC-Sierra Big Sur Ethernet MAC Driver");
    89939335+MODULE_LICENSE("GPL");
    8994 diff -Naur linux-2.6.18.1/drivers/net/big_sur_ge.h linux-mips-2.6.18.1/drivers/net/big_sur_ge.h
    8995 --- linux-2.6.18.1/drivers/net/big_sur_ge.h     1969-12-31 16:00:00.000000000 -0800
    8996 +++ linux-mips-2.6.18.1/drivers/net/big_sur_ge.h        2006-10-17 06:23:28.000000000 -0700
     9336diff -Naur linux-2.6.18.2/drivers/net/big_sur_ge.h linux-mips-2.6.18.2/drivers/net/big_sur_ge.h
     9337--- linux-2.6.18.2/drivers/net/big_sur_ge.h     1969-12-31 16:00:00.000000000 -0800
     9338+++ linux-mips-2.6.18.2/drivers/net/big_sur_ge.h        2006-11-04 14:51:12.000000000 -0800
    89979339@@ -0,0 +1,713 @@
    89989340+/*
    … …  
    970910051+
    971010052+#endif
    9711 diff -Naur linux-2.6.18.1/drivers/net/gt64240eth.c linux-mips-2.6.18.1/drivers/net/gt64240eth.c
    9712 --- linux-2.6.18.1/drivers/net/gt64240eth.c     1969-12-31 16:00:00.000000000 -0800
    9713 +++ linux-mips-2.6.18.1/drivers/net/gt64240eth.c        2006-10-17 06:23:28.000000000 -0700
     10053diff -Naur linux-2.6.18.2/drivers/net/gt64240eth.c linux-mips-2.6.18.2/drivers/net/gt64240eth.c
     10054--- linux-2.6.18.2/drivers/net/gt64240eth.c     1969-12-31 16:00:00.000000000 -0800
     10055+++ linux-mips-2.6.18.2/drivers/net/gt64240eth.c        2006-11-04 14:51:12.000000000 -0800
    971410056@@ -0,0 +1,1672 @@
    971510057+/*
    … …  
    1138511727+       return &gp->stats;
    1138611728+}
    11387 diff -Naur linux-2.6.18.1/drivers/net/gt64240eth.h linux-mips-2.6.18.1/drivers/net/gt64240eth.h
    11388 --- linux-2.6.18.1/drivers/net/gt64240eth.h     2006-10-13 20:34:03.000000000 -0700
    11389 +++ linux-mips-2.6.18.1/drivers/net/gt64240eth.h        2006-10-17 06:23:28.000000000 -0700
     11729diff -Naur linux-2.6.18.2/drivers/net/gt64240eth.h linux-mips-2.6.18.2/drivers/net/gt64240eth.h
     11730--- linux-2.6.18.2/drivers/net/gt64240eth.h     2006-11-03 17:33:58.000000000 -0800
     11731+++ linux-mips-2.6.18.2/drivers/net/gt64240eth.h        2006-11-04 14:51:12.000000000 -0800
    1139011732@@ -9,6 +9,7 @@
    1139111733  * Copyright 2000 MontaVista Software Inc.
    … …  
    1142811770 /* Bit definitions of the SMI Reg */
    1142911771 enum {
    11430 diff -Naur linux-2.6.18.1/drivers/net/ioc3-eth.c linux-mips-2.6.18.1/drivers/net/ioc3-eth.c
    11431 --- linux-2.6.18.1/drivers/net/ioc3-eth.c       2006-10-13 20:34:03.000000000 -0700
    11432 +++ linux-mips-2.6.18.1/drivers/net/ioc3-eth.c  2006-10-17 06:23:28.000000000 -0700
     11772diff -Naur linux-2.6.18.2/drivers/net/ioc3-eth.c linux-mips-2.6.18.2/drivers/net/ioc3-eth.c
     11773--- linux-2.6.18.2/drivers/net/ioc3-eth.c       2006-11-03 17:33:58.000000000 -0800
     11774+++ linux-mips-2.6.18.2/drivers/net/ioc3-eth.c  2006-11-04 14:51:12.000000000 -0800
    1143311775@@ -5,7 +5,7 @@
    1143411776  *
    … …  
    1155711899 
    1155811900 static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
    11559 diff -Naur linux-2.6.18.1/drivers/net/titan_ge.c linux-mips-2.6.18.1/drivers/net/titan_ge.c
    11560 --- linux-2.6.18.1/drivers/net/titan_ge.c       1969-12-31 16:00:00.000000000 -0800
    11561 +++ linux-mips-2.6.18.1/drivers/net/titan_ge.c  2006-10-17 06:23:28.000000000 -0700
     11901diff -Naur linux-2.6.18.2/drivers/net/titan_ge.c linux-mips-2.6.18.2/drivers/net/titan_ge.c
     11902--- linux-2.6.18.2/drivers/net/titan_ge.c       1969-12-31 16:00:00.000000000 -0800
     11903+++ linux-mips-2.6.18.2/drivers/net/titan_ge.c  2006-11-04 14:51:12.000000000 -0800
    1156211904@@ -0,0 +1,2071 @@
    1156311905+/*
    … …  
    1363213974+module_init(titan_ge_init_module);
    1363313975+module_exit(titan_ge_cleanup_module);
    13634 diff -Naur linux-2.6.18.1/drivers/net/titan_ge.h linux-mips-2.6.18.1/drivers/net/titan_ge.h
    13635 --- linux-2.6.18.1/drivers/net/titan_ge.h       1969-12-31 16:00:00.000000000 -0800
    13636 +++ linux-mips-2.6.18.1/drivers/net/titan_ge.h  2006-10-17 06:23:28.000000000 -0700
     13976diff -Naur linux-2.6.18.2/drivers/net/titan_ge.h linux-mips-2.6.18.2/drivers/net/titan_ge.h
     13977--- linux-2.6.18.2/drivers/net/titan_ge.h       1969-12-31 16:00:00.000000000 -0800
     13978+++ linux-mips-2.6.18.2/drivers/net/titan_ge.h  2006-11-04 14:51:12.000000000 -0800
    1363713979@@ -0,0 +1,417 @@
    1363813980+#ifndef _TITAN_GE_H_
    … …  
    1405314395+#endif                                 /* _TITAN_GE_H_ */
    1405414396+
    14055 diff -Naur linux-2.6.18.1/drivers/net/titan_mdio.c linux-mips-2.6.18.1/drivers/net/titan_mdio.c
    14056 --- linux-2.6.18.1/drivers/net/titan_mdio.c     1969-12-31 16:00:00.000000000 -0800
    14057 +++ linux-mips-2.6.18.1/drivers/net/titan_mdio.c        2006-10-17 06:23:28.000000000 -0700
     14397diff -Naur linux-2.6.18.2/drivers/net/titan_mdio.c linux-mips-2.6.18.2/drivers/net/titan_mdio.c
     14398--- linux-2.6.18.2/drivers/net/titan_mdio.c     1969-12-31 16:00:00.000000000 -0800
     14399+++ linux-mips-2.6.18.2/drivers/net/titan_mdio.c        2006-11-04 14:51:12.000000000 -0800
    1405814400@@ -0,0 +1,217 @@
    1405914401+/*
    … …  
    1427414616+}
    1427514617+
    14276 diff -Naur linux-2.6.18.1/drivers/net/titan_mdio.h linux-mips-2.6.18.1/drivers/net/titan_mdio.h
    14277 --- linux-2.6.18.1/drivers/net/titan_mdio.h     1969-12-31 16:00:00.000000000 -0800
    14278 +++ linux-mips-2.6.18.1/drivers/net/titan_mdio.h        2006-10-17 06:23:28.000000000 -0700
     14618diff -Naur linux-2.6.18.2/drivers/net/titan_mdio.h linux-mips-2.6.18.2/drivers/net/titan_mdio.h
     14619--- linux-2.6.18.2/drivers/net/titan_mdio.h     1969-12-31 16:00:00.000000000 -0800
     14620+++ linux-mips-2.6.18.2/drivers/net/titan_mdio.h        2006-11-04 14:51:12.000000000 -0800
    1427914621@@ -0,0 +1,56 @@
    1428014622+/*
    … …  
    1433414676+
    1433514677+#endif /* _TITAN_MDIO_H */
    14336 diff -Naur linux-2.6.18.1/drivers/scsi/NCR53C9x.h linux-mips-2.6.18.1/drivers/scsi/NCR53C9x.h
    14337 --- linux-2.6.18.1/drivers/scsi/NCR53C9x.h      2006-10-13 20:34:03.000000000 -0700
    14338 +++ linux-mips-2.6.18.1/drivers/scsi/NCR53C9x.h 2006-10-17 06:23:28.000000000 -0700
     14678diff -Naur linux-2.6.18.2/drivers/scsi/NCR53C9x.h linux-mips-2.6.18.2/drivers/scsi/NCR53C9x.h
     14679--- linux-2.6.18.2/drivers/scsi/NCR53C9x.h      2006-11-03 17:33:58.000000000 -0800
     14680+++ linux-mips-2.6.18.2/drivers/scsi/NCR53C9x.h 2006-11-04 14:51:12.000000000 -0800
    1433914681@@ -144,12 +144,7 @@
    1434014682 
    … …  
    1435114693 
    1435214694 struct ESP_regs {
    14353 diff -Naur linux-2.6.18.1/drivers/scsi/dec_esp.c linux-mips-2.6.18.1/drivers/scsi/dec_esp.c
    14354 --- linux-2.6.18.1/drivers/scsi/dec_esp.c       2006-10-13 20:34:03.000000000 -0700
    14355 +++ linux-mips-2.6.18.1/drivers/scsi/dec_esp.c  2006-10-17 06:23:28.000000000 -0700
     14695diff -Naur linux-2.6.18.2/drivers/scsi/dec_esp.c linux-mips-2.6.18.2/drivers/scsi/dec_esp.c
     14696--- linux-2.6.18.2/drivers/scsi/dec_esp.c       2006-11-03 17:33:58.000000000 -0800
     14697+++ linux-mips-2.6.18.2/drivers/scsi/dec_esp.c  2006-11-04 14:51:12.000000000 -0800
    1435614698@@ -55,7 +55,7 @@
    1435714699 
    … …  
    1437214714                        esp->dregs = 0;
    1437314715                        esp->eregs = (void *)CKSEG1ADDR(mem_start +
    14374 diff -Naur linux-2.6.18.1/drivers/scsi/sgiwd93.c linux-mips-2.6.18.1/drivers/scsi/sgiwd93.c
    14375 --- linux-2.6.18.1/drivers/scsi/sgiwd93.c       2006-10-13 20:34:03.000000000 -0700
    14376 +++ linux-mips-2.6.18.1/drivers/scsi/sgiwd93.c  2006-10-17 06:23:28.000000000 -0700
     14716diff -Naur linux-2.6.18.2/drivers/scsi/sgiwd93.c linux-mips-2.6.18.2/drivers/scsi/sgiwd93.c
     14717--- linux-2.6.18.2/drivers/scsi/sgiwd93.c       2006-11-03 17:33:58.000000000 -0800
     14718+++ linux-mips-2.6.18.2/drivers/scsi/sgiwd93.c  2006-11-04 14:51:12.000000000 -0800
    1437714719@@ -14,6 +14,7 @@
    1437814720 #include <linux/interrupt.h>
    … …  
    1439114733 static inline void init_hpc_chain(struct hpc_data *hd)
    1439214734 {
    14393 diff -Naur linux-2.6.18.1/drivers/serial/Kconfig linux-mips-2.6.18.1/drivers/serial/Kconfig
    14394 --- linux-2.6.18.1/drivers/serial/Kconfig       2006-10-13 20:34:03.000000000 -0700
    14395 +++ linux-mips-2.6.18.1/drivers/serial/Kconfig  2006-10-17 06:23:28.000000000 -0700
     14735diff -Naur linux-2.6.18.2/drivers/serial/Kconfig linux-mips-2.6.18.2/drivers/serial/Kconfig
     14736--- linux-2.6.18.2/drivers/serial/Kconfig       2006-11-03 17:33:58.000000000 -0800
     14737+++ linux-mips-2.6.18.2/drivers/serial/Kconfig  2006-11-04 14:51:12.000000000 -0800
    1439614738@@ -651,6 +651,25 @@
    1439714739        depends on SERIAL_SH_SCI=y
    … …  
    1442014762        tristate
    1442114763 
    14422 diff -Naur linux-2.6.18.1/drivers/serial/Makefile linux-mips-2.6.18.1/drivers/serial/Makefile
    14423 --- linux-2.6.18.1/drivers/serial/Makefile      2006-10-13 20:34:03.000000000 -0700
    14424 +++ linux-mips-2.6.18.1/drivers/serial/Makefile 2006-10-17 06:23:28.000000000 -0700
     14764diff -Naur linux-2.6.18.2/drivers/serial/Makefile linux-mips-2.6.18.2/drivers/serial/Makefile
     14765--- linux-2.6.18.2/drivers/serial/Makefile      2006-11-03 17:33:58.000000000 -0800
     14766+++ linux-mips-2.6.18.2/drivers/serial/Makefile 2006-11-04 14:51:12.000000000 -0800
    1442514767@@ -39,6 +39,7 @@
    1442614768 obj-$(CONFIG_V850E_UART) += v850e_uart.o
    … …  
    1443114773 obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
    1443214774 obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o
    14433 diff -Naur linux-2.6.18.1/drivers/serial/ip22zilog.c linux-mips-2.6.18.1/drivers/serial/ip22zilog.c
    14434 --- linux-2.6.18.1/drivers/serial/ip22zilog.c   2006-10-13 20:34:03.000000000 -0700
    14435 +++ linux-mips-2.6.18.1/drivers/serial/ip22zilog.c      2006-10-17 06:23:28.000000000 -0700
     14775diff -Naur linux-2.6.18.2/drivers/serial/ip22zilog.c linux-mips-2.6.18.2/drivers/serial/ip22zilog.c
     14776--- linux-2.6.18.2/drivers/serial/ip22zilog.c   2006-11-03 17:33:58.000000000 -0800
     14777+++ linux-mips-2.6.18.2/drivers/serial/ip22zilog.c      2006-11-04 14:51:12.000000000 -0800
    1443614778@@ -865,6 +865,7 @@
    1443714779        up->cflag = termios->c_cflag;
    … …  
    1445114793 
    1445214794 static int __init ip22zilog_console_setup(struct console *con, char *options)
    14453 diff -Naur linux-2.6.18.1/drivers/serial/ip3106_uart.c linux-mips-2.6.18.1/drivers/serial/ip3106_uart.c
    14454 --- linux-2.6.18.1/drivers/serial/ip3106_uart.c 1969-12-31 16:00:00.000000000 -0800
    14455 +++ linux-mips-2.6.18.1/drivers/serial/ip3106_uart.c    2006-10-17 06:23:28.000000000 -0700
     14795diff -Naur linux-2.6.18.2/drivers/serial/ip3106_uart.c linux-mips-2.6.18.2/drivers/serial/ip3106_uart.c
     14796--- linux-2.6.18.2/drivers/serial/ip3106_uart.c 1969-12-31 16:00:00.000000000 -0800
     14797+++ linux-mips-2.6.18.2/drivers/serial/ip3106_uart.c    2006-11-04 14:51:12.000000000 -0800
    1445614798@@ -0,0 +1,912 @@
    1445714799+/*
    … …  
    1536715709+MODULE_LICENSE("GPL");
    1536815710+MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_IP3106_MAJOR);
    15369 diff -Naur linux-2.6.18.1/drivers/usb/gadget/net2280.c linux-mips-2.6.18.1/drivers/usb/gadget/net2280.c
    15370 --- linux-2.6.18.1/drivers/usb/gadget/net2280.c 2006-10-13 20:34:03.000000000 -0700
    15371 +++ linux-mips-2.6.18.1/drivers/usb/gadget/net2280.c    2006-10-17 06:23:28.000000000 -0700
     15711diff -Naur linux-2.6.18.2/drivers/usb/gadget/net2280.c linux-mips-2.6.18.2/drivers/usb/gadget/net2280.c
     15712--- linux-2.6.18.2/drivers/usb/gadget/net2280.c 2006-11-03 17:33:58.000000000 -0800
     15713+++ linux-mips-2.6.18.2/drivers/usb/gadget/net2280.c    2006-11-04 14:51:12.000000000 -0800
    1537215714@@ -467,7 +467,8 @@
    1537315715 #elif  defined(CONFIG_PPC) && !defined(CONFIG_NOT_COHERENT_CACHE)
    … …  
    1538015722 
    1538115723 /* FIXME there are other cases, including an x86-64 one ...  */
    15382 diff -Naur linux-2.6.18.1/drivers/usb/host/ohci-hcd.c linux-mips-2.6.18.1/drivers/usb/host/ohci-hcd.c
    15383 --- linux-2.6.18.1/drivers/usb/host/ohci-hcd.c  2006-10-13 20:34:03.000000000 -0700
    15384 +++ linux-mips-2.6.18.1/drivers/usb/host/ohci-hcd.c     2006-10-17 06:23:28.000000000 -0700
     15724diff -Naur linux-2.6.18.2/drivers/usb/host/ohci-hcd.c linux-mips-2.6.18.2/drivers/usb/host/ohci-hcd.c
     15725--- linux-2.6.18.2/drivers/usb/host/ohci-hcd.c  2006-11-03 17:33:58.000000000 -0800
     15726+++ linux-mips-2.6.18.2/drivers/usb/host/ohci-hcd.c     2006-11-04 14:51:12.000000000 -0800
    1538515727@@ -909,6 +909,10 @@
    1538615728 #include "ohci-au1xxx.c"
    … …  
    1539415736 #include "ohci-ppc-soc.c"
    1539515737 #endif
    15396 diff -Naur linux-2.6.18.1/drivers/usb/host/ohci-pnx8550.c linux-mips-2.6.18.1/drivers/usb/host/ohci-pnx8550.c
    15397 --- linux-2.6.18.1/drivers/usb/host/ohci-pnx8550.c      1969-12-31 16:00:00.000000000 -0800
    15398 +++ linux-mips-2.6.18.1/drivers/usb/host/ohci-pnx8550.c 2006-10-17 06:23:28.000000000 -0700
     15738diff -Naur linux-2.6.18.2/drivers/usb/host/ohci-pnx8550.c linux-mips-2.6.18.2/drivers/usb/host/ohci-pnx8550.c
     15739--- linux-2.6.18.2/drivers/usb/host/ohci-pnx8550.c      1969-12-31 16:00:00.000000000 -0800
     15740+++ linux-mips-2.6.18.2/drivers/usb/host/ohci-pnx8550.c 2006-11-04 14:51:12.000000000 -0800
    1539915741@@ -0,0 +1,277 @@
    1540015742+/*
    … …  
    1567516017+module_init (ohci_hcd_pnx8550_init);
    1567616018+module_exit (ohci_hcd_pnx8550_cleanup);
    15677 diff -Naur linux-2.6.18.1/drivers/video/Kconfig linux-mips-2.6.18.1/drivers/video/Kconfig
    15678 --- linux-2.6.18.1/drivers/video/Kconfig        2006-10-13 20:34:03.000000000 -0700
    15679 +++ linux-mips-2.6.18.1/drivers/video/Kconfig   2006-10-17 06:23:28.000000000 -0700
     16019diff -Naur linux-2.6.18.2/drivers/video/Kconfig linux-mips-2.6.18.2/drivers/video/Kconfig
     16020--- linux-2.6.18.2/drivers/video/Kconfig        2006-11-03 17:33:58.000000000 -0800
     16021+++ linux-mips-2.6.18.2/drivers/video/Kconfig   2006-11-04 14:51:12.000000000 -0800
    1568016022@@ -1250,6 +1250,17 @@
    1568116023          Please read the <file:Documentation/fb/README-sstfb.txt> for supported
    … …  
    1573416076 config FB_MAXINE
    1573516077        bool "Maxine (Personal DECstation) onboard framebuffer support"
    15736 diff -Naur linux-2.6.18.1/drivers/video/Makefile linux-mips-2.6.18.1/drivers/video/Makefile
    15737 --- linux-2.6.18.1/drivers/video/Makefile       2006-10-13 20:34:03.000000000 -0700
    15738 +++ linux-mips-2.6.18.1/drivers/video/Makefile  2006-10-17 06:23:28.000000000 -0700
     16078diff -Naur linux-2.6.18.2/drivers/video/Makefile linux-mips-2.6.18.2/drivers/video/Makefile
     16079--- linux-2.6.18.2/drivers/video/Makefile       2006-11-03 17:33:58.000000000 -0800
     16080+++ linux-mips-2.6.18.2/drivers/video/Makefile  2006-11-04 14:51:12.000000000 -0800
    1573916081@@ -95,6 +95,7 @@
    1574016082 obj-$(CONFIG_FB_TX3912)                  += tx3912fb.o
    … …  
    1574516087 obj-$(CONFIG_FB_PNX4008_DUM)     += pnx4008/
    1574616088 obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
    15747 diff -Naur linux-2.6.18.1/drivers/video/au1100fb.c linux-mips-2.6.18.1/drivers/video/au1100fb.c
    15748 --- linux-2.6.18.1/drivers/video/au1100fb.c     2006-10-13 20:34:03.000000000 -0700
    15749 +++ linux-mips-2.6.18.1/drivers/video/au1100fb.c        2006-10-17 06:23:28.000000000 -0700
     16089diff -Naur linux-2.6.18.2/drivers/video/au1100fb.c linux-mips-2.6.18.2/drivers/video/au1100fb.c
     16090--- linux-2.6.18.2/drivers/video/au1100fb.c     2006-11-03 17:33:58.000000000 -0800
     16091+++ linux-mips-2.6.18.2/drivers/video/au1100fb.c        2006-11-04 14:51:12.000000000 -0800
    1575016092@@ -40,6 +40,7 @@
    1575116093  *  with this program; if not, write  to the Free Software Foundation, Inc.,
    … …  
    1575616098 #include <linux/kernel.h>
    1575716099 #include <linux/errno.h>
    15758 diff -Naur linux-2.6.18.1/drivers/video/smivgxfb.c linux-mips-2.6.18.1/drivers/video/smivgxfb.c
    15759 --- linux-2.6.18.1/drivers/video/smivgxfb.c     1969-12-31 16:00:00.000000000 -0800
    15760 +++ linux-mips-2.6.18.1/drivers/video/smivgxfb.c        2006-10-17 06:23:28.000000000 -0700
     16100diff -Naur linux-2.6.18.2/drivers/video/smivgxfb.c linux-mips-2.6.18.2/drivers/video/smivgxfb.c
     16101--- linux-2.6.18.2/drivers/video/smivgxfb.c     1969-12-31 16:00:00.000000000 -0800
     16102+++ linux-mips-2.6.18.2/drivers/video/smivgxfb.c        2006-11-04 14:51:12.000000000 -0800
    1576116103@@ -0,0 +1,387 @@
    1576216104+/***************************************************************************
    … …  
    1614716489+MODULE_DESCRIPTION("Framebuffer driver for SMI Voyager");
    1614816490+MODULE_LICENSE("GPL");
    16149 diff -Naur linux-2.6.18.1/include/asm-mips/Kbuild linux-mips-2.6.18.1/include/asm-mips/Kbuild
    16150 --- linux-2.6.18.1/include/asm-mips/Kbuild      2006-10-13 20:34:03.000000000 -0700
    16151 +++ linux-mips-2.6.18.1/include/asm-mips/Kbuild 2006-10-17 06:23:28.000000000 -0700
     16491diff -Naur linux-2.6.18.2/include/asm-mips/Kbuild linux-mips-2.6.18.2/include/asm-mips/Kbuild
     16492--- linux-2.6.18.2/include/asm-mips/Kbuild      2006-11-03 17:33:58.000000000 -0800
     16493+++ linux-mips-2.6.18.2/include/asm-mips/Kbuild 2006-11-04 14:51:12.000000000 -0800
    1615216494@@ -1 +1,3 @@
    1615316495 include include/asm-generic/Kbuild.asm
    1615416496+
    1615516497+header-y += cachectl.h sgidefs.h sysmips.h
    16156 diff -Naur linux-2.6.18.1/include/asm-mips/cacheflush.h linux-mips-2.6.18.1/include/asm-mips/cacheflush.h
    16157 --- linux-2.6.18.1/include/asm-mips/cacheflush.h        2006-10-13 20:34:03.000000000 -0700
    16158 +++ linux-mips-2.6.18.1/include/asm-mips/cacheflush.h   2006-10-17 06:23:28.000000000 -0700
     16498diff -Naur linux-2.6.18.2/include/asm-mips/asm.h linux-mips-2.6.18.2/include/asm-mips/asm.h
     16499--- linux-2.6.18.2/include/asm-mips/asm.h       2006-11-03 17:33:58.000000000 -0800
     16500+++ linux-mips-2.6.18.2/include/asm-mips/asm.h  2006-11-04 14:51:12.000000000 -0800
     16501@@ -344,6 +344,7 @@
     16502 #define PTR_L          lw
     16503 #define PTR_S          sw
     16504 #define PTR_LA         la
     16505+#define PTR_LI         li
     16506 #define PTR_SLL                sll
     16507 #define PTR_SLLV       sllv
     16508 #define PTR_SRL                srl
     16509@@ -368,6 +369,7 @@
     16510 #define PTR_L          ld
     16511 #define PTR_S          sd
     16512 #define PTR_LA         dla
     16513+#define PTR_LI         dli
     16514 #define PTR_SLL                dsll
     16515 #define PTR_SLLV       dsllv
     16516 #define PTR_SRL                dsrl
     16517diff -Naur linux-2.6.18.2/include/asm-mips/cacheflush.h linux-mips-2.6.18.2/include/asm-mips/cacheflush.h
     16518--- linux-2.6.18.2/include/asm-mips/cacheflush.h        2006-11-03 17:33:58.000000000 -0800
     16519+++ linux-mips-2.6.18.2/include/asm-mips/cacheflush.h   2006-11-04 14:51:12.000000000 -0800
    1615916520@@ -21,7 +21,6 @@
    1616016521  *  - flush_cache_range(vma, start, end) flushes a range of pages
    … …  
    1621516576 extern void (*flush_cache_sigtramp)(unsigned long addr);
    1621616577 extern void (*flush_icache_all)(void);
    16217 diff -Naur linux-2.6.18.1/include/asm-mips/fixmap.h linux-mips-2.6.18.1/include/asm-mips/fixmap.h
    16218 --- linux-2.6.18.1/include/asm-mips/fixmap.h    2006-10-13 20:34:03.000000000 -0700
    16219 +++ linux-mips-2.6.18.1/include/asm-mips/fixmap.h       2006-10-17 06:23:28.000000000 -0700
     16578diff -Naur linux-2.6.18.2/include/asm-mips/fixmap.h linux-mips-2.6.18.2/include/asm-mips/fixmap.h
     16579--- linux-2.6.18.2/include/asm-mips/fixmap.h    2006-11-03 17:33:58.000000000 -0800
     16580+++ linux-mips-2.6.18.2/include/asm-mips/fixmap.h       2006-11-04 14:51:12.000000000 -0800
    1622016581@@ -45,8 +45,16 @@
    1622116582  * fix-mapped?
    … …  
    1624816609 #define FIXADDR_SIZE   (__end_of_fixed_addresses << PAGE_SHIFT)
    1624916610 #define FIXADDR_START  (FIXADDR_TOP - FIXADDR_SIZE)
    16250 diff -Naur linux-2.6.18.1/include/asm-mips/fpu.h linux-mips-2.6.18.1/include/asm-mips/fpu.h
    16251 --- linux-2.6.18.1/include/asm-mips/fpu.h       2006-10-13 20:34:03.000000000 -0700
    16252 +++ linux-mips-2.6.18.1/include/asm-mips/fpu.h  2006-10-17 06:23:28.000000000 -0700
     16611diff -Naur linux-2.6.18.2/include/asm-mips/fpu.h linux-mips-2.6.18.2/include/asm-mips/fpu.h
     16612--- linux-2.6.18.2/include/asm-mips/fpu.h       2006-11-03 17:33:58.000000000 -0800
     16613+++ linux-mips-2.6.18.2/include/asm-mips/fpu.h  2006-11-04 14:51:12.000000000 -0800
    1625316614@@ -134,9 +134,11 @@
    1625416615 
    … …  
    1626516626 
    1626616627        return tsk->thread.fpu.fpr;
    16267 diff -Naur linux-2.6.18.1/include/asm-mips/io.h linux-mips-2.6.18.1/include/asm-mips/io.h
    16268 --- linux-2.6.18.1/include/asm-mips/io.h        2006-10-13 20:34:03.000000000 -0700
    16269 +++ linux-mips-2.6.18.1/include/asm-mips/io.h   2006-10-17 06:23:28.000000000 -0700
     16628diff -Naur linux-2.6.18.2/include/asm-mips/io.h linux-mips-2.6.18.2/include/asm-mips/io.h
     16629--- linux-2.6.18.2/include/asm-mips/io.h        2006-11-03 17:33:58.000000000 -0800
     16630+++ linux-mips-2.6.18.2/include/asm-mips/io.h   2006-11-04 14:51:12.000000000 -0800
     16631@@ -172,7 +172,7 @@
     16632 #define page_to_phys(page)     ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)
     16633 
     16634 extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags);
     16635-extern void __iounmap(volatile void __iomem *addr);
     16636+extern void __iounmap(const volatile void __iomem *addr);
     16637 
     16638 static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
     16639        unsigned long flags)
     16640@@ -279,7 +279,7 @@
     16641 #define ioremap_uncached_accelerated(offset, size)                     \
     16642        __ioremap_mode((offset), (size), _CACHE_UNCACHED_ACCELERATED)
     16643 
     16644-static inline void iounmap(volatile void __iomem *addr)
     16645+static inline void iounmap(const volatile void __iomem *addr)
     16646 {
     16647 #define __IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1)
     16648 
    1627016649@@ -518,34 +518,6 @@
    1627116650 }
    … …  
    1630316682  * to explicitly ioremap() it. The fact that the ISA IO space is mapped
    1630416683  * to PAGE_OFFSET is pure coincidence - it does not mean ISA values
    16305 diff -Naur linux-2.6.18.1/include/asm-mips/irq.h linux-mips-2.6.18.1/include/asm-mips/irq.h
    16306 --- linux-2.6.18.1/include/asm-mips/irq.h       2006-10-13 20:34:03.000000000 -0700
    16307 +++ linux-mips-2.6.18.1/include/asm-mips/irq.h  2006-10-17 06:23:28.000000000 -0700
     16684diff -Naur linux-2.6.18.2/include/asm-mips/irq.h linux-mips-2.6.18.2/include/asm-mips/irq.h
     16685--- linux-2.6.18.2/include/asm-mips/irq.h       2006-11-03 17:33:58.000000000 -0800
     16686+++ linux-mips-2.6.18.2/include/asm-mips/irq.h  2006-11-04 14:51:12.000000000 -0800
    1630816687@@ -76,8 +76,4 @@
    1630916688                           unsigned long hwmask);
    … …  
    1631516694-
    1631616695 #endif /* _ASM_IRQ_H */
    16317 diff -Naur linux-2.6.18.1/include/asm-mips/mach-atlas/mc146818rtc.h linux-mips-2.6.18.1/include/asm-mips/mach-atlas/mc146818rtc.h
    16318 --- linux-2.6.18.1/include/asm-mips/mach-atlas/mc146818rtc.h    2006-10-13 20:34:03.000000000 -0700
    16319 +++ linux-mips-2.6.18.1/include/asm-mips/mach-atlas/mc146818rtc.h       2006-10-17 06:23:28.000000000 -0700
     16696diff -Naur linux-2.6.18.2/include/asm-mips/mach-atlas/mc146818rtc.h linux-mips-2.6.18.2/include/asm-mips/mach-atlas/mc146818rtc.h
     16697--- linux-2.6.18.2/include/asm-mips/mach-atlas/mc146818rtc.h    2006-11-03 17:33:58.000000000 -0800
     16698+++ linux-mips-2.6.18.2/include/asm-mips/mach-atlas/mc146818rtc.h       2006-11-04 14:51:12.000000000 -0800
    1632016699@@ -28,10 +28,12 @@
    1632116700 #include <asm/mips-boards/atlas.h>
    … …  
    1633216711 static inline unsigned char CMOS_READ(unsigned long addr)
    1633316712 {
    16334 diff -Naur linux-2.6.18.1/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.18.1/include/asm-mips/mach-au1x00/au1xxx_ide.h
    16335 --- linux-2.6.18.1/include/asm-mips/mach-au1x00/au1xxx_ide.h    2006-10-13 20:34:03.000000000 -0700
    16336 +++ linux-mips-2.6.18.1/include/asm-mips/mach-au1x00/au1xxx_ide.h       2006-10-17 06:23:28.000000000 -0700
     16713diff -Naur linux-2.6.18.2/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.18.2/include/asm-mips/mach-au1x00/au1xxx_ide.h
     16714--- linux-2.6.18.2/include/asm-mips/mach-au1x00/au1xxx_ide.h    2006-11-03 17:33:58.000000000 -0800
     16715+++ linux-mips-2.6.18.2/include/asm-mips/mach-au1x00/au1xxx_ide.h       2006-11-04 14:51:12.000000000 -0800
    1633716716@@ -83,6 +83,7 @@
    1633816717 } _auide_hwif;
    … …  
    1634316722 static const struct drive_list_entry dma_white_list [] = {
    1634416723 /*
    16345 diff -Naur linux-2.6.18.1/include/asm-mips/mips-boards/atlasint.h linux-mips-2.6.18.1/include/asm-mips/mips-boards/atlasint.h
    16346 --- linux-2.6.18.1/include/asm-mips/mips-boards/atlasint.h      2006-10-13 20:34:03.000000000 -0700
    16347 +++ linux-mips-2.6.18.1/include/asm-mips/mips-boards/atlasint.h 2006-10-17 06:23:28.000000000 -0700
     16724diff -Naur linux-2.6.18.2/include/asm-mips/mips-boards/atlasint.h linux-mips-2.6.18.2/include/asm-mips/mips-boards/atlasint.h
     16725--- linux-2.6.18.2/include/asm-mips/mips-boards/atlasint.h      2006-11-03 17:33:58.000000000 -0800
     16726+++ linux-mips-2.6.18.2/include/asm-mips/mips-boards/atlasint.h 2006-11-04 14:51:12.000000000 -0800
    1634816727@@ -1,6 +1,7 @@
    1634916728 /*
    … …  
    1648116860 
    1648216861 #endif /* !(_MIPS_ATLASINT_H) */
    16483 diff -Naur linux-2.6.18.1/include/asm-mips/page.h linux-mips-2.6.18.1/include/asm-mips/page.h
    16484 --- linux-2.6.18.1/include/asm-mips/page.h      2006-10-13 20:34:03.000000000 -0700
    16485 +++ linux-mips-2.6.18.1/include/asm-mips/page.h 2006-10-17 06:23:28.000000000 -0700
     16862diff -Naur linux-2.6.18.2/include/asm-mips/page.h linux-mips-2.6.18.2/include/asm-mips/page.h
     16863--- linux-2.6.18.2/include/asm-mips/page.h      2006-11-03 17:33:58.000000000 -0800
     16864+++ linux-mips-2.6.18.2/include/asm-mips/page.h 2006-11-04 14:51:12.000000000 -0800
    1648616865@@ -53,19 +53,17 @@
    1648716866        extern void (*flush_data_cache_page)(unsigned long addr);
    … …  
    1653016909 /*
    1653116910  * For 3-level pagetables we defines these ourselves, for 2-level the
    16532 diff -Naur linux-2.6.18.1/include/asm-mips/ptrace.h linux-mips-2.6.18.1/include/asm-mips/ptrace.h
    16533 --- linux-2.6.18.1/include/asm-mips/ptrace.h    2006-10-13 20:34:03.000000000 -0700
    16534 +++ linux-mips-2.6.18.1/include/asm-mips/ptrace.h       2006-10-17 06:23:28.000000000 -0700
     16911diff -Naur linux-2.6.18.2/include/asm-mips/pgalloc.h linux-mips-2.6.18.2/include/asm-mips/pgalloc.h
     16912--- linux-2.6.18.2/include/asm-mips/pgalloc.h   2006-11-03 17:33:58.000000000 -0800
     16913+++ linux-mips-2.6.18.2/include/asm-mips/pgalloc.h      2006-11-04 14:51:12.000000000 -0800
     16914@@ -48,7 +48,7 @@
     16915 
     16916        ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_ORDER);
     16917        if (ret) {
     16918-               init = pgd_offset(&init_mm, 0);
     16919+               init = pgd_offset(&init_mm, 0UL);
     16920                pgd_init((unsigned long)ret);
     16921                memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,
     16922                       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
     16923diff -Naur linux-2.6.18.2/include/asm-mips/pgtable-64.h linux-mips-2.6.18.2/include/asm-mips/pgtable-64.h
     16924--- linux-2.6.18.2/include/asm-mips/pgtable-64.h        2006-11-03 17:33:58.000000000 -0800
     16925+++ linux-mips-2.6.18.2/include/asm-mips/pgtable-64.h   2006-11-04 14:51:12.000000000 -0800
     16926@@ -170,7 +170,7 @@
     16927 #define __pmd_offset(address)  pmd_index(address)
     16928 
     16929 /* to find an entry in a kernel page-table-directory */
     16930-#define pgd_offset_k(address) pgd_offset(&init_mm, 0)
     16931+#define pgd_offset_k(address) pgd_offset(&init_mm, 0UL)
     16932 
     16933 #define pgd_index(address)     (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
     16934 #define pmd_index(address)     (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
     16935diff -Naur linux-2.6.18.2/include/asm-mips/ptrace.h linux-mips-2.6.18.2/include/asm-mips/ptrace.h
     16936--- linux-2.6.18.2/include/asm-mips/ptrace.h    2006-11-03 17:33:58.000000000 -0800
     16937+++ linux-mips-2.6.18.2/include/asm-mips/ptrace.h       2006-11-04 14:51:12.000000000 -0800
    1653516938@@ -10,8 +10,6 @@
    1653616939 #define _ASM_PTRACE_H
    … …  
    1655016953 /*
    1655116954  * Does the process account for user or for system time?
    16552 diff -Naur linux-2.6.18.1/include/asm-mips/spinlock.h linux-mips-2.6.18.1/include/asm-mips/spinlock.h
    16553 --- linux-2.6.18.1/include/asm-mips/spinlock.h  2006-10-13 20:34:03.000000000 -0700
    16554 +++ linux-mips-2.6.18.1/include/asm-mips/spinlock.h     2006-10-17 06:23:28.000000000 -0700
     16955diff -Naur linux-2.6.18.2/include/asm-mips/spinlock.h linux-mips-2.6.18.2/include/asm-mips/spinlock.h
     16956--- linux-2.6.18.2/include/asm-mips/spinlock.h  2006-11-03 17:33:58.000000000 -0800
     16957+++ linux-mips-2.6.18.2/include/asm-mips/spinlock.h     2006-11-04 14:51:12.000000000 -0800
    1655516958@@ -239,7 +239,51 @@
    1655616959        : "memory");
    … …  
    1661217015+
    1661317016 #endif /* _ASM_SPINLOCK_H */
    16614 diff -Naur linux-2.6.18.1/include/asm-mips/system.h linux-mips-2.6.18.1/include/asm-mips/system.h
    16615 --- linux-2.6.18.1/include/asm-mips/system.h    2006-10-13 20:34:03.000000000 -0700
    16616 +++ linux-mips-2.6.18.1/include/asm-mips/system.h       2006-10-17 06:23:28.000000000 -0700
     17017diff -Naur linux-2.6.18.2/include/asm-mips/system.h linux-mips-2.6.18.2/include/asm-mips/system.h
     17018--- linux-2.6.18.2/include/asm-mips/system.h    2006-11-03 17:33:58.000000000 -0800
     17019+++ linux-mips-2.6.18.2/include/asm-mips/system.h       2006-11-04 14:51:12.000000000 -0800
    1661717020@@ -392,7 +392,7 @@
    1661817021 {
    … …  
    1662417027                "       .set    push                                    \n"
    1662517028                "       .set    noat                                    \n"
    16626 diff -Naur linux-2.6.18.1/include/asm-mips/timex.h linux-mips-2.6.18.1/include/asm-mips/timex.h
    16627 --- linux-2.6.18.1/include/asm-mips/timex.h     2006-10-13 20:34:03.000000000 -0700
    16628 +++ linux-mips-2.6.18.1/include/asm-mips/timex.h        2006-10-17 06:23:28.000000000 -0700
     17029diff -Naur linux-2.6.18.2/include/asm-mips/timex.h linux-mips-2.6.18.2/include/asm-mips/timex.h
     17030--- linux-2.6.18.2/include/asm-mips/timex.h     2006-11-03 17:33:58.000000000 -0800
     17031+++ linux-mips-2.6.18.2/include/asm-mips/timex.h        2006-11-04 14:51:12.000000000 -0800
    1662917032@@ -8,6 +8,8 @@
    1663017033 #ifndef _ASM_TIMEX_H
    … …  
    1664317046+
    1664417047 #endif /*  _ASM_TIMEX_H */
    16645 diff -Naur linux-2.6.18.1/include/asm-mips/unistd.h linux-mips-2.6.18.1/include/asm-mips/unistd.h
    16646 --- linux-2.6.18.1/include/asm-mips/unistd.h    2006-10-13 20:34:03.000000000 -0700
    16647 +++ linux-mips-2.6.18.1/include/asm-mips/unistd.h       2006-10-17 06:23:28.000000000 -0700
     17048diff -Naur linux-2.6.18.2/include/asm-mips/unistd.h linux-mips-2.6.18.2/include/asm-mips/unistd.h
     17049--- linux-2.6.18.2/include/asm-mips/unistd.h    2006-11-03 17:33:58.000000000 -0800
     17050+++ linux-mips-2.6.18.2/include/asm-mips/unistd.h       2006-11-04 14:51:12.000000000 -0800
    1664817051@@ -313,7 +313,7 @@
    1664917052 #define __NR_mknodat                   (__NR_Linux + 290)
    … …  
    1673617139 #ifdef __KERNEL__
    1673717140 
    16738 diff -Naur linux-2.6.18.1/include/asm-mips/user.h linux-mips-2.6.18.1/include/asm-mips/user.h
    16739 --- linux-2.6.18.1/include/asm-mips/user.h      2006-10-13 20:34:03.000000000 -0700
    16740 +++ linux-mips-2.6.18.1/include/asm-mips/user.h 2006-10-17 06:23:28.000000000 -0700
     17141diff -Naur linux-2.6.18.2/include/asm-mips/user.h linux-mips-2.6.18.2/include/asm-mips/user.h
     17142--- linux-2.6.18.2/include/asm-mips/user.h      2006-11-03 17:33:58.000000000 -0800
     17143+++ linux-mips-2.6.18.2/include/asm-mips/user.h 2006-11-04 14:51:12.000000000 -0800
    1674117144@@ -8,6 +8,8 @@
    1674217145 #ifndef _ASM_USER_H
    … …  
    1675517158+
    1675617159 #endif /* _ASM_USER_H */
    16757 diff -Naur linux-2.6.18.1/include/linux/highmem.h linux-mips-2.6.18.1/include/linux/highmem.h
    16758 --- linux-2.6.18.1/include/linux/highmem.h      2006-10-13 20:34:03.000000000 -0700
    16759 +++ linux-mips-2.6.18.1/include/linux/highmem.h 2006-10-17 06:23:28.000000000 -0700
     17160diff -Naur linux-2.6.18.2/include/linux/highmem.h linux-mips-2.6.18.2/include/linux/highmem.h
     17161--- linux-2.6.18.2/include/linux/highmem.h      2006-11-03 17:33:58.000000000 -0800
     17162+++ linux-mips-2.6.18.2/include/linux/highmem.h 2006-11-04 14:51:12.000000000 -0800
    1676017163@@ -89,7 +89,10 @@
    1676117164        kunmap_atomic(kaddr, KM_USER0);
    … …  
    1677917182 {
    1678017183        char *vfrom, *vto;
    16781 diff -Naur linux-2.6.18.1/include/linux/pci_ids.h linux-mips-2.6.18.1/include/linux/pci_ids.h
    16782 --- linux-2.6.18.1/include/linux/pci_ids.h      2006-10-13 20:34:03.000000000 -0700
    16783 +++ linux-mips-2.6.18.1/include/linux/pci_ids.h 2006-10-17 06:23:28.000000000 -0700
     17184diff -Naur linux-2.6.18.2/include/linux/pci_ids.h linux-mips-2.6.18.2/include/linux/pci_ids.h
     17185--- linux-2.6.18.2/include/linux/pci_ids.h      2006-11-03 17:33:58.000000000 -0800
     17186+++ linux-mips-2.6.18.2/include/linux/pci_ids.h 2006-11-04 14:51:12.000000000 -0800
    1678417187@@ -1603,6 +1603,9 @@
    1678517188 #define PCI_VENDOR_ID_SATSAGEM         0x1267
    … …  
    1679217195 #define PCI_VENDOR_ID_ENSONIQ          0x1274
    1679317196 #define PCI_DEVICE_ID_ENSONIQ_CT5880   0x5880
    16794 diff -Naur linux-2.6.18.1/include/linux/serial.h linux-mips-2.6.18.1/include/linux/serial.h
    16795 --- linux-2.6.18.1/include/linux/serial.h       2006-10-13 20:34:03.000000000 -0700
    16796 +++ linux-mips-2.6.18.1/include/linux/serial.h  2006-10-17 06:23:28.000000000 -0700
     17197diff -Naur linux-2.6.18.2/include/linux/serial.h linux-mips-2.6.18.2/include/linux/serial.h
     17198--- linux-2.6.18.2/include/linux/serial.h       2006-11-03 17:33:58.000000000 -0800
     17199+++ linux-mips-2.6.18.2/include/linux/serial.h  2006-11-04 14:51:12.000000000 -0800
    1679717200@@ -76,7 +76,8 @@
    1679817201 #define PORT_16654     11
    … …  
    1680517208 #define SERIAL_IO_PORT 0
    1680617209 #define SERIAL_IO_HUB6 1
    16807 diff -Naur linux-2.6.18.1/include/linux/serial_ip3106.h linux-mips-2.6.18.1/include/linux/serial_ip3106.h
    16808 --- linux-2.6.18.1/include/linux/serial_ip3106.h        2006-10-13 20:34:03.000000000 -0700
    16809 +++ linux-mips-2.6.18.1/include/linux/serial_ip3106.h   2006-10-17 06:23:28.000000000 -0700
     17210diff -Naur linux-2.6.18.2/include/linux/serial_ip3106.h linux-mips-2.6.18.2/include/linux/serial_ip3106.h
     17211--- linux-2.6.18.2/include/linux/serial_ip3106.h        2006-11-03 17:33:58.000000000 -0800
     17212+++ linux-mips-2.6.18.2/include/linux/serial_ip3106.h   2006-11-04 14:51:12.000000000 -0800
    1681017213@@ -78,4 +78,16 @@
    1681117214 #define IP3106_UART_FIFO_RXFIFO                0x00001F00
    … …  
    1682517228+
    1682617229 #endif
    16827 diff -Naur linux-2.6.18.1/mm/memory.c linux-mips-2.6.18.1/mm/memory.c
    16828 --- linux-2.6.18.1/mm/memory.c  2006-10-13 20:34:03.000000000 -0700
    16829 +++ linux-mips-2.6.18.1/mm/memory.c     2006-10-17 06:23:28.000000000 -0700
     17230diff -Naur linux-2.6.18.2/mm/memory.c linux-mips-2.6.18.2/mm/memory.c
     17231--- linux-2.6.18.2/mm/memory.c  2006-11-03 17:33:58.000000000 -0800
     17232+++ linux-mips-2.6.18.2/mm/memory.c     2006-11-04 14:51:12.000000000 -0800
    1683017233@@ -1407,7 +1407,7 @@
    1683117234        return pte;
    … …  
    1685817261 
    1685917262        /*
    16860 @@ -2135,7 +2135,7 @@
     17263@@ -2142,7 +2142,7 @@
    1686117264                        page = alloc_page_vma(GFP_HIGHUSER, vma, address);
    1686217265                        if (!page)
    … …  
    1686717270                        new_page = page;
    1686817271                        anon = 1;
    16869 diff -Naur linux-2.6.18.1/sound/oss/Kconfig linux-mips-2.6.18.1/sound/oss/Kconfig
    16870 --- linux-2.6.18.1/sound/oss/Kconfig    2006-10-13 20:34:03.000000000 -0700
    16871 +++ linux-mips-2.6.18.1/sound/oss/Kconfig       2006-10-17 06:23:28.000000000 -0700
     17272diff -Naur linux-2.6.18.2/sound/oss/Kconfig linux-mips-2.6.18.2/sound/oss/Kconfig
     17273--- linux-2.6.18.2/sound/oss/Kconfig    2006-11-03 17:33:58.000000000 -0800
     17274+++ linux-mips-2.6.18.2/sound/oss/Kconfig       2006-11-04 14:51:12.000000000 -0800
    1687217275@@ -132,6 +132,13 @@
    1687317276        select SND_AC97_CODEC
    … …  
    1688417287        tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
    1688517288        depends on SOUND_PRIME && PCI
    16886 diff -Naur linux-2.6.18.1/sound/oss/Makefile linux-mips-2.6.18.1/sound/oss/Makefile
    16887 --- linux-2.6.18.1/sound/oss/Makefile   2006-10-13 20:34:03.000000000 -0700
    16888 +++ linux-mips-2.6.18.1/sound/oss/Makefile      2006-10-17 06:23:28.000000000 -0700
     17289diff -Naur linux-2.6.18.2/sound/oss/Makefile linux-mips-2.6.18.2/sound/oss/Makefile
     17290--- linux-2.6.18.2/sound/oss/Makefile   2006-11-03 17:33:58.000000000 -0800
     17291+++ linux-mips-2.6.18.2/sound/oss/Makefile      2006-11-04 14:51:12.000000000 -0800
    1688917292@@ -66,6 +66,7 @@
    1689017293 obj-$(CONFIG_SOUND_VRC5477)    += nec_vrc5477.o ac97_codec.o
    … …  
    1689517298 obj-$(CONFIG_SOUND_FUSION)     += cs46xx.o ac97_codec.o
    1689617299 obj-$(CONFIG_SOUND_MAESTRO)    += maestro.o
    16897 diff -Naur linux-2.6.18.1/sound/oss/au1550_i2s.c linux-mips-2.6.18.1/sound/oss/au1550_i2s.c
    16898 --- linux-2.6.18.1/sound/oss/au1550_i2s.c       1969-12-31 16:00:00.000000000 -0800
    16899 +++ linux-mips-2.6.18.1/sound/oss/au1550_i2s.c  2006-10-17 06:23:28.000000000 -0700
     17300diff -Naur linux-2.6.18.2/sound/oss/au1550_i2s.c linux-mips-2.6.18.2/sound/oss/au1550_i2s.c
     17301--- linux-2.6.18.2/sound/oss/au1550_i2s.c       1969-12-31 16:00:00.000000000 -0800
     17302+++ linux-mips-2.6.18.2/sound/oss/au1550_i2s.c  2006-11-04 14:51:12.000000000 -0800
    1690017303@@ -0,0 +1,2029 @@
    1690117304+/*
Note: See TracChangeset for help on using the changeset viewer.