Changeset be76242 in clfs-embedded for patches


Ignore:
Timestamp:
Feb 4, 2007, 10:46:05 AM (18 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
master
Children:
1603a9d
Parents:
961b7c5
Message:

Updated to Linux 2.6.19.2
Fixes for uClibc
Changed > to &gt;
Updated all Linux Patches
Updated Linux Headers
Updated to Busybox 1.4.1
Added E2FSProgs since it was removed from Busybox
Fixed Typos

Location:
patches
Files:
6 moved

Legend:

Unmodified
Added
Removed

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

    r961b7c5 rbe76242  
    11Submitted By: Jim Gifford (patches at jg555 dot com)
    2 Date: 2006-11-29
    3 Initial Package Version: 2.6.19
     2Date: 2006-12-12
     3Initial Package Version: 2.6.19.1
    44Origin: Linux-MIPS
    55Upstream Status: http://www.linux-mips.org/pub/linux/mips/kernel/v2.6/
    66
    7 diff -Naur linux-2.6.19/arch/mips/Kconfig linux-mips-2.6.19/arch/mips/Kconfig
    8 --- linux-2.6.19/arch/mips/Kconfig      2006-11-29 13:57:37.000000000 -0800
    9 +++ linux-mips-2.6.19/arch/mips/Kconfig 2006-11-29 15:23:09.000000000 -0800
     7diff -Naur linux-2.6.19.1/arch/mips/Kconfig linux-mips-2.6.19.1/arch/mips/Kconfig
     8--- linux-2.6.19.1/arch/mips/Kconfig    2006-12-11 11:32:53.000000000 -0800
     9+++ linux-mips-2.6.19.1/arch/mips/Kconfig       2006-12-11 15:38:26.000000000 -0800
    1010@@ -468,8 +468,6 @@
    1111 config MACH_VR41XX
    … …  
    3838        bool "Kernel support for o32 binaries"
    3939        depends on MIPS32_COMPAT
    40 diff -Naur linux-2.6.19/arch/mips/au1000/common/pci.c linux-mips-2.6.19/arch/mips/au1000/common/pci.c
    41 --- linux-2.6.19/arch/mips/au1000/common/pci.c  2006-11-29 13:57:37.000000000 -0800
    42 +++ linux-mips-2.6.19/arch/mips/au1000/common/pci.c     2006-11-29 15:23:09.000000000 -0800
     40diff -Naur linux-2.6.19.1/arch/mips/au1000/common/pci.c linux-mips-2.6.19.1/arch/mips/au1000/common/pci.c
     41--- linux-2.6.19.1/arch/mips/au1000/common/pci.c        2006-12-11 11:32:53.000000000 -0800
     42+++ linux-mips-2.6.19.1/arch/mips/au1000/common/pci.c   2006-12-11 15:38:26.000000000 -0800
    4343@@ -76,13 +76,17 @@
    4444        }
    … …  
    6666 #endif
    6767 
    68 diff -Naur linux-2.6.19/arch/mips/au1000/common/setup.c linux-mips-2.6.19/arch/mips/au1000/common/setup.c
    69 --- linux-2.6.19/arch/mips/au1000/common/setup.c        2006-11-29 13:57:37.000000000 -0800
    70 +++ linux-mips-2.6.19/arch/mips/au1000/common/setup.c   2006-11-29 15:23:09.000000000 -0800
     68diff -Naur linux-2.6.19.1/arch/mips/au1000/common/setup.c linux-mips-2.6.19.1/arch/mips/au1000/common/setup.c
     69--- linux-2.6.19.1/arch/mips/au1000/common/setup.c      2006-12-11 11:32:53.000000000 -0800
     70+++ linux-mips-2.6.19.1/arch/mips/au1000/common/setup.c 2006-12-11 15:38:26.000000000 -0800
    7171@@ -141,17 +141,20 @@
    7272 /* This routine should be valid for all Au1x based boards */
    … …  
    9898 #endif
    9999 
    100 diff -Naur linux-2.6.19/arch/mips/au1000/pb1100/board_setup.c linux-mips-2.6.19/arch/mips/au1000/pb1100/board_setup.c
    101 --- linux-2.6.19/arch/mips/au1000/pb1100/board_setup.c  2006-11-29 13:57:37.000000000 -0800
    102 +++ linux-mips-2.6.19/arch/mips/au1000/pb1100/board_setup.c     2006-11-29 15:23:09.000000000 -0800
     100diff -Naur linux-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c linux-mips-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c
     101--- linux-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c        2006-12-11 11:32:53.000000000 -0800
     102+++ linux-mips-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c   2006-12-11 15:38:26.000000000 -0800
    103103@@ -47,8 +47,7 @@
    104104 
    … …  
    216216        }
    217217 }
    218 diff -Naur linux-2.6.19/arch/mips/kernel/linux32.c linux-mips-2.6.19/arch/mips/kernel/linux32.c
    219 --- linux-2.6.19/arch/mips/kernel/linux32.c     2006-11-29 13:57:37.000000000 -0800
    220 +++ linux-mips-2.6.19/arch/mips/kernel/linux32.c        2006-11-29 15:23:09.000000000 -0800
     218diff -Naur linux-2.6.19.1/arch/mips/configs/malta_defconfig linux-mips-2.6.19.1/arch/mips/configs/malta_defconfig
     219--- linux-2.6.19.1/arch/mips/configs/malta_defconfig    2006-12-11 11:32:53.000000000 -0800
     220+++ linux-mips-2.6.19.1/arch/mips/configs/malta_defconfig       2006-12-11 15:38:26.000000000 -0800
     221@@ -644,7 +644,85 @@
     222 #
     223 # Memory Technology Devices (MTD)
     224 #
     225-# CONFIG_MTD is not set
     226+CONFIG_MTD=y
     227+# CONFIG_MTD_DEBUG is not set
     228+# CONFIG_MTD_CONCAT is not set
     229+CONFIG_MTD_PARTITIONS=y
     230+# CONFIG_MTD_REDBOOT_PARTS is not set
     231+# CONFIG_MTD_CMDLINE_PARTS is not set
     232+
     233+#
     234+# User Modules And Translation Layers
     235+#
     236+CONFIG_MTD_CHAR=y
     237+CONFIG_MTD_BLOCK=y
     238+# CONFIG_FTL is not set
     239+# CONFIG_NFTL is not set
     240+# CONFIG_INFTL is not set
     241+# CONFIG_RFD_FTL is not set
     242+# CONFIG_SSFDC is not set
     243+
     244+#
     245+# RAM/ROM/Flash chip drivers
     246+#
     247+CONFIG_MTD_CFI=y
     248+# CONFIG_MTD_JEDECPROBE is not set
     249+CONFIG_MTD_GEN_PROBE=y
     250+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
     251+CONFIG_MTD_MAP_BANK_WIDTH_1=y
     252+CONFIG_MTD_MAP_BANK_WIDTH_2=y
     253+CONFIG_MTD_MAP_BANK_WIDTH_4=y
     254+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
     255+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
     256+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
     257+CONFIG_MTD_CFI_I1=y
     258+CONFIG_MTD_CFI_I2=y
     259+# CONFIG_MTD_CFI_I4 is not set
     260+# CONFIG_MTD_CFI_I8 is not set
     261+CONFIG_MTD_CFI_INTELEXT=y
     262+CONFIG_MTD_CFI_AMDSTD=y
     263+CONFIG_MTD_CFI_STAA=y
     264+CONFIG_MTD_CFI_UTIL=y
     265+# CONFIG_MTD_RAM is not set
     266+# CONFIG_MTD_ROM is not set
     267+# CONFIG_MTD_ABSENT is not set
     268+# CONFIG_MTD_OBSOLETE_CHIPS is not set
     269+
     270+#
     271+# Mapping drivers for chip access
     272+#
     273+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
     274+CONFIG_MTD_PHYSMAP=y
     275+CONFIG_MTD_PHYSMAP_START=0x0
     276+CONFIG_MTD_PHYSMAP_LEN=0x0
     277+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
     278+# CONFIG_MTD_PLATRAM is not set
     279+
     280+#
     281+# Self-contained MTD device drivers
     282+#
     283+# CONFIG_MTD_PMC551 is not set
     284+# CONFIG_MTD_SLRAM is not set
     285+# CONFIG_MTD_PHRAM is not set
     286+# CONFIG_MTD_MTDRAM is not set
     287+# CONFIG_MTD_BLOCK2MTD is not set
     288+
     289+#
     290+# Disk-On-Chip Device Drivers
     291+#
     292+# CONFIG_MTD_DOC2000 is not set
     293+# CONFIG_MTD_DOC2001 is not set
     294+# CONFIG_MTD_DOC2001PLUS is not set
     295+
     296+#
     297+# NAND Flash Device Drivers
     298+#
     299+# CONFIG_MTD_NAND is not set
     300+
     301+#
     302+# OneNAND Flash Device Drivers
     303+#
     304+# CONFIG_MTD_ONENAND is not set
     305 
     306 #
     307 # Parallel port support
     308diff -Naur linux-2.6.19.1/arch/mips/kernel/linux32.c linux-mips-2.6.19.1/arch/mips/kernel/linux32.c
     309--- linux-2.6.19.1/arch/mips/kernel/linux32.c   2006-12-11 11:32:53.000000000 -0800
     310+++ linux-mips-2.6.19.1/arch/mips/kernel/linux32.c      2006-12-11 15:38:26.000000000 -0800
    221311@@ -382,531 +382,6 @@
    222312        return ret;
    … …  
    842932 struct sysctl_args32
    843933 {
    844 diff -Naur linux-2.6.19/arch/mips/kernel/mips-mt.c linux-mips-2.6.19/arch/mips/kernel/mips-mt.c
    845 --- linux-2.6.19/arch/mips/kernel/mips-mt.c     2006-11-29 13:57:37.000000000 -0800
    846 +++ linux-mips-2.6.19/arch/mips/kernel/mips-mt.c        2006-11-29 15:23:09.000000000 -0800
     934diff -Naur linux-2.6.19.1/arch/mips/kernel/mips-mt.c linux-mips-2.6.19.1/arch/mips/kernel/mips-mt.c
     935--- linux-2.6.19.1/arch/mips/kernel/mips-mt.c   2006-12-11 11:32:53.000000000 -0800
     936+++ linux-mips-2.6.19.1/arch/mips/kernel/mips-mt.c      2006-12-11 15:38:26.000000000 -0800
    847937@@ -96,6 +96,10 @@
    848938                goto out_unlock;
    … …  
    868958        cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);
    869959 
    870 diff -Naur linux-2.6.19/arch/mips/kernel/ptrace.c linux-mips-2.6.19/arch/mips/kernel/ptrace.c
    871 --- linux-2.6.19/arch/mips/kernel/ptrace.c      2006-11-29 13:57:37.000000000 -0800
    872 +++ linux-mips-2.6.19/arch/mips/kernel/ptrace.c 2006-11-29 15:23:09.000000000 -0800
     960diff -Naur linux-2.6.19.1/arch/mips/kernel/ptrace.c linux-mips-2.6.19.1/arch/mips/kernel/ptrace.c
     961--- linux-2.6.19.1/arch/mips/kernel/ptrace.c    2006-12-11 11:32:53.000000000 -0800
     962+++ linux-mips-2.6.19.1/arch/mips/kernel/ptrace.c       2006-12-11 15:38:26.000000000 -0800
    873963@@ -20,12 +20,12 @@
    874964 #include <linux/mm.h>
    … …  
    9221012+                                   regs->regs[6], regs->regs[7]);
    9231013 }
    924 diff -Naur linux-2.6.19/arch/mips/kernel/scall64-n32.S linux-mips-2.6.19/arch/mips/kernel/scall64-n32.S
    925 --- linux-2.6.19/arch/mips/kernel/scall64-n32.S 2006-11-29 13:57:37.000000000 -0800
    926 +++ linux-mips-2.6.19/arch/mips/kernel/scall64-n32.S    2006-11-29 15:23:09.000000000 -0800
     1014diff -Naur linux-2.6.19.1/arch/mips/kernel/reset.c linux-mips-2.6.19.1/arch/mips/kernel/reset.c
     1015--- linux-2.6.19.1/arch/mips/kernel/reset.c     2006-12-11 11:32:53.000000000 -0800
     1016+++ linux-mips-2.6.19.1/arch/mips/kernel/reset.c        2006-12-11 15:38:26.000000000 -0800
     1017@@ -23,6 +23,8 @@
     1018 void (*_machine_halt)(void);
     1019 void (*pm_power_off)(void);
     1020 
     1021+EXPORT_SYMBOL(pm_power_off);
     1022+
     1023 void machine_restart(char *command)
     1024 {
     1025        if (_machine_restart)
     1026diff -Naur linux-2.6.19.1/arch/mips/kernel/scall64-n32.S linux-mips-2.6.19.1/arch/mips/kernel/scall64-n32.S
     1027--- linux-2.6.19.1/arch/mips/kernel/scall64-n32.S       2006-12-11 11:32:53.000000000 -0800
     1028+++ linux-mips-2.6.19.1/arch/mips/kernel/scall64-n32.S  2006-12-11 15:38:26.000000000 -0800
    9271029@@ -149,8 +149,8 @@
    9281030        PTR     sys_mincore
    … …  
    9621064        PTR     compat_sys_statfs64
    9631065        PTR     compat_sys_fstatfs64
    964 diff -Naur linux-2.6.19/arch/mips/lib/Makefile linux-mips-2.6.19/arch/mips/lib/Makefile
    965 --- linux-2.6.19/arch/mips/lib/Makefile 2006-11-29 13:57:37.000000000 -0800
    966 +++ linux-mips-2.6.19/arch/mips/lib/Makefile    2006-11-29 15:23:09.000000000 -0800
     1066diff -Naur linux-2.6.19.1/arch/mips/kernel/vmlinux.lds.S linux-mips-2.6.19.1/arch/mips/kernel/vmlinux.lds.S
     1067--- linux-2.6.19.1/arch/mips/kernel/vmlinux.lds.S       2006-12-11 11:32:53.000000000 -0800
     1068+++ linux-mips-2.6.19.1/arch/mips/kernel/vmlinux.lds.S  2006-12-11 15:38:26.000000000 -0800
     1069@@ -112,6 +112,7 @@
     1070     /* .exit.text is discarded at runtime, not link time, to deal with
     1071      references from .rodata */
     1072   .exit.text : { *(.exit.text) }
     1073+  .exit.data : { *(.exit.data) }
     1074   . = ALIGN(_PAGE_SIZE);
     1075   __initramfs_start = .;
     1076   .init.ramfs : { *(.init.ramfs) }
     1077@@ -139,7 +140,6 @@
     1078 
     1079   /* Sections to be discarded */
     1080   /DISCARD/ : {
     1081-        *(.exit.data)
     1082         *(.exitcall.exit)
     1083 
     1084        /* ABI crap starts here */
     1085diff -Naur linux-2.6.19.1/arch/mips/lib/Makefile linux-mips-2.6.19.1/arch/mips/lib/Makefile
     1086--- linux-2.6.19.1/arch/mips/lib/Makefile       2006-12-11 11:32:53.000000000 -0800
     1087+++ linux-mips-2.6.19.1/arch/mips/lib/Makefile  2006-12-11 15:38:26.000000000 -0800
    9671088@@ -5,8 +5,6 @@
    9681089 lib-y  += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
    … …  
    9741095 lib-y += ashldi3.o ashrdi3.o lshrdi3.o
    9751096 
    976 diff -Naur linux-2.6.19/arch/mips/lib/iomap.c linux-mips-2.6.19/arch/mips/lib/iomap.c
    977 --- linux-2.6.19/arch/mips/lib/iomap.c  2006-11-29 13:57:37.000000000 -0800
    978 +++ linux-mips-2.6.19/arch/mips/lib/iomap.c     1969-12-31 16:00:00.000000000 -0800
     1097diff -Naur linux-2.6.19.1/arch/mips/lib/csum_partial_copy.c linux-mips-2.6.19.1/arch/mips/lib/csum_partial_copy.c
     1098--- linux-2.6.19.1/arch/mips/lib/csum_partial_copy.c    2006-12-11 11:32:53.000000000 -0800
     1099+++ linux-mips-2.6.19.1/arch/mips/lib/csum_partial_copy.c       2006-12-11 15:38:26.000000000 -0800
     1100@@ -7,6 +7,7 @@
     1101  * Copyright (C) 1998, 1999 Ralf Baechle
     1102  */
     1103 #include <linux/kernel.h>
     1104+#include <linux/module.h>
     1105 #include <linux/types.h>
     1106 #include <asm/byteorder.h>
     1107 #include <asm/string.h>
     1108@@ -29,6 +30,8 @@
     1109        return sum;
     1110 }
     1111 
     1112+EXPORT_SYMBOL(csum_partial_copy_nocheck);
     1113+
     1114 /*
     1115  * Copy from userspace and compute checksum.  If we catch an exception
     1116  * then zero the rest of the buffer.
     1117diff -Naur linux-2.6.19.1/arch/mips/lib/iomap.c linux-mips-2.6.19.1/arch/mips/lib/iomap.c
     1118--- linux-2.6.19.1/arch/mips/lib/iomap.c        2006-12-11 11:32:53.000000000 -0800
     1119+++ linux-mips-2.6.19.1/arch/mips/lib/iomap.c   1969-12-31 16:00:00.000000000 -0800
    9791120@@ -1,78 +0,0 @@
    9801121-/*
    … …  
    10561197-EXPORT_SYMBOL(pci_iomap);
    10571198-EXPORT_SYMBOL(pci_iounmap);
    1058 diff -Naur linux-2.6.19/arch/mips/lib-32/dump_tlb.c linux-mips-2.6.19/arch/mips/lib-32/dump_tlb.c
    1059 --- linux-2.6.19/arch/mips/lib-32/dump_tlb.c    2006-11-29 13:57:37.000000000 -0800
    1060 +++ linux-mips-2.6.19/arch/mips/lib-32/dump_tlb.c       2006-11-29 15:23:09.000000000 -0800
     1199diff -Naur linux-2.6.19.1/arch/mips/lib-32/dump_tlb.c linux-mips-2.6.19.1/arch/mips/lib-32/dump_tlb.c
     1200--- linux-2.6.19.1/arch/mips/lib-32/dump_tlb.c  2006-12-11 11:32:53.000000000 -0800
     1201+++ linux-mips-2.6.19.1/arch/mips/lib-32/dump_tlb.c     2006-12-11 15:38:26.000000000 -0800
    10611202@@ -40,8 +40,6 @@
    10621203                return "256Mb";
    … …  
    10681209 
    10691210 #define BARRIER()                                      \
    1070 diff -Naur linux-2.6.19/arch/mips/lib-64/dump_tlb.c linux-mips-2.6.19/arch/mips/lib-64/dump_tlb.c
    1071 --- linux-2.6.19/arch/mips/lib-64/dump_tlb.c    2006-11-29 13:57:37.000000000 -0800
    1072 +++ linux-mips-2.6.19/arch/mips/lib-64/dump_tlb.c       2006-11-29 15:23:09.000000000 -0800
     1211diff -Naur linux-2.6.19.1/arch/mips/lib-64/dump_tlb.c linux-mips-2.6.19.1/arch/mips/lib-64/dump_tlb.c
     1212--- linux-2.6.19.1/arch/mips/lib-64/dump_tlb.c  2006-12-11 11:32:53.000000000 -0800
     1213+++ linux-mips-2.6.19.1/arch/mips/lib-64/dump_tlb.c     2006-12-11 15:38:26.000000000 -0800
    10731214@@ -31,8 +31,6 @@
    10741215        case PM_256M:   return "256Mb";
    … …  
    10801221 
    10811222 #define BARRIER()                                      \
    1082 diff -Naur linux-2.6.19/arch/mips/mm/init.c linux-mips-2.6.19/arch/mips/mm/init.c
    1083 --- linux-2.6.19/arch/mips/mm/init.c    2006-11-29 13:57:37.000000000 -0800
    1084 +++ linux-mips-2.6.19/arch/mips/mm/init.c       2006-11-29 15:23:09.000000000 -0800
     1223diff -Naur linux-2.6.19.1/arch/mips/mips-boards/malta/Makefile linux-mips-2.6.19.1/arch/mips/mips-boards/malta/Makefile
     1224--- linux-2.6.19.1/arch/mips/mips-boards/malta/Makefile 2006-12-11 11:32:53.000000000 -0800
     1225+++ linux-mips-2.6.19.1/arch/mips/mips-boards/malta/Makefile    2006-12-11 15:38:26.000000000 -0800
     1226@@ -19,5 +19,5 @@
     1227 # under Linux.
     1228 #
     1229 
     1230-obj-y := malta_int.o malta_setup.o
     1231+obj-y := malta_int.o malta_mtd.o malta_setup.o
     1232 obj-$(CONFIG_SMP) += malta_smp.o
     1233diff -Naur linux-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c linux-mips-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c
     1234--- linux-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c    2006-12-11 11:32:53.000000000 -0800
     1235+++ linux-mips-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c       2006-12-11 15:38:26.000000000 -0800
     1236@@ -21,13 +21,6 @@
     1237 #include <linux/pci.h>
     1238 #include <linux/screen_info.h>
     1239 
     1240-#ifdef CONFIG_MTD
     1241-#include <linux/mtd/partitions.h>
     1242-#include <linux/mtd/physmap.h>
     1243-#include <linux/mtd/mtd.h>
     1244-#include <linux/mtd/map.h>
     1245-#endif
     1246-
     1247 #include <asm/cpu.h>
     1248 #include <asm/bootinfo.h>
     1249 #include <asm/irq.h>
     1250@@ -58,30 +51,6 @@
     1251        { .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY },
     1252 };
     1253 
     1254-#ifdef CONFIG_MTD
     1255-static struct mtd_partition malta_mtd_partitions[] = {
     1256-       {
     1257-               .name =         "YAMON",
     1258-               .offset =       0x0,
     1259-               .size =         0x100000,
     1260-               .mask_flags =   MTD_WRITEABLE
     1261-       },
     1262-       {
     1263-               .name =         "User FS",
     1264-               .offset =       0x100000,
     1265-               .size =         0x2e0000
     1266-       },
     1267-       {
     1268-               .name =         "Board Config",
     1269-               .offset =       0x3e0000,
     1270-               .size =         0x020000,
     1271-               .mask_flags =   MTD_WRITEABLE
     1272-       }
     1273-};
     1274-
     1275-#define number_partitions      (sizeof(malta_mtd_partitions)/sizeof(struct mtd_partition))
     1276-#endif
     1277-
     1278 const char *get_system_type(void)
     1279 {
     1280        return "MIPS Malta";
     1281@@ -211,14 +180,6 @@
     1282 #endif
     1283 #endif
     1284 
     1285-#ifdef CONFIG_MTD
     1286-       /*
     1287-        * Support for MTD on Malta. Use the generic physmap driver
     1288-        */
     1289-       physmap_configure(0x1e000000, 0x400000, 4, NULL);
     1290-       physmap_set_partitions(malta_mtd_partitions, number_partitions);
     1291-#endif
     1292-
     1293        mips_reboot_setup();
     1294 
     1295        board_time_init = mips_time_init;
     1296diff -Naur linux-2.6.19.1/arch/mips/mm/cache.c linux-mips-2.6.19.1/arch/mips/mm/cache.c
     1297--- linux-2.6.19.1/arch/mips/mm/cache.c 2006-12-11 11:32:53.000000000 -0800
     1298+++ linux-mips-2.6.19.1/arch/mips/mm/cache.c    2006-12-11 15:38:26.000000000 -0800
     1299@@ -32,6 +32,7 @@
     1300 void (*flush_data_cache_page)(unsigned long addr);
     1301 void (*flush_icache_all)(void);
     1302 
     1303+EXPORT_SYMBOL_GPL(local_flush_data_cache_page);
     1304 EXPORT_SYMBOL(flush_data_cache_page);
     1305 
     1306 #ifdef CONFIG_DMA_NONCOHERENT
     1307diff -Naur linux-2.6.19.1/arch/mips/mm/init.c linux-mips-2.6.19.1/arch/mips/mm/init.c
     1308--- linux-2.6.19.1/arch/mips/mm/init.c  2006-12-11 11:32:53.000000000 -0800
     1309+++ linux-mips-2.6.19.1/arch/mips/mm/init.c     2006-12-11 15:38:26.000000000 -0800
    10851310@@ -203,6 +203,31 @@
    10861311        preempt_check_resched();
    … …  
    11151340        struct page *page, unsigned long vaddr, void *dst, const void *src,
    11161341        unsigned long len)
    1117 diff -Naur linux-2.6.19/arch/mips/momentum/jaguar_atx/Makefile linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/Makefile
    1118 --- linux-2.6.19/arch/mips/momentum/jaguar_atx/Makefile 2006-11-29 13:57:37.000000000 -0800
    1119 +++ linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/Makefile    2006-11-29 15:23:09.000000000 -0800
     1342diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile
     1343--- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile       2006-12-11 11:32:53.000000000 -0800
     1344+++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile  2006-12-11 15:38:26.000000000 -0800
    11201345@@ -6,7 +6,7 @@
    11211346 # unless it's something special (ie not a .c file).
    … …  
    11271352 obj-$(CONFIG_SERIAL_8250_CONSOLE) += ja-console.o
    11281353 obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
    1129 diff -Naur linux-2.6.19/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h
    1130 --- linux-2.6.19/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h        2006-11-29 13:57:37.000000000 -0800
    1131 +++ linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h   2006-11-29 15:23:09.000000000 -0800
     1354diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h
     1355--- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h      2006-12-11 11:32:53.000000000 -0800
     1356+++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h 2006-12-11 15:38:26.000000000 -0800
    11321357@@ -46,7 +46,9 @@
    11331358 
    … …  
    11421367 
    11431368 #endif
    1144 diff -Naur linux-2.6.19/arch/mips/momentum/jaguar_atx/platform.c linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/platform.c
    1145 --- linux-2.6.19/arch/mips/momentum/jaguar_atx/platform.c       1969-12-31 16:00:00.000000000 -0800
    1146 +++ linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/platform.c  2006-11-29 15:23:09.000000000 -0800
     1369diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c
     1370--- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c     1969-12-31 16:00:00.000000000 -0800
     1371+++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c        2006-12-11 15:38:26.000000000 -0800
    11471372@@ -0,0 +1,235 @@
    11481373+#include <linux/delay.h>
    … …  
    13811606+
    13821607+#endif /* defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) */
    1383 diff -Naur linux-2.6.19/arch/mips/momentum/jaguar_atx/prom.c linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/prom.c
    1384 --- linux-2.6.19/arch/mips/momentum/jaguar_atx/prom.c   2006-11-29 13:57:37.000000000 -0800
    1385 +++ linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/prom.c      2006-11-29 15:23:09.000000000 -0800
     1608diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c
     1609--- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c 2006-12-11 11:32:53.000000000 -0800
     1610+++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c    2006-12-11 15:38:26.000000000 -0800
    13861611@@ -39,56 +39,6 @@
    13871612        return "Momentum Jaguar-ATX";
    … …  
    14531678 
    14541679 unsigned long __init prom_free_prom_memory(void)
    1455 diff -Naur linux-2.6.19/arch/mips/pci/fixup-tb0219.c linux-mips-2.6.19/arch/mips/pci/fixup-tb0219.c
    1456 --- linux-2.6.19/arch/mips/pci/fixup-tb0219.c   2006-11-29 13:57:37.000000000 -0800
    1457 +++ linux-mips-2.6.19/arch/mips/pci/fixup-tb0219.c      2006-11-29 15:23:09.000000000 -0800
     1680diff -Naur linux-2.6.19.1/arch/mips/pci/fixup-tb0219.c linux-mips-2.6.19.1/arch/mips/pci/fixup-tb0219.c
     1681--- linux-2.6.19.1/arch/mips/pci/fixup-tb0219.c 2006-12-11 11:32:53.000000000 -0800
     1682+++ linux-mips-2.6.19.1/arch/mips/pci/fixup-tb0219.c    2006-12-11 15:38:26.000000000 -0800
    14581683@@ -2,7 +2,7 @@
    14591684  *  fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups.
    … …  
    14651690  *  This program is free software; you can redistribute it and/or modify
    14661691  *  it under the terms of the GNU General Public License as published by
    1467 diff -Naur linux-2.6.19/arch/mips/qemu/Makefile linux-mips-2.6.19/arch/mips/qemu/Makefile
    1468 --- linux-2.6.19/arch/mips/qemu/Makefile        2006-11-29 13:57:37.000000000 -0800
    1469 +++ linux-mips-2.6.19/arch/mips/qemu/Makefile   2006-11-29 15:23:09.000000000 -0800
     1692diff -Naur linux-2.6.19.1/arch/mips/qemu/Makefile linux-mips-2.6.19.1/arch/mips/qemu/Makefile
     1693--- linux-2.6.19.1/arch/mips/qemu/Makefile      2006-12-11 11:32:53.000000000 -0800
     1694+++ linux-mips-2.6.19.1/arch/mips/qemu/Makefile 2006-12-11 15:38:26.000000000 -0800
    14701695@@ -4,4 +4,5 @@
    14711696 
    … …  
    14741699+obj-$(CONFIG_VT) += q-vga.o
    14751700 obj-$(CONFIG_SMP) += q-smp.o
    1476 diff -Naur linux-2.6.19/arch/mips/qemu/q-setup.c linux-mips-2.6.19/arch/mips/qemu/q-setup.c
    1477 --- linux-2.6.19/arch/mips/qemu/q-setup.c       2006-11-29 13:57:37.000000000 -0800
    1478 +++ linux-mips-2.6.19/arch/mips/qemu/q-setup.c  2006-11-29 15:23:09.000000000 -0800
     1701diff -Naur linux-2.6.19.1/arch/mips/qemu/q-setup.c linux-mips-2.6.19.1/arch/mips/qemu/q-setup.c
     1702--- linux-2.6.19.1/arch/mips/qemu/q-setup.c     2006-12-11 11:32:53.000000000 -0800
     1703+++ linux-mips-2.6.19.1/arch/mips/qemu/q-setup.c        2006-12-11 15:38:26.000000000 -0800
    14791704@@ -2,6 +2,7 @@
    14801705 #include <asm/io.h>
    … …  
    14951720        qemu_reboot_setup();
    14961721 }
    1497 diff -Naur linux-2.6.19/arch/mips/qemu/q-vga.c linux-mips-2.6.19/arch/mips/qemu/q-vga.c
    1498 --- linux-2.6.19/arch/mips/qemu/q-vga.c 1969-12-31 16:00:00.000000000 -0800
    1499 +++ linux-mips-2.6.19/arch/mips/qemu/q-vga.c    2006-11-29 15:23:09.000000000 -0800
     1722diff -Naur linux-2.6.19.1/arch/mips/qemu/q-vga.c linux-mips-2.6.19.1/arch/mips/qemu/q-vga.c
     1723--- linux-2.6.19.1/arch/mips/qemu/q-vga.c       1969-12-31 16:00:00.000000000 -0800
     1724+++ linux-mips-2.6.19.1/arch/mips/qemu/q-vga.c  2006-12-11 15:38:26.000000000 -0800
    15001725@@ -0,0 +1,189 @@
    15011726+/*
    … …  
    16881913+#endif
    16891914+}
    1690 diff -Naur linux-2.6.19/drivers/char/Kconfig linux-mips-2.6.19/drivers/char/Kconfig
    1691 --- linux-2.6.19/drivers/char/Kconfig   2006-11-29 13:57:37.000000000 -0800
    1692 +++ linux-mips-2.6.19/drivers/char/Kconfig      2006-11-29 15:23:09.000000000 -0800
     1915diff -Naur linux-2.6.19.1/arch/mips/sibyte/swarm/setup.c linux-mips-2.6.19.1/arch/mips/sibyte/swarm/setup.c
     1916--- linux-2.6.19.1/arch/mips/sibyte/swarm/setup.c       2006-12-11 11:32:53.000000000 -0800
     1917+++ linux-mips-2.6.19.1/arch/mips/sibyte/swarm/setup.c  2006-12-11 15:38:26.000000000 -0800
     1918@@ -43,7 +43,7 @@
     1919 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
     1920 #include <asm/sibyte/sb1250_regs.h>
     1921 #else
     1922-#error invalid SiByte board configuation
     1923+#error invalid SiByte board configuration
     1924 #endif
     1925 #include <asm/sibyte/sb1250_genbus.h>
     1926 #include <asm/sibyte/board.h>
     1927@@ -53,7 +53,7 @@
     1928 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
     1929 extern void sb1250_setup(void);
     1930 #else
     1931-#error invalid SiByte board configuation
     1932+#error invalid SiByte board configuration
     1933 #endif
     1934 
     1935 extern int xicor_probe(void);
     1936@@ -90,7 +90,7 @@
     1937 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
     1938        sb1250_time_init();
     1939 #else
     1940-#error invalid SiByte board configuation
     1941+#error invalid SiByte board configuration
     1942 #endif
     1943 }
     1944 
     1945@@ -111,7 +111,7 @@
     1946 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
     1947        sb1250_setup();
     1948 #else
     1949-#error invalid SiByte board configuation
     1950+#error invalid SiByte board configuration
     1951 #endif
     1952 
     1953        panic_timeout = 5;  /* For debug.  */
     1954diff -Naur linux-2.6.19.1/drivers/char/Kconfig linux-mips-2.6.19.1/drivers/char/Kconfig
     1955--- linux-2.6.19.1/drivers/char/Kconfig 2006-12-11 11:32:53.000000000 -0800
     1956+++ linux-mips-2.6.19.1/drivers/char/Kconfig    2006-12-11 15:38:26.000000000 -0800
    16931957@@ -357,19 +357,56 @@
    16941958          To compile this driver as a module, choose M here: the
    … …  
    17602024 config A2232
    17612025        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
    1762 diff -Naur linux-2.6.19/drivers/char/Makefile linux-mips-2.6.19/drivers/char/Makefile
    1763 --- linux-2.6.19/drivers/char/Makefile  2006-11-29 13:57:37.000000000 -0800
    1764 +++ linux-mips-2.6.19/drivers/char/Makefile     2006-11-29 15:23:09.000000000 -0800
     2026diff -Naur linux-2.6.19.1/drivers/char/Makefile linux-mips-2.6.19.1/drivers/char/Makefile
     2027--- linux-2.6.19.1/drivers/char/Makefile        2006-12-11 11:32:53.000000000 -0800
     2028+++ linux-mips-2.6.19.1/drivers/char/Makefile   2006-12-11 15:38:26.000000000 -0800
    17652029@@ -31,6 +31,7 @@
    17662030 obj-$(CONFIG_A2232)            += ser_a2232.o generic_serial.o
    … …  
    17872051 obj-$(CONFIG_NWBUTTON)         += nwbutton.o
    17882052 obj-$(CONFIG_NWFLASH)          += nwflash.o
    1789 diff -Naur linux-2.6.19/drivers/char/au1000_gpio.c linux-mips-2.6.19/drivers/char/au1000_gpio.c
    1790 --- linux-2.6.19/drivers/char/au1000_gpio.c     1969-12-31 16:00:00.000000000 -0800
    1791 +++ linux-mips-2.6.19/drivers/char/au1000_gpio.c        2006-11-29 15:23:09.000000000 -0800
     2053diff -Naur linux-2.6.19.1/drivers/char/au1000_gpio.c linux-mips-2.6.19.1/drivers/char/au1000_gpio.c
     2054--- linux-2.6.19.1/drivers/char/au1000_gpio.c   1969-12-31 16:00:00.000000000 -0800
     2055+++ linux-mips-2.6.19.1/drivers/char/au1000_gpio.c      2006-12-11 15:38:26.000000000 -0800
    17922056@@ -0,0 +1,262 @@
    17932057+/*
    … …  
    20532317+module_init(au1000gpio_init);
    20542318+module_exit(au1000gpio_exit);
    2055 diff -Naur linux-2.6.19/drivers/char/au1000_ts.c linux-mips-2.6.19/drivers/char/au1000_ts.c
    2056 --- linux-2.6.19/drivers/char/au1000_ts.c       1969-12-31 16:00:00.000000000 -0800
    2057 +++ linux-mips-2.6.19/drivers/char/au1000_ts.c  2006-11-29 15:23:09.000000000 -0800
     2319diff -Naur linux-2.6.19.1/drivers/char/au1000_ts.c linux-mips-2.6.19.1/drivers/char/au1000_ts.c
     2320--- linux-2.6.19.1/drivers/char/au1000_ts.c     1969-12-31 16:00:00.000000000 -0800
     2321+++ linux-mips-2.6.19.1/drivers/char/au1000_ts.c        2006-12-11 15:38:26.000000000 -0800
    20582322@@ -0,0 +1,677 @@
    20592323+/*
    … …  
    27342998+module_init(au1000ts_init_module);
    27352999+module_exit(au1000ts_cleanup_module);
    2736 diff -Naur linux-2.6.19/drivers/char/decserial.c linux-mips-2.6.19/drivers/char/decserial.c
    2737 --- linux-2.6.19/drivers/char/decserial.c       2006-11-29 13:57:37.000000000 -0800
    2738 +++ linux-mips-2.6.19/drivers/char/decserial.c  2006-11-29 15:23:09.000000000 -0800
     3000diff -Naur linux-2.6.19.1/drivers/char/decserial.c linux-mips-2.6.19.1/drivers/char/decserial.c
     3001--- linux-2.6.19.1/drivers/char/decserial.c     2006-12-11 11:32:53.000000000 -0800
     3002+++ linux-mips-2.6.19.1/drivers/char/decserial.c        2006-12-11 15:38:26.000000000 -0800
    27393003@@ -14,86 +14,84 @@
    27403004  *      device. Added support for PROM console in drivers/char/tty_io.c
    … …  
    28703134 
    28713135 #endif
    2872 diff -Naur linux-2.6.19/drivers/char/sb1250_duart.c linux-mips-2.6.19/drivers/char/sb1250_duart.c
    2873 --- linux-2.6.19/drivers/char/sb1250_duart.c    1969-12-31 16:00:00.000000000 -0800
    2874 +++ linux-mips-2.6.19/drivers/char/sb1250_duart.c       2006-11-29 15:23:09.000000000 -0800
     3136diff -Naur linux-2.6.19.1/drivers/char/sb1250_duart.c linux-mips-2.6.19.1/drivers/char/sb1250_duart.c
     3137--- linux-2.6.19.1/drivers/char/sb1250_duart.c  1969-12-31 16:00:00.000000000 -0800
     3138+++ linux-mips-2.6.19.1/drivers/char/sb1250_duart.c     2006-12-11 15:38:26.000000000 -0800
    28753139@@ -0,0 +1,909 @@
    28763140+/*
    … …  
    37834047+
    37844048+#endif /* CONFIG_SIBYTE_SB1250_DUART_CONSOLE */
    3785 diff -Naur linux-2.6.19/drivers/ide/mips/Makefile linux-mips-2.6.19/drivers/ide/mips/Makefile
    3786 --- linux-2.6.19/drivers/ide/mips/Makefile      2006-11-29 13:57:37.000000000 -0800
    3787 +++ linux-mips-2.6.19/drivers/ide/mips/Makefile 2006-11-29 15:23:09.000000000 -0800
     4049diff -Naur linux-2.6.19.1/drivers/ide/mips/Makefile linux-mips-2.6.19.1/drivers/ide/mips/Makefile
     4050--- linux-2.6.19.1/drivers/ide/mips/Makefile    2006-12-11 11:32:53.000000000 -0800
     4051+++ linux-mips-2.6.19.1/drivers/ide/mips/Makefile       2006-12-11 15:38:26.000000000 -0800
    37884052@@ -1,4 +1,4 @@
    37894053 obj-$(CONFIG_BLK_DEV_IDE_SWARM)                += swarm.o
    … …  
    37924056-EXTRA_CFLAGS    := -Idrivers/ide
    37934057+CFLAGS_au1xxx-ide.o := -Idrivers/ide
    3794 diff -Naur linux-2.6.19/drivers/mtd/devices/docprobe.c linux-mips-2.6.19/drivers/mtd/devices/docprobe.c
    3795 --- linux-2.6.19/drivers/mtd/devices/docprobe.c 2006-11-29 13:57:37.000000000 -0800
    3796 +++ linux-mips-2.6.19/drivers/mtd/devices/docprobe.c    2006-11-29 15:23:09.000000000 -0800
     4058diff -Naur linux-2.6.19.1/drivers/isdn/hisax/Kconfig linux-mips-2.6.19.1/drivers/isdn/hisax/Kconfig
     4059--- linux-2.6.19.1/drivers/isdn/hisax/Kconfig   2006-12-11 11:32:53.000000000 -0800
     4060+++ linux-mips-2.6.19.1/drivers/isdn/hisax/Kconfig      2006-12-11 15:38:26.000000000 -0800
     4061@@ -110,7 +110,7 @@
     4062 
     4063 config HISAX_TELESPCI
     4064        bool "Teles PCI"
     4065-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
     4066+       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
     4067        help
     4068          This enables HiSax support for the Teles PCI.
     4069          See <file:Documentation/isdn/README.HiSax> on how to configure it.
     4070@@ -238,7 +238,7 @@
     4071 
     4072 config HISAX_NETJET
     4073        bool "NETjet card"
     4074-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
     4075+       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
     4076        help
     4077          This enables HiSax support for the NetJet from Traverse
     4078          Technologies.
     4079@@ -249,7 +249,7 @@
     4080 
     4081 config HISAX_NETJET_U
     4082        bool "NETspider U card"
     4083-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
     4084+       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
     4085        help
     4086          This enables HiSax support for the Netspider U interface ISDN card
     4087          from Traverse Technologies.
     4088@@ -317,7 +317,7 @@
     4089 
     4090 config HISAX_HFC_PCI
     4091        bool "HFC PCI-Bus cards"
     4092-       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
     4093+       depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
     4094        help
     4095          This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
     4096 
     4097@@ -344,7 +344,7 @@
     4098 
     4099 config HISAX_ENTERNOW_PCI
     4100        bool "Formula-n enter:now PCI card"
     4101-       depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
     4102+       depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))
     4103        help
     4104          This enables HiSax support for the Formula-n enter:now PCI
     4105          ISDN card.
     4106diff -Naur linux-2.6.19.1/drivers/mtd/devices/docprobe.c linux-mips-2.6.19.1/drivers/mtd/devices/docprobe.c
     4107--- linux-2.6.19.1/drivers/mtd/devices/docprobe.c       2006-12-11 11:32:53.000000000 -0800
     4108+++ linux-mips-2.6.19.1/drivers/mtd/devices/docprobe.c  2006-12-11 15:38:26.000000000 -0800
    37974109@@ -83,10 +83,10 @@
    37984110        0xe4000000,
    … …  
    38094121 #endif
    38104122        0xffffffff };
    3811 diff -Naur linux-2.6.19/drivers/mtd/maps/lasat.c linux-mips-2.6.19/drivers/mtd/maps/lasat.c
    3812 --- linux-2.6.19/drivers/mtd/maps/lasat.c       2006-11-29 13:57:37.000000000 -0800
    3813 +++ linux-mips-2.6.19/drivers/mtd/maps/lasat.c  2006-11-29 15:23:09.000000000 -0800
     4123diff -Naur linux-2.6.19.1/drivers/mtd/maps/lasat.c linux-mips-2.6.19.1/drivers/mtd/maps/lasat.c
     4124--- linux-2.6.19.1/drivers/mtd/maps/lasat.c     2006-12-11 11:32:53.000000000 -0800
     4125+++ linux-mips-2.6.19.1/drivers/mtd/maps/lasat.c        2006-12-11 15:38:26.000000000 -0800
    38144126@@ -7,7 +7,7 @@
    38154127  * modify it under the terms of the GNU General Public License version
    … …  
    38304142        lasat_map.size = lasat_board_info.li_flash_size;
    38314143 
    3832 diff -Naur linux-2.6.19/drivers/net/Kconfig linux-mips-2.6.19/drivers/net/Kconfig
    3833 --- linux-2.6.19/drivers/net/Kconfig    2006-11-29 13:57:37.000000000 -0800
    3834 +++ linux-mips-2.6.19/drivers/net/Kconfig       2006-11-29 15:23:09.000000000 -0800
     4144diff -Naur linux-2.6.19.1/drivers/net/Kconfig linux-mips-2.6.19.1/drivers/net/Kconfig
     4145--- linux-2.6.19.1/drivers/net/Kconfig  2006-12-11 11:32:53.000000000 -0800
     4146+++ linux-mips-2.6.19.1/drivers/net/Kconfig     2006-12-11 15:38:26.000000000 -0800
    38354147@@ -441,6 +441,14 @@
    38364148          This is the driver for the onboard card of MIPS Magnum 4000,
    … …  
    39344246        tristate "QLogic QLA3XXX Network Driver Support"
    39354247        depends on PCI
    3936 diff -Naur linux-2.6.19/drivers/net/Makefile linux-mips-2.6.19/drivers/net/Makefile
    3937 --- linux-2.6.19/drivers/net/Makefile   2006-11-29 13:57:37.000000000 -0800
    3938 +++ linux-mips-2.6.19/drivers/net/Makefile      2006-11-29 15:23:09.000000000 -0800
     4248diff -Naur linux-2.6.19.1/drivers/net/Makefile linux-mips-2.6.19.1/drivers/net/Makefile
     4249--- linux-2.6.19.1/drivers/net/Makefile 2006-12-11 11:32:53.000000000 -0800
     4250+++ linux-mips-2.6.19.1/drivers/net/Makefile    2006-12-11 15:38:26.000000000 -0800
    39394251@@ -112,6 +112,10 @@
    39404252 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
    … …  
    39484260 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
    39494261 obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
    3950 diff -Naur linux-2.6.19/drivers/net/big_sur_ge.c linux-mips-2.6.19/drivers/net/big_sur_ge.c
    3951 --- linux-2.6.19/drivers/net/big_sur_ge.c       1969-12-31 16:00:00.000000000 -0800
    3952 +++ linux-mips-2.6.19/drivers/net/big_sur_ge.c  2006-11-29 15:23:09.000000000 -0800
     4262diff -Naur linux-2.6.19.1/drivers/net/big_sur_ge.c linux-mips-2.6.19.1/drivers/net/big_sur_ge.c
     4263--- linux-2.6.19.1/drivers/net/big_sur_ge.c     1969-12-31 16:00:00.000000000 -0800
     4264+++ linux-mips-2.6.19.1/drivers/net/big_sur_ge.c        2006-12-11 15:38:26.000000000 -0800
    39534265@@ -0,0 +1,2004 @@
    39544266+/*
    … …  
    59566268+MODULE_DESCRIPTION("PMC-Sierra Big Sur Ethernet MAC Driver");
    59576269+MODULE_LICENSE("GPL");
    5958 diff -Naur linux-2.6.19/drivers/net/big_sur_ge.h linux-mips-2.6.19/drivers/net/big_sur_ge.h
    5959 --- linux-2.6.19/drivers/net/big_sur_ge.h       1969-12-31 16:00:00.000000000 -0800
    5960 +++ linux-mips-2.6.19/drivers/net/big_sur_ge.h  2006-11-29 15:23:09.000000000 -0800
     6270diff -Naur linux-2.6.19.1/drivers/net/big_sur_ge.h linux-mips-2.6.19.1/drivers/net/big_sur_ge.h
     6271--- linux-2.6.19.1/drivers/net/big_sur_ge.h     1969-12-31 16:00:00.000000000 -0800
     6272+++ linux-mips-2.6.19.1/drivers/net/big_sur_ge.h        2006-12-11 15:38:26.000000000 -0800
    59616273@@ -0,0 +1,713 @@
    59626274+/*
    … …  
    66736985+
    66746986+#endif
    6675 diff -Naur linux-2.6.19/drivers/net/gt64240eth.c linux-mips-2.6.19/drivers/net/gt64240eth.c
    6676 --- linux-2.6.19/drivers/net/gt64240eth.c       1969-12-31 16:00:00.000000000 -0800
    6677 +++ linux-mips-2.6.19/drivers/net/gt64240eth.c  2006-11-29 15:23:09.000000000 -0800
     6987diff -Naur linux-2.6.19.1/drivers/net/gt64240eth.c linux-mips-2.6.19.1/drivers/net/gt64240eth.c
     6988--- linux-2.6.19.1/drivers/net/gt64240eth.c     1969-12-31 16:00:00.000000000 -0800
     6989+++ linux-mips-2.6.19.1/drivers/net/gt64240eth.c        2006-12-11 15:38:26.000000000 -0800
    66786990@@ -0,0 +1,1671 @@
    66796991+/*
    … …  
    83488660+       return &gp->stats;
    83498661+}
    8350 diff -Naur linux-2.6.19/drivers/net/gt64240eth.h linux-mips-2.6.19/drivers/net/gt64240eth.h
    8351 --- linux-2.6.19/drivers/net/gt64240eth.h       1969-12-31 16:00:00.000000000 -0800
    8352 +++ linux-mips-2.6.19/drivers/net/gt64240eth.h  2006-11-29 15:23:09.000000000 -0800
     8662diff -Naur linux-2.6.19.1/drivers/net/gt64240eth.h linux-mips-2.6.19.1/drivers/net/gt64240eth.h
     8663--- linux-2.6.19.1/drivers/net/gt64240eth.h     1969-12-31 16:00:00.000000000 -0800
     8664+++ linux-mips-2.6.19.1/drivers/net/gt64240eth.h        2006-12-11 15:38:26.000000000 -0800
    83538665@@ -0,0 +1,403 @@
    83548666+/*
    … …  
    87559067+
    87569068+#endif /* _GT64240ETH_H */
    8757 diff -Naur linux-2.6.19/drivers/net/ioc3-eth.c linux-mips-2.6.19/drivers/net/ioc3-eth.c
    8758 --- linux-2.6.19/drivers/net/ioc3-eth.c 2006-11-29 13:57:37.000000000 -0800
    8759 +++ linux-mips-2.6.19/drivers/net/ioc3-eth.c    2006-11-29 15:23:09.000000000 -0800
     9069diff -Naur linux-2.6.19.1/drivers/net/ioc3-eth.c linux-mips-2.6.19.1/drivers/net/ioc3-eth.c
     9070--- linux-2.6.19.1/drivers/net/ioc3-eth.c       2006-12-11 11:32:53.000000000 -0800
     9071+++ linux-mips-2.6.19.1/drivers/net/ioc3-eth.c  2006-12-11 15:38:26.000000000 -0800
    87609072@@ -5,7 +5,7 @@
    87619073  *
    … …  
    88849196 
    88859197 static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
    8886 diff -Naur linux-2.6.19/drivers/net/titan_ge.c linux-mips-2.6.19/drivers/net/titan_ge.c
    8887 --- linux-2.6.19/drivers/net/titan_ge.c 1969-12-31 16:00:00.000000000 -0800
    8888 +++ linux-mips-2.6.19/drivers/net/titan_ge.c    2006-11-29 15:23:09.000000000 -0800
     9198diff -Naur linux-2.6.19.1/drivers/net/titan_ge.c linux-mips-2.6.19.1/drivers/net/titan_ge.c
     9199--- linux-2.6.19.1/drivers/net/titan_ge.c       1969-12-31 16:00:00.000000000 -0800
     9200+++ linux-mips-2.6.19.1/drivers/net/titan_ge.c  2006-12-11 15:38:26.000000000 -0800
    88899201@@ -0,0 +1,2069 @@
    88909202+/*
    … …  
    1095711269+module_init(titan_ge_init_module);
    1095811270+module_exit(titan_ge_cleanup_module);
    10959 diff -Naur linux-2.6.19/drivers/net/titan_ge.h linux-mips-2.6.19/drivers/net/titan_ge.h
    10960 --- linux-2.6.19/drivers/net/titan_ge.h 1969-12-31 16:00:00.000000000 -0800
    10961 +++ linux-mips-2.6.19/drivers/net/titan_ge.h    2006-11-29 15:23:09.000000000 -0800
     11271diff -Naur linux-2.6.19.1/drivers/net/titan_ge.h linux-mips-2.6.19.1/drivers/net/titan_ge.h
     11272--- linux-2.6.19.1/drivers/net/titan_ge.h       1969-12-31 16:00:00.000000000 -0800
     11273+++ linux-mips-2.6.19.1/drivers/net/titan_ge.h  2006-12-11 15:38:26.000000000 -0800
    1096211274@@ -0,0 +1,415 @@
    1096311275+#ifndef _TITAN_GE_H_
    … …  
    1137611688+#endif                                 /* _TITAN_GE_H_ */
    1137711689+
    11378 diff -Naur linux-2.6.19/drivers/net/titan_mdio.c linux-mips-2.6.19/drivers/net/titan_mdio.c
    11379 --- linux-2.6.19/drivers/net/titan_mdio.c       1969-12-31 16:00:00.000000000 -0800
    11380 +++ linux-mips-2.6.19/drivers/net/titan_mdio.c  2006-11-29 15:23:09.000000000 -0800
     11690diff -Naur linux-2.6.19.1/drivers/net/titan_mdio.c linux-mips-2.6.19.1/drivers/net/titan_mdio.c
     11691--- linux-2.6.19.1/drivers/net/titan_mdio.c     1969-12-31 16:00:00.000000000 -0800
     11692+++ linux-mips-2.6.19.1/drivers/net/titan_mdio.c        2006-12-11 15:38:26.000000000 -0800
    1138111693@@ -0,0 +1,217 @@
    1138211694+/*
    … …  
    1159711909+}
    1159811910+
    11599 diff -Naur linux-2.6.19/drivers/net/titan_mdio.h linux-mips-2.6.19/drivers/net/titan_mdio.h
    11600 --- linux-2.6.19/drivers/net/titan_mdio.h       1969-12-31 16:00:00.000000000 -0800
    11601 +++ linux-mips-2.6.19/drivers/net/titan_mdio.h  2006-11-29 15:23:09.000000000 -0800
     11911diff -Naur linux-2.6.19.1/drivers/net/titan_mdio.h linux-mips-2.6.19.1/drivers/net/titan_mdio.h
     11912--- linux-2.6.19.1/drivers/net/titan_mdio.h     1969-12-31 16:00:00.000000000 -0800
     11913+++ linux-mips-2.6.19.1/drivers/net/titan_mdio.h        2006-12-11 15:38:26.000000000 -0800
    1160211914@@ -0,0 +1,56 @@
    1160311915+/*
    … …  
    1165711969+
    1165811970+#endif /* _TITAN_MDIO_H */
    11659 diff -Naur linux-2.6.19/drivers/scsi/NCR53C9x.h linux-mips-2.6.19/drivers/scsi/NCR53C9x.h
    11660 --- linux-2.6.19/drivers/scsi/NCR53C9x.h        2006-11-29 13:57:37.000000000 -0800
    11661 +++ linux-mips-2.6.19/drivers/scsi/NCR53C9x.h   2006-11-29 15:23:09.000000000 -0800
     11971diff -Naur linux-2.6.19.1/drivers/scsi/NCR53C9x.h linux-mips-2.6.19.1/drivers/scsi/NCR53C9x.h
     11972--- linux-2.6.19.1/drivers/scsi/NCR53C9x.h      2006-12-11 11:32:53.000000000 -0800
     11973+++ linux-mips-2.6.19.1/drivers/scsi/NCR53C9x.h 2006-12-11 15:38:26.000000000 -0800
    1166211974@@ -144,12 +144,7 @@
    1166311975 
    … …  
    1167411986 
    1167511987 struct ESP_regs {
    11676 diff -Naur linux-2.6.19/drivers/scsi/dec_esp.c linux-mips-2.6.19/drivers/scsi/dec_esp.c
    11677 --- linux-2.6.19/drivers/scsi/dec_esp.c 2006-11-29 13:57:37.000000000 -0800
    11678 +++ linux-mips-2.6.19/drivers/scsi/dec_esp.c    2006-11-29 15:23:09.000000000 -0800
     11988diff -Naur linux-2.6.19.1/drivers/scsi/dec_esp.c linux-mips-2.6.19.1/drivers/scsi/dec_esp.c
     11989--- linux-2.6.19.1/drivers/scsi/dec_esp.c       2006-12-11 11:32:53.000000000 -0800
     11990+++ linux-mips-2.6.19.1/drivers/scsi/dec_esp.c  2006-12-11 15:38:26.000000000 -0800
    1167911991@@ -55,7 +55,7 @@
    1168011992 
    … …  
    1169512007                        esp->dregs = 0;
    1169612008                        esp->eregs = (void *)CKSEG1ADDR(mem_start +
    11697 diff -Naur linux-2.6.19/drivers/scsi/sgiwd93.c linux-mips-2.6.19/drivers/scsi/sgiwd93.c
    11698 --- linux-2.6.19/drivers/scsi/sgiwd93.c 2006-11-29 13:57:37.000000000 -0800
    11699 +++ linux-mips-2.6.19/drivers/scsi/sgiwd93.c    2006-11-29 15:23:09.000000000 -0800
     12009diff -Naur linux-2.6.19.1/drivers/scsi/sgiwd93.c linux-mips-2.6.19.1/drivers/scsi/sgiwd93.c
     12010--- linux-2.6.19.1/drivers/scsi/sgiwd93.c       2006-12-11 11:32:53.000000000 -0800
     12011+++ linux-mips-2.6.19.1/drivers/scsi/sgiwd93.c  2006-12-11 15:38:26.000000000 -0800
    1170012012@@ -14,6 +14,7 @@
    1170112013 #include <linux/interrupt.h>
    … …  
    1171412026 static inline void init_hpc_chain(struct hpc_data *hd)
    1171512027 {
    11716 diff -Naur linux-2.6.19/drivers/serial/Kconfig linux-mips-2.6.19/drivers/serial/Kconfig
    11717 --- linux-2.6.19/drivers/serial/Kconfig 2006-11-29 13:57:37.000000000 -0800
    11718 +++ linux-mips-2.6.19/drivers/serial/Kconfig    2006-11-29 15:23:09.000000000 -0800
     12028diff -Naur linux-2.6.19.1/drivers/serial/Kconfig linux-mips-2.6.19.1/drivers/serial/Kconfig
     12029--- linux-2.6.19.1/drivers/serial/Kconfig       2006-12-11 11:32:53.000000000 -0800
     12030+++ linux-mips-2.6.19.1/drivers/serial/Kconfig  2006-12-11 15:38:26.000000000 -0800
    1171912031@@ -657,6 +657,25 @@
    1172012032        depends on SERIAL_SH_SCI=y
    … …  
    1174312055        tristate
    1174412056 
    11745 diff -Naur linux-2.6.19/drivers/serial/Makefile linux-mips-2.6.19/drivers/serial/Makefile
    11746 --- linux-2.6.19/drivers/serial/Makefile        2006-11-29 13:57:37.000000000 -0800
    11747 +++ linux-mips-2.6.19/drivers/serial/Makefile   2006-11-29 15:23:09.000000000 -0800
     12057diff -Naur linux-2.6.19.1/drivers/serial/Makefile linux-mips-2.6.19.1/drivers/serial/Makefile
     12058--- linux-2.6.19.1/drivers/serial/Makefile      2006-12-11 11:32:53.000000000 -0800
     12059+++ linux-mips-2.6.19.1/drivers/serial/Makefile 2006-12-11 15:38:26.000000000 -0800
    1174812060@@ -39,6 +39,7 @@
    1174912061 obj-$(CONFIG_V850E_UART) += v850e_uart.o
    … …  
    1175412066 obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
    1175512067 obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o
    11756 diff -Naur linux-2.6.19/drivers/serial/ip22zilog.c linux-mips-2.6.19/drivers/serial/ip22zilog.c
    11757 --- linux-2.6.19/drivers/serial/ip22zilog.c     2006-11-29 13:57:37.000000000 -0800
    11758 +++ linux-mips-2.6.19/drivers/serial/ip22zilog.c        2006-11-29 15:23:09.000000000 -0800
     12068diff -Naur linux-2.6.19.1/drivers/serial/ip22zilog.c linux-mips-2.6.19.1/drivers/serial/ip22zilog.c
     12069--- linux-2.6.19.1/drivers/serial/ip22zilog.c   2006-12-11 11:32:53.000000000 -0800
     12070+++ linux-mips-2.6.19.1/drivers/serial/ip22zilog.c      2006-12-11 15:38:26.000000000 -0800
    1175912071@@ -863,6 +863,7 @@
    1176012072        up->cflag = termios->c_cflag;
    … …  
    1177412086 
    1177512087 static int __init ip22zilog_console_setup(struct console *con, char *options)
    11776 diff -Naur linux-2.6.19/drivers/serial/ip3106_uart.c linux-mips-2.6.19/drivers/serial/ip3106_uart.c
    11777 --- linux-2.6.19/drivers/serial/ip3106_uart.c   1969-12-31 16:00:00.000000000 -0800
    11778 +++ linux-mips-2.6.19/drivers/serial/ip3106_uart.c      2006-11-29 15:23:09.000000000 -0800
     12088diff -Naur linux-2.6.19.1/drivers/serial/ip3106_uart.c linux-mips-2.6.19.1/drivers/serial/ip3106_uart.c
     12089--- linux-2.6.19.1/drivers/serial/ip3106_uart.c 1969-12-31 16:00:00.000000000 -0800
     12090+++ linux-mips-2.6.19.1/drivers/serial/ip3106_uart.c    2006-12-11 15:38:26.000000000 -0800
    1177912091@@ -0,0 +1,909 @@
    1178012092+/*
    … …  
    1268712999+MODULE_LICENSE("GPL");
    1268813000+MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_IP3106_MAJOR);
    12689 diff -Naur linux-2.6.19/drivers/usb/host/ohci-hcd.c linux-mips-2.6.19/drivers/usb/host/ohci-hcd.c
    12690 --- linux-2.6.19/drivers/usb/host/ohci-hcd.c    2006-11-29 13:57:37.000000000 -0800
    12691 +++ linux-mips-2.6.19/drivers/usb/host/ohci-hcd.c       2006-11-29 15:23:09.000000000 -0800
     13001diff -Naur linux-2.6.19.1/drivers/usb/host/ohci-hcd.c linux-mips-2.6.19.1/drivers/usb/host/ohci-hcd.c
     13002--- linux-2.6.19.1/drivers/usb/host/ohci-hcd.c  2006-12-11 11:32:53.000000000 -0800
     13003+++ linux-mips-2.6.19.1/drivers/usb/host/ohci-hcd.c     2006-12-11 15:38:26.000000000 -0800
    1269213004@@ -931,6 +931,10 @@
    1269313005 #include "ohci-au1xxx.c"
    … …  
    1270113013 #include "ohci-ppc-soc.c"
    1270213014 #endif
    12703 diff -Naur linux-2.6.19/drivers/usb/host/ohci-pnx8550.c linux-mips-2.6.19/drivers/usb/host/ohci-pnx8550.c
    12704 --- linux-2.6.19/drivers/usb/host/ohci-pnx8550.c        1969-12-31 16:00:00.000000000 -0800
    12705 +++ linux-mips-2.6.19/drivers/usb/host/ohci-pnx8550.c   2006-11-29 15:23:09.000000000 -0800
     13015diff -Naur linux-2.6.19.1/drivers/usb/host/ohci-pnx8550.c linux-mips-2.6.19.1/drivers/usb/host/ohci-pnx8550.c
     13016--- linux-2.6.19.1/drivers/usb/host/ohci-pnx8550.c      1969-12-31 16:00:00.000000000 -0800
     13017+++ linux-mips-2.6.19.1/drivers/usb/host/ohci-pnx8550.c 2006-12-11 15:38:26.000000000 -0800
    1270613018@@ -0,0 +1,277 @@
    1270713019+/*
    … …  
    1298213294+module_init (ohci_hcd_pnx8550_init);
    1298313295+module_exit (ohci_hcd_pnx8550_cleanup);
    12984 diff -Naur linux-2.6.19/drivers/video/Kconfig linux-mips-2.6.19/drivers/video/Kconfig
    12985 --- linux-2.6.19/drivers/video/Kconfig  2006-11-29 13:57:37.000000000 -0800
    12986 +++ linux-mips-2.6.19/drivers/video/Kconfig     2006-11-29 15:23:09.000000000 -0800
     13296diff -Naur linux-2.6.19.1/drivers/video/Kconfig linux-mips-2.6.19.1/drivers/video/Kconfig
     13297--- linux-2.6.19.1/drivers/video/Kconfig        2006-12-11 11:32:53.000000000 -0800
     13298+++ linux-mips-2.6.19.1/drivers/video/Kconfig   2006-12-11 15:38:26.000000000 -0800
    1298713299@@ -1277,6 +1277,17 @@
    1298813300          Please read the <file:Documentation/fb/README-sstfb.txt> for supported
    … …  
    1304113353 config FB_MAXINE
    1304213354        bool "Maxine (Personal DECstation) onboard framebuffer support"
    13043 diff -Naur linux-2.6.19/drivers/video/Makefile linux-mips-2.6.19/drivers/video/Makefile
    13044 --- linux-2.6.19/drivers/video/Makefile 2006-11-29 13:57:37.000000000 -0800
    13045 +++ linux-mips-2.6.19/drivers/video/Makefile    2006-11-29 15:23:09.000000000 -0800
     13355diff -Naur linux-2.6.19.1/drivers/video/Makefile linux-mips-2.6.19.1/drivers/video/Makefile
     13356--- linux-2.6.19.1/drivers/video/Makefile       2006-12-11 11:32:53.000000000 -0800
     13357+++ linux-mips-2.6.19.1/drivers/video/Makefile  2006-12-11 15:38:26.000000000 -0800
    1304613358@@ -96,6 +96,7 @@
    1304713359 obj-$(CONFIG_FB_TX3912)                  += tx3912fb.o
    … …  
    1305213364 obj-$(CONFIG_FB_PNX4008_DUM)     += pnx4008/
    1305313365 obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
    13054 diff -Naur linux-2.6.19/drivers/video/au1100fb.c linux-mips-2.6.19/drivers/video/au1100fb.c
    13055 --- linux-2.6.19/drivers/video/au1100fb.c       2006-11-29 13:57:37.000000000 -0800
    13056 +++ linux-mips-2.6.19/drivers/video/au1100fb.c  2006-11-29 15:23:09.000000000 -0800
     13366diff -Naur linux-2.6.19.1/drivers/video/au1100fb.c linux-mips-2.6.19.1/drivers/video/au1100fb.c
     13367--- linux-2.6.19.1/drivers/video/au1100fb.c     2006-12-11 11:32:53.000000000 -0800
     13368+++ linux-mips-2.6.19.1/drivers/video/au1100fb.c        2006-12-11 15:38:26.000000000 -0800
    1305713369@@ -41,6 +41,7 @@
    1305813370  *  with this program; if not, write  to the Free Software Foundation, Inc.,
    … …  
    1306313375 #include <linux/kernel.h>
    1306413376 #include <linux/errno.h>
    13065 diff -Naur linux-2.6.19/drivers/video/smivgxfb.c linux-mips-2.6.19/drivers/video/smivgxfb.c
    13066 --- linux-2.6.19/drivers/video/smivgxfb.c       1969-12-31 16:00:00.000000000 -0800
    13067 +++ linux-mips-2.6.19/drivers/video/smivgxfb.c  2006-11-29 15:23:09.000000000 -0800
     13377diff -Naur linux-2.6.19.1/drivers/video/smivgxfb.c linux-mips-2.6.19.1/drivers/video/smivgxfb.c
     13378--- linux-2.6.19.1/drivers/video/smivgxfb.c     1969-12-31 16:00:00.000000000 -0800
     13379+++ linux-mips-2.6.19.1/drivers/video/smivgxfb.c        2006-12-11 15:38:26.000000000 -0800
    1306813380@@ -0,0 +1,387 @@
    1306913381+/***************************************************************************
    … …  
    1345413766+MODULE_DESCRIPTION("Framebuffer driver for SMI Voyager");
    1345513767+MODULE_LICENSE("GPL");
    13456 diff -Naur linux-2.6.19/include/asm-mips/compat.h linux-mips-2.6.19/include/asm-mips/compat.h
    13457 --- linux-2.6.19/include/asm-mips/compat.h      2006-11-29 13:57:37.000000000 -0800
    13458 +++ linux-mips-2.6.19/include/asm-mips/compat.h 2006-11-29 15:23:09.000000000 -0800
    13459 @@ -32,6 +32,7 @@
     13768diff -Naur linux-2.6.19.1/include/asm-mips/compat.h linux-mips-2.6.19.1/include/asm-mips/compat.h
     13769--- linux-2.6.19.1/include/asm-mips/compat.h    2006-12-11 11:32:53.000000000 -0800
     13770+++ linux-mips-2.6.19.1/include/asm-mips/compat.h       2006-12-11 15:38:26.000000000 -0800
     13771@@ -5,6 +5,7 @@
     13772  */
     13773 #include <linux/types.h>
     13774 #include <asm/page.h>
     13775+#include <asm/ptrace.h>
     13776 
     13777 #define COMPAT_USER_HZ 100
     13778 
     13779@@ -32,6 +33,7 @@
    1346013780        s32     val[2];
    1346113781 } compat_fsid_t;
    … …  
    1346513785 typedef s32            compat_int_t;
    1346613786 typedef s32            compat_long_t;
    13467 @@ -146,4 +147,71 @@
     13787@@ -146,4 +148,71 @@
    1346813788        return (void __user *) (regs->regs[29] - len);
    1346913789 }
    … …  
    1353713857+
    1353813858 #endif /* _ASM_COMPAT_H */
    13539 diff -Naur linux-2.6.19/include/asm-mips/io.h linux-mips-2.6.19/include/asm-mips/io.h
    13540 --- linux-2.6.19/include/asm-mips/io.h  2006-11-29 13:57:37.000000000 -0800
    13541 +++ linux-mips-2.6.19/include/asm-mips/io.h     2006-11-29 15:23:09.000000000 -0800
     13859diff -Naur linux-2.6.19.1/include/asm-mips/io.h linux-mips-2.6.19.1/include/asm-mips/io.h
     13860--- linux-2.6.19.1/include/asm-mips/io.h        2006-12-11 11:32:53.000000000 -0800
     13861+++ linux-mips-2.6.19.1/include/asm-mips/io.h   2006-12-11 15:38:26.000000000 -0800
    1354213862@@ -518,34 +518,6 @@
    1354313863 }
    … …  
    1357513895  * to explicitly ioremap() it. The fact that the ISA IO space is mapped
    1357613896  * to PAGE_OFFSET is pure coincidence - it does not mean ISA values
    13577 diff -Naur linux-2.6.19/include/asm-mips/mach-au1x00/au1000.h linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1000.h
    13578 --- linux-2.6.19/include/asm-mips/mach-au1x00/au1000.h  2006-11-29 13:57:37.000000000 -0800
    13579 +++ linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1000.h     2006-11-29 15:23:09.000000000 -0800
     13897diff -Naur linux-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h
     13898--- linux-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h        2006-12-11 11:32:53.000000000 -0800
     13899+++ linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h   2006-12-11 15:38:26.000000000 -0800
    1358013900@@ -39,6 +39,7 @@
    1358113901 #ifndef _LANGUAGE_ASSEMBLY
    … …  
    1360513925 #define PCI_IO_START    (Au1500_PCI_IO_START + 0x1000)
    1360613926 #define PCI_IO_END      (Au1500_PCI_IO_END)
    13607 diff -Naur linux-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h
    13608 --- linux-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h      2006-11-29 13:57:37.000000000 -0800
    13609 +++ linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-11-29 15:23:09.000000000 -0800
     13927diff -Naur linux-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h
     13928--- linux-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h    2006-12-11 11:32:53.000000000 -0800
     13929+++ linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h       2006-12-11 15:38:26.000000000 -0800
    1361013930@@ -83,6 +83,7 @@
    1361113931 } _auide_hwif;
    … …  
    1361613936 static const struct drive_list_entry dma_white_list [] = {
    1361713937 /*
    13618 diff -Naur linux-2.6.19/include/asm-mips/page.h linux-mips-2.6.19/include/asm-mips/page.h
    13619 --- linux-2.6.19/include/asm-mips/page.h        2006-11-29 13:57:37.000000000 -0800
    13620 +++ linux-mips-2.6.19/include/asm-mips/page.h   2006-11-29 15:23:09.000000000 -0800
     13938diff -Naur linux-2.6.19.1/include/asm-mips/mach-ip27/irq.h linux-mips-2.6.19.1/include/asm-mips/mach-ip27/irq.h
     13939--- linux-2.6.19.1/include/asm-mips/mach-ip27/irq.h     2006-12-11 11:32:53.000000000 -0800
     13940+++ linux-mips-2.6.19.1/include/asm-mips/mach-ip27/irq.h        2006-12-11 15:38:26.000000000 -0800
     13941@@ -10,8 +10,6 @@
     13942 #ifndef __ASM_MACH_IP27_IRQ_H
     13943 #define __ASM_MACH_IP27_IRQ_H
     13944 
     13945-#include <asm/sn/arch.h>
     13946-
     13947 /*
     13948  * A hardwired interrupt number is completly stupid for this system - a
     13949  * large configuration might have thousands if not tenthousands of
     13950diff -Naur linux-2.6.19.1/include/asm-mips/mach-ip27/topology.h linux-mips-2.6.19.1/include/asm-mips/mach-ip27/topology.h
     13951--- linux-2.6.19.1/include/asm-mips/mach-ip27/topology.h        2006-12-11 11:32:53.000000000 -0800
     13952+++ linux-mips-2.6.19.1/include/asm-mips/mach-ip27/topology.h   2006-12-11 15:38:26.000000000 -0800
     13953@@ -1,7 +1,6 @@
     13954 #ifndef _ASM_MACH_TOPOLOGY_H
     13955 #define _ASM_MACH_TOPOLOGY_H   1
     13956 
     13957-#include <asm/sn/arch.h>
     13958 #include <asm/sn/hub.h>
     13959 #include <asm/mmzone.h>
     13960 
     13961diff -Naur linux-2.6.19.1/include/asm-mips/page.h linux-mips-2.6.19.1/include/asm-mips/page.h
     13962--- linux-2.6.19.1/include/asm-mips/page.h      2006-12-11 11:32:53.000000000 -0800
     13963+++ linux-mips-2.6.19.1/include/asm-mips/page.h 2006-12-11 15:38:26.000000000 -0800
    1362113964@@ -59,16 +59,13 @@
    1362213965                flush_data_cache_page((unsigned long)addr);
    … …  
    1364313986 /*
    1364413987  * These are used to make use of C type-checking..
    13645 diff -Naur linux-2.6.19/include/linux/highmem.h linux-mips-2.6.19/include/linux/highmem.h
    13646 --- linux-2.6.19/include/linux/highmem.h        2006-11-29 13:57:37.000000000 -0800
    13647 +++ linux-mips-2.6.19/include/linux/highmem.h   2006-11-29 15:23:09.000000000 -0800
     13988diff -Naur linux-2.6.19.1/include/asm-mips/pci.h linux-mips-2.6.19.1/include/asm-mips/pci.h
     13989--- linux-2.6.19.1/include/asm-mips/pci.h       2006-12-11 11:32:53.000000000 -0800
     13990+++ linux-mips-2.6.19.1/include/asm-mips/pci.h  2006-12-11 15:38:26.000000000 -0800
     13991@@ -187,4 +187,10 @@
     13992 /* Do platform specific device initialization at pci_enable_device() time */
     13993 extern int pcibios_plat_dev_init(struct pci_dev *dev);
     13994 
     13995+/* Chances are this interrupt is wired PC-style ...  */
     13996+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
     13997+{
     13998+       return channel ? 15 : 14;
     13999+}
     14000+
     14001 #endif /* _ASM_PCI_H */
     14002diff -Naur linux-2.6.19.1/include/asm-mips/ptrace.h linux-mips-2.6.19.1/include/asm-mips/ptrace.h
     14003--- linux-2.6.19.1/include/asm-mips/ptrace.h    2006-12-11 11:32:53.000000000 -0800
     14004+++ linux-mips-2.6.19.1/include/asm-mips/ptrace.h       2006-12-11 15:38:26.000000000 -0800
     14005@@ -84,6 +84,14 @@
     14006 
     14007 extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit);
     14008 
     14009+extern NORET_TYPE void die(const char *, struct pt_regs *);
     14010+
     14011+static inline void die_if_kernel(const char *str, struct pt_regs *regs)
     14012+{
     14013+       if (unlikely(!user_mode(regs)))
     14014+               die(str, regs);
     14015+}
     14016+
     14017 #endif
     14018 
     14019 #endif /* _ASM_PTRACE_H */
     14020diff -Naur linux-2.6.19.1/include/asm-mips/sn/arch.h linux-mips-2.6.19.1/include/asm-mips/sn/arch.h
     14021--- linux-2.6.19.1/include/asm-mips/sn/arch.h   2006-12-11 11:32:53.000000000 -0800
     14022+++ linux-mips-2.6.19.1/include/asm-mips/sn/arch.h      2006-12-11 15:38:26.000000000 -0800
     14023@@ -18,7 +18,6 @@
     14024 #endif
     14025 
     14026 typedef u64    hubreg_t;
     14027-typedef u64    nic_t;
     14028 
     14029 #define cputonasid(cpu)                        (cpu_data[(cpu)].p_nasid)
     14030 #define cputoslice(cpu)                        (cpu_data[(cpu)].p_slice)
     14031diff -Naur linux-2.6.19.1/include/asm-mips/sn/klconfig.h linux-mips-2.6.19.1/include/asm-mips/sn/klconfig.h
     14032--- linux-2.6.19.1/include/asm-mips/sn/klconfig.h       2006-12-11 11:32:53.000000000 -0800
     14033+++ linux-mips-2.6.19.1/include/asm-mips/sn/klconfig.h  2006-12-11 15:38:26.000000000 -0800
     14034@@ -61,6 +61,8 @@
     14035 #endif /* CONFIG_SGI_IP35 */
     14036 #endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */
     14037 
     14038+typedef u64  nic_t;
     14039+
     14040 #define KLCFGINFO_MAGIC        0xbeedbabe
     14041 
     14042 typedef s32 klconf_off_t;
     14043@@ -176,7 +178,7 @@
     14044 /* --- New Macros for the changed kl_config_hdr_t structure --- */
     14045 
     14046 #define PTR_CH_MALLOC_HDR(_k)   ((klc_malloc_hdr_t *)\
     14047-                       (unsigned long)_k + (_k->ch_malloc_hdr_off)))
     14048+                       ((unsigned long)_k + (_k->ch_malloc_hdr_off)))
     14049 
     14050 #define KL_CONFIG_CH_MALLOC_HDR(_n)   PTR_CH_MALLOC_HDR(KL_CONFIG_HDR(_n))
     14051 
     14052diff -Naur linux-2.6.19.1/include/asm-mips/system.h linux-mips-2.6.19.1/include/asm-mips/system.h
     14053--- linux-2.6.19.1/include/asm-mips/system.h    2006-12-11 11:32:53.000000000 -0800
     14054+++ linux-mips-2.6.19.1/include/asm-mips/system.h       2006-12-11 15:38:26.000000000 -0800
     14055@@ -18,7 +18,6 @@
     14056 #include <asm/addrspace.h>
     14057 #include <asm/cpu-features.h>
     14058 #include <asm/dsp.h>
     14059-#include <asm/ptrace.h>
     14060 #include <asm/war.h>
     14061 
     14062 /*
     14063@@ -472,14 +471,6 @@
     14064 extern unsigned long ebase;
     14065 extern void per_cpu_trap_init(void);
     14066 
     14067-extern NORET_TYPE void die(const char *, struct pt_regs *);
     14068-
     14069-static inline void die_if_kernel(const char *str, struct pt_regs *regs)
     14070-{
     14071-       if (unlikely(!user_mode(regs)))
     14072-               die(str, regs);
     14073-}
     14074-
     14075 extern int stop_a_enabled;
     14076 
     14077 /*
     14078diff -Naur linux-2.6.19.1/include/linux/highmem.h linux-mips-2.6.19.1/include/linux/highmem.h
     14079--- linux-2.6.19.1/include/linux/highmem.h      2006-12-11 11:32:53.000000000 -0800
     14080+++ linux-mips-2.6.19.1/include/linux/highmem.h 2006-12-11 15:38:26.000000000 -0800
    1364814081@@ -94,7 +94,10 @@
    1364914082        kunmap_atomic(kaddr, KM_USER0);
    … …  
    1366714100 {
    1366814101        char *vfrom, *vto;
    13669 diff -Naur linux-2.6.19/include/linux/pci_ids.h linux-mips-2.6.19/include/linux/pci_ids.h
    13670 --- linux-2.6.19/include/linux/pci_ids.h        2006-11-29 13:57:37.000000000 -0800
    13671 +++ linux-mips-2.6.19/include/linux/pci_ids.h   2006-11-29 15:23:09.000000000 -0800
     14102diff -Naur linux-2.6.19.1/include/linux/pci_ids.h linux-mips-2.6.19.1/include/linux/pci_ids.h
     14103--- linux-2.6.19.1/include/linux/pci_ids.h      2006-12-11 11:32:53.000000000 -0800
     14104+++ linux-mips-2.6.19.1/include/linux/pci_ids.h 2006-12-11 15:38:26.000000000 -0800
    1367214105@@ -1604,6 +1604,9 @@
    1367314106 #define PCI_VENDOR_ID_SATSAGEM         0x1267
    … …  
    1368014113 #define PCI_VENDOR_ID_ENSONIQ          0x1274
    1368114114 #define PCI_DEVICE_ID_ENSONIQ_CT5880   0x5880
    13682 diff -Naur linux-2.6.19/include/linux/serial.h linux-mips-2.6.19/include/linux/serial.h
    13683 --- linux-2.6.19/include/linux/serial.h 2006-11-29 13:57:37.000000000 -0800
    13684 +++ linux-mips-2.6.19/include/linux/serial.h    2006-11-29 15:23:09.000000000 -0800
     14115diff -Naur linux-2.6.19.1/include/linux/serial.h linux-mips-2.6.19.1/include/linux/serial.h
     14116--- linux-2.6.19.1/include/linux/serial.h       2006-12-11 11:32:53.000000000 -0800
     14117+++ linux-mips-2.6.19.1/include/linux/serial.h  2006-12-11 15:38:26.000000000 -0800
    1368514118@@ -76,7 +76,8 @@
    1368614119 #define PORT_16654     11
    … …  
    1369314126 #define SERIAL_IO_PORT 0
    1369414127 #define SERIAL_IO_HUB6 1
    13695 diff -Naur linux-2.6.19/include/linux/serial_ip3106.h linux-mips-2.6.19/include/linux/serial_ip3106.h
    13696 --- linux-2.6.19/include/linux/serial_ip3106.h  2006-11-29 13:57:37.000000000 -0800
    13697 +++ linux-mips-2.6.19/include/linux/serial_ip3106.h     2006-11-29 15:23:09.000000000 -0800
     14128diff -Naur linux-2.6.19.1/include/linux/serial_ip3106.h linux-mips-2.6.19.1/include/linux/serial_ip3106.h
     14129--- linux-2.6.19.1/include/linux/serial_ip3106.h        2006-12-11 11:32:53.000000000 -0800
     14130+++ linux-mips-2.6.19.1/include/linux/serial_ip3106.h   2006-12-11 15:38:26.000000000 -0800
    1369814131@@ -78,4 +78,16 @@
    1369914132 #define IP3106_UART_FIFO_RXFIFO                0x00001F00
    … …  
    1371314146+
    1371414147 #endif
    13715 diff -Naur linux-2.6.19/mm/memory.c linux-mips-2.6.19/mm/memory.c
    13716 --- linux-2.6.19/mm/memory.c    2006-11-29 13:57:37.000000000 -0800
    13717 +++ linux-mips-2.6.19/mm/memory.c       2006-11-29 15:23:09.000000000 -0800
     14148diff -Naur linux-2.6.19.1/mm/memory.c linux-mips-2.6.19.1/mm/memory.c
     14149--- linux-2.6.19.1/mm/memory.c  2006-12-11 11:32:53.000000000 -0800
     14150+++ linux-mips-2.6.19.1/mm/memory.c     2006-12-11 15:38:26.000000000 -0800
    1371814151@@ -1431,7 +1431,7 @@
    1371914152        return pte;
    … …  
    1375514188                        new_page = page;
    1375614189                        anon = 1;
    13757 diff -Naur linux-2.6.19/sound/oss/Kconfig linux-mips-2.6.19/sound/oss/Kconfig
    13758 --- linux-2.6.19/sound/oss/Kconfig      2006-11-29 13:57:37.000000000 -0800
    13759 +++ linux-mips-2.6.19/sound/oss/Kconfig 2006-11-29 15:23:09.000000000 -0800
     14190diff -Naur linux-2.6.19.1/sound/oss/Kconfig linux-mips-2.6.19.1/sound/oss/Kconfig
     14191--- linux-2.6.19.1/sound/oss/Kconfig    2006-12-11 11:32:53.000000000 -0800
     14192+++ linux-mips-2.6.19.1/sound/oss/Kconfig       2006-12-11 15:38:26.000000000 -0800
    1376014193@@ -128,6 +128,13 @@
    1376114194        select SND_AC97_CODEC
    … …  
    1377214205        tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
    1377314206        depends on SOUND_PRIME && PCI
    13774 diff -Naur linux-2.6.19/sound/oss/Makefile linux-mips-2.6.19/sound/oss/Makefile
    13775 --- linux-2.6.19/sound/oss/Makefile     2006-11-29 13:57:37.000000000 -0800
    13776 +++ linux-mips-2.6.19/sound/oss/Makefile        2006-11-29 15:23:09.000000000 -0800
     14207diff -Naur linux-2.6.19.1/sound/oss/Makefile linux-mips-2.6.19.1/sound/oss/Makefile
     14208--- linux-2.6.19.1/sound/oss/Makefile   2006-12-11 11:32:53.000000000 -0800
     14209+++ linux-mips-2.6.19.1/sound/oss/Makefile      2006-12-11 15:38:26.000000000 -0800
    1377714210@@ -45,6 +45,7 @@
    1377814211 obj-$(CONFIG_SOUND_ES1371)     += es1371.o ac97_codec.o
    … …  
    1378314216 obj-$(CONFIG_SOUND_TRIDENT)    += trident.o ac97_codec.o
    1378414217 obj-$(CONFIG_SOUND_EMU10K1)    += ac97_codec.o
    13785 diff -Naur linux-2.6.19/sound/oss/au1550_i2s.c linux-mips-2.6.19/sound/oss/au1550_i2s.c
    13786 --- linux-2.6.19/sound/oss/au1550_i2s.c 1969-12-31 16:00:00.000000000 -0800
    13787 +++ linux-mips-2.6.19/sound/oss/au1550_i2s.c    2006-11-29 15:23:09.000000000 -0800
     14218diff -Naur linux-2.6.19.1/sound/oss/au1550_i2s.c linux-mips-2.6.19.1/sound/oss/au1550_i2s.c
     14219--- linux-2.6.19.1/sound/oss/au1550_i2s.c       1969-12-31 16:00:00.000000000 -0800
     14220+++ linux-mips-2.6.19.1/sound/oss/au1550_i2s.c  2006-12-11 15:38:26.000000000 -0800
    1378814221@@ -0,0 +1,2029 @@
    1378914222+/*
Note: See TracChangeset for help on using the changeset viewer.